revlog: skip opener options to pass sparse reading values
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 10 Oct 2023 10:04:06 +0200
changeset 51044 e2941c398f10
parent 51043 8ed03f773eac
child 51045 127656e0b97b
revlog: skip opener options to pass sparse reading values We can directly set the option in the config object now.
mercurial/localrepo.py
mercurial/revlog.py
--- a/mercurial/localrepo.py	Tue Oct 10 10:03:58 2023 +0200
+++ b/mercurial/localrepo.py	Tue Oct 10 10:04:06 2023 +0200
@@ -1125,14 +1125,15 @@
         ui.config(b'experimental', b'sparse-read.density-threshold')
     )
     srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size')
-    options[b'with-sparse-read'] = withsparseread
-    options[b'sparse-read-density-threshold'] = srdensitythres
-    options[b'sparse-read-min-gap-size'] = srmingapsize
+    data_config.with_sparse_read = withsparseread
+    data_config.sr_density_threshold = srdensitythres
+    data_config.sr_min_gap_size = srmingapsize
 
     sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements
     delta_config.sparse_revlog = sparserevlog
     if sparserevlog:
         options[b'generaldelta'] = True
+        data_config.with_sparse_read = True
 
     maxchainlen = None
     if sparserevlog:
--- a/mercurial/revlog.py	Tue Oct 10 10:03:58 2023 +0200
+++ b/mercurial/revlog.py	Tue Oct 10 10:04:06 2023 +0200
@@ -630,17 +630,6 @@
         mmapindexthreshold = None
         if self._mmaplargeindex:
             mmapindexthreshold = self.data_config.mmap_index_threshold
-        if self.delta_config.sparse_revlog:
-            # sparse-revlog forces sparse-read
-            self.data_config.with_sparse_read = True
-        elif b'with-sparse-read' in opts:
-            self.data_config.with_sparse_read = bool(opts[b'with-sparse-read'])
-        if b'sparse-read-density-threshold' in opts:
-            self.data_config.sr_density_threshold = opts[
-                b'sparse-read-density-threshold'
-            ]
-        if b'sparse-read-min-gap-size' in opts:
-            self.data_config.sr_min_gap_size = opts[b'sparse-read-min-gap-size']
         if self.feature_config.enable_ellipsis:
             self._flagprocessors[REVIDX_ELLIPSIS] = ellipsisprocessor