mercurial/simplemerge.py
changeset 49284 d44e3c45f0e4
parent 48981 f3aafd785e65
child 49956 2282d8ac0fa9
equal deleted inserted replaced
49283:44b26349127b 49284:d44e3c45f0e4
    19 
    19 
    20 from .i18n import _
    20 from .i18n import _
    21 from . import (
    21 from . import (
    22     error,
    22     error,
    23     mdiff,
    23     mdiff,
    24     pycompat,
       
    25 )
    24 )
    26 from .utils import stringutil
    25 from .utils import stringutil
    27 
    26 
    28 
    27 
    29 def intersect(ra, rb):
    28 def intersect(ra, rb):
    51 
    50 
    52 def compare_range(a, astart, aend, b, bstart, bend):
    51 def compare_range(a, astart, aend, b, bstart, bend):
    53     """Compare a[astart:aend] == b[bstart:bend], without slicing."""
    52     """Compare a[astart:aend] == b[bstart:bend], without slicing."""
    54     if (aend - astart) != (bend - bstart):
    53     if (aend - astart) != (bend - bstart):
    55         return False
    54         return False
    56     for ia, ib in zip(
    55     for ia, ib in zip(range(astart, aend), range(bstart, bend)):
    57         pycompat.xrange(astart, aend), pycompat.xrange(bstart, bend)
       
    58     ):
       
    59         if a[ia] != b[ib]:
    56         if a[ia] != b[ib]:
    60             return False
    57             return False
    61     else:
    58     else:
    62         return True
    59         return True
    63 
    60