This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5859

subrepo: migrate to scmutil.backuppath()
ClosedPublic

Authored by martinvonz on Feb 5 2019, 12:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGea5ebb8f72bd: subrepo: migrate to scmutil.backuppath()
rHG8f09edf6590b: subrepo: migrate to scmutil.backuppath()
Summary

This has a test impact. It seems to me to be for the better.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 5 2019, 12:52 PM
martinvonz updated this revision to Diff 13864.Feb 6 2019, 6:59 PM
martinvonz planned changes to this revision.Feb 6 2019, 7:04 PM

This one breaks tests, so I'll need to fix that.

martinvonz edited the summary of this revision. (Show Details)Feb 6 2019, 7:23 PM
martinvonz updated this revision to Diff 13866.
martinvonz added a comment.Feb 6 2019, 7:23 PM
In D5859#85954, @martinvonz wrote:

This one breaks tests, so I'll need to fix that.

Done.

Closed by commit rHG8f09edf6590b: subrepo: migrate to scmutil.backuppath() (authored by martinvonz). · Explain WhyFeb 6 2019, 9:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (4 lines)

Diff 13864

mercurial/subrepo.py

self.ui.status(_('reverting subrepo %s\n') % substate[0]) self.ui.status(_('reverting subrepo %s\n') % substate[0])
if not opts.get(r'no_backup'): if not opts.get(r'no_backup'):
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.backuppath(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, os.path.relpath(bakname))) (name, os.path.relpath(bakname)))
name = self.wvfs.join(name) name = self.wvfs.join(name)
origvfs.rename(name, bakname) origvfs.rename(self.wvfs.join(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,
} }