This is an archive of the discontinued Mercurial Phabricator instance.

Differential D371

simplemerge: extract verifytext as a helper function
ClosedPublic

Authored by phillco on Aug 14 2017, 2:15 AM.

Details

Reviewers
smf
Group Reviewers
hg-reviewers
Commits
rHGde573184686e: simplemerge: extract verifytext as a helper function
Summary

This will be used in a subsequent commit.

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

phillco created this revision.Aug 14 2017, 2:15 AM
phillco added a reviewer: smf.Aug 14 2017, 2:19 AM
phillco added a comment.Aug 14 2017, 2:22 AM

This stack isn't particular complicated; it's just that changing simplemerge to go from files to contexts, with small commits and working intermediate commits, requires some jumping around.

Closed by commit rHGde573184686e: simplemerge: extract verifytext as a helper function (authored by phillco). · Explain WhyAug 15 2017, 5:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (19 lines)

Diff 953

mercurial/simplemerge.py

if a2 < b2: if a2 < b2:
del am[0] del am[0]
else: else:
del bm[0] del bm[0]
return unc return unc
def simplemerge(ui, local, base, other, **opts): def _verifytext(text, path, ui, opts):
def readfile(filename): """verifies that text is non-binary (unless opts[text] is passed,
f = open(filename, "rb") then we just warn)"""
text = f.read()
f.close()
if util.binary(text): if util.binary(text):
msg = _("%s looks like a binary file.") % filename msg = _("%s looks like a binary file.") % path
if not opts.get('quiet'): if not opts.get('quiet'):
ui.warn(_('warning: %s\n') % msg) ui.warn(_('warning: %s\n') % msg)
if not opts.get('text'): if not opts.get('text'):
raise error.Abort(msg) raise error.Abort(msg)
return text return text
def simplemerge(ui, local, base, other, **opts):
def readfile(filename):
f = open(filename, "rb")
text = f.read()
f.close()
return _verifytext(text, filename, ui, opts)
mode = opts.get('mode','merge') mode = opts.get('mode','merge')
if mode == 'union': if mode == 'union':
name_a = None name_a = None
name_b = None name_b = None
name_base = None name_base = None
else: else:
name_a = local name_a = local
name_b = other name_b = other