Mercurial > public > mercurial-scm > hg-stable

diff hgext/mq.py @ 27651:07fc2f2134ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
origpath: move from cmdutil to scmutil This is a lower-level function so it doesn't need to be in cmdutil, and putting it here avoids a bunch of potential import cycle issues.
author Siddharth Agarwal <sid0@fb.com>
date Sat, 02 Jan 2016 03:02:57 -0800
parents 42910f9fffeb
children a5b168953013
line wrap: on
line diff
--- a/hgext/mq.py	Sun Nov 22 17:57:35 2015 -0800
+++ b/hgext/mq.py	Sat Jan 02 03:02:57 2016 -0800
@@ -700,9 +700,9 @@
             absf = repo.wjoin(f)
             if os.path.lexists(absf):
                 self.ui.note(_('saving current version of %s as %s\n') %
-                             (f, cmdutil.origpath(self.ui, repo, f)))
-
-                absorig = cmdutil.origpath(self.ui, repo, absf)
+                             (f, scmutil.origpath(self.ui, repo, f)))
+
+                absorig = scmutil.origpath(self.ui, repo, absf)
                 if copy:
                     util.copyfile(absf, absorig)
                 else: