This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12169

simplemerge: remove code for checking binary input now that callers do it
ClosedPublic

Authored by martinvonz on Feb 10 2022, 9:55 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd9602f0df4f3: simplemerge: remove code for checking binary input now that callers do it
Summary

The callers now do the checking for binary inputs and handle warnings
and/or errors, so we can remove that code from the low-level
simplemerge module now. After this patch we just raise an error
unless the caller told us to allow binary inputs.

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 (33 lines)

Diff 32192

mercurial/simplemerge.py

intbase = len(self.base) intbase = len(self.base)
abase = len(self.a) abase = len(self.a)
bbase = len(self.b) bbase = len(self.b)
sl.append((intbase, intbase, abase, abase, bbase, bbase)) sl.append((intbase, intbase, abase, abase, bbase, bbase))
return sl return sl
def _verifytext(text, path, ui, quiet=False, allow_binary=False): def _verifytext(input):
"""verifies that text is non-binary (unless opts[text] is passed, """verifies that text is non-binary (unless opts[text] is passed,
then we just warn)""" then we just warn)"""
if stringutil.binary(text): if stringutil.binary(input.text()):
msg = _(b"%s looks like a binary file.") % path msg = _(b"%s looks like a binary file.") % input.fctx.path()
if not quiet:
ui.warn(_(b'warning: %s\n') % msg)
if not allow_binary:
raise error.Abort(msg) raise error.Abort(msg)
return text
def _format_labels(*inputs): def _format_labels(*inputs):
pad = max(len(input.label) if input.label else 0 for input in inputs) pad = max(len(input.label) if input.label else 0 for input in inputs)
labels = [] labels = []
for input in inputs: for input in inputs:
if input.label: if input.label:
if input.label_detail: if input.label_detail:
allow_binary=False, allow_binary=False,
print_result=False, print_result=False,
): ):
"""Performs the simplemerge algorithm. """Performs the simplemerge algorithm.
The merged result is written into `localctx`. The merged result is written into `localctx`.
""" """
def readctx(input): if not allow_binary:
return _verifytext( _verifytext(local)
input.text(), _verifytext(base)
input.fctx.path(), _verifytext(other)
ui,
quiet=quiet,
allow_binary=allow_binary,
)
try:
localtext = readctx(local)
basetext = readctx(base)
othertext = readctx(other)
except error.Abort:
return True
m3 = Merge3Text(basetext, localtext, othertext) m3 = Merge3Text(base.text(), local.text(), other.text())
conflicts = False conflicts = False
if mode == b'union': if mode == b'union':
lines = _resolve(m3, (1, 2)) lines = _resolve(m3, (1, 2))
elif mode == b'local': elif mode == b'local':
lines = _resolve(m3, (1,)) lines = _resolve(m3, (1,))
elif mode == b'other': elif mode == b'other':
lines = _resolve(m3, (2,)) lines = _resolve(m3, (2,))
else: else: