git-subrepos: revert respects specified location to save .orig files

This patch makes revert in git subrepos save .orig files where the user wants
them by using the cmdutil.origpath function.
This commit is contained in:
Christian Delahousse 2015-11-10 14:29:13 -08:00
parent a53e055553
commit 49f274e0e0
2 changed files with 11 additions and 1 deletions

View File

@ -1910,7 +1910,7 @@ class gitsubrepo(abstractsubrepo):
status = self.status(None)
names = status.modified
for name in names:
bakname = "%s.orig" % name
bakname = cmdutil.origpath(self.ui, self._subparent, name)
self.ui.note(_('saving current version of %s as %s\n') %
(name, bakname))
self.wvfs.rename(name, bakname)

View File

@ -875,6 +875,16 @@ revert the subrepository
$ hg status --subrepos
? s/barfoo
revert moves orig files to the right place
$ echo 'bloop' > s/foobar
$ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
reverting subrepo ../gitroot
creating directory: $TESTTMP/tc/.hg/origbackups
saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar.orig
$ ls .hg/origbackups
foobar.orig
$ rm -rf .hg/origbackups
show file at specific revision
$ cat > s/foobar << EOF
> woop woop