This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12146

simplemerge: let extension check for binary inputs (unless `--text`)
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG109fec7bf7de: simplemerge: let extension check for binary inputs (unless `--text`)
Summary

The simplemerge module does too much UI-related things. This patch
puts a specialized copy of simplemerge._verifytext() in the
simplemerge extension.

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.

Event Timeline

martinvonz created this revision.Feb 8 2022, 4:26 PM
Alphare accepted this revision.Feb 9 2022, 10:56 AM
This revision is now accepted and ready to land.Feb 9 2022, 10:56 AM
martinvonz added a parent revision: D12144: simplemerge: store input data in MergeInput.Feb 10 2022, 9:55 PM
martinvonz retitled this revision from simplemerge: make _verifytext() callable by simplemerge's users to simplemerge: let extension check for binary inputs (unless `--text`).
martinvonz edited the summary of this revision. (Show Details)
martinvonz added a child revision: D12147: simplemerge: let filemerge check for binary inputs.
martinvonz updated this revision to Diff 32135.

Revision Contents
Changeset List

PathPackages
Mcontrib/simplemerge (25 lines)

Diff 32189

contrib/simplemerge

b'%s' % desc, b'%s' % desc,
) )
) )
opts_len = max([len(opt[0]) for opt in out_opts]) opts_len = max([len(opt[0]) for opt in out_opts])
for first, second in out_opts: for first, second in out_opts:
procutil.stdout.write(b' %-*s %s\n' % (opts_len, first, second)) procutil.stdout.write(b' %-*s %s\n' % (opts_len, first, second))
def _verifytext(input, ui, quiet=False, allow_binary=False):
"""verifies that text is non-binary (unless opts[text] is passed,
then we just warn)"""
if stringutil.binary(input.text()):
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:
sys.exit(1)
try: try:
for fp in (sys.stdin, procutil.stdout, sys.stderr): for fp in (sys.stdin, procutil.stdout, sys.stderr):
procutil.setbinary(fp) procutil.setbinary(fp)
opts = {} opts = {}
try: try:
bargv = [a.encode('utf8') for a in sys.argv[1:]] bargv = [a.encode('utf8') for a in sys.argv[1:]]
args = fancyopts.fancyopts(bargv, options, opts) args = fancyopts.fancyopts(bargv, options, opts)
context.arbitraryfilectx(local), labels[0] context.arbitraryfilectx(local), labels[0]
) )
other_input = simplemerge.MergeInput( other_input = simplemerge.MergeInput(
context.arbitraryfilectx(other), labels[1] context.arbitraryfilectx(other), labels[1]
) )
base_input = simplemerge.MergeInput( base_input = simplemerge.MergeInput(
context.arbitraryfilectx(base), labels[2] context.arbitraryfilectx(base), labels[2]
) )
quiet = opts.get(b'quiet')
allow_binary = opts.get(b'text')
ui = uimod.ui.load()
_verifytext(local_input, ui, quiet=quiet, allow_binary=allow_binary)
_verifytext(base_input, ui, quiet=quiet, allow_binary=allow_binary)
_verifytext(other_input, ui, quiet=quiet, allow_binary=allow_binary)
sys.exit( sys.exit(
simplemerge.simplemerge( simplemerge.simplemerge(
uimod.ui.load(), ui,
local_input, local_input,
base_input, base_input,
other_input, other_input,
mode, mode,
quiet=opts.get(b'quiet'), quiet=True,
allow_binary=opts.get(b'text'), allow_binary=allow_binary,
print_result=opts.get(b'print'), print_result=opts.get(b'print'),
) )
) )
except ParseError as e: except ParseError as e:
e = stringutil.forcebytestr(e) e = stringutil.forcebytestr(e)
procutil.stdout.write(b"%s: %s\n" % (sys.argv[0].encode('utf8'), e)) procutil.stdout.write(b"%s: %s\n" % (sys.argv[0].encode('utf8'), e))
showhelp() showhelp()
sys.exit(1) sys.exit(1)
except error.Abort as e: except error.Abort as e:
procutil.stderr.write(b"abort: %s\n" % e) procutil.stderr.write(b"abort: %s\n" % e)
sys.exit(255) sys.exit(255)
except KeyboardInterrupt: except KeyboardInterrupt:
sys.exit(255) sys.exit(255)