[Request] [+ ] D12189: filemerge: remove `uselocalpath` argument from `_maketempfiles()`
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Feb 16 04:09:48 UTC 2022
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION 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.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D12189
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -743,9 +743,14 @@
return False, 1, None
localpath = _workingpath(repo, fcd)
args = _toolstr(repo.ui, tool, b"args")
+ localoutputpath = None
+ if b"$output" in args:
+ localoutputpath = backup.path()
with _maketempfiles(
- fco, fca, backup.path(), b"$output" in args
+ fco,
+ fca,
+ localoutputpath,
) as temppaths:
basepath, otherpath, localoutputpath = temppaths
outpath = b""
@@ -908,10 +913,10 @@
@contextlib.contextmanager
-def _maketempfiles(fco, fca, localpath, uselocalpath):
- """Writes out `fco` and `fca` as temporary files, and (if uselocalpath)
- copies `localpath` to another temporary file, so an external merge tool may
- use them.
+def _maketempfiles(fco, fca, localpath):
+ """Writes out `fco` and `fca` as temporary files, and (if localpath is not
+ None) copies `localpath` to another temporary file, so an external merge
+ tool may use them.
"""
tmproot = pycompat.mkdtemp(prefix=b'hgmerge-')
@@ -934,7 +939,7 @@
b = tempfromcontext(b"base", fca)
c = tempfromcontext(b"other", fco)
d = localpath
- if uselocalpath:
+ if localpath is not None:
# We start off with this being the backup filename, so remove the .orig
# to make syntax-highlighting more likely.
if d.endswith(b'.orig'):
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20220216/f5989f0c/attachment-0001.html>
More information about the Mercurial-patches
mailing list