This revision was automatically updated to reflect the committed changes. Closed by commit rHG8f09edf6590b: subrepo: migrate to scmutil.backuppath() (authored by martinvonz, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5859?vs=13866&id=13881 REVISION DETAIL https://phab.mercurial-scm.org/D5859 AFFECTED FILES mercurial/subrepo.py tests/test-subrepo-git.t CHANGE DETAILS diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t --- a/tests/test-subrepo-git.t +++ b/tests/test-subrepo-git.t @@ -924,9 +924,9 @@ $ 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 .hg/origbackups/foobar - $ ls .hg/origbackups + creating directory: $TESTTMP/tc/.hg/origbackups/s + saving current version of foobar as .hg/origbackups/s/foobar + $ ls .hg/origbackups/s foobar $ rm -rf .hg/origbackups diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -1824,15 +1824,15 @@ if not opts.get(r'no_backup'): status = self.status(None) names = status.modified - origvfs = scmutil.getorigvfs(self.ui, self._subparent) - if origvfs is None: - origvfs = self.wvfs for name in names: - bakname = scmutil.origpath(self.ui, self._subparent, name) + # backuppath() expects a path relative to the parent repo (the + # repo that ui.origbackuppath is relative to) + parentname = os.path.join(self._path, name) + bakname = scmutil.backuppath(self.ui, self._subparent, + parentname) self.ui.note(_('saving current version of %s as %s\n') % (name, os.path.relpath(bakname))) - name = self.wvfs.join(name) - origvfs.rename(name, bakname) + util.rename(self.wvfs.join(name), bakname) if not opts.get(r'dry_run'): self.get(substate, overwrite=True) To: martinvonz, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel