This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9763

persistent-nodemap: drop the storage.revlog.nodemap.mode config
ClosedPublic

Authored by marmoute on Jan 13 2021, 11:05 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG28899b6f4480: persistent-nodemap: drop the storage.revlog.nodemap.mode config
rHG50296276615f: persistent-nodemap: drop the storage.revlog.nodemap.mode config
rHG44f2e95bfd7c: persistent-nodemap: drop the storage.revlog.nodemap.mode config
Summary

We now have a new, better, higher level, option. So we can drop the older one as
planned.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 24895

mercurial/configitems.py

coreconfigitem( coreconfigitem(
b'storage', b'storage',
b'revlog.persistent-nodemap.mmap', b'revlog.persistent-nodemap.mmap',
default=True, default=True,
experimental=True, experimental=True,
) )
# experimental as long as format.use-persistent-nodemap is. # experimental as long as format.use-persistent-nodemap is.
coreconfigitem( 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'storage',
b'revlog.persistent-nodemap.slow-path', b'revlog.persistent-nodemap.slow-path',
default=b"abort", default=b"abort",
experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'storage', b'storage',

mercurial/localrepo.py

if not ui.quiet: if not ui.quiet:
hint = b'(' + hint + b')\n' hint = b'(' + hint + b')\n'
ui.warn(hint) ui.warn(hint)
if slow_path == b'abort': if slow_path == b'abort':
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
options[b'persistent-nodemap'] = True options[b'persistent-nodemap'] = True
if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'): if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'):
options[b'persistent-nodemap.mmap'] = True 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'): if ui.configbool(b'devel', b'persistent-nodemap'):
options[b'devel-force-nodemap'] = True options[b'devel-force-nodemap'] = True
return options return options
def makemain(**kwargs): def makemain(**kwargs):
"""Produce a type conforming to ``ilocalrepositorymain``.""" """Produce a type conforming to ``ilocalrepositorymain``."""

mercurial/revlogutils/nodemap.py

# nodemap.py - nodemap related code and utilities # nodemap.py - nodemap related code and utilities
# #
# Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net> # Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net>
# Copyright 2019 George Racinet <georges.racinet@octobus.net> # Copyright 2019 George Racinet <georges.racinet@octobus.net>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
import os import os
import re import re
import struct import struct
from ..i18n import _
from ..node import hex from ..node import hex
from .. import ( from .. import (
error, error,
util, util,
) )
if revlog.nodemap_file is None: if revlog.nodemap_file is None:
msg = "calling persist nodemap on a revlog without the feature enableb" msg = "calling persist nodemap on a revlog without the feature enableb"
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
can_incremental = util.safehasattr(revlog.index, "nodemap_data_incremental") can_incremental = util.safehasattr(revlog.index, "nodemap_data_incremental")
ondisk_docket = revlog._nodemap_docket ondisk_docket = revlog._nodemap_docket
feed_data = util.safehasattr(revlog.index, "update_nodemap_data") feed_data = util.safehasattr(revlog.index, "update_nodemap_data")
use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap") 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 data = None
# first attemp an incremental update of the data # first attemp an incremental update of the data
if can_incremental and ondisk_docket is not None: if can_incremental and ondisk_docket is not None:
target_docket = revlog._nodemap_docket.copy() target_docket = revlog._nodemap_docket.copy()
( (
src_docket, src_docket,
data_changed_count, data_changed_count,