# HG changeset patch # User Pierre-Yves David # Date 2019-11-09 12:23:52 # Node ID f212cc5ffceb8ebddfe7df547b7388936604554d # Parent 698e11f7be6a74ac440226dff1622ea006cbb9da index: use `index.get_rev` in `unionrepo.unionrevlog` Differential Revision: https://phab.mercurial-scm.org/D7338 diff --git a/mercurial/unionrepo.py b/mercurial/unionrepo.py --- a/mercurial/unionrepo.py +++ b/mercurial/unionrepo.py @@ -62,9 +62,10 @@ class unionrevlog(revlog.revlog): if linkmapper is not None: # link is to same revlog base = linkmapper(base) - if node in self.nodemap: + this_rev = self.index.get_rev(node) + if this_rev is not None: # this happens for the common revlog revisions - self.bundlerevs.add(self.nodemap[node]) + self.bundlerevs.add(this_rev) continue p1node = self.revlog2.node(p1rev)