This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9760

persistent-node: check the value of the slow-path config
ClosedPublic

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

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2c9c88879ab7: persistent-node: check the value of the slow-path config
rHGda2e21a261ab: persistent-node: check the value of the slow-path config
rHGddb395cd0205: persistent-node: check the value of the slow-path config
Summary

We should probably provide some standard for this in config item, but this is a
quest for another adventure.

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.Jan 13 2021, 11:05 PM
marmoute updated this revision to Diff 24840.Jan 14 2021, 12:24 AM
Alphare accepted this revision.Jan 15 2021, 5:54 AM
baymax updated this revision to Diff 24892.Jan 15 2021, 6:59 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Jan 16 2021, 4:51 AM
This revision is now accepted and ready to land.Jan 16 2021, 4:51 AM
indygreg added a subscriber: indygreg.Jan 24 2021, 3:17 PM
indygreg added inline comments.
mercurial/localrepo.py
1050

(b'allow') is bytes not Tuple[bytes]. This works since we're comparing bytes to bytes. But I thought it was strange.

marmoute added inline comments.Jan 25 2021, 10:19 AM
mercurial/localrepo.py
1050

Yeah, that is a small typo I made while splitting the change. This get "fixed" in the next changes.

Revision Contents
Changeset List

Diff 24971

mercurial/localrepo.py

raise error.Abort(msg % options[b'zstd.level']) raise error.Abort(msg % options[b'zstd.level'])
if requirementsmod.NARROW_REQUIREMENT in requirements: if requirementsmod.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 requirementsmod.NODEMAP_REQUIREMENT in requirements: if requirementsmod.NODEMAP_REQUIREMENT in requirements:
slow_path = ui.config(
b'storage', b'revlog.persistent-nodemap.slow-path'
)
if slow_path not in (b'allow'):
indygregUnsubmitted
Not Done

(b'allow') is bytes not Tuple[bytes]. This works since we're comparing bytes to bytes. But I thought it was strange.

indygreg: `(b'allow')` is `bytes` not `Tuple[bytes]`. This works since we're comparing `bytes` to `bytes`.
marmouteAuthorUnsubmitted
Done

Yeah, that is a small typo I made while splitting the change. This get "fixed" in the next changes.

marmoute: Yeah, that is a small typo I made while splitting the change. This get "fixed" in the next…
default = ui.config_default(
b'storage', b'revlog.persistent-nodemap.slow-path'
)
msg = _(
b'unknown value for config '
b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n'
)
ui.warn(msg % slow_path)
if not ui.quiet:
ui.warn(_(b'falling back to default value: %s\n') % default)
slow_path = default
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') 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

tests/test-persistent-nodemap.t

add a new commit add a new commit
$ 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
Check slow-path config value handling
-------------------------------------
$ hg id --config "storage.revlog.persistent-nodemap.slow-path=invalid-value"
unknown value for config "storage.revlog.persistent-nodemap.slow-path": "invalid-value"
falling back to default value: allow
6b02b8c7b966+ tip
#if no-pure no-rust #if no-pure no-rust
$ hg ci -m 'foo' --config "storage.revlog.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]