( )⚙ D7329 index: use `index.has_node` in `repo._rollback`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7329

index: use `index.has_node` in `repo._rollback`
ClosedPublic

Authored by marmoute on Nov 8 2019, 11:24 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG7f489b9a79a1: index: use `index.has_node` in `repo._rollback`
rHG8ff16807dee4: index: use `index.has_node` in `repo._rollback`

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (3 lines)

Diff 17868

mercurial/localrepo.py

if bookmarksvfs.exists(b'undo.bookmarks'): if bookmarksvfs.exists(b'undo.bookmarks'):
bookmarksvfs.rename( bookmarksvfs.rename(
b'undo.bookmarks', b'bookmarks', checkambig=True b'undo.bookmarks', b'bookmarks', checkambig=True
) )
if self.svfs.exists(b'undo.phaseroots'): if self.svfs.exists(b'undo.phaseroots'):
self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True) self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
self.invalidate() self.invalidate()
parentgone = any(p not in self.changelog.nodemap for p in parents) has_node = self.changelog.index.has_node
parentgone = any(not has_node(p) for p in parents)
if parentgone: if parentgone:
# prevent dirstateguard from overwriting already restored one # prevent dirstateguard from overwriting already restored one
dsguard.close() dsguard.close()
narrowspec.restorebackup(self, b'undo.narrowspec') narrowspec.restorebackup(self, b'undo.narrowspec')
narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate') narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate')
self.dirstate.restorebackup(None, b'undo.dirstate') self.dirstate.restorebackup(None, b'undo.dirstate')
try: try: