hg/gitweb: contrib/simplemerge annotate

annotate contrib/simplemerge @ 4376:de612b5f8d59

Make copy --after work for files that have been hg added.

author	Brendan Cully <brendan@kublai.com>
date	Tue, 24 Apr 2007 18:43:18 -0700
parents	d5c3a70f8422
children	1ef4445c6506

rev	line source
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	1 #!/usr/bin/env python
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	2 # Copyright (C) 2004, 2005 Canonical Ltd
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	3 #
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	4 # This program is free software; you can redistribute it and/or modify
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	5 # it under the terms of the GNU General Public License as published by
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	6 # the Free Software Foundation; either version 2 of the License, or
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	7 # (at your option) any later version.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	8 #
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	9 # This program is distributed in the hope that it will be useful,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	12 # GNU General Public License for more details.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	13 #
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	14 # You should have received a copy of the GNU General Public License
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	15 # along with this program; if not, write to the Free Software
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	16 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	17
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	18
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	19 # mbp: "you know that thing where cvs gives you conflict markers?"
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	20 # s: "i hate that."
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	21
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	22 from mercurial import demandimport
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	23 demandimport.enable()
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	24
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	25 from mercurial import util, mdiff, fancyopts
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	26 from mercurial.i18n import _
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	27
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	28
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	29 class CantReprocessAndShowBase(Exception):
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	30 pass
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	31
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	32
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	33 def intersect(ra, rb):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	34 """Given two ranges return the range where they intersect or None.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	35
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	36 >>> intersect((0, 10), (0, 6))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	37 (0, 6)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	38 >>> intersect((0, 10), (5, 15))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	39 (5, 10)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	40 >>> intersect((0, 10), (10, 15))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	41 >>> intersect((0, 9), (10, 15))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	42 >>> intersect((0, 9), (7, 15))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	43 (7, 9)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	44 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	45 assert ra[0] <= ra[1]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	46 assert rb[0] <= rb[1]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	47
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	48 sa = max(ra[0], rb[0])
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	49 sb = min(ra[1], rb[1])
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	50 if sa < sb:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	51 return sa, sb
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	52 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	53 return None
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	54
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	55
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	56 def compare_range(a, astart, aend, b, bstart, bend):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	57 """Compare a[astart:aend] == b[bstart:bend], without slicing.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	58 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	59 if (aend-astart) != (bend-bstart):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	60 return False
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	61 for ia, ib in zip(xrange(astart, aend), xrange(bstart, bend)):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	62 if a[ia] != b[ib]:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	63 return False
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	64 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	65 return True
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	66
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	67
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	68
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	69
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	70 class Merge3Text(object):
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	71 """3-way merge of texts.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	72
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	73 Given strings BASE, OTHER, THIS, tries to produce a combined text
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	74 incorporating the changes from both BASE->OTHER and BASE->THIS."""
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	75 def __init__(self, basetext, atext, btext, base=None, a=None, b=None):
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	76 self.basetext = basetext
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	77 self.atext = atext
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	78 self.btext = btext
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	79 if base is None:
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	80 base = mdiff.splitnewlines(basetext)
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	81 if a is None:
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	82 a = mdiff.splitnewlines(atext)
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	83 if b is None:
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	84 b = mdiff.splitnewlines(btext)
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	85 self.base = base
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	86 self.a = a
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	87 self.b = b
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	88
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	89
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	90
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	91 def merge_lines(self,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	92 name_a=None,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	93 name_b=None,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	94 name_base=None,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	95 start_marker='<<<<<<<',
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	96 mid_marker='=======',
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	97 end_marker='>>>>>>>',
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	98 base_marker=None,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	99 reprocess=False):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	100 """Return merge in cvs-like form.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	101 """
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	102 self.conflicts = False
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	103 newline = '\n'
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	104 if len(self.a) > 0:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	105 if self.a[0].endswith('\r\n'):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	106 newline = '\r\n'
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	107 elif self.a[0].endswith('\r'):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	108 newline = '\r'
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	109 if base_marker and reprocess:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	110 raise CantReprocessAndShowBase()
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	111 if name_a:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	112 start_marker = start_marker + ' ' + name_a
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	113 if name_b:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	114 end_marker = end_marker + ' ' + name_b
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	115 if name_base and base_marker:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	116 base_marker = base_marker + ' ' + name_base
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	117 merge_regions = self.merge_regions()
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	118 if reprocess is True:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	119 merge_regions = self.reprocess_merge_regions(merge_regions)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	120 for t in merge_regions:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	121 what = t[0]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	122 if what == 'unchanged':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	123 for i in range(t[1], t[2]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	124 yield self.base[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	125 elif what == 'a' or what == 'same':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	126 for i in range(t[1], t[2]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	127 yield self.a[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	128 elif what == 'b':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	129 for i in range(t[1], t[2]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	130 yield self.b[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	131 elif what == 'conflict':
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	132 self.conflicts = True
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	133 yield start_marker + newline
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	134 for i in range(t[3], t[4]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	135 yield self.a[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	136 if base_marker is not None:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	137 yield base_marker + newline
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	138 for i in range(t[1], t[2]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	139 yield self.base[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	140 yield mid_marker + newline
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	141 for i in range(t[5], t[6]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	142 yield self.b[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	143 yield end_marker + newline
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	144 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	145 raise ValueError(what)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	146
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	147
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	148
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	149
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	150
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	151 def merge_annotated(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	152 """Return merge with conflicts, showing origin of lines.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	153
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	154 Most useful for debugging merge.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	155 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	156 for t in self.merge_regions():
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	157 what = t[0]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	158 if what == 'unchanged':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	159 for i in range(t[1], t[2]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	160 yield 'u \| ' + self.base[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	161 elif what == 'a' or what == 'same':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	162 for i in range(t[1], t[2]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	163 yield what[0] + ' \| ' + self.a[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	164 elif what == 'b':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	165 for i in range(t[1], t[2]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	166 yield 'b \| ' + self.b[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	167 elif what == 'conflict':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	168 yield '<<<<\n'
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	169 for i in range(t[3], t[4]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	170 yield 'A \| ' + self.a[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	171 yield '----\n'
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	172 for i in range(t[5], t[6]):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	173 yield 'B \| ' + self.b[i]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	174 yield '>>>>\n'
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	175 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	176 raise ValueError(what)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	177
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	178
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	179
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	180
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	181
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	182 def merge_groups(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	183 """Yield sequence of line groups. Each one is a tuple:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	184
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	185 'unchanged', lines
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	186 Lines unchanged from base
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	187
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	188 'a', lines
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	189 Lines taken from a
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	190
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	191 'same', lines
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	192 Lines taken from a (and equal to b)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	193
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	194 'b', lines
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	195 Lines taken from b
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	196
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	197 'conflict', base_lines, a_lines, b_lines
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	198 Lines from base were changed to either a or b and conflict.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	199 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	200 for t in self.merge_regions():
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	201 what = t[0]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	202 if what == 'unchanged':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	203 yield what, self.base[t[1]:t[2]]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	204 elif what == 'a' or what == 'same':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	205 yield what, self.a[t[1]:t[2]]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	206 elif what == 'b':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	207 yield what, self.b[t[1]:t[2]]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	208 elif what == 'conflict':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	209 yield (what,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	210 self.base[t[1]:t[2]],
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	211 self.a[t[3]:t[4]],
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	212 self.b[t[5]:t[6]])
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	213 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	214 raise ValueError(what)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	215
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	216
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	217 def merge_regions(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	218 """Return sequences of matching and conflicting regions.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	219
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	220 This returns tuples, where the first value says what kind we
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	221 have:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	222
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	223 'unchanged', start, end
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	224 Take a region of base[start:end]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	225
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	226 'same', astart, aend
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	227 b and a are different from base but give the same result
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	228
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	229 'a', start, end
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	230 Non-clashing insertion from a[start:end]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	231
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	232 Method is as follows:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	233
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	234 The two sequences align only on regions which match the base
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	235 and both descendents. These are found by doing a two-way diff
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	236 of each one against the base, and then finding the
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	237 intersections between those regions. These "sync regions"
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	238 are by definition unchanged in both and easily dealt with.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	239
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	240 The regions in between can be in any of three cases:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	241 conflicted, or changed on only one side.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	242 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	243
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	244 # section a[0:ia] has been disposed of, etc
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	245 iz = ia = ib = 0
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	246
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	247 for zmatch, zend, amatch, aend, bmatch, bend in self.find_sync_regions():
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	248 #print 'match base [%d:%d]' % (zmatch, zend)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	249
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	250 matchlen = zend - zmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	251 assert matchlen >= 0
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	252 assert matchlen == (aend - amatch)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	253 assert matchlen == (bend - bmatch)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	254
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	255 len_a = amatch - ia
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	256 len_b = bmatch - ib
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	257 len_base = zmatch - iz
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	258 assert len_a >= 0
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	259 assert len_b >= 0
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	260 assert len_base >= 0
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	261
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	262 #print 'unmatched a=%d, b=%d' % (len_a, len_b)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	263
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	264 if len_a or len_b:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	265 # try to avoid actually slicing the lists
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	266 equal_a = compare_range(self.a, ia, amatch,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	267 self.base, iz, zmatch)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	268 equal_b = compare_range(self.b, ib, bmatch,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	269 self.base, iz, zmatch)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	270 same = compare_range(self.a, ia, amatch,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	271 self.b, ib, bmatch)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	272
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	273 if same:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	274 yield 'same', ia, amatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	275 elif equal_a and not equal_b:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	276 yield 'b', ib, bmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	277 elif equal_b and not equal_a:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	278 yield 'a', ia, amatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	279 elif not equal_a and not equal_b:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	280 yield 'conflict', iz, zmatch, ia, amatch, ib, bmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	281 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	282 raise AssertionError("can't handle a=b=base but unmatched")
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	283
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	284 ia = amatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	285 ib = bmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	286 iz = zmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	287
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	288 # if the same part of the base was deleted on both sides
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	289 # that's OK, we can just skip it.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	290
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	291
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	292 if matchlen > 0:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	293 assert ia == amatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	294 assert ib == bmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	295 assert iz == zmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	296
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	297 yield 'unchanged', zmatch, zend
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	298 iz = zend
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	299 ia = aend
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	300 ib = bend
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	301
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	302
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	303 def reprocess_merge_regions(self, merge_regions):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	304 """Where there are conflict regions, remove the agreed lines.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	305
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	306 Lines where both A and B have made the same changes are
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	307 eliminated.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	308 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	309 for region in merge_regions:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	310 if region[0] != "conflict":
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	311 yield region
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	312 continue
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	313 type, iz, zmatch, ia, amatch, ib, bmatch = region
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	314 a_region = self.a[ia:amatch]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	315 b_region = self.b[ib:bmatch]
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	316 matches = mdiff.get_matching_blocks(''.join(a_region),
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	317 ''.join(b_region))
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	318 next_a = ia
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	319 next_b = ib
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	320 for region_ia, region_ib, region_len in matches[:-1]:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	321 region_ia += ia
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	322 region_ib += ib
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	323 reg = self.mismatch_region(next_a, region_ia, next_b,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	324 region_ib)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	325 if reg is not None:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	326 yield reg
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	327 yield 'same', region_ia, region_len+region_ia
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	328 next_a = region_ia + region_len
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	329 next_b = region_ib + region_len
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	330 reg = self.mismatch_region(next_a, amatch, next_b, bmatch)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	331 if reg is not None:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	332 yield reg
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	333
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	334
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	335 def mismatch_region(next_a, region_ia, next_b, region_ib):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	336 if next_a < region_ia or next_b < region_ib:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	337 return 'conflict', None, None, next_a, region_ia, next_b, region_ib
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	338 mismatch_region = staticmethod(mismatch_region)
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	339
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	340
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	341 def find_sync_regions(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	342 """Return a list of sync regions, where both descendents match the base.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	343
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	344 Generates a list of (base1, base2, a1, a2, b1, b2). There is
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	345 always a zero-length sync region at the end of all the files.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	346 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	347
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	348 ia = ib = 0
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	349 amatches = mdiff.get_matching_blocks(self.basetext, self.atext)
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	350 bmatches = mdiff.get_matching_blocks(self.basetext, self.btext)
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	351 len_a = len(amatches)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	352 len_b = len(bmatches)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	353
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	354 sl = []
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	355
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	356 while ia < len_a and ib < len_b:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	357 abase, amatch, alen = amatches[ia]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	358 bbase, bmatch, blen = bmatches[ib]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	359
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	360 # there is an unconflicted block at i; how long does it
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	361 # extend? until whichever one ends earlier.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	362 i = intersect((abase, abase+alen), (bbase, bbase+blen))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	363 if i:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	364 intbase = i[0]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	365 intend = i[1]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	366 intlen = intend - intbase
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	367
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	368 # found a match of base[i[0], i[1]]; this may be less than
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	369 # the region that matches in either one
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	370 assert intlen <= alen
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	371 assert intlen <= blen
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	372 assert abase <= intbase
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	373 assert bbase <= intbase
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	374
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	375 asub = amatch + (intbase - abase)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	376 bsub = bmatch + (intbase - bbase)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	377 aend = asub + intlen
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	378 bend = bsub + intlen
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	379
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	380 assert self.base[intbase:intend] == self.a[asub:aend], \
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	381 (self.base[intbase:intend], self.a[asub:aend])
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	382
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	383 assert self.base[intbase:intend] == self.b[bsub:bend]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	384
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	385 sl.append((intbase, intend,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	386 asub, aend,
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	387 bsub, bend))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	388
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	389 # advance whichever one ends first in the base text
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	390 if (abase + alen) < (bbase + blen):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	391 ia += 1
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	392 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	393 ib += 1
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	394
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	395 intbase = len(self.base)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	396 abase = len(self.a)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	397 bbase = len(self.b)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	398 sl.append((intbase, intbase, abase, abase, bbase, bbase))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	399
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	400 return sl
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	401
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	402
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	403
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	404 def find_unconflicted(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	405 """Return a list of ranges in base that are not conflicted."""
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	406 am = mdiff.get_matching_blocks(self.basetext, self.atext)
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	407 bm = mdiff.get_matching_blocks(self.basetext, self.btext)
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	408
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	409 unc = []
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	410
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	411 while am and bm:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	412 # there is an unconflicted block at i; how long does it
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	413 # extend? until whichever one ends earlier.
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	414 a1 = am[0][0]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	415 a2 = a1 + am[0][2]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	416 b1 = bm[0][0]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	417 b2 = b1 + bm[0][2]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	418 i = intersect((a1, a2), (b1, b2))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	419 if i:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	420 unc.append(i)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	421
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	422 if a2 < b2:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	423 del am[0]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	424 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	425 del bm[0]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	426
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	427 return unc
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	428
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	429
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	430 # bzr compatible interface, for the tests
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	431 class Merge3(Merge3Text):
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	432 """3-way merge of texts.
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	433
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	434 Given BASE, OTHER, THIS, tries to produce a combined text
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	435 incorporating the changes from both BASE->OTHER and BASE->THIS.
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	436 All three will typically be sequences of lines."""
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	437 def __init__(self, base, a, b):
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	438 basetext = '\n'.join([i.strip('\n') for i in base] + [''])
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	439 atext = '\n'.join([i.strip('\n') for i in a] + [''])
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	440 btext = '\n'.join([i.strip('\n') for i in b] + [''])
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	441 if util.binary(basetext) or util.binary(atext) or util.binary(btext):
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	442 raise util.Abort(_("don't know how to merge binary files"))
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	443 Merge3Text.__init__(self, basetext, atext, btext, base, a, b)
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	444
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	445
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	446 def simplemerge(local, base, other, **opts):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	447 def readfile(filename):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	448 f = open(filename, "rb")
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	449 text = f.read()
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	450 f.close()
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	451 if util.binary(text):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	452 msg = _("%s looks like a binary file.") % filename
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	453 if not opts.get('text'):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	454 raise util.Abort(msg)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	455 elif not opts.get('quiet'):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	456 sys.stderr.write(_('warning: %s\n') % msg)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	457 return text
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	458
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	459 name_a = local
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	460 name_b = other
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	461 labels = opts.get('label', [])
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	462 if labels:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	463 name_a = labels.pop(0)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	464 if labels:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	465 name_b = labels.pop(0)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	466 if labels:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	467 raise util.Abort(_("can only specify two labels."))
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	468
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	469 localtext = readfile(local)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	470 basetext = readfile(base)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	471 othertext = readfile(other)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	472
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	473 orig = local
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	474 local = os.path.realpath(local)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	475 if not opts.get('print'):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	476 opener = util.opener(os.path.dirname(local))
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	477 out = opener(os.path.basename(local), "w", atomictemp=True)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	478 else:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	479 out = sys.stdout
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	480
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	481 reprocess = not opts.get('no_minimal')
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	482
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	483 m3 = Merge3Text(basetext, localtext, othertext)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	484 for line in m3.merge_lines(name_a=name_a, name_b=name_b,
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	485 reprocess=reprocess):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	486 out.write(line)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	487
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	488 if not opts.get('print'):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	489 out.rename()
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	490
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	491 if m3.conflicts:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	492 if not opts.get('quiet'):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	493 sys.stdout.flush()
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	494 sys.stderr.write(_("warning: conflicts during merge.\n"))
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	495 return 1
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	496
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	497 options = [('L', 'label', [], _('labels to use on conflict markers')),
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	498 ('a', 'text', None, _('treat all files as text')),
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	499 ('p', 'print', None,
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	500 _('print results instead of overwriting LOCAL')),
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	501 ('', 'no-minimal', None,
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	502 _('do not try to minimize conflict regions')),
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	503 ('h', 'help', None, _('display help and exit')),
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	504 ('q', 'quiet', None, _('suppress output'))]
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	505
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	506 usage = _('''simplemerge [OPTS] LOCAL BASE OTHER
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	507
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	508 Simple three-way file merge utility with a minimal feature set.
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	509
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	510 Apply to LOCAL the changes necessary to go from BASE to OTHER.
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	511
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	512 By default, LOCAL is overwritten with the results of this operation.
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	513 ''')
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	514
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	515 def showhelp():
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	516 sys.stdout.write(usage)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	517 sys.stdout.write('\noptions:\n')
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	518
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	519 out_opts = []
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	520 for shortopt, longopt, default, desc in options:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	521 out_opts.append(('%2s%s' % (shortopt and '-%s' % shortopt,
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	522 longopt and ' --%s' % longopt),
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	523 '%s' % desc))
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	524 opts_len = max([len(opt[0]) for opt in out_opts])
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	525 for first, second in out_opts:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	526 sys.stdout.write(' %-*s %s\n' % (opts_len, first, second))
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	527
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	528 class ParseError(Exception):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	529 """Exception raised on errors in parsing the command line."""
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	530
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	531 def main(argv):
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	532 try:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	533 opts = {}
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	534 try:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	535 args = fancyopts.fancyopts(argv[1:], options, opts)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	536 except fancyopts.getopt.GetoptError, e:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	537 raise ParseError(e)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	538 if opts['help']:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	539 showhelp()
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	540 return 0
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	541 if len(args) != 3:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	542 raise ParseError(_('wrong number of arguments'))
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	543 return simplemerge(args, *opts)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	544 except ParseError, e:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	545 sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	546 showhelp()
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	547 return 1
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	548 except util.Abort, e:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	549 sys.stderr.write("abort: %s\n" % e)
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	550 return 255
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	551 except KeyboardInterrupt:
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	552 return 255
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	553
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	554 if __name__ == '__main__':
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	555 import sys
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	556 import os
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	557 sys.exit(main(sys.argv))

Mercurial > hg > gitweb

annotate contrib/simplemerge @ 4376:de612b5f8d59