This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12193

filemerge: make `_maketempfiles()` more reusable
ClosedPublic

Authored by martinvonz on Feb 15 2022, 11:09 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf90337706ce7: filemerge: make `_maketempfiles()` more reusable
Summary

_maketempfiles() is very specialized for its current use. I hope to
use it also when creating temporary files for input for tools that do
partial conflict resolution. That'll be possible if the function is
more generic. Instead of passing in two contexts (for "other" and
"base") and an optional path (for "local"), let's pass a single list
of files to make backups for. Even if we don't end up using for
partial conflict resolution, this is still a simplification (but I do
have a WIP patch for partial conflict resolution and it is able to
benefit from this).

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 15 2022, 11:09 PM
Alphare accepted this revision.Feb 16 2022, 5:27 AM
This revision is now accepted and ready to land.Feb 16 2022, 5:27 AM
martinvonz added a commit: rHGf90337706ce7: filemerge: make `_maketempfiles()` more reusable.Feb 16 2022, 5:31 AM
Closed by commit rHGf90337706ce7: filemerge: make `_maketempfiles()` more reusable (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (48 lines)

Diff 32250

mercurial/filemerge.py

if fcd.isabsent() or fco.isabsent(): if fcd.isabsent() or fco.isabsent():
repo.ui.warn( repo.ui.warn(
_(b'warning: %s cannot merge change/delete conflict for %s\n') _(b'warning: %s cannot merge change/delete conflict for %s\n')
% (tool, uipathfn(fcd.path())) % (tool, uipathfn(fcd.path()))
) )
return False, 1, None return False, 1, None
localpath = _workingpath(repo, fcd) localpath = _workingpath(repo, fcd)
args = _toolstr(repo.ui, tool, b"args") args = _toolstr(repo.ui, tool, b"args")
localoutputpath = None
files = [
(b"base", fca.path(), fca.decodeddata()),
(b"other", fco.path(), fco.decodeddata()),
]
outpath = b""
if b"$output" in args: if b"$output" in args:
# read input from backup, write to original
outpath = localpath
localoutputpath = backup.path() localoutputpath = backup.path()
# Remove the .orig to make syntax-highlighting more likely. # Remove the .orig to make syntax-highlighting more likely.
if localoutputpath.endswith(b'.orig'): if localoutputpath.endswith(b'.orig'):
localoutputpath, ext = os.path.splitext(localoutputpath) localoutputpath, ext = os.path.splitext(localoutputpath)
localdata = util.readfile(localpath)
files.append((b"local", localoutputpath, localdata))
with _maketempfiles( with _maketempfiles(files) as temppaths:
fco, basepath, otherpath = temppaths[:2]
fca, if len(temppaths) == 3:
localoutputpath, localpath = temppaths[2]
) as temppaths:
basepath, otherpath, localoutputpath = temppaths
outpath = b""
def format_label(input): def format_label(input):
if input.label_detail: if input.label_detail:
return b'%s: %s' % (input.label, input.label_detail) return b'%s: %s' % (input.label, input.label_detail)
else: else:
return input.label return input.label
env = { env = {
b'HG_FILE': fcd.path(), b'HG_FILE': fcd.path(),
b'HG_MY_NODE': short(mynode), b'HG_MY_NODE': short(mynode),
b'HG_OTHER_NODE': short(fco.changectx().node()), b'HG_OTHER_NODE': short(fco.changectx().node()),
b'HG_BASE_NODE': short(fca.changectx().node()), b'HG_BASE_NODE': short(fca.changectx().node()),
b'HG_MY_ISLINK': b'l' in fcd.flags(), b'HG_MY_ISLINK': b'l' in fcd.flags(),
b'HG_OTHER_ISLINK': b'l' in fco.flags(), b'HG_OTHER_ISLINK': b'l' in fco.flags(),
b'HG_BASE_ISLINK': b'l' in fca.flags(), b'HG_BASE_ISLINK': b'l' in fca.flags(),
b'HG_MY_LABEL': format_label(local), b'HG_MY_LABEL': format_label(local),
b'HG_OTHER_LABEL': format_label(other), b'HG_OTHER_LABEL': format_label(other),
b'HG_BASE_LABEL': format_label(base), b'HG_BASE_LABEL': format_label(base),
} }
ui = repo.ui ui = repo.ui
if b"$output" in args:
# read input from backup, write to original
outpath = localpath
localpath = localoutputpath
replace = { replace = {
b'local': localpath, b'local': localpath,
b'base': basepath, b'base': basepath,
b'other': otherpath, b'other': otherpath,
b'output': outpath, b'output': outpath,
b'labellocal': format_label(local), b'labellocal': format_label(local),
b'labelother': format_label(other), b'labelother': format_label(other),
b'labelbase': format_label(base), b'labelbase': format_label(base),
backup = scmutil.backuppath(ui, repo, fcd.path()) backup = scmutil.backuppath(ui, repo, fcd.path())
a = _workingpath(repo, fcd) a = _workingpath(repo, fcd)
util.copyfile(a, backup) util.copyfile(a, backup)
return context.arbitraryfilectx(backup, repo=repo) return context.arbitraryfilectx(backup, repo=repo)
@contextlib.contextmanager @contextlib.contextmanager
def _maketempfiles(fco, fca, localpath): def _maketempfiles(files):
"""Writes out `fco` and `fca` as temporary files, and (if localpath is not """Creates a temporary file for each (prefix, path, data) tuple in `files`,
None) copies `localpath` to another temporary file, so an external merge so an external merge tool may use them.
tool may use them.
""" """
tmproot = pycompat.mkdtemp(prefix=b'hgmerge-') tmproot = pycompat.mkdtemp(prefix=b'hgmerge-')
def maketempfrompath(prefix, path, data): def maketempfrompath(prefix, path, data):
fullbase, ext = os.path.splitext(path) fullbase, ext = os.path.splitext(path)
pre = b"%s~%s" % (os.path.basename(fullbase), prefix) pre = b"%s~%s" % (os.path.basename(fullbase), prefix)
name = os.path.join(tmproot, pre) name = os.path.join(tmproot, pre)
if ext: if ext:
name += ext name += ext
util.writefile(name, data) util.writefile(name, data)
return name return name
def tempfromcontext(prefix, ctx): temp_files = []
return maketempfrompath(prefix, ctx.path(), ctx.decodeddata()) for prefix, path, data in files:
temp_files.append(maketempfrompath(prefix, path, data))
b = tempfromcontext(b"base", fca)
c = tempfromcontext(b"other", fco)
d = localpath
if localpath is not None:
data = util.readfile(localpath)
d = maketempfrompath(b"local", localpath, data)
try: try:
yield b, c, d yield temp_files
finally: finally:
shutil.rmtree(tmproot) shutil.rmtree(tmproot)
def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
"""perform a 3-way merge in the working directory """perform a 3-way merge in the working directory
mynode = parent node before merge mynode = parent node before merge