D5858: resolve: migrate to scmutil.backuppath()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Tue Feb 5 17:53:40 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5858
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4971,7 +4971,7 @@
if complete:
try:
util.rename(a + ".resolve",
- scmutil.origpath(ui, repo, a))
+ repo.wjoin(scmutil.backuppath(ui, repo, f)))
except OSError as inst:
if inst.errno != errno.ENOENT:
raise
@@ -4997,7 +4997,8 @@
# replace filemerge's .orig file with our resolve file
a = repo.wjoin(f)
try:
- util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
+ util.rename(a + ".resolve",
+ repo.wjoin(scmutil.backuppath(ui, repo, f)))
except OSError as inst:
if inst.errno != errno.ENOENT:
raise
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list