style.py (9081:bbb0132f0369) | style.py (9135:64d4c9d8a384) |
---|---|
1#! /usr/bin/env python 2# Copyright (c) 2006 The Regents of The University of Michigan 3# Copyright (c) 2007,2011 The Hewlett-Packard Development Company 4# All rights reserved. 5# 6# Redistribution and use in source and binary forms, with or without 7# modification, are permitted provided that the following conditions are 8# met: redistributions of source code must retain the above copyright --- 64 unchanged lines hidden (view full) --- 73 if len(pctx) in (1, 2): 74 mod_regions = modified_regions(pctx[0].data(), file_data) 75 if len(pctx) == 2: 76 m2 = modified_regions(pctx[1].data(), file_data) 77 # only the lines that are new in both 78 mod_regions &= m2 79 else: 80 mod_regions = Regions() | 1#! /usr/bin/env python 2# Copyright (c) 2006 The Regents of The University of Michigan 3# Copyright (c) 2007,2011 The Hewlett-Packard Development Company 4# All rights reserved. 5# 6# Redistribution and use in source and binary forms, with or without 7# modification, are permitted provided that the following conditions are 8# met: redistributions of source code must retain the above copyright --- 64 unchanged lines hidden (view full) --- 73 if len(pctx) in (1, 2): 74 mod_regions = modified_regions(pctx[0].data(), file_data) 75 if len(pctx) == 2: 76 m2 = modified_regions(pctx[1].data(), file_data) 77 # only the lines that are new in both 78 mod_regions &= m2 79 else: 80 mod_regions = Regions() |
81 mod_regions.add(0, len(lines)) | 81 mod_regions.append(0, len(lines)) |
82 83 return mod_regions 84 85class UserInterface(object): 86 def __init__(self, verbose=False, auto=False): 87 self.auto = auto 88 self.verbose = verbose 89 --- 462 unchanged lines hidden --- | 82 83 return mod_regions 84 85class UserInterface(object): 86 def __init__(self, verbose=False, auto=False): 87 self.auto = auto 88 self.verbose = verbose 89 --- 462 unchanged lines hidden --- |