This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12188

filemerge: remove an unnecessary join with absolute path
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG218154867575: filemerge: remove an unnecessary join with absolute path
Summary

The backup path is now always absolute, so we don't need to join it
with the working copy path.

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 (2 lines)

Diff 32244

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(
fco, fca, repo.wvfs.join(backup.path()), b"$output" in args fco, fca, 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: