Show More
@@ -1328,7 +1328,7 b' class deltacomputer:' | |||||
1328 | and cachedelta[0] in candidaterevs |
|
1328 | and cachedelta[0] in candidaterevs | |
1329 | ): |
|
1329 | ): | |
1330 | round_type = b"cached-delta" |
|
1330 | round_type = b"cached-delta" | |
1331 | elif p1 in candidaterevs or p2 in candidaterevs: |
|
1331 | elif p1r in candidaterevs or p2r in candidaterevs: | |
1332 | round_type = b"parents" |
|
1332 | round_type = b"parents" | |
1333 | elif prev is not None and all(c < prev for c in candidaterevs): |
|
1333 | elif prev is not None and all(c < prev for c in candidaterevs): | |
1334 | round_type = b"refine-down" |
|
1334 | round_type = b"refine-down" | |
@@ -1356,9 +1356,9 b' class deltacomputer:' | |||||
1356 | msg %= candidaterev |
|
1356 | msg %= candidaterev | |
1357 | self._write_debug(msg) |
|
1357 | self._write_debug(msg) | |
1358 | candidate_type = None |
|
1358 | candidate_type = None | |
1359 | if candidaterev == p1: |
|
1359 | if candidaterev == p1r: | |
1360 | candidate_type = b"p1" |
|
1360 | candidate_type = b"p1" | |
1361 | elif candidaterev == p2: |
|
1361 | elif candidaterev == p2r: | |
1362 | candidate_type = b"p2" |
|
1362 | candidate_type = b"p2" | |
1363 | elif self.revlog.issnapshot(candidaterev): |
|
1363 | elif self.revlog.issnapshot(candidaterev): | |
1364 | candidate_type = b"snapshot-%d" |
|
1364 | candidate_type = b"snapshot-%d" |
General Comments 0
You need to be logged in to leave comments.
Login now