This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8422

nodemap: move the mode option to storage.revlog.nodemap.mode
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd36283e20833: nodemap: move the mode option to storage.revlog.nodemap.mode
Summary

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

Diff Detail

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

Revision Contents
Changeset List

Diff 21070

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.mode', default=b'compat',
)
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',
default=100000, default=100000,
) )
coreconfigitem( coreconfigitem(
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 implemented) # experimental as long as format.use-persistent-nodemap is.
coreconfigitem( coreconfigitem(
b'storage', b'revlog.nodemap.mmap', default=True, experimental=True b'storage', b'revlog.nodemap.mmap', default=True, experimental=True
) )
# experimental as long as format.use-persistent-nodemap is.
coreconfigitem(
b'storage', b'revlog.nodemap.mode', default=b'compat', 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

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'storage', b'revlog.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'storage', b'revlog.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
def makemain(**kwargs): def makemain(**kwargs):

tests/test-persistent-nodemap.t

=================================== ===================================
Test the persistent on-disk nodemap Test the persistent on-disk nodemap
=================================== ===================================
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [format] > [format]
> use-persistent-nodemap=yes > use-persistent-nodemap=yes
> [devel] > [devel]
> persistent-nodemap=yes > persistent-nodemap=yes
> EOF > EOF
$ hg init test-repo $ hg init test-repo
$ cd test-repo $ cd test-repo
$ hg debugbuilddag .+5000 --new-file --config "experimental.exp-persistent-nodemap.mode=warn" $ hg debugbuilddag .+5000 --new-file --config "storage.revlog.nodemap.mode=warn"
persistent nodemap in strict mode without efficient method (no-rust no-pure !) persistent nodemap in strict mode without efficient method (no-rust no-pure !)
persistent nodemap in strict mode without efficient method (no-rust no-pure !) persistent nodemap in strict mode without efficient method (no-rust no-pure !)
$ hg debugnodemap --metadata $ hg debugnodemap --metadata
uid: ???????????????? (glob) uid: ???????????????? (glob)
tip-rev: 5000 tip-rev: 5000
tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
data-length: 121088 data-length: 121088
data-unused: 0 data-unused: 0
$ hg up $ hg up
5001 files updated, 0 files merged, 0 files removed, 0 files unresolved 5001 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foo > foo $ echo foo > foo
$ hg add foo $ hg add foo
#if no-pure no-rust #if no-pure no-rust
$ hg ci -m 'foo' --config "experimental.exp-persistent-nodemap.mode=strict" $ hg ci -m 'foo' --config "storage.revlog.nodemap.mode=strict"
transaction abort! transaction abort!
rollback completed rollback completed
abort: persistent nodemap in strict mode without efficient method abort: persistent nodemap in strict mode without efficient method
[255] [255]
#endif #endif
$ hg ci -m 'foo' $ hg ci -m 'foo'