Mercurial > hg

diff hgext/mq.py @ 26943:263edb591b72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: let the user choose where .orig files are kept This patch uses cmdutil.origpath to let the user decide where .orig files are kept when backup files are created.
author Christian Delahousse <cdelahousse@fb.com>
date Tue, 10 Nov 2015 14:52:54 -0800
parents 0a7610758c42
children 05d8db5d2116
line wrap: on
line diff
--- 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={}):