--- a/mercurial/patch.py Wed Aug 01 12:57:15 2018 -0700
+++ b/mercurial/patch.py Wed Aug 01 13:00:45 2018 -0700
@@ -815,7 +815,7 @@
for x, s in enumerate(self.lines):
self.hash.setdefault(s, []).append(x)
- for fuzzlen in xrange(self.ui.configint("patch", "fuzz") + 1):
+ for fuzzlen in pycompat.xrange(self.ui.configint("patch", "fuzz") + 1):
for toponly in [True, False]:
old, oldstart, new, newstart = h.fuzzit(fuzzlen, toponly)
oldstart = oldstart + self.offset + self.skew
@@ -1286,7 +1286,7 @@
self.lena = int(aend) - self.starta
if self.starta:
self.lena += 1
- for x in xrange(self.lena):
+ for x in pycompat.xrange(self.lena):
l = lr.readline()
if l.startswith('---'):
# lines addition, old block is empty
@@ -1320,7 +1320,7 @@
if self.startb:
self.lenb += 1
hunki = 1
- for x in xrange(self.lenb):
+ for x in pycompat.xrange(self.lenb):
l = lr.readline()
if l.startswith('\ '):
# XXX: the only way to hit this is with an invalid line range.
@@ -1396,14 +1396,14 @@
top = 0
bot = 0
hlen = len(self.hunk)
- for x in xrange(hlen - 1):
+ for x in pycompat.xrange(hlen - 1):
# the hunk starts with the @@ line, so use x+1
if self.hunk[x + 1].startswith(' '):
top += 1
else:
break
if not toponly:
- for x in xrange(hlen - 1):
+ for x in pycompat.xrange(hlen - 1):
if self.hunk[hlen - bot - 1].startswith(' '):
bot += 1
else: