equal
deleted
inserted
replaced
683 """ |
683 """ |
684 |
684 |
685 def __init__( |
685 def __init__( |
686 self, |
686 self, |
687 revlog, |
687 revlog, |
688 textlen, |
688 revinfo, |
689 p1, |
689 p1, |
690 p2, |
690 p2, |
691 cachedelta, |
691 cachedelta, |
692 excluded_bases=None, |
692 excluded_bases=None, |
693 target_rev=None, |
693 target_rev=None, |
700 cachedelta is None |
700 cachedelta is None |
701 or cachedelta[2] != DELTA_BASE_REUSE_FORCE |
701 or cachedelta[2] != DELTA_BASE_REUSE_FORCE |
702 or not revlog.delta_config.general_delta |
702 or not revlog.delta_config.general_delta |
703 ) |
703 ) |
704 self.revlog = revlog |
704 self.revlog = revlog |
705 self.textlen = textlen |
705 self.revinfo = revinfo |
|
706 self.textlen = revinfo.textlen |
706 self.p1 = p1 |
707 self.p1 = p1 |
707 self.p2 = p2 |
708 self.p2 = p2 |
708 self.cachedelta = cachedelta |
709 self.cachedelta = cachedelta |
709 self.excluded_bases = excluded_bases |
710 self.excluded_bases = excluded_bases |
710 if target_rev is None: |
711 if target_rev is None: |
1430 msg %= target_rev |
1431 msg %= target_rev |
1431 self._write_debug(msg) |
1432 self._write_debug(msg) |
1432 |
1433 |
1433 search = _DeltaSearch( |
1434 search = _DeltaSearch( |
1434 self.revlog, |
1435 self.revlog, |
1435 revinfo.textlen, |
1436 revinfo, |
1436 p1r, |
1437 p1r, |
1437 p2r, |
1438 p2r, |
1438 cachedelta, |
1439 cachedelta, |
1439 excluded_bases, |
1440 excluded_bases, |
1440 target_rev, |
1441 target_rev, |