Mercurial > hg
diff mercurial/patch.py @ 16123:b0c7525f826d stable
patch: fix fuzzing of hunks without previous lines (issue3264)
When applying hunks such as:
@@ -2,1 +2,2 @@
context
+change
fuzzing would empty the "old" block and make patchfile.apply() traceback.
Instead, we apply the new block at specified location without testing.
The "bottom hunk" test was removed as patch(1) has no problem applying hunk
with no context in the middle of a file.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Mon, 13 Feb 2012 16:47:31 +0100 |
parents | 9ef3a4a2c6c0 |
children | 0e0060bf2f44 |
line wrap: on
line diff
--- a/mercurial/patch.py Mon Feb 13 13:51:38 2012 +0100 +++ b/mercurial/patch.py Mon Feb 13 16:47:31 2012 +0100 @@ -748,20 +748,21 @@ self.hash = {} for x, s in enumerate(self.lines): self.hash.setdefault(s, []).append(x) - if h.hunk[-1][0] != ' ': - # if the hunk tried to put something at the bottom of the file - # override the start line and use eof here - search_start = len(self.lines) - else: - search_start = orig_start + self.skew for fuzzlen in xrange(3): for toponly in [True, False]: old, oldstart, new, newstart = h.fuzzit(fuzzlen, toponly) + oldstart = oldstart + self.offset + self.skew + oldstart = min(oldstart, len(self.lines)) + if old: + cand = self.findlines(old[0][1:], oldstart) + else: + # Only adding lines with no or fuzzed context, just + # take the skew in account + cand = [oldstart] - cand = self.findlines(old[0][1:], search_start) for l in cand: - if diffhelpers.testhunk(old, self.lines, l) == 0: + if not old or diffhelpers.testhunk(old, self.lines, l) == 0: self.lines[l : l + len(old)] = new self.offset += len(new) - len(old) self.skew = l - orig_start