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

comparison contrib/simplemerge @ 4359:2e3c54fb79a3

actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Mon, 16 Apr 2007 20:17:39 -0300
parents	465b9ea02868
children	d5c3a70f8422

comparison

equal deleted inserted replaced

-:465b9ea02868
+:2e3c54fb79a3
+#!/usr/bin/env python
 # Copyright (C) 2004, 2005 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # mbp: "you know that thing where cvs gives you conflict markers?"
 # s: "i hate that."
-from bzrlib.errors import CantReprocessAndShowBase
+from mercurial import util, mdiff
-import bzrlib.patiencediff
+from mercurial.i18n import _
-from bzrlib.textfile import check_text_lines
+class CantReprocessAndShowBase(Exception):
+pass
 def intersect(ra, rb):
 """Given two ranges return the range where they intersect or None.
 return True
-class Merge3(object):
+class Merge3Text(object):
 """3-way merge of texts.
-Given BASE, OTHER, THIS, tries to produce a combined text
+Given strings BASE, OTHER, THIS, tries to produce a combined text
-incorporating the changes from both BASE->OTHER and BASE->THIS.
+incorporating the changes from both BASE->OTHER and BASE->THIS."""
-All three will typically be sequences of lines."""
+def __init__(self, basetext, atext, btext, base=None, a=None, b=None):
-def __init__(self, base, a, b):
+self.basetext = basetext
-check_text_lines(base)
+self.atext = atext
-check_text_lines(a)
+self.btext = btext
-check_text_lines(b)
+if base is None:
+base = mdiff.splitnewlines(basetext)
+if a is None:
+a = mdiff.splitnewlines(atext)
+if b is None:
+b = mdiff.splitnewlines(btext)
 self.base = base
 self.a = a
 self.b = b
 yield region
 continue
 type, iz, zmatch, ia, amatch, ib, bmatch = region
 a_region = self.a[ia:amatch]
 b_region = self.b[ib:bmatch]
-matches = bzrlib.patiencediff.PatienceSequenceMatcher(
+matches = mdiff.get_matching_blocks(''.join(a_region),
-None, a_region, b_region).get_matching_blocks()
+''.join(b_region))
 next_a = ia
 next_b = ib
 for region_ia, region_ib, region_len in matches[:-1]:
 region_ia += ia
 region_ib += ib
 reg = self.mismatch_region(next_a, amatch, next_b, bmatch)
 if reg is not None:
 yield reg
-@staticmethod
 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
 always a zero-length sync region at the end of all the files.
 """
 ia = ib = 0
-amatches = bzrlib.patiencediff.PatienceSequenceMatcher(
+amatches = mdiff.get_matching_blocks(self.basetext, self.atext)
-None, self.base, self.a).get_matching_blocks()
+bmatches = mdiff.get_matching_blocks(self.basetext, self.btext)
-bmatches = bzrlib.patiencediff.PatienceSequenceMatcher(
-None, self.base, self.b).get_matching_blocks()
 len_a = len(amatches)
 len_b = len(bmatches)
 sl = []
 def find_unconflicted(self):
 """Return a list of ranges in base that are not conflicted."""
-am = bzrlib.patiencediff.PatienceSequenceMatcher(
+am = mdiff.get_matching_blocks(self.basetext, self.atext)
-None, self.base, self.a).get_matching_blocks()
+bm = mdiff.get_matching_blocks(self.basetext, self.btext)
-bm = bzrlib.patiencediff.PatienceSequenceMatcher(
-None, self.base, self.b).get_matching_blocks()
 unc = []
 while am and bm:
 # there is an unconflicted block at i; how long does it
 del bm[0]
 return unc
+# bzr compatible interface, for the tests
+class Merge3(Merge3Text):
+"""3-way merge of texts.
+Given BASE, OTHER, THIS, tries to produce a combined text
+incorporating the changes from both BASE->OTHER and BASE->THIS.
+All three will typically be sequences of lines."""
+def __init__(self, base, a, b):
+basetext = '\n'.join([i.strip('\n') for i in base] + [''])
+atext = '\n'.join([i.strip('\n') for i in a] + [''])
+btext = '\n'.join([i.strip('\n') for i in b] + [''])
+if util.binary(basetext) or util.binary(atext) or util.binary(btext):
+raise util.Abort(_("don't know how to merge binary files"))
+Merge3Text.__init__(self, basetext, atext, btext, base, a, b)
 def main(argv):
 # as for diff3 and meld the syntax is "MINE BASE OTHER"
 a = file(argv[1], 'rt').readlines()
 base = file(argv[2], 'rt').readlines()
 b = file(argv[3], 'rt').readlines()

Mercurial > hg > mercurial-crew-with-dirclash

comparison contrib/simplemerge @ 4359:2e3c54fb79a3