[Updated] D12194: filemerge: remove unused `repo` argument from `_maketempfiles()`
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Feb 16 10:30:42 UTC 2022
Closed by commit rHG8dd5853eaa04: filemerge: remove unused `repo` argument from `_maketempfiles()` (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D12194?vs=32232&id=32243
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D12194/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D12194
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
@@ -745,7 +745,7 @@
args = _toolstr(repo.ui, tool, b"args")
with _maketempfiles(
- repo, fco, fca, repo.wvfs.join(backup.path()), b"$output" in args
+ fco, fca, repo.wvfs.join(backup.path()), b"$output" in args
) as temppaths:
basepath, otherpath, localoutputpath = temppaths
outpath = b""
@@ -921,7 +921,7 @@
@contextlib.contextmanager
-def _maketempfiles(repo, fco, fca, localpath, uselocalpath):
+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.
To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220216/659f0c72/attachment-0002.html>
More information about the Mercurial-patches
mailing list