This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11980

simplemerge: make minimize() a free function
ClosedPublic

Authored by martinvonz on Jan 12 2022, 1:55 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGad0c6bf6f02e: simplemerge: make minimize() a free function
rHGa0cb162369ce: simplemerge: make minimize() a free function
Summary

IMO, Merge3Text should be about merging text without knowing about
conflict markers. "Conflict minimization" is about making conflict
markers smaller, so it should be moved out. This patch does that. I'll
refactor it next.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (89 lines)

Diff 31674

mercurial/simplemerge.py

assert ib == bmatch assert ib == bmatch
assert iz == zmatch assert iz == zmatch
yield b'unchanged', zmatch, zend yield b'unchanged', zmatch, zend
iz = zend iz = zend
ia = aend ia = aend
ib = bend ib = bend
def minimize(self, merge_groups):
"""Trim conflict regions of lines where A and B sides match.
Lines where both A and B have made the same changes at the beginning
or the end of each merge region are eliminated from the conflict
region and are instead considered the same.
"""
for what, lines in merge_groups:
if what != b"conflict":
yield what, lines
continue
base_lines, a_lines, b_lines = lines
alen = len(a_lines)
blen = len(b_lines)
# find matches at the front
ii = 0
while ii < alen and ii < blen and a_lines[ii] == b_lines[ii]:
ii += 1
startmatches = ii
# find matches at the end
ii = 0
while (
ii < alen and ii < blen and a_lines[-ii - 1] == b_lines[-ii - 1]
):
ii += 1
endmatches = ii
if startmatches > 0:
yield b'same', a_lines[:startmatches]
yield (
b'conflict',
(
base_lines,
a_lines[startmatches : alen - endmatches],
b_lines[startmatches : blen - endmatches],
),
)
if endmatches > 0:
yield b'same', a_lines[alen - endmatches :]
def find_sync_regions(self): def find_sync_regions(self):
"""Return a list of sync regions, where both descendants match the base. """Return a list of sync regions, where both descendants match the base.
Generates a list of (base1, base2, a1, a2, b1, b2). There is Generates a list of (base1, base2, a1, a2, b1, b2). There is
always a zero-length sync region at the end of all the files. always a zero-length sync region at the end of all the files.
""" """
ia = ib = 0 ia = ib = 0
if len(m3.a) > 0: if len(m3.a) > 0:
if m3.a[0].endswith(b'\r\n'): if m3.a[0].endswith(b'\r\n'):
return b'\r\n' return b'\r\n'
elif m3.a[0].endswith(b'\r'): elif m3.a[0].endswith(b'\r'):
return b'\r' return b'\r'
return b'\n' return b'\n'
def _minimize(merge_groups):
"""Trim conflict regions of lines where A and B sides match.
Lines where both A and B have made the same changes at the beginning
or the end of each merge region are eliminated from the conflict
region and are instead considered the same.
"""
for what, lines in merge_groups:
if what != b"conflict":
yield what, lines
continue
base_lines, a_lines, b_lines = lines
alen = len(a_lines)
blen = len(b_lines)
# find matches at the front
ii = 0
while ii < alen and ii < blen and a_lines[ii] == b_lines[ii]:
ii += 1
startmatches = ii
# find matches at the end
ii = 0
while ii < alen and ii < blen and a_lines[-ii - 1] == b_lines[-ii - 1]:
ii += 1
endmatches = ii
if startmatches > 0:
yield b'same', a_lines[:startmatches]
yield (
b'conflict',
(
base_lines,
a_lines[startmatches : alen - endmatches],
b_lines[startmatches : blen - endmatches],
),
)
if endmatches > 0:
yield b'same', a_lines[alen - endmatches :]
def render_minimized( def render_minimized(
m3, m3,
name_a=None, name_a=None,
name_b=None, name_b=None,
start_marker=b'<<<<<<<', start_marker=b'<<<<<<<',
mid_marker=b'=======', mid_marker=b'=======',
end_marker=b'>>>>>>>', end_marker=b'>>>>>>>',
): ):
"""Return merge in cvs-like form.""" """Return merge in cvs-like form."""
newline = _detect_newline(m3) newline = _detect_newline(m3)
conflicts = False conflicts = False
if name_a: if name_a:
start_marker = start_marker + b' ' + name_a start_marker = start_marker + b' ' + name_a
if name_b: if name_b:
end_marker = end_marker + b' ' + name_b end_marker = end_marker + b' ' + name_b
merge_groups = m3.merge_groups() merge_groups = m3.merge_groups()
merge_groups = m3.minimize(merge_groups) merge_groups = _minimize(merge_groups)
lines = [] lines = []
for what, group_lines in merge_groups: for what, group_lines in merge_groups:
if what == b'conflict': if what == b'conflict':
base_lines, a_lines, b_lines = group_lines base_lines, a_lines, b_lines = group_lines
conflicts = True conflicts = True
lines.append(start_marker + newline) lines.append(start_marker + newline)
lines.extend(a_lines) lines.extend(a_lines)
lines.append(mid_marker + newline) lines.append(mid_marker + newline)