Show More
@@ -725,9 +725,7 b' def _candidategroups(' | |||
|
725 | 725 | group = [] |
|
726 | 726 | for rev in temptative: |
|
727 | 727 | # skip over empty delta (no need to include them in a chain) |
|
728 | while revlog._generaldelta and not ( | |
|
729 | rev == nullrev or rev in tested or deltalength(rev) | |
|
730 | ): | |
|
728 | while not (rev == nullrev or rev in tested or deltalength(rev)): | |
|
731 | 729 | tested.add(rev) |
|
732 | 730 | rev = deltaparent(rev) |
|
733 | 731 | # no need to try a delta against nullrev, this will be done as a |
@@ -910,27 +908,27 b' def _rawgroups(revlog, p1, p2, cachedelt' | |||
|
910 | 908 | |
|
911 | 909 | The group order aims at providing fast or small candidates first. |
|
912 | 910 | """ |
|
913 | gdelta = revlog._generaldelta | |
|
914 | # gate sparse behind general-delta because of issue6056 | |
|
915 | sparse = gdelta and revlog._sparserevlog | |
|
911 | # Why search for delta base if we cannot use a delta base ? | |
|
912 | assert revlog._generaldelta | |
|
913 | # also see issue6056 | |
|
914 | sparse = revlog._sparserevlog | |
|
916 | 915 | curr = len(revlog) |
|
917 | 916 | prev = curr - 1 |
|
918 | 917 | deltachain = lambda rev: revlog._deltachain(rev)[0] |
|
919 | 918 | |
|
920 | if gdelta: | |
|
921 | # exclude already lazy tested base if any | |
|
922 | parents = [p for p in (p1, p2) if p != nullrev] | |
|
919 | # exclude already lazy tested base if any | |
|
920 | parents = [p for p in (p1, p2) if p != nullrev] | |
|
923 | 921 | |
|
924 |
|
|
|
925 |
|
|
|
926 |
|
|
|
927 |
|
|
|
928 |
|
|
|
929 |
|
|
|
930 |
|
|
|
931 |
|
|
|
932 |
|
|
|
933 |
|
|
|
922 | if not revlog._deltabothparents and len(parents) == 2: | |
|
923 | parents.sort() | |
|
924 | # To minimize the chance of having to build a fulltext, | |
|
925 | # pick first whichever parent is closest to us (max rev) | |
|
926 | yield (parents[1],) | |
|
927 | # then the other one (min rev) if the first did not fit | |
|
928 | yield (parents[0],) | |
|
929 | elif len(parents) > 0: | |
|
930 | # Test all parents (1 or 2), and keep the best candidate | |
|
931 | yield parents | |
|
934 | 932 | |
|
935 | 933 | if sparse and parents: |
|
936 | 934 | if snapshot_cache is None: |
General Comments 0
You need to be logged in to leave comments.
Login now