/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/patches.py

merge trailing whitespace removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patches.py
92
92
    range = int(range)
93
93
    return (pos, range)
94
94
 
95
 
 
 
95
 
96
96
def hunk_from_header(line):
97
97
    import re
98
98
    matches = re.match(r'\@\@ ([^@]*) \@\@( (.*))?\n', line)
268
268
        self.hunks = []
269
269
 
270
270
    def __str__(self):
271
 
        ret = self.get_header() 
 
271
        ret = self.get_header()
272
272
        ret += "".join([str(h) for h in self.hunks])
273
273
        return ret
274
274
 
296
296
                return None
297
297
            newpos += shift
298
298
        return newpos
299
 
            
 
299
 
300
300
    def iter_inserted(self):
301
301
        """Iteraties through inserted lines
302
 
        
 
302
 
303
303
        :return: Pair of line number, line
304
304
        :rtype: iterator of (int, InsertLine)
305
305
        """