Submitter | phabricator |
---|---|
Date | Nov. 8, 2019, 4:25 p.m. |
Message ID | <differential-rev-PHID-DREV-sddcd3nhrr553h6tei6y-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/42937/ |
State | Superseded |
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()