This is an archive of the discontinued Mercurial Phabricator instance.

Differential D372

simplemerge: add optional context parameters to simplemerge
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb3571dc0e6b8: simplemerge: add optional context parameters to simplemerge
Summary

Rename the existing parameters for clarity.

These will, in subsequent patches, allow callers to redirect reads (of the
three sides of the merge) and writes (of the result) to the given contexts,
instead of using the filesystem.

While in most cases, the writes will go to a workingfilectx, this opens the
door for it to be a memfilectx in the case of an in-memory merge.

Repo will be necessary in a subsequent comit.

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
Closed by commit rHGb3571dc0e6b8: simplemerge: add optional context parameters to simplemerge (authored by phillco). · Explain WhyAug 15 2017, 5:32 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Aug 19 2017, 12:53 AM
martinvonz added inline comments.
mercurial/simplemerge.py
412

Seems unfortunate to have both files and contexts. This is what you mentioned today you will replace by use of "arbitraryfilectx"?

phillco added inline comments.Aug 19 2017, 1:50 PM
mercurial/simplemerge.py
412

They get taken out in D381; they have to co-exist briefly in order to ensure each step of this series can be applied cleanly.

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (19 lines)

Diff 954

mercurial/simplemerge.py

if util.binary(text): if util.binary(text):
msg = _("%s looks like a binary file.") % path 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 simplemerge(ui, localfile, basefile, otherfile,
localctx=None, basectx=None, otherctx=None, repo=None, **opts):
martinvonzUnsubmitted
Not Done

Seems unfortunate to have both files and contexts. This is what you mentioned today you will replace by use of "arbitraryfilectx"?

martinvonz: Seems unfortunate to have both files and contexts. This is what you mentioned today you will…
phillcoAuthorUnsubmitted
Not Done

They get taken out in D381; they have to co-exist briefly in order to ensure each step of this series can be applied cleanly.

phillco: They get taken out in D381; they have to co-exist briefly in order to ensure each step of this…
def readfile(filename): def readfile(filename):
f = open(filename, "rb") f = open(filename, "rb")
text = f.read() text = f.read()
f.close() f.close()
return _verifytext(text, filename, ui, opts) 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 = localfile
name_b = other name_b = otherfile
name_base = None name_base = None
labels = opts.get('label', []) labels = opts.get('label', [])
if len(labels) > 0: if len(labels) > 0:
name_a = labels[0] name_a = labels[0]
if len(labels) > 1: if len(labels) > 1:
name_b = labels[1] name_b = labels[1]
if len(labels) > 2: if len(labels) > 2:
name_base = labels[2] name_base = labels[2]
if len(labels) > 3: if len(labels) > 3:
raise error.Abort(_("can only specify three labels.")) raise error.Abort(_("can only specify three labels."))
try: try:
localtext = readfile(local) localtext = readfile(localfile)
basetext = readfile(base) basetext = readfile(basefile)
othertext = readfile(other) othertext = readfile(otherfile)
except error.Abort: except error.Abort:
return 1 return 1
local = os.path.realpath(local) localfile = os.path.realpath(localfile)
if not opts.get('print'): if not opts.get('print'):
opener = vfsmod.vfs(os.path.dirname(local)) opener = vfsmod.vfs(os.path.dirname(localfile))
out = opener(os.path.basename(local), "w", atomictemp=True) out = opener(os.path.basename(localfile), "w", atomictemp=True)
else: else:
out = ui.fout out = ui.fout
m3 = Merge3Text(basetext, localtext, othertext) m3 = Merge3Text(basetext, localtext, othertext)
extrakwargs = { extrakwargs = {
"localorother": opts.get("localorother", None), "localorother": opts.get("localorother", None),
'minimize': True, 'minimize': True,
} }