Mercurial > public > mercurial-scm > hg
diff hgext/mq.py @ 41592:e67a85e0f19e
mq: always show relative path to .orig backup
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).
Differential Revision: https://phab.mercurial-scm.org/D5872
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 06 Feb 2019 15:26:53 -0800 |
| parents | bd3f03d8cc9f |
| children | 106b0bec162a |
line wrap: on
line diff
--- a/hgext/mq.py Wed Feb 06 14:57:08 2019 -0800 +++ b/hgext/mq.py Wed Feb 06 15:26:53 2019 -0800 @@ -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: