Show More
@@ -2471,9 +2471,12 b' class revlog(object):' | |||||
2471 | elif p1r == nullrev and p2r != nullrev: |
|
2471 | elif p1r == nullrev and p2r != nullrev: | |
2472 | rank = 1 + self.fast_rank(p2r) |
|
2472 | rank = 1 + self.fast_rank(p2r) | |
2473 | else: # merge node |
|
2473 | else: # merge node | |
2474 | pmin, pmax = sorted((p1r, p2r)) |
|
2474 | if rustdagop is not None and self.index.rust_ext_compat: | |
2475 | rank = 1 + self.fast_rank(pmax) |
|
2475 | rank = rustdagop.rank(self.index, p1r, p2r) | |
2476 | rank += sum(1 for _ in self.findmissingrevs([pmax], [pmin])) |
|
2476 | else: | |
|
2477 | pmin, pmax = sorted((p1r, p2r)) | |||
|
2478 | rank = 1 + self.fast_rank(pmax) | |||
|
2479 | rank += sum(1 for _ in self.findmissingrevs([pmax], [pmin])) | |||
2477 |
|
2480 | |||
2478 | e = revlogutils.entry( |
|
2481 | e = revlogutils.entry( | |
2479 | flags=flags, |
|
2482 | flags=flags, |
General Comments 0
You need to be logged in to leave comments.
Login now