Submitter | phabricator |
---|---|
Date | Nov. 9, 2019, 5:19 a.m. |
Message ID | <c883eae4da283d3e55a927f94af52df8@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/43030/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -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()