This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8421

nodemap: move the option for mmap usage to storage.revlog.nodemap.mmap
ClosedPublic

Authored by marmoute on Apr 14 2020, 11:49 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG059c99af141d: nodemap: move the option for mmap usage to storage.revlog.nodemap.mmap
Summary

The option is stay experimental as long as the main feature is.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Apr 14 2020, 11:49 AM
marmoute updated this revision to Diff 21231.Apr 27 2020, 1:13 PM
Alphare accepted this revision.May 7 2020, 9:16 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/configitems.py
1082

Looks like you accidentally some words at the end of that comment

marmoute added a commit: rHG059c99af141d: nodemap: move the option for mmap usage to storage.revlog.nodemap.mmap.May 7 2020, 11:35 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG059c99af141d: nodemap: move the option for mmap usage to storage.revlog.nodemap.mmap (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21297

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'experimental', b'revisions.disambiguatewithin', default=None, b'experimental', b'revisions.disambiguatewithin', default=None,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'rust.index', default=False, b'experimental', b'rust.index', default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'exp-persistent-nodemap.mmap', default=True,
)
coreconfigitem(
b'experimental', b'exp-persistent-nodemap.mode', default=b'compat', b'experimental', b'exp-persistent-nodemap.mode', default=b'compat',
) )
coreconfigitem( coreconfigitem(
b'experimental', b'server.filesdata.recommended-batch-size', default=50000, b'experimental', b'server.filesdata.recommended-batch-size', default=50000,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'server.manifestdata.recommended-batch-size', b'server.manifestdata.recommended-batch-size',
b'storage', b'new-repo-backend', default=b'revlogv1', experimental=True, b'storage', b'new-repo-backend', default=b'revlogv1', experimental=True,
) )
coreconfigitem( coreconfigitem(
b'storage', b'storage',
b'revlog.optimize-delta-parent-choice', b'revlog.optimize-delta-parent-choice',
default=True, default=True,
alias=[(b'format', b'aggressivemergedeltas')], alias=[(b'format', b'aggressivemergedeltas')],
) )
# experimental as long as rust is experimental (or a C version is implemented)
AlphareUnsubmitted
Not Done

Looks like you accidentally some words at the end of that comment

Alphare: Looks like you accidentally some words at the end of that comment
coreconfigitem(
b'storage', b'revlog.nodemap.mmap', default=True, experimental=True
)
coreconfigitem( coreconfigitem(
b'storage', b'revlog.reuse-external-delta', default=True, b'storage', b'revlog.reuse-external-delta', default=True,
) )
coreconfigitem( coreconfigitem(
b'storage', b'revlog.reuse-external-delta-parent', default=None, b'storage', b'revlog.reuse-external-delta-parent', default=None,
) )
coreconfigitem( coreconfigitem(
b'storage', b'revlog.zlib.level', default=None, b'storage', b'revlog.zlib.level', default=None,

mercurial/localrepo.py

if repository.NARROW_REQUIREMENT in requirements: if repository.NARROW_REQUIREMENT in requirements:
options[b'enableellipsis'] = True options[b'enableellipsis'] = True
if ui.configbool(b'experimental', b'rust.index'): if ui.configbool(b'experimental', b'rust.index'):
options[b'rust.index'] = True options[b'rust.index'] = True
if NODEMAP_REQUIREMENT in requirements: if NODEMAP_REQUIREMENT in requirements:
options[b'persistent-nodemap'] = True options[b'persistent-nodemap'] = True
if ui.configbool(b'experimental', b'exp-persistent-nodemap.mmap'): if ui.configbool(b'storage', b'revlog.nodemap.mmap'):
options[b'persistent-nodemap.mmap'] = True options[b'persistent-nodemap.mmap'] = True
epnm = ui.config(b'experimental', b'exp-persistent-nodemap.mode') epnm = ui.config(b'experimental', b'exp-persistent-nodemap.mode')
options[b'persistent-nodemap.mode'] = epnm 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

tests/test-persistent-nodemap.t

revision in index: 5002 revision in index: 5002
revision in nodemap: 5002 revision in nodemap: 5002
Test code path without mmap Test code path without mmap
--------------------------- ---------------------------
$ echo bar > bar $ echo bar > bar
$ hg add bar $ hg add bar
$ hg ci -m 'bar' --config experimental.exp-persistent-nodemap.mmap=no $ hg ci -m 'bar' --config storage.revlog.nodemap.mmap=no
$ hg debugnodemap --check --config experimental.exp-persistent-nodemap.mmap=yes $ hg debugnodemap --check --config storage.revlog.nodemap.mmap=yes
revision in index: 5003 revision in index: 5003
revision in nodemap: 5003 revision in nodemap: 5003
$ hg debugnodemap --check --config experimental.exp-persistent-nodemap.mmap=no $ hg debugnodemap --check --config storage.revlog.nodemap.mmap=no
revision in index: 5003 revision in index: 5003
revision in nodemap: 5003 revision in nodemap: 5003
#if pure #if pure
$ hg debugnodemap --metadata $ hg debugnodemap --metadata
uid: ???????????????? (glob) uid: ???????????????? (glob)
tip-rev: 5002 tip-rev: 5002