--- a/hgext/mq.py Tue Nov 10 14:41:14 2015 -0800
+++ b/hgext/mq.py Tue Nov 10 14:52:54 2015 -0800
@@ -697,11 +697,13 @@
absf = repo.wjoin(f)
if os.path.lexists(absf):
self.ui.note(_('saving current version of %s as %s\n') %
- (f, f + '.orig'))
+ (f, cmdutil.origpath(self.ui, repo, f)))
+
+ absorig = cmdutil.origpath(self.ui, repo, absf)
if copy:
- util.copyfile(absf, absf + '.orig')
+ util.copyfile(absf, absorig)
else:
- util.rename(absf, absf + '.orig')
+ util.rename(absf, absorig)
def printdiff(self, repo, diffopts, node1, node2=None, files=None,
fp=None, changes=None, opts={}):