diff -r 127656e0b97b -r f636103c4d67 mercurial/revlogutils/deltas.py --- a/mercurial/revlogutils/deltas.py Tue Oct 10 18:02:20 2023 +0200 +++ b/mercurial/revlogutils/deltas.py Tue Oct 10 10:56:42 2023 +0200 @@ -597,7 +597,7 @@ assert ( revinfo.cachedelta is None or revinfo.cachedelta[2] != DELTA_BASE_REUSE_FORCE - or not revlog._generaldelta + or not revlog.delta_config.general_delta ) # - 'deltainfo.distance' is the distance from the base revision -- @@ -695,7 +695,7 @@ if target_rev is None: target_rev = len(revlog) - if not revlog._generaldelta: + if not revlog.delta_config.general_delta: # before general delta, there is only one possible delta base yield (target_rev - 1,) yield None @@ -707,7 +707,7 @@ assert ( cachedelta is None or cachedelta[2] != DELTA_BASE_REUSE_FORCE - or not revlog._generaldelta + or not revlog.delta_config.general_delta ) deltalength = revlog.length @@ -908,7 +908,7 @@ The group order aims at providing fast or small candidates first. """ # Why search for delta base if we cannot use a delta base ? - assert revlog._generaldelta + assert revlog.delta_config.general_delta # also see issue6056 sparse = revlog._sparserevlog curr = len(revlog) @@ -1140,7 +1140,7 @@ # can we use the cached delta? revlog = self.revlog chainbase = revlog.chainbase(base) - if revlog._generaldelta: + if revlog.delta_config.general_delta: deltabase = base else: if target_rev is not None and base != target_rev - 1: @@ -1317,7 +1317,7 @@ # If this source delta are to be forcibly reuse, let us comply early. if ( - revlog._generaldelta + revlog.delta_config.general_delta and revinfo.cachedelta is not None and revinfo.cachedelta[2] == DELTA_BASE_REUSE_FORCE ):