D12188: filemerge: remove an unnecessary join with absolute path

[martinvonz (Martin von Zweigbergk)]

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

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""



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