mercurial-scm/hg-stable: mercurial/simplemerge.py annotate

annotate mercurial/simplemerge.py @ 48607:07069fcd9a6e

filemerge: work with `simplemerge.MergeInput` in `filemerge()` We currently pass around pairs of file context objects and labels between functions in the `filemerge` module. I plan to pass around `simplemerge.MergeInput` instead. This patch prepares for that by using the type internally in `filemerge.filemerge()`. Differential Revision: https://phab.mercurial-scm.org/D12017

author	Martin von Zweigbergk <martinvonz@google.com>
date	Thu, 20 Jan 2022 14:42:50 -0800
parents	77e24ee8994b
children	3c8cc987672e

rev	line source
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	1 # 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	2 #
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	3 # 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	4 # 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	5 # 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	6 # (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	7 #
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	8 # 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	9 # 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	10 # 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	11 # 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	12 #
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	13 # You should have received a copy of the GNU General Public License
15782 7de7630053cb Remove FSF mailing address from GPL headers Martin Geisler <mg@aragost.com> parents: 15381 diff changeset	14 # along with this program; if not, see <http://www.gnu.org/licenses/>.
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	15
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	16 # 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	17 # s: "i hate that."
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	18
25974 241a1324a180 simplemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 22056 diff changeset	19 from __future__ import absolute_import
241a1324a180 simplemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 22056 diff changeset	20
241a1324a180 simplemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 22056 diff changeset	21 from .i18n import _
48603 77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	22 from .thirdparty import attr
25974 241a1324a180 simplemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 22056 diff changeset	23 from . import (
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26223 diff changeset	24 error,
25974 241a1324a180 simplemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 22056 diff changeset	25 mdiff,
33033 c31d45623304 py3: convert kwargs' keys' to str using pycompat.strkwargs() Pulkit Goyal <7895pulkit@gmail.com> parents: 31248 diff changeset	26 pycompat,
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 35377 diff changeset	27 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	28 from .utils import stringutil
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	29
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	30
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	31 def intersect(ra, rb):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	32 """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	33
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	34 >>> intersect((0, 10), (0, 6))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	35 (0, 6)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	36 >>> intersect((0, 10), (5, 15))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	37 (5, 10)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	38 >>> intersect((0, 10), (10, 15))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	39 >>> intersect((0, 9), (10, 15))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	40 >>> intersect((0, 9), (7, 15))
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	41 (7, 9)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	42 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	43 assert ra[0] <= ra[1]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	44 assert rb[0] <= rb[1]
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4408 diff changeset	45
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	46 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	47 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	48 if sa < sb:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	49 return sa, sb
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	50 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	51 return None
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	52
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	53
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	54 def compare_range(a, astart, aend, b, bstart, bend):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44990 diff changeset	55 """Compare a[astart:aend] == b[bstart:bend], without slicing."""
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 8312 diff changeset	56 if (aend - astart) != (bend - bstart):
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	57 return False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	58 for ia, ib in zip(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	59 pycompat.xrange(astart, aend), pycompat.xrange(bstart, bend)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	60 ):
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	61 if a[ia] != b[ib]:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	62 return False
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	63 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	64 return True
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4408 diff changeset	65
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	66
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	67 class Merge3Text(object):
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	68 """3-way merge of texts.
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 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	71 incorporating the changes from both BASE->OTHER and BASE->THIS."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	72
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	73 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	74 self.basetext = basetext
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	75 self.atext = atext
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	76 self.btext = btext
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	77 if base is None:
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	78 base = mdiff.splitnewlines(basetext)
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	79 if a is None:
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	80 a = mdiff.splitnewlines(atext)
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	81 if b is None:
2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	82 b = mdiff.splitnewlines(btext)
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	83 self.base = base
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	84 self.a = a
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	85 self.b = b
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	86
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	87 def merge_groups(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	88 """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	89
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	90 'unchanged', lines
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	91 Lines unchanged from base
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	92
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	93 'a', lines
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	94 Lines taken from a
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	95
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	96 'same', lines
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	97 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	98
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	99 'b', lines
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	100 Lines taken from b
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	101
48576 374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	102 'conflict', (base_lines, a_lines, b_lines)
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	103 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	104 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	105 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	106 what = t[0]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	107 if what == b'unchanged':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	108 yield what, self.base[t[1] : t[2]]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	109 elif what == b'a' or what == b'same':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	110 yield what, self.a[t[1] : t[2]]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	111 elif what == b'b':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	112 yield what, self.b[t[1] : t[2]]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	113 elif what == b'conflict':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	114 yield (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	115 what,
48576 374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	116 (
374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	117 self.base[t[1] : t[2]],
374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	118 self.a[t[3] : t[4]],
374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	119 self.b[t[5] : t[6]],
374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	120 ),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	121 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	122 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	123 raise ValueError(what)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	124
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	125 def merge_regions(self):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	126 """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	127
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	128 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	129 have:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	130
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	131 'unchanged', start, end
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	132 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	133
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	134 'same', astart, aend
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	135 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	136
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	137 'a', start, end
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	138 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	139
28070 a504794cee29 merge: add some useful documentation Ryan McElroy <rmcelroy@fb.com> parents: 26614 diff changeset	140 'conflict', zstart, zend, astart, aend, bstart, bend
a504794cee29 merge: add some useful documentation Ryan McElroy <rmcelroy@fb.com> parents: 26614 diff changeset	141 Conflict between a and b, with z as common ancestor
a504794cee29 merge: add some useful documentation Ryan McElroy <rmcelroy@fb.com> parents: 26614 diff changeset	142
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	143 Method is as follows:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	144
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	145 The two sequences align only on regions which match the base
14549 48ec0763afbb check-code: catch misspellings of descendant Matt Mackall <mpm@selenic.com> parents: 14329 diff changeset	146 and both descendants. These are found by doing a two-way diff
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	147 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	148 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	149 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	150
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	151 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	152 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	153 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	154
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	155 # 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	156 iz = ia = ib = 0
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4408 diff changeset	157
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 15782 diff changeset	158 for region in self.find_sync_regions():
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 15782 diff changeset	159 zmatch, zend, amatch, aend, bmatch, bend = region
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	160 # print 'match base [%d:%d]' % (zmatch, zend)
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4408 diff changeset	161
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	162 matchlen = zend - zmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	163 assert matchlen >= 0
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	164 assert matchlen == (aend - amatch)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	165 assert matchlen == (bend - bmatch)
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4408 diff changeset	166
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	167 len_a = amatch - ia
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	168 len_b = bmatch - ib
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	169 len_base = zmatch - iz
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	170 assert len_a >= 0
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	171 assert len_b >= 0
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	172 assert len_base >= 0
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	173
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	174 # print 'unmatched a=%d, b=%d' % (len_a, len_b)
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	175
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	176 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	177 # try to avoid actually slicing the lists
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	178 equal_a = compare_range(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	179 self.a, ia, amatch, self.base, iz, zmatch
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	180 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	181 equal_b = compare_range(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	182 self.b, ib, bmatch, self.base, iz, zmatch
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	183 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	184 same = compare_range(self.a, ia, amatch, self.b, ib, bmatch)
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	185
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	186 if same:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	187 yield b'same', ia, amatch
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	188 elif equal_a and not equal_b:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	189 yield b'b', ib, bmatch
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	190 elif equal_b and not equal_a:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	191 yield b'a', ia, amatch
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	192 elif not equal_a and not equal_b:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	193 yield b'conflict', iz, zmatch, ia, amatch, ib, bmatch
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	194 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	195 raise AssertionError(b"can't handle a=b=base but unmatched")
4362 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 ia = amatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	198 ib = bmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	199 iz = zmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	200
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	201 # 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	202 # 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	203
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	204 if matchlen > 0:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	205 assert ia == amatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	206 assert ib == bmatch
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	207 assert iz == zmatch
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4408 diff changeset	208
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	209 yield b'unchanged', zmatch, zend
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	210 iz = zend
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	211 ia = aend
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	212 ib = bend
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4408 diff changeset	213
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	214 def find_sync_regions(self):
14549 48ec0763afbb check-code: catch misspellings of descendant Matt Mackall <mpm@selenic.com> parents: 14329 diff changeset	215 """Return a list of sync regions, where both descendants match the base.
4362 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 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	218 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	219 """
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	220
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	221 ia = ib = 0
4363 2e3c54fb79a3 actually port simplemerge to hg Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4362 diff changeset	222 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	223 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	224 len_a = len(amatches)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	225 len_b = len(bmatches)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	226
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	227 sl = []
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 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	230 abase, amatch, alen = amatches[ia]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	231 bbase, bmatch, blen = bmatches[ib]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	232
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	233 # 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	234 # extend? until whichever one ends earlier.
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 8312 diff changeset	235 i = intersect((abase, abase + alen), (bbase, bbase + blen))
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	236 if i:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	237 intbase = i[0]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	238 intend = i[1]
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	239 intlen = intend - intbase
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	240
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	241 # 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	242 # 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	243 assert intlen <= alen
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	244 assert intlen <= blen
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	245 assert abase <= intbase
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	246 assert bbase <= intbase
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	247
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	248 asub = amatch + (intbase - abase)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	249 bsub = bmatch + (intbase - bbase)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	250 aend = asub + intlen
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	251 bend = bsub + intlen
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	252
41768 aaad36b88298 cleanup: use () to wrap long lines instead of \ Augie Fackler <augie@google.com> parents: 38823 diff changeset	253 assert self.base[intbase:intend] == self.a[asub:aend], (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	254 self.base[intbase:intend],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	255 self.a[asub:aend],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	256 )
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	257
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	258 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	259
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	260 sl.append((intbase, intend, asub, aend, bsub, bend))
4362 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 # 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	263 if (abase + alen) < (bbase + blen):
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	264 ia += 1
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	265 else:
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	266 ib += 1
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4408 diff changeset	267
4362 465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	268 intbase = len(self.base)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	269 abase = len(self.a)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	270 bbase = len(self.b)
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	271 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	272
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	273 return sl
465b9ea02868 Import 3-way merge code from bzr Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	274
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	275
33846 de573184686e simplemerge: extract verifytext as a helper function Phil Cohen <phillco@fb.com> parents: 33033 diff changeset	276 def _verifytext(text, path, ui, opts):
de573184686e simplemerge: extract verifytext as a helper function Phil Cohen <phillco@fb.com> parents: 33033 diff changeset	277 """verifies that text is non-binary (unless opts[text] is passed,
de573184686e simplemerge: extract verifytext as a helper function Phil Cohen <phillco@fb.com> parents: 33033 diff changeset	278 then we just warn)"""
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 35377 diff changeset	279 if stringutil.binary(text):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	280 msg = _(b"%s looks like a binary file.") % path
46099 5510e2ac213f simplemerge: work with opts as native strings instead of bytes Martin von Zweigbergk <martinvonz@google.com> parents: 45957 diff changeset	281 if not opts.get('quiet'):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	282 ui.warn(_(b'warning: %s\n') % msg)
46099 5510e2ac213f simplemerge: work with opts as native strings instead of bytes Martin von Zweigbergk <martinvonz@google.com> parents: 45957 diff changeset	283 if not opts.get('text'):
33846 de573184686e simplemerge: extract verifytext as a helper function Phil Cohen <phillco@fb.com> parents: 33033 diff changeset	284 raise error.Abort(msg)
de573184686e simplemerge: extract verifytext as a helper function Phil Cohen <phillco@fb.com> parents: 33033 diff changeset	285 return text
de573184686e simplemerge: extract verifytext as a helper function Phil Cohen <phillco@fb.com> parents: 33033 diff changeset	286
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	287
48603 77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	288 def _format_labels(*inputs):
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	289 labels = []
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	290 for input in inputs:
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	291 if input.label:
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	292 labels.append(input.label)
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	293 else:
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	294 labels.append(None)
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	295 return labels
33851 aa6c290a77fa filemerge: extract `_picklabels` as a helper function Phil Cohen <phillco@fb.com> parents: 33850 diff changeset	296
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41768 diff changeset	297
48587 b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	298 def _detect_newline(m3):
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	299 if len(m3.a) > 0:
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	300 if m3.a[0].endswith(b'\r\n'):
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	301 return b'\r\n'
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	302 elif m3.a[0].endswith(b'\r'):
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	303 return b'\r'
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	304 return b'\n'
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	305
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	306
48592 c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	307 def _minimize(a_lines, b_lines):
48591 ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	308 """Trim conflict regions of lines where A and B sides match.
ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	309
ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	310 Lines where both A and B have made the same changes at the beginning
ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	311 or the end of each merge region are eliminated from the conflict
ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	312 region and are instead considered the same.
ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	313 """
48592 c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	314 alen = len(a_lines)
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	315 blen = len(b_lines)
48591 ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	316
48592 c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	317 # find matches at the front
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	318 ii = 0
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	319 while ii < alen and ii < blen and a_lines[ii] == b_lines[ii]:
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	320 ii += 1
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	321 startmatches = ii
48591 ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	322
48592 c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	323 # find matches at the end
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	324 ii = 0
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	325 while ii < alen and ii < blen and a_lines[-ii - 1] == b_lines[-ii - 1]:
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	326 ii += 1
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	327 endmatches = ii
48591 ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	328
48592 c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	329 lines_before = a_lines[:startmatches]
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	330 new_a_lines = a_lines[startmatches : alen - endmatches]
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	331 new_b_lines = b_lines[startmatches : blen - endmatches]
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	332 lines_after = a_lines[alen - endmatches :]
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	333 return lines_before, new_a_lines, new_b_lines, lines_after
48591 ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	334
ad0c6bf6f02e simplemerge: make minimize() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48590 diff changeset	335
48590 12ac4401ff7d simplemerge: simplify and rename `render_markers()` Martin von Zweigbergk <martinvonz@google.com> parents: 48589 diff changeset	336 def render_minimized(
48585 c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	337 m3,
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	338 name_a=None,
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	339 name_b=None,
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	340 start_marker=b'<<<<<<<',
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	341 mid_marker=b'=======',
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	342 end_marker=b'>>>>>>>',
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	343 ):
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	344 """Return merge in cvs-like form."""
48587 b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	345 newline = _detect_newline(m3)
48585 c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	346 conflicts = False
48590 12ac4401ff7d simplemerge: simplify and rename `render_markers()` Martin von Zweigbergk <martinvonz@google.com> parents: 48589 diff changeset	347 if name_a:
48585 c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	348 start_marker = start_marker + b' ' + name_a
48590 12ac4401ff7d simplemerge: simplify and rename `render_markers()` Martin von Zweigbergk <martinvonz@google.com> parents: 48589 diff changeset	349 if name_b:
48585 c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	350 end_marker = end_marker + b' ' + name_b
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	351 merge_groups = m3.merge_groups()
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	352 lines = []
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	353 for what, group_lines in merge_groups:
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	354 if what == b'conflict':
48592 c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	355 conflicts = True
48585 c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	356 base_lines, a_lines, b_lines = group_lines
48592 c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	357 minimized = _minimize(a_lines, b_lines)
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	358 lines_before, a_lines, b_lines, lines_after = minimized
c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	359 lines.extend(lines_before)
48590 12ac4401ff7d simplemerge: simplify and rename `render_markers()` Martin von Zweigbergk <martinvonz@google.com> parents: 48589 diff changeset	360 lines.append(start_marker + newline)
48585 c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	361 lines.extend(a_lines)
48590 12ac4401ff7d simplemerge: simplify and rename `render_markers()` Martin von Zweigbergk <martinvonz@google.com> parents: 48589 diff changeset	362 lines.append(mid_marker + newline)
48585 c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	363 lines.extend(b_lines)
48590 12ac4401ff7d simplemerge: simplify and rename `render_markers()` Martin von Zweigbergk <martinvonz@google.com> parents: 48589 diff changeset	364 lines.append(end_marker + newline)
48592 c2537aec3bb6 simplemerge: change _minimize() to minimize a single conflict Martin von Zweigbergk <martinvonz@google.com> parents: 48591 diff changeset	365 lines.extend(lines_after)
48585 c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	366 else:
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	367 lines.extend(group_lines)
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	368 return lines, conflicts
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	369
c6649c53073f simplemerge: make merge_lines() a free function Martin von Zweigbergk <martinvonz@google.com> parents: 48584 diff changeset	370
48589 69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	371 def render_merge3(m3, name_a, name_b, name_base):
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	372 """Render conflicts as 3-way conflict markers."""
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	373 newline = _detect_newline(m3)
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	374 conflicts = False
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	375 lines = []
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	376 for what, group_lines in m3.merge_groups():
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	377 if what == b'conflict':
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	378 base_lines, a_lines, b_lines = group_lines
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	379 conflicts = True
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	380 lines.append(b'<<<<<<< ' + name_a + newline)
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	381 lines.extend(a_lines)
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	382 lines.append(b'\|\|\|\|\|\|\| ' + name_base + newline)
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	383 lines.extend(base_lines)
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	384 lines.append(b'=======' + newline)
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	385 lines.extend(b_lines)
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	386 lines.append(b'>>>>>>> ' + name_b + newline)
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	387 else:
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	388 lines.extend(group_lines)
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	389 return lines, conflicts
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	390
69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	391
48586 2dbee604a4f0 simplemerge: clarify names of functions that render conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48585 diff changeset	392 def render_mergediff(m3, name_a, name_b, name_base):
48589 69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	393 """Render conflicts as conflict markers with one snapshot and one diff."""
48587 b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	394 newline = _detect_newline(m3)
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	395 lines = []
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	396 conflicts = False
48576 374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	397 for what, group_lines in m3.merge_groups():
374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	398 if what == b'conflict':
374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	399 base_lines, a_lines, b_lines = group_lines
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	400 base_text = b''.join(base_lines)
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	401 b_blocks = list(
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	402 mdiff.allblocks(
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	403 base_text,
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	404 b''.join(b_lines),
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	405 lines1=base_lines,
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	406 lines2=b_lines,
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	407 )
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	408 )
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	409 a_blocks = list(
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	410 mdiff.allblocks(
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	411 base_text,
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	412 b''.join(a_lines),
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	413 lines1=base_lines,
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	414 lines2=b_lines,
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	415 )
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	416 )
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	417
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	418 def matching_lines(blocks):
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	419 return sum(
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	420 block[1] - block[0]
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	421 for block, kind in blocks
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	422 if kind == b'='
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	423 )
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	424
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	425 def diff_lines(blocks, lines1, lines2):
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	426 for block, kind in blocks:
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	427 if kind == b'=':
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	428 for line in lines1[block[0] : block[1]]:
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	429 yield b' ' + line
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	430 else:
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	431 for line in lines1[block[0] : block[1]]:
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	432 yield b'-' + line
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	433 for line in lines2[block[2] : block[3]]:
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	434 yield b'+' + line
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	435
48587 b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	436 lines.append(b"<<<<<<<" + newline)
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	437 if matching_lines(a_blocks) < matching_lines(b_blocks):
48587 b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	438 lines.append(b"======= " + name_a + newline)
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	439 lines.extend(a_lines)
48587 b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	440 lines.append(b"------- " + name_base + newline)
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	441 lines.append(b"+++++++ " + name_b + newline)
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	442 lines.extend(diff_lines(b_blocks, base_lines, b_lines))
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	443 else:
48587 b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	444 lines.append(b"------- " + name_base + newline)
b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	445 lines.append(b"+++++++ " + name_a + newline)
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	446 lines.extend(diff_lines(a_blocks, base_lines, a_lines))
48587 b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	447 lines.append(b"======= " + name_b + newline)
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	448 lines.extend(b_lines)
48587 b5e1283c0475 simplemerge: use same newline detection for :mergediff as for :merge[3] Martin von Zweigbergk <martinvonz@google.com> parents: 48586 diff changeset	449 lines.append(b">>>>>>>" + newline)
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	450 conflicts = True
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	451 else:
48576 374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	452 lines.extend(group_lines)
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	453 return lines, conflicts
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	454
bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	455
48551 fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	456 def _resolve(m3, sides):
fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	457 lines = []
48576 374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	458 for what, group_lines in m3.merge_groups():
374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	459 if what == b'conflict':
48551 fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	460 for side in sides:
48576 374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	461 lines.extend(group_lines[side])
48551 fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	462 else:
48576 374bf34c9ffd simplemerge: make merge_groups() yield only 2-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 48553 diff changeset	463 lines.extend(group_lines)
48551 fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	464 return lines
fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	465
fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	466
48603 77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	467 @attr.s
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	468 class MergeInput(object):
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	469 fctx = attr.ib()
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	470 label = attr.ib(default=None)
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	471
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	472
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	473 def simplemerge(ui, local, base, other, **opts):
33849 8b91a4ff23ad simplemerge: use contexts to read file data from, if passed Phil Cohen <phillco@fb.com> parents: 33847 diff changeset	474 """Performs the simplemerge algorithm.
8b91a4ff23ad simplemerge: use contexts to read file data from, if passed Phil Cohen <phillco@fb.com> parents: 33847 diff changeset	475
33925 1ad3085239ad simplemerge: make context parameters non-optional Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	476 The merged result is written into `localctx`.
33923 61b267a99fea simplemerge: stop reading from, and writing to, files Phil Cohen <phillco@fb.com> parents: 33922 diff changeset	477 """
35377 93c4958d987c py3: handle keyword arguments correctly in simplemerge.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34066 diff changeset	478
33849 8b91a4ff23ad simplemerge: use contexts to read file data from, if passed Phil Cohen <phillco@fb.com> parents: 33847 diff changeset	479 def readctx(ctx):
33920 f39ba8237ed6 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` Phil Cohen <phillco@fb.com> parents: 33851 diff changeset	480 # Merges were always run in the working copy before, which means
f39ba8237ed6 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` Phil Cohen <phillco@fb.com> parents: 33851 diff changeset	481 # they used decoded data, if the user defined any repository
f39ba8237ed6 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` Phil Cohen <phillco@fb.com> parents: 33851 diff changeset	482 # filters.
f39ba8237ed6 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` Phil Cohen <phillco@fb.com> parents: 33851 diff changeset	483 #
f39ba8237ed6 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` Phil Cohen <phillco@fb.com> parents: 33851 diff changeset	484 # Maintain that behavior today for BC, though perhaps in the future
f39ba8237ed6 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` Phil Cohen <phillco@fb.com> parents: 33851 diff changeset	485 # it'd be worth considering whether merging encoded data (what the
f39ba8237ed6 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` Phil Cohen <phillco@fb.com> parents: 33851 diff changeset	486 # repository usually sees) might be more useful.
f39ba8237ed6 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` Phil Cohen <phillco@fb.com> parents: 33851 diff changeset	487 return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts)
33849 8b91a4ff23ad simplemerge: use contexts to read file data from, if passed Phil Cohen <phillco@fb.com> parents: 33847 diff changeset	488
14328 3c65cdcf3ba6 simplemerge: do not allow binary files to abort an entire merge Steve Borho <steve@borho.org> parents: 12401 diff changeset	489 try:
48603 77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	490 localtext = readctx(local.fctx)
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	491 basetext = readctx(base.fctx)
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	492 othertext = readctx(other.fctx)
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26223 diff changeset	493 except error.Abort:
48594 50de08904c63 merge: consider the file merged when using :merge-{local,other} Martin von Zweigbergk <martinvonz@google.com> parents: 48593 diff changeset	494 return True
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	495
d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	496 m3 = Merge3Text(basetext, localtext, othertext)
48551 fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	497 conflicts = False
48553 59524cb1cd73 simplemerge: don't calculate conflict labels when resolving automatically Martin von Zweigbergk <martinvonz@google.com> parents: 48552 diff changeset	498 mode = opts.get('mode', b'merge')
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	499 if mode == b'union':
48551 fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	500 lines = _resolve(m3, (1, 2))
48546 5151b0f6519e simplemerge: make `localorother` a "mode" instead of a separate thing Martin von Zweigbergk <martinvonz@google.com> parents: 48545 diff changeset	501 elif mode == b'local':
48551 fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	502 lines = _resolve(m3, (1,))
48546 5151b0f6519e simplemerge: make `localorother` a "mode" instead of a separate thing Martin von Zweigbergk <martinvonz@google.com> parents: 48545 diff changeset	503 elif mode == b'other':
48551 fb691fa90807 simplemerge: add a specialized function for "union", "local", "other" Martin von Zweigbergk <martinvonz@google.com> parents: 48546 diff changeset	504 lines = _resolve(m3, (2,))
46109 bdc2bf68f19e mergetools: add new conflict marker format with diffs in Martin von Zweigbergk <martinvonz@google.com> parents: 46101 diff changeset	505 else:
48553 59524cb1cd73 simplemerge: don't calculate conflict labels when resolving automatically Martin von Zweigbergk <martinvonz@google.com> parents: 48552 diff changeset	506 if mode == b'mergediff':
48603 77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	507 labels = _format_labels(local, other, base)
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	508 lines, conflicts = render_mergediff(m3, *labels)
48589 69e76b2aad3d simplemerge: split out function for rendering :merge3 conflict markers Martin von Zweigbergk <martinvonz@google.com> parents: 48588 diff changeset	509 elif mode == b'merge3':
48603 77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	510 labels = _format_labels(local, other, base)
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	511 lines, conflicts = render_merge3(m3, *labels)
48553 59524cb1cd73 simplemerge: don't calculate conflict labels when resolving automatically Martin von Zweigbergk <martinvonz@google.com> parents: 48552 diff changeset	512 else:
48603 77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	513 labels = _format_labels(local, other)
77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	514 lines, conflicts = render_minimized(m3, *labels)
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	515
46101 a771ffc378a8 simplemerge: write output only once it's complete Martin von Zweigbergk <martinvonz@google.com> parents: 46100 diff changeset	516 mergedtext = b''.join(lines)
a771ffc378a8 simplemerge: write output only once it's complete Martin von Zweigbergk <martinvonz@google.com> parents: 46100 diff changeset	517 if opts.get('print'):
a771ffc378a8 simplemerge: write output only once it's complete Martin von Zweigbergk <martinvonz@google.com> parents: 46100 diff changeset	518 ui.fout.write(mergedtext)
a771ffc378a8 simplemerge: write output only once it's complete Martin von Zweigbergk <martinvonz@google.com> parents: 46100 diff changeset	519 else:
48603 77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	520 # local.fctx.flags() already has the merged flags (done in
48544 58a3be48ddd2 simplemerge: stop merging file flags Martin von Zweigbergk <martinvonz@google.com> parents: 48470 diff changeset	521 # mergestate.resolve())
48603 77e24ee8994b simplemerge: take arguments as annotated context objects Martin von Zweigbergk <martinvonz@google.com> parents: 48594 diff changeset	522 local.fctx.write(mergedtext, local.fctx.flags())
4364 d5c3a70f8422 polish the simplemerge command; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4363 diff changeset	523
48594 50de08904c63 merge: consider the file merged when using :merge-{local,other} Martin von Zweigbergk <martinvonz@google.com> parents: 48593 diff changeset	524 return conflicts

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/simplemerge.py @ 48607:07069fcd9a6e