Show More
@@ -36,6 +36,9 b' def coreconfigitem(*args, **kwargs):' | |||||
36 |
|
36 | |||
37 | # Registering actual config items |
|
37 | # Registering actual config items | |
38 |
|
38 | |||
|
39 | coreconfigitem('patch', 'fuzz', | |||
|
40 | default=2, | |||
|
41 | ) | |||
39 | coreconfigitem('ui', 'quiet', |
|
42 | coreconfigitem('ui', 'quiet', | |
40 | default=False, |
|
43 | default=False, | |
41 | ) |
|
44 | ) |
@@ -803,7 +803,7 b' class patchfile(object):' | |||||
803 | for x, s in enumerate(self.lines): |
|
803 | for x, s in enumerate(self.lines): | |
804 | self.hash.setdefault(s, []).append(x) |
|
804 | self.hash.setdefault(s, []).append(x) | |
805 |
|
805 | |||
806 |
for fuzzlen in xrange(self.ui.configint("patch", "fuzz" |
|
806 | for fuzzlen in xrange(self.ui.configint("patch", "fuzz") + 1): | |
807 | for toponly in [True, False]: |
|
807 | for toponly in [True, False]: | |
808 | old, oldstart, new, newstart = h.fuzzit(fuzzlen, toponly) |
|
808 | old, oldstart, new, newstart = h.fuzzit(fuzzlen, toponly) | |
809 | oldstart = oldstart + self.offset + self.skew |
|
809 | oldstart = oldstart + self.offset + self.skew |
General Comments 0
You need to be logged in to leave comments.
Login now