Patchwork D12194: filemerge: remove unused `repo` argument from `_maketempfiles()`

login
register
mail settings
Submitter phabricator
Date Feb. 16, 2022, 4:19 a.m.
Message ID <differential-rev-PHID-DREV-w7vk4fwegqymj77rc3sr-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50531/
State New
Headers show

Comments

phabricator - Feb. 16, 2022, 4:19 a.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I missed this in D12171 <https://phab.mercurial-scm.org/D12171>.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12194

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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.