D5872: mq: always show relative path to .orig backup
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Feb 6 23:57:44 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Same as previous commit, but for mq (I would have folded them, but
test-check-commit doesn't like "revert/mq" as a topic and I couldn't
think of a better one).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5872
AFFECTED FILES
hgext/mq.py
tests/test-mq.t
CHANGE DETAILS
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -1406,7 +1406,7 @@
$ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups'
applying empty
creating directory: $TESTTMP/forcepush/.hg/origbackups
- saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt
+ saving current version of hello.txt as .hg/origbackups/hello.txt
patching file hello.txt
committing files:
hello.txt
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -738,10 +738,10 @@
for f in sorted(files):
absf = repo.wjoin(f)
if os.path.lexists(absf):
+ absorig = scmutil.origpath(self.ui, repo, absf)
self.ui.note(_('saving current version of %s as %s\n') %
- (f, scmutil.origpath(self.ui, repo, f)))
-
- absorig = scmutil.origpath(self.ui, repo, absf)
+ (f, os.path.relpath(absorig)))
+
if copy:
util.copyfile(absf, absorig)
else:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list