mercurial-scm/hg: comparison mercurial/simplemerge.py

equal deleted inserted replaced

-:15d3facfa40a
+:aaad36b88298
 alen = a2 - a1
 blen = b2 - b1
 # find matches at the front
 ii = 0
-while ii < alen and ii < blen and \
+while (ii < alen and ii < blen and
-self.a[a1 + ii] == self.b[b1 + ii]:
+self.a[a1 + ii] == self.b[b1 + ii]):
 ii += 1
 startmatches = ii
 # find matches at the end
 ii = 0
-while ii < alen and ii < blen and \
+while (ii < alen and ii < blen and
-self.a[a2 - ii - 1] == self.b[b2 - ii - 1]:
+self.a[a2 - ii - 1] == self.b[b2 - ii - 1]):
 ii += 1
 endmatches = ii
 if startmatches > 0:
 yield 'same', a1, a1 + startmatches
 asub = amatch + (intbase - abase)
 bsub = bmatch + (intbase - bbase)
 aend = asub + intlen
 bend = bsub + intlen
-assert self.base[intbase:intend] == self.a[asub:aend], \
+assert self.base[intbase:intend] == self.a[asub:aend], (
-(self.base[intbase:intend], self.a[asub:aend])
+(self.base[intbase:intend], self.a[asub:aend]))
 assert self.base[intbase:intend] == self.b[bsub:bend]
 sl.append((intbase, intend,
 asub, aend,