# HG changeset patch # User Pierre-Yves David # Date 2020-04-14 01:27:04 # Node ID 5e3c718692bbdbdc71b49b3a78deb0d4b0f76445 # Parent b81486b609a3397a876ffc0ff886b33fe19a886b 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 diff --git a/mercurial/changelog.py b/mercurial/changelog.py --- a/mercurial/changelog.py +++ b/mercurial/changelog.py @@ -385,9 +385,7 @@ class changelog(revlog.revlog): 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): diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -937,11 +937,11 @@ def resolverevlogstorevfsoptions(ui, req 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 diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -1588,9 +1588,7 @@ class manifestrevlog(object): 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 diff --git a/mercurial/revlogutils/nodemap.py b/mercurial/revlogutils/nodemap.py --- a/mercurial/revlogutils/nodemap.py +++ b/mercurial/revlogutils/nodemap.py @@ -50,7 +50,7 @@ def persisted_data(revlog): 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 @@ def _persist_nodemap(tr, revlog, pending 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':