Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
index: use `index.has_node` in `repo._rollback`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 08 Nov 2019 14:00:22 +0100
changeset 43585 7f489b9a79a1
parent 43584 bf6fa330e0a5
child 43586 9970412d2ce3
index: use `index.has_node` in `repo._rollback` Differential Revision: https://phab.mercurial-scm.org/D7329
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Sun Nov 03 00:49:55 2019 +0100
+++ b/mercurial/localrepo.py	Fri Nov 08 14:00:22 2019 +0100
@@ -2351,7 +2351,8 @@
             self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
         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:
             # prevent dirstateguard from overwriting already restored one
             dsguard.close()
hg-stable