This revision was automatically updated to reflect the committed changes. Closed by commit rHGe67a85e0f19e: mq: always show relative path to .orig backup (authored by martinvonz, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5872?vs=13853&id=13870 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 _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel