Show More
@@ -585,12 +585,14 b' def is_good_delta_info(revlog, deltainfo' | |||
|
585 | 585 | if deltainfo is None: |
|
586 | 586 | return False |
|
587 | 587 | |
|
588 | if ( | |
|
589 | revinfo.cachedelta is not None | |
|
590 | and deltainfo.base == revinfo.cachedelta[0] | |
|
591 | and revinfo.cachedelta[2] == DELTA_BASE_REUSE_FORCE | |
|
592 | ): | |
|
593 | return True | |
|
588 | # the DELTA_BASE_REUSE_FORCE case should have been taken care of sooner so | |
|
589 | # we should never end up asking such question. Adding the assert as a | |
|
590 | # safe-guard to detect anything that would be fishy in this regard. | |
|
591 | assert ( | |
|
592 | revinfo.cachedelta is None | |
|
593 | or revinfo.cachedelta[2] != DELTA_BASE_REUSE_FORCE | |
|
594 | or not revlog._generaldelta | |
|
595 | ) | |
|
594 | 596 | |
|
595 | 597 | # - 'deltainfo.distance' is the distance from the base revision -- |
|
596 | 598 | # bounding it limits the amount of I/O we need to do. |
@@ -693,14 +695,14 b' def _candidategroups(' | |||
|
693 | 695 | yield None |
|
694 | 696 | return |
|
695 | 697 | |
|
696 | if ( | |
|
697 | cachedelta is not None | |
|
698 | and nullrev == cachedelta[0] | |
|
699 | and cachedelta[2] == DELTA_BASE_REUSE_FORCE | |
|
700 | ): | |
|
701 | # instruction are to forcibly do a full snapshot | |
|
702 | yield None | |
|
703 | return | |
|
698 | # the DELTA_BASE_REUSE_FORCE case should have been taken care of sooner so | |
|
699 | # we should never end up asking such question. Adding the assert as a | |
|
700 | # safe-guard to detect anything that would be fishy in this regard. | |
|
701 | assert ( | |
|
702 | cachedelta is None | |
|
703 | or cachedelta[2] != DELTA_BASE_REUSE_FORCE | |
|
704 | or not revlog._generaldelta | |
|
705 | ) | |
|
704 | 706 | |
|
705 | 707 | deltalength = revlog.length |
|
706 | 708 | deltaparent = revlog.deltaparent |
@@ -736,15 +738,6 b' def _candidategroups(' | |||
|
736 | 738 | if rev in tested: |
|
737 | 739 | continue |
|
738 | 740 | |
|
739 | if ( | |
|
740 | cachedelta is not None | |
|
741 | and rev == cachedelta[0] | |
|
742 | and cachedelta[2] == DELTA_BASE_REUSE_FORCE | |
|
743 | ): | |
|
744 | # instructions are to forcibly consider/use this delta base | |
|
745 | group.append(rev) | |
|
746 | continue | |
|
747 | ||
|
748 | 741 | # an higher authority deamed the base unworthy (e.g. censored) |
|
749 | 742 | if excluded_bases is not None and rev in excluded_bases: |
|
750 | 743 | tested.add(rev) |
General Comments 0
You need to be logged in to leave comments.
Login now