Show More
@@ -2077,7 +2077,7 b' class revlog:' | |||||
2077 |
|
2077 | |||
2078 | def issnapshot(self, rev): |
|
2078 | def issnapshot(self, rev): | |
2079 | """tells whether rev is a snapshot""" |
|
2079 | """tells whether rev is a snapshot""" | |
2080 | if not self._sparserevlog: |
|
2080 | if not self.delta_config.sparse_revlog: | |
2081 | return self.deltaparent(rev) == nullrev |
|
2081 | return self.deltaparent(rev) == nullrev | |
2082 | elif hasattr(self.index, 'issnapshot'): |
|
2082 | elif hasattr(self.index, 'issnapshot'): | |
2083 | # directly assign the method to cache the testing and access |
|
2083 | # directly assign the method to cache the testing and access |
@@ -622,7 +622,7 b' def is_good_delta_info(revlog, deltainfo' | |||||
622 | # possible to build pathological revlog where delta pattern would lead |
|
622 | # possible to build pathological revlog where delta pattern would lead | |
623 | # to too many reads. However, they do not happen in practice at all. So |
|
623 | # to too many reads. However, they do not happen in practice at all. So | |
624 | # we skip the span check entirely. |
|
624 | # we skip the span check entirely. | |
625 | if not revlog._sparserevlog and maxdist < deltainfo.distance: |
|
625 | if not revlog.delta_config.sparse_revlog and maxdist < deltainfo.distance: | |
626 | return False |
|
626 | return False | |
627 |
|
627 | |||
628 | # Bad delta from new delta size: |
|
628 | # Bad delta from new delta size: | |
@@ -715,7 +715,7 b' def _candidategroups(' | |||||
715 |
|
715 | |||
716 | deltalength = revlog.length |
|
716 | deltalength = revlog.length | |
717 | deltaparent = revlog.deltaparent |
|
717 | deltaparent = revlog.deltaparent | |
718 | sparse = revlog._sparserevlog |
|
718 | sparse = revlog.delta_config.sparse_revlog | |
719 | good = None |
|
719 | good = None | |
720 |
|
720 | |||
721 | deltas_limit = textlen * LIMIT_DELTA2TEXT |
|
721 | deltas_limit = textlen * LIMIT_DELTA2TEXT | |
@@ -875,7 +875,7 b' def _refinedgroups(revlog, p1, p2, cache' | |||||
875 | break |
|
875 | break | |
876 |
|
876 | |||
877 | # If sparse revlog is enabled, we can try to refine the available deltas |
|
877 | # If sparse revlog is enabled, we can try to refine the available deltas | |
878 | if not revlog._sparserevlog: |
|
878 | if not revlog.delta_config.sparse_revlog: | |
879 | yield None |
|
879 | yield None | |
880 | return |
|
880 | return | |
881 |
|
881 | |||
@@ -916,7 +916,7 b' def _rawgroups(revlog, p1, p2, cachedelt' | |||||
916 | # Why search for delta base if we cannot use a delta base ? |
|
916 | # Why search for delta base if we cannot use a delta base ? | |
917 | assert revlog.delta_config.general_delta |
|
917 | assert revlog.delta_config.general_delta | |
918 | # also see issue6056 |
|
918 | # also see issue6056 | |
919 | sparse = revlog._sparserevlog |
|
919 | sparse = revlog.delta_config.sparse_revlog | |
920 | curr = len(revlog) |
|
920 | curr = len(revlog) | |
921 | prev = curr - 1 |
|
921 | prev = curr - 1 | |
922 | deltachain = lambda rev: revlog._deltachain(rev)[0] |
|
922 | deltachain = lambda rev: revlog._deltachain(rev)[0] | |
@@ -1158,9 +1158,9 b' class deltacomputer:' | |||||
1158 | raise error.ProgrammingError(msg) |
|
1158 | raise error.ProgrammingError(msg) | |
1159 | deltabase = chainbase |
|
1159 | deltabase = chainbase | |
1160 | snapshotdepth = None |
|
1160 | snapshotdepth = None | |
1161 | if revlog._sparserevlog and deltabase == nullrev: |
|
1161 | if revlog.delta_config.sparse_revlog and deltabase == nullrev: | |
1162 | snapshotdepth = 0 |
|
1162 | snapshotdepth = 0 | |
1163 | elif revlog._sparserevlog and revlog.issnapshot(deltabase): |
|
1163 | elif revlog.delta_config.sparse_revlog and revlog.issnapshot(deltabase): | |
1164 | # A delta chain should always be one full snapshot, |
|
1164 | # A delta chain should always be one full snapshot, | |
1165 | # zero or more semi-snapshots, and zero or more deltas |
|
1165 | # zero or more semi-snapshots, and zero or more deltas | |
1166 | p1, p2 = revlog.rev(revinfo.p1), revlog.rev(revinfo.p2) |
|
1166 | p1, p2 = revlog.rev(revinfo.p1), revlog.rev(revinfo.p2) |
General Comments 0
You need to be logged in to leave comments.
Login now