mercurial-crew-with-dirclash: comparison contrib/simplemerge

equal deleted inserted replaced

-:73fdc8bd3ed8
+:ea7b982b6c08
 from mercurial.i18n import _
 class CantReprocessAndShowBase(Exception):
 pass
 def warn(message):
 sys.stdout.flush()
 sys.stderr.write(message)
 sys.stderr.flush()
 >>> intersect((0, 9), (7, 15))
 (7, 9)
 """
 assert ra[0] <= ra[1]
 assert rb[0] <= rb[1]
 sa = max(ra[0], rb[0])
 sb = min(ra[1], rb[1])
 if sa < sb:
 return sa, sb
 else:
 for ia, ib in zip(xrange(astart, aend), xrange(bstart, bend)):
 if a[ia] != b[ib]:
 return False
 else:
 return True
 class Merge3Text(object):
 """3-way merge of texts.
 for i in range(t[5], t[6]):
 yield self.b[i]
 yield end_marker + newline
 else:
 raise ValueError(what)
 def merge_annotated(self):
 """Return merge with conflicts, showing origin of lines.
 Most useful for debugging merge.
 """
 for t in self.merge_regions():
 what = t[0]
 if what == 'unchanged':
 for i in range(t[1], t[2]):
 for i in range(t[5], t[6]):
 yield 'B | ' + self.b[i]
 yield '>>>>\n'
 else:
 raise ValueError(what)
 def merge_groups(self):
 """Yield sequence of line groups.  Each one is a tuple:
 conflicted, or changed on only one side.
 """
 # section a[0:ia] has been disposed of, etc
 iz = ia = ib = 0
 for zmatch, zend, amatch, aend, bmatch, bend in self.find_sync_regions():
 #print 'match base [%d:%d]' % (zmatch, zend)
 matchlen = zend - zmatch
 assert matchlen >= 0
 assert matchlen == (aend - amatch)
 assert matchlen == (bend - bmatch)
 len_a = amatch - ia
 len_b = bmatch - ib
 len_base = zmatch - iz
 assert len_a >= 0
 assert len_b >= 0
 iz = zmatch
 # if the same part of the base was deleted on both sides
 # that's OK, we can just skip it.
 if matchlen > 0:
 assert ia == amatch
 assert ib == bmatch
 assert iz == zmatch
 yield 'unchanged', zmatch, zend
 iz = zend
 ia = aend
 ib = bend
 def reprocess_merge_regions(self, merge_regions):
 """Where there are conflict regions, remove the agreed lines.
 Lines where both A and B have made the same changes are
 eliminated.
 """
 for region in merge_regions:
 if region[0] != "conflict":
 yield region
 def mismatch_region(next_a, region_ia,  next_b, region_ib):
 if next_a < region_ia or next_b < region_ib:
 return 'conflict', None, None, next_a, region_ia, next_b, region_ib
 mismatch_region = staticmethod(mismatch_region)
 def find_sync_regions(self):
 """Return a list of sync regions, where both descendents match the base.
 Generates a list of (base1, base2, a1, a2, b1, b2).  There is
 # advance whichever one ends first in the base text
 if (abase + alen) < (bbase + blen):
 ia += 1
 else:
 ib += 1
 intbase = len(self.base)
 abase = len(self.a)
 bbase = len(self.b)
 sl.append((intbase, intbase, abase, abase, bbase, bbase))
 if a2 < b2:
 del am[0]
 else:
 del bm[0]
 return unc
 # bzr compatible interface, for the tests
 class Merge3(Merge3Text):
 ('q', 'quiet', None, _('suppress output'))]
 usage = _('''simplemerge [OPTS] LOCAL BASE OTHER
 Simple three-way file merge utility with a minimal feature set.
 Apply to LOCAL the changes necessary to go from BASE to OTHER.
 By default, LOCAL is overwritten with the results of this operation.
 ''')
 def showhelp():
 sys.stdout.write(usage)

changeset 5115	ea7b982b6c08
parent 4406	1ef4445c6506