diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -1776,10 +1776,6 @@ ) # experimental as long as format.use-persistent-nodemap is. coreconfigitem( - b'storage', b'revlog.nodemap.mode', default=b'compat', experimental=True -) -# experimental as long as format.use-persistent-nodemap is. -coreconfigitem( b'storage', b'revlog.persistent-nodemap.slow-path', default=b"abort", diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1081,8 +1081,6 @@ options[b'persistent-nodemap'] = True if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): options[b'persistent-nodemap.mmap'] = True - epnm = ui.config(b'storage', b'revlog.nodemap.mode') - options[b'persistent-nodemap.mode'] = epnm if ui.configbool(b'devel', b'persistent-nodemap'): options[b'devel-force-nodemap'] = True diff --git a/mercurial/revlogutils/nodemap.py b/mercurial/revlogutils/nodemap.py --- a/mercurial/revlogutils/nodemap.py +++ b/mercurial/revlogutils/nodemap.py @@ -13,7 +13,6 @@ import re import struct -from ..i18n import _ from ..node import hex from .. import ( @@ -143,13 +142,6 @@ ondisk_docket = revlog._nodemap_docket feed_data = util.safehasattr(revlog.index, "update_nodemap_data") 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': - tr._report(b"%s\n" % msg) - elif mode == b'strict': - raise error.Abort(msg) data = None # first attemp an incremental update of the data