##// END OF EJS Templates
index: use `index.has_node` in `bundlerepo.bundlerevlog`...
marmoute -
r43942:5f347567 default
parent child Browse files
Show More
@@ -64,18 +64,18 b' class bundlerevlog(revlog.revlog):'
64 start = cgunpacker.tell() - size
64 start = cgunpacker.tell() - size
65
65
66 link = linkmapper(cs)
66 link = linkmapper(cs)
67 if node in self.nodemap:
67 if self.index.has_node(node):
68 # this can happen if two branches make the same change
68 # this can happen if two branches make the same change
69 self.bundlerevs.add(self.nodemap[node])
69 self.bundlerevs.add(self.nodemap[node])
70 continue
70 continue
71
71
72 for p in (p1, p2):
72 for p in (p1, p2):
73 if p not in self.nodemap:
73 if not self.index.has_node(p):
74 raise error.LookupError(
74 raise error.LookupError(
75 p, self.indexfile, _(b"unknown parent")
75 p, self.indexfile, _(b"unknown parent")
76 )
76 )
77
77
78 if deltabase not in self.nodemap:
78 if not self.index.has_node(deltabase):
79 raise LookupError(
79 raise LookupError(
80 deltabase, self.indexfile, _(b'unknown delta base')
80 deltabase, self.indexfile, _(b'unknown delta base')
81 )
81 )
General Comments 0
You need to be logged in to leave comments. Login now