changeset 44869:5e3c718692bb

nodemap: drop the 'exp-' prefix for internal opener option The feature is now in a descent shape and we can consider having it "less" experimental. We won't be able to make it "totally" non-experimental, because its benefit rely on rust, which is totally experimental. Differential Revision: https://phab.mercurial-scm.org/D8418
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 14 Apr 2020 03:27:04 +0200
parents b81486b609a3
children d688a8d537b9
files mercurial/changelog.py mercurial/localrepo.py mercurial/manifest.py mercurial/revlogutils/nodemap.py
diffstat 4 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/changelog.py	Tue Apr 14 03:16:23 2020 +0200
+++ b/mercurial/changelog.py	Tue Apr 14 03:27:04 2020 +0200
@@ -385,9 +385,7 @@
             datafile=datafile,
             checkambig=True,
             mmaplargeindex=True,
-            persistentnodemap=opener.options.get(
-                b'exp-persistent-nodemap', False
-            ),
+            persistentnodemap=opener.options.get(b'persistent-nodemap', False),
         )
 
         if self._initempty and (self.version & 0xFFFF == revlog.REVLOGV1):
--- a/mercurial/localrepo.py	Tue Apr 14 03:16:23 2020 +0200
+++ b/mercurial/localrepo.py	Tue Apr 14 03:27:04 2020 +0200
@@ -937,11 +937,11 @@
     if ui.configbool(b'experimental', b'rust.index'):
         options[b'rust.index'] = True
     if NODEMAP_REQUIREMENT in requirements:
-        options[b'exp-persistent-nodemap'] = True
+        options[b'persistent-nodemap'] = True
     if ui.configbool(b'experimental', b'exp-persistent-nodemap.mmap'):
-        options[b'exp-persistent-nodemap.mmap'] = True
+        options[b'persistent-nodemap.mmap'] = True
     epnm = ui.config(b'experimental', b'exp-persistent-nodemap.mode')
-    options[b'exp-persistent-nodemap.mode'] = epnm
+    options[b'persistent-nodemap.mode'] = epnm
     if ui.configbool(b'devel', b'persistent-nodemap'):
         options[b'devel-force-nodemap'] = True
 
--- a/mercurial/manifest.py	Tue Apr 14 03:16:23 2020 +0200
+++ b/mercurial/manifest.py	Tue Apr 14 03:27:04 2020 +0200
@@ -1588,9 +1588,7 @@
             checkambig=not bool(tree),
             mmaplargeindex=True,
             upperboundcomp=MAXCOMPRESSION,
-            persistentnodemap=opener.options.get(
-                b'exp-persistent-nodemap', False
-            ),
+            persistentnodemap=opener.options.get(b'persistent-nodemap', False),
         )
 
         self.index = self._revlog.index
--- a/mercurial/revlogutils/nodemap.py	Tue Apr 14 03:16:23 2020 +0200
+++ b/mercurial/revlogutils/nodemap.py	Tue Apr 14 03:27:04 2020 +0200
@@ -50,7 +50,7 @@
     docket.data_unused = data_unused
 
     filename = _rawdata_filepath(revlog, docket)
-    use_mmap = revlog.opener.options.get(b"exp-persistent-nodemap.mmap")
+    use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap")
     try:
         with revlog.opener(filename) as fd:
             if use_mmap:
@@ -142,8 +142,8 @@
     can_incremental = util.safehasattr(revlog.index, "nodemap_data_incremental")
     ondisk_docket = revlog._nodemap_docket
     feed_data = util.safehasattr(revlog.index, "update_nodemap_data")
-    use_mmap = revlog.opener.options.get(b"exp-persistent-nodemap.mmap")
-    mode = revlog.opener.options.get(b"exp-persistent-nodemap.mode")
+    use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap")
+    mode = revlog.opener.options.get(b"persistent-nodemap.mode")
     if not can_incremental:
         msg = _(b"persistent nodemap in strict mode without efficient method")
         if mode == b'warn':