Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: remove unused `repo` argument from `_maketempfiles()`
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 15 Feb 2022 20:18:57 -0800
changeset 48781 8dd5853eaa04
parent 48780 6e77083683a7
child 48782 c7dbfc363655
filemerge: remove unused `repo` argument from `_maketempfiles()` I missed this in D12171. Differential Revision: https://phab.mercurial-scm.org/D12194
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Tue Feb 15 23:45:30 2022 +0100
+++ b/mercurial/filemerge.py	Tue Feb 15 20:18:57 2022 -0800
@@ -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.
Mercurial