##// END OF EJS Templates
revlogdeltas: pass revision number to _candidatesgroups...
Boris Feld -
r39371:1441eb38 default
parent child Browse files
Show More
@@ -576,7 +576,6 b' def _candidategroups(revlog, p1, p2, cac'
576 gdelta = revlog._generaldelta
576 gdelta = revlog._generaldelta
577 curr = len(revlog)
577 curr = len(revlog)
578 prev = curr - 1
578 prev = curr - 1
579 p1r, p2r = revlog.rev(p1), revlog.rev(p2)
580
579
581 # should we try to build a delta?
580 # should we try to build a delta?
582 if prev != nullrev and revlog._storedeltachains:
581 if prev != nullrev and revlog._storedeltachains:
@@ -593,7 +592,7 b' def _candidategroups(revlog, p1, p2, cac'
593
592
594 if gdelta:
593 if gdelta:
595 # exclude already lazy tested base if any
594 # exclude already lazy tested base if any
596 parents = [p for p in (p1r, p2r)
595 parents = [p for p in (p1, p2)
597 if p != nullrev and p not in tested]
596 if p != nullrev and p not in tested]
598
597
599 if not revlog._deltabothparents and len(parents) == 2:
598 if not revlog._deltabothparents and len(parents) == 2:
@@ -734,7 +733,8 b' class deltacomputer(object):'
734
733
735 deltainfo = None
734 deltainfo = None
736 deltas_limit = revinfo.textlen * LIMIT_DELTA2TEXT
735 deltas_limit = revinfo.textlen * LIMIT_DELTA2TEXT
737 groups = _candidategroups(self.revlog, p1, p2, cachedelta)
736 p1r, p2r = revlog.rev(p1), revlog.rev(p2)
737 groups = _candidategroups(self.revlog, p1r, p2r, cachedelta)
738 for candidaterevs in groups:
738 for candidaterevs in groups:
739 # filter out delta base that will never produce good delta
739 # filter out delta base that will never produce good delta
740 candidaterevs = [r for r in candidaterevs
740 candidaterevs = [r for r in candidaterevs
General Comments 0
You need to be logged in to leave comments. Login now