Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.py @ 49292:d44e3c45f0e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace `pycompat.xrange` by `range`
author Manuel Jacob <me@manueljacob.de>
date Sun, 29 May 2022 15:17:27 +0200
parents f3aafd785e65
children 2282d8ac0fa9
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Sun May 29 12:38:54 2022 +0200
+++ b/mercurial/simplemerge.py	Sun May 29 15:17:27 2022 +0200
@@ -21,7 +21,6 @@
 from . import (
     error,
     mdiff,
-    pycompat,
 )
 from .utils import stringutil
 
@@ -53,9 +52,7 @@
     """Compare a[astart:aend] == b[bstart:bend], without slicing."""
     if (aend - astart) != (bend - bstart):
         return False
-    for ia, ib in zip(
-        pycompat.xrange(astart, aend), pycompat.xrange(bstart, bend)
-    ):
+    for ia, ib in zip(range(astart, aend), range(bstart, bend)):
         if a[ia] != b[ib]:
             return False
     else: