Patchwork D12188: filemerge: remove an unnecessary join with absolute path

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

Comments

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

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

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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(
-        fco, fca, repo.wvfs.join(backup.path()), b"$output" in args
+        fco, fca, backup.path(), b"$output" in args
     ) as temppaths:
         basepath, otherpath, localoutputpath = temppaths
         outpath = b""