← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patches.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-23 17:00:36 UTC
  • mfrom: (4032.1.4 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090223170036-3q1v68ewdt8i0to5
(Marius Kruger) Remove all trailing whitespace and add tests to
        enforce this.

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
 
300
300
                return None
301
301
            newpos += shift
302
302
        return newpos
303
 
            
 
303
 
304
304
    def iter_inserted(self):
305
305
        """Iteraties through inserted lines
306
 
        
 
306
 
307
307
        :return: Pair of line number, line
308
308
        :rtype: iterator of (int, InsertLine)
309
309
        """