( )⚙ D11976 simplemerge: use same newline detection for :mergediff as for :merge[3]

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11976

simplemerge: use same newline detection for :mergediff as for :merge[3]
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb5e1283c0475: simplemerge: use same newline detection for :mergediff as for :merge[3]
rHG2c802d46108f: simplemerge: use same newline detection for :mergediff as for :merge[3]
Summary

The :merge and :merge3 markers used the newline style detected
from the base input. The :mergediff style always used LF as newline
character. This patch teaches :mergediff to use the same detection
as the others did.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (33 lines)

Diff 31631

mercurial/simplemerge.py

if len(overrides) > 3: if len(overrides) > 3:
raise error.Abort(_(b"can only specify three labels.")) raise error.Abort(_(b"can only specify three labels."))
result = defaults[:] result = defaults[:]
for i, override in enumerate(overrides): for i, override in enumerate(overrides):
result[i] = override result[i] = override
return result return result
def _detect_newline(m3):
if len(m3.a) > 0:
if m3.a[0].endswith(b'\r\n'):
return b'\r\n'
elif m3.a[0].endswith(b'\r'):
return b'\r'
return b'\n'
def render_markers( def render_markers(
m3, m3,
name_a=None, name_a=None,
name_b=None, name_b=None,
name_base=None, name_base=None,
start_marker=b'<<<<<<<', start_marker=b'<<<<<<<',
mid_marker=b'=======', mid_marker=b'=======',
end_marker=b'>>>>>>>', end_marker=b'>>>>>>>',
base_marker=None, base_marker=None,
minimize=False, minimize=False,
): ):
"""Return merge in cvs-like form.""" """Return merge in cvs-like form."""
newline = _detect_newline(m3)
conflicts = False conflicts = False
newline = b'\n'
if len(m3.a) > 0:
if m3.a[0].endswith(b'\r\n'):
newline = b'\r\n'
elif m3.a[0].endswith(b'\r'):
newline = b'\r'
if name_a and start_marker: if name_a and start_marker:
start_marker = start_marker + b' ' + name_a start_marker = start_marker + b' ' + name_a
if name_b and end_marker: if name_b and end_marker:
end_marker = end_marker + b' ' + name_b end_marker = end_marker + b' ' + name_b
if name_base and base_marker: if name_base and base_marker:
base_marker = base_marker + b' ' + name_base base_marker = base_marker + b' ' + name_base
merge_groups = m3.merge_groups() merge_groups = m3.merge_groups()
if minimize: if minimize:
if end_marker is not None: if end_marker is not None:
lines.append(end_marker + newline) lines.append(end_marker + newline)
else: else:
lines.extend(group_lines) lines.extend(group_lines)
return lines, conflicts return lines, conflicts
def render_mergediff(m3, name_a, name_b, name_base): def render_mergediff(m3, name_a, name_b, name_base):
newline = _detect_newline(m3)
lines = [] lines = []
conflicts = False conflicts = False
for what, group_lines in m3.merge_groups(): for what, group_lines in m3.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
base_text = b''.join(base_lines) base_text = b''.join(base_lines)
b_blocks = list( b_blocks = list(
mdiff.allblocks( mdiff.allblocks(
for line in lines1[block[0] : block[1]]: for line in lines1[block[0] : block[1]]:
yield b' ' + line yield b' ' + line
else: else:
for line in lines1[block[0] : block[1]]: for line in lines1[block[0] : block[1]]:
yield b'-' + line yield b'-' + line
for line in lines2[block[2] : block[3]]: for line in lines2[block[2] : block[3]]:
yield b'+' + line yield b'+' + line
lines.append(b"<<<<<<<\n") lines.append(b"<<<<<<<" + newline)
if matching_lines(a_blocks) < matching_lines(b_blocks): if matching_lines(a_blocks) < matching_lines(b_blocks):
lines.append(b"======= %s\n" % name_a) lines.append(b"======= " + name_a + newline)
lines.extend(a_lines) lines.extend(a_lines)
lines.append(b"------- %s\n" % name_base) lines.append(b"------- " + name_base + newline)
lines.append(b"+++++++ %s\n" % name_b) lines.append(b"+++++++ " + name_b + newline)
lines.extend(diff_lines(b_blocks, base_lines, b_lines)) lines.extend(diff_lines(b_blocks, base_lines, b_lines))
else: else:
lines.append(b"------- %s\n" % name_base) lines.append(b"------- " + name_base + newline)
lines.append(b"+++++++ %s\n" % name_a) lines.append(b"+++++++ " + name_a + newline)
lines.extend(diff_lines(a_blocks, base_lines, a_lines)) lines.extend(diff_lines(a_blocks, base_lines, a_lines))
lines.append(b"======= %s\n" % name_b) lines.append(b"======= " + name_b + newline)
lines.extend(b_lines) lines.extend(b_lines)
lines.append(b">>>>>>>\n") lines.append(b">>>>>>>" + newline)
conflicts = True conflicts = True
else: else:
lines.extend(group_lines) lines.extend(group_lines)
return lines, conflicts return lines, conflicts
def _resolve(m3, sides): def _resolve(m3, sides):
lines = [] lines = []