Mercurial > public > mercurial-scm > hg
comparison mercurial/patch.py @ 6948:359e93ceee3a
fix double indentation and trailing whitespace
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Sun, 31 Aug 2008 11:41:52 +0200 |
| parents | 11229144aa01 |
| children | 3fffba1c87d0 |
comparison
equal
deleted
inserted
replaced
| 6947:a7fcb43af82e | 6948:359e93ceee3a |
|---|---|
| 535 self.startb = int(self.startb) | 535 self.startb = int(self.startb) |
| 536 diffhelpers.addlines(lr.fp, self.hunk, self.lena, self.lenb, self.a, self.b) | 536 diffhelpers.addlines(lr.fp, self.hunk, self.lena, self.lenb, self.a, self.b) |
| 537 # if we hit eof before finishing out the hunk, the last line will | 537 # if we hit eof before finishing out the hunk, the last line will |
| 538 # be zero length. Lets try to fix it up. | 538 # be zero length. Lets try to fix it up. |
| 539 while len(self.hunk[-1]) == 0: | 539 while len(self.hunk[-1]) == 0: |
| 540 del self.hunk[-1] | 540 del self.hunk[-1] |
| 541 del self.a[-1] | 541 del self.a[-1] |
| 542 del self.b[-1] | 542 del self.b[-1] |
| 543 self.lena -= 1 | 543 self.lena -= 1 |
| 544 self.lenb -= 1 | 544 self.lenb -= 1 |
| 545 | 545 |
| 546 def read_context_hunk(self, lr): | 546 def read_context_hunk(self, lr): |
| 547 self.desc = lr.readline() | 547 self.desc = lr.readline() |
| 548 m = contextdesc.match(self.desc) | 548 m = contextdesc.match(self.desc) |
| 549 if not m: | 549 if not m: |