This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12189

filemerge: remove `uselocalpath` argument from `_maketempfiles()`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9d0d0a388c39: filemerge: remove `uselocalpath` argument from `_maketempfiles()`
Summary

The localpath argument is unused if uselocalpath is false, so we
can use None as a sentinel value for the variable instead and remove
extra uselocalpath argument. That's not much of a win, but it's a
small step towards further improvements.

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/filemerge.py (17 lines)

Diff 32246

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
if b"$output" in args:
localoutputpath = backup.path()
with _maketempfiles( with _maketempfiles(
fco, fca, backup.path(), b"$output" in args fco,
fca,
localoutputpath,
) as temppaths: ) as temppaths:
basepath, otherpath, localoutputpath = temppaths basepath, otherpath, localoutputpath = temppaths
outpath = b"" 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:
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, uselocalpath): def _maketempfiles(fco, fca, localpath):
"""Writes out `fco` and `fca` as temporary files, and (if uselocalpath) """Writes out `fco` and `fca` as temporary files, and (if localpath is not
copies `localpath` to another temporary file, so an external merge tool may None) copies `localpath` to another temporary file, so an external merge
use them. tool may use them.
""" """
tmproot = pycompat.mkdtemp(prefix=b'hgmerge-') tmproot = pycompat.mkdtemp(prefix=b'hgmerge-')
def maketempfrompath(prefix, path): def maketempfrompath(prefix, path):
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
f = open(name, "wb") f = open(name, "wb")
return f, name return f, name
def tempfromcontext(prefix, ctx): def tempfromcontext(prefix, ctx):
f, name = maketempfrompath(prefix, ctx.path()) f, name = maketempfrompath(prefix, ctx.path())
data = ctx.decodeddata() data = ctx.decodeddata()
f.write(data) f.write(data)
f.close() f.close()
return name return name
b = tempfromcontext(b"base", fca) b = tempfromcontext(b"base", fca)
c = tempfromcontext(b"other", fco) c = tempfromcontext(b"other", fco)
d = localpath d = localpath
if uselocalpath: if localpath is not None:
# We start off with this being the backup filename, so remove the .orig # We start off with this being the backup filename, so remove the .orig
# to make syntax-highlighting more likely. # to make syntax-highlighting more likely.
if d.endswith(b'.orig'): if d.endswith(b'.orig'):
d, _ = os.path.splitext(d) d, _ = os.path.splitext(d)
f, d = maketempfrompath(b"local", d) f, d = maketempfrompath(b"local", d)
with open(localpath, b'rb') as src: with open(localpath, b'rb') as src:
f.write(src.read()) f.write(src.read())
f.close() f.close()