Mercurial Mercurial > mercurial / 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.
localrepo: slightly simplify check for removed parents in _rollback()
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 24 Jan 2019 16:25:19 -0800
changeset 41372 390ef056081b
parent 41371 608c15f76f50
child 41373 b5f5dc0fa908
localrepo: slightly simplify check for removed parents in _rollback() Differential Revision: https://phab.mercurial-scm.org/D5692
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Thu Jan 24 16:16:10 2019 -0800
+++ b/mercurial/localrepo.py	Thu Jan 24 16:25:19 2019 -0800
@@ -2011,8 +2011,7 @@
             self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True)
         self.invalidate()
 
-        parentgone = (parents[0] not in self.changelog.nodemap or
-                      parents[1] not in self.changelog.nodemap)
+        parentgone = any(p not in self.changelog.nodemap for p in parents)
         if parentgone:
             # prevent dirstateguard from overwriting already restored one
             dsguard.close()
mercurial