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

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12194

filemerge: remove unused `repo` argument from `_maketempfiles()`
ClosedPublic

Authored by martinvonz on Feb 15 2022, 11:19 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8dd5853eaa04: filemerge: remove unused `repo` argument from `_maketempfiles()`
Summary

I missed this in D12171.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (4 lines)

Diff 32243

mercurial/filemerge.py

_(b'warning: %s cannot merge change/delete conflict for %s\n') _(b'warning: %s cannot merge change/delete conflict for %s\n')
% (tool, uipathfn(fcd.path())) % (tool, uipathfn(fcd.path()))
) )
return False, 1, None return False, 1, None
localpath = _workingpath(repo, fcd) localpath = _workingpath(repo, fcd)
args = _toolstr(repo.ui, tool, b"args") args = _toolstr(repo.ui, tool, b"args")
with _maketempfiles( 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: ) as temppaths:
basepath, otherpath, localoutputpath = temppaths basepath, otherpath, localoutputpath = temppaths
outpath = b"" outpath = b""
def format_label(input): def format_label(input):
if input.label_detail: if input.label_detail:
return b'%s: %s' % (input.label, input.label_detail) return b'%s: %s' % (input.label, input.label_detail)
else: else:
a = _workingpath(repo, fcd) a = _workingpath(repo, fcd)
util.copyfile(a, backup) util.copyfile(a, backup)
# A arbitraryfilectx is returned, so we can run the same functions on # A arbitraryfilectx is returned, so we can run the same functions on
# the backup context regardless of where it lives. # the backup context regardless of where it lives.
return context.arbitraryfilectx(backup, repo=repo) return context.arbitraryfilectx(backup, repo=repo)
@contextlib.contextmanager @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) """Writes out `fco` and `fca` as temporary files, and (if uselocalpath)
copies `localpath` to another temporary file, so an external merge tool may copies `localpath` to another temporary file, so an external merge tool may
use them. use them.
""" """
tmproot = pycompat.mkdtemp(prefix=b'hgmerge-') tmproot = pycompat.mkdtemp(prefix=b'hgmerge-')
def maketempfrompath(prefix, path): def maketempfrompath(prefix, path):
fullbase, ext = os.path.splitext(path) fullbase, ext = os.path.splitext(path)