Mercurial > hg
comparison mercurial/unionrepo.py @ 43565: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 | 642433629e20 |
| children | a5206e71c536 |
comparison
equal
deleted
inserted
replaced
| 43564:698e11f7be6a | 43565:f212cc5ffceb |
|---|---|
| 60 link = linkmapper(linkrev) | 60 link = linkmapper(linkrev) |
| 61 | 61 |
| 62 if linkmapper is not None: # link is to same revlog | 62 if linkmapper is not None: # link is to same revlog |
| 63 base = linkmapper(base) | 63 base = linkmapper(base) |
| 64 | 64 |
| 65 if node in self.nodemap: | 65 this_rev = self.index.get_rev(node) |
| 66 if this_rev is not None: | |
| 66 # this happens for the common revlog revisions | 67 # this happens for the common revlog revisions |
| 67 self.bundlerevs.add(self.nodemap[node]) | 68 self.bundlerevs.add(this_rev) |
| 68 continue | 69 continue |
| 69 | 70 |
| 70 p1node = self.revlog2.node(p1rev) | 71 p1node = self.revlog2.node(p1rev) |
| 71 p2node = self.revlog2.node(p2rev) | 72 p2node = self.revlog2.node(p2rev) |
| 72 | 73 |