Mercurial > hg
diff hgext/shelve.py @ 26942:d55d22840592
shelve: choose where .orig file locations are kept
This patch uses cmdutil.origpath to let the user set the location of the orig
files.
author | Christian Delahousse <cdelahousse@fb.com> |
---|---|
date | Tue, 10 Nov 2015 14:41:14 -0800 |
parents | ae03d4190321 |
children | b3b5ed560283 |
line wrap: on
line diff
--- a/hgext/shelve.py Tue Nov 10 16:25:59 2015 -0800 +++ b/hgext/shelve.py Tue Nov 10 14:41:14 2015 -0800 @@ -507,7 +507,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, file + ".orig") + util.rename(file, cmdutil.origpath(ui, repo, file)) ui.pushbuffer(True) cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), *pathtofiles(repo, files),