diff hgext/shelve.py @ 27651:07fc2f2134ba

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 c14af2d4b08c
children 2dc363274702
line wrap: on
line diff
--- a/hgext/shelve.py	Sun Nov 22 17:57:35 2015 -0800
+++ b/hgext/shelve.py	Sat Jan 02 03:02:57 2016 -0800
@@ -512,7 +512,7 @@
         # revert will overwrite unknown files, so move them out of the way
         for file in repo.status(unknown=True).unknown:
             if file in files:
-                util.rename(file, cmdutil.origpath(ui, repo, file))
+                util.rename(file, scmutil.origpath(ui, repo, file))
         ui.pushbuffer(True)
         cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),
                        *pathtofiles(repo, files),