Mercurial > hg-stable
changeset 43613:f212cc5ffceb
index: use `index.get_rev` in `unionrepo.unionrevlog`
Differential Revision: https://phab.mercurial-scm.org/D7338
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 09 Nov 2019 13:23:52 +0100 |
| parents | 698e11f7be6a |
| children | 054846d213ba |
| files | mercurial/unionrepo.py |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/unionrepo.py Sat Nov 09 13:23:53 2019 +0100 +++ b/mercurial/unionrepo.py Sat Nov 09 13:23:52 2019 +0100 @@ -62,9 +62,10 @@ 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)