Mercurial > hg
comparison mercurial/patch.py @ 16662:ea7bf1d49bce
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 12 May 2012 12:23:49 +0200 |
| parents | aef3d0d4631c fcb97d9a26cd |
| children | 525fdb738975 |
comparison
equal
deleted
inserted
replaced
| 16661:de4b42daf396 | 16662:ea7bf1d49bce |
|---|---|
| 1012 def fuzzit(self, fuzz, toponly): | 1012 def fuzzit(self, fuzz, toponly): |
| 1013 old, new, top = self._fuzzit(self.a, self.b, fuzz, toponly) | 1013 old, new, top = self._fuzzit(self.a, self.b, fuzz, toponly) |
| 1014 oldstart = self.starta + top | 1014 oldstart = self.starta + top |
| 1015 newstart = self.startb + top | 1015 newstart = self.startb + top |
| 1016 # zero length hunk ranges already have their start decremented | 1016 # zero length hunk ranges already have their start decremented |
| 1017 if self.lena: | 1017 if self.lena and oldstart > 0: |
| 1018 oldstart -= 1 | 1018 oldstart -= 1 |
| 1019 if self.lenb: | 1019 if self.lenb and newstart > 0: |
| 1020 newstart -= 1 | 1020 newstart -= 1 |
| 1021 return old, oldstart, new, newstart | 1021 return old, oldstart, new, newstart |
| 1022 | 1022 |
| 1023 class binhunk(object): | 1023 class binhunk(object): |
| 1024 'A binary patch file. Only understands literals so far.' | 1024 'A binary patch file. Only understands literals so far.' |