This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5873

subrepo: always show relative path to .orig backup
ClosedPublic

Authored by martinvonz on Feb 6 2019, 6:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG59025c9b3540: subrepo: always show relative path to .orig backup
Summary

Same as previous commit, but for subrepo.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (2 lines)
Mtests/test-subrepo-git.t (2 lines)

Diff 13854

mercurial/subrepo.py

status = self.status(None) status = self.status(None)
names = status.modified names = status.modified
origvfs = scmutil.getorigvfs(self.ui, self._subparent) origvfs = scmutil.getorigvfs(self.ui, self._subparent)
if origvfs is None: if origvfs is None:
origvfs = self.wvfs origvfs = self.wvfs
for name in names: for name in names:
bakname = scmutil.origpath(self.ui, self._subparent, name) bakname = scmutil.origpath(self.ui, self._subparent, name)
self.ui.note(_('saving current version of %s as %s\n') % self.ui.note(_('saving current version of %s as %s\n') %
(name, bakname)) (name, os.path.relpath(bakname)))
name = self.wvfs.join(name) name = self.wvfs.join(name)
origvfs.rename(name, bakname) origvfs.rename(name, bakname)
if not opts.get(r'dry_run'): if not opts.get(r'dry_run'):
self.get(substate, overwrite=True) self.get(substate, overwrite=True)
return [] return []
def shortid(self, revid): def shortid(self, revid):
return revid[:7] return revid[:7]
types = { types = {
'hg': hgsubrepo, 'hg': hgsubrepo,
'svn': svnsubrepo, 'svn': svnsubrepo,
'git': gitsubrepo, 'git': gitsubrepo,
} }

tests/test-subrepo-git.t

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