# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2019-02-05 05:14:37
# Node ID a8ccd821b7d2a23db3aeae48d8ffe3fd7864da42
# Parent  106b0bec162ab2ba1fb1718ad71b709db71d2134

filemerge: migrate to scmutil.backuppath()

Differential Revision: https://phab.mercurial-scm.org/D5856

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -743,8 +743,7 @@ def _makebackup(repo, ui, wctx, fcd, pre
     # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset ->
     # merge -> filemerge). (I suspect the fileset import is the weakest link)
     from . import context
-    a = _workingpath(repo, fcd)
-    back = scmutil.origpath(ui, repo, a)
+    back = scmutil.backuppath(ui, repo, fcd.path())
     inworkingdir = (back.startswith(repo.wvfs.base) and not
         back.startswith(repo.vfs.base))
     if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir:
@@ -764,6 +763,7 @@ def _makebackup(repo, ui, wctx, fcd, pre
             if isinstance(fcd, context.overlayworkingfilectx):
                 util.writefile(back, fcd.data())
             else:
+                a = _workingpath(repo, fcd)
                 util.copyfile(a, back)
         # A arbitraryfilectx is returned, so we can run the same functions on
         # the backup context regardless of where it lives.