equal
deleted
inserted
replaced
691 cachedelta, |
691 cachedelta, |
692 excluded_bases=None, |
692 excluded_bases=None, |
693 target_rev=None, |
693 target_rev=None, |
694 snapshot_cache=None, |
694 snapshot_cache=None, |
695 ): |
695 ): |
|
696 # the DELTA_BASE_REUSE_FORCE case should have been taken care of sooner |
|
697 # so we should never end up asking such question. Adding the assert as |
|
698 # a safe-guard to detect anything that would be fishy in this regard. |
|
699 assert ( |
|
700 cachedelta is None |
|
701 or cachedelta[2] != DELTA_BASE_REUSE_FORCE |
|
702 or not revlog.delta_config.general_delta |
|
703 ) |
696 self.revlog = revlog |
704 self.revlog = revlog |
697 self.textlen = textlen |
705 self.textlen = textlen |
698 self.p1 = p1 |
706 self.p1 = p1 |
699 self.p2 = p2 |
707 self.p2 = p2 |
700 self.cachedelta = cachedelta |
708 self.cachedelta = cachedelta |
722 if not self.revlog.delta_config.general_delta: |
730 if not self.revlog.delta_config.general_delta: |
723 # before general delta, there is only one possible delta base |
731 # before general delta, there is only one possible delta base |
724 yield (self.target_rev - 1,) |
732 yield (self.target_rev - 1,) |
725 yield None |
733 yield None |
726 return |
734 return |
727 |
|
728 # the DELTA_BASE_REUSE_FORCE case should have been taken care of sooner |
|
729 # so we should never end up asking such question. Adding the assert as |
|
730 # a safe-guard to detect anything that would be fishy in this regard. |
|
731 assert ( |
|
732 self.cachedelta is None |
|
733 or self.cachedelta[2] != DELTA_BASE_REUSE_FORCE |
|
734 or not self.revlog.delta_config.general_delta |
|
735 ) |
|
736 |
735 |
737 deltalength = self.revlog.length |
736 deltalength = self.revlog.length |
738 deltaparent = self.revlog.deltaparent |
737 deltaparent = self.revlog.deltaparent |
739 sparse = self.revlog.delta_config.sparse_revlog |
738 sparse = self.revlog.delta_config.sparse_revlog |
740 good = None |
739 good = None |