##// END OF EJS Templates
revlog: precalculate p1 and p2 revisions
Matt Mackall -
r12889:5482c6b8 stable
parent child Browse files
Show More
@@ -1192,9 +1192,10 b' class revlog(object):'
1192 offset = self.end(prev)
1192 offset = self.end(prev)
1193 flags = 0
1193 flags = 0
1194 d = None
1194 d = None
1195 p1r, p2r = self.rev(p1), self.rev(p2)
1195
1196
1196 if self._parentdelta:
1197 if self._parentdelta:
1197 deltarev, deltanode = self.rev(p1), p1
1198 deltarev, deltanode = p1r, p1
1198 flags = REVIDX_PARENTDELTA
1199 flags = REVIDX_PARENTDELTA
1199 else:
1200 else:
1200 deltarev, deltanode = prev, self.node(prev)
1201 deltarev, deltanode = prev, self.node(prev)
@@ -1220,7 +1221,7 b' class revlog(object):'
1220 base = curr
1221 base = curr
1221
1222
1222 e = (offset_type(offset, flags), l, textlen,
1223 e = (offset_type(offset, flags), l, textlen,
1223 base, link, self.rev(p1), self.rev(p2), node)
1224 base, link, p1r, p2r, node)
1224 self.index.insert(-1, e)
1225 self.index.insert(-1, e)
1225 self.nodemap[node] = curr
1226 self.nodemap[node] = curr
1226
1227
General Comments 0
You need to be logged in to leave comments. Login now