Mercurial > hg-stable
changeset 48781:8dd5853eaa04
filemerge: remove unused `repo` argument from `_maketempfiles()`
I missed this in D12171.
Differential Revision: https://phab.mercurial-scm.org/D12194
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 15 Feb 2022 20:18:57 -0800 |
| parents | 6e77083683a7 |
| children | c7dbfc363655 |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.