This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9761

persistent-nodemap: add a "warn" option to the slow-path config
ClosedPublic

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

Details

Reviewers
indygreg
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfc2d5c0aed7f: persistent-nodemap: add a "warn" option to the slow-path config
rHGa7d70e4c95b8: persistent-nodemap: add a "warn" option to the slow-path config
rHG9db6dba1ad79: persistent-nodemap: add a "warn" option to the slow-path config
Summary

And make it the default until we get an abort option.

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.

Revision Contents
Changeset List

Diff 24972

mercurial/configitems.py

# 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 b'storage', b'revlog.nodemap.mode', default=b'compat', 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'storage',
b'revlog.persistent-nodemap.slow-path', b'revlog.persistent-nodemap.slow-path',
default=b"allow", default=b"warn",
experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'storage', b'storage',
b'revlog.reuse-external-delta', b'revlog.reuse-external-delta',
default=True, default=True,
) )

mercurial/helptext/config.txt

:hg:`help config format.use-persistent-nodemap`. :hg:`help config format.use-persistent-nodemap`.
``revlog.persistent-nodemap.slow-path`` ``revlog.persistent-nodemap.slow-path``
Control the behavior of Merucrial when using a repository with "persistent" Control the behavior of Merucrial when using a repository with "persistent"
nodemap with an installation of Mercurial without a fast implementation for nodemap with an installation of Mercurial without a fast implementation for
the feature: the feature:
``allow``: Silently use the slower implementation to access the repository. ``allow``: Silently use the slower implementation to access the repository.
``warn``: Warn, but use the slower implementation to access the repository.
Default to "allow" Default to ``warn``
For details on the "persistent-nodemap" feature, see: For details on the "persistent-nodemap" feature, see:
:hg:`help config format.use-persistent-nodemap`. :hg:`help config format.use-persistent-nodemap`.
``revlog.reuse-external-delta-parent`` ``revlog.reuse-external-delta-parent``
Control the order in which delta parents are considered when adding new Control the order in which delta parents are considered when adding new
revisions from an external source. revisions from an external source.
(typically: apply bundle from `hg pull` or `hg push`). (typically: apply bundle from `hg pull` or `hg push`).

mercurial/localrepo.py

obsolete, obsolete,
pathutil, pathutil,
phases, phases,
pushkey, pushkey,
pycompat, pycompat,
rcutil, rcutil,
repoview, repoview,
requirements as requirementsmod, requirements as requirementsmod,
revlog,
revset, revset,
revsetlang, revsetlang,
scmutil, scmutil,
sparse, sparse,
store as storemod, store as storemod,
subrepoutil, subrepoutil,
tags as tagsmod, tags as tagsmod,
transaction, transaction,
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( slow_path = ui.config(
b'storage', b'revlog.persistent-nodemap.slow-path' b'storage', b'revlog.persistent-nodemap.slow-path'
) )
if slow_path not in (b'allow'): if slow_path not in (b'allow', b'warn'):
default = ui.config_default( default = ui.config_default(
b'storage', b'revlog.persistent-nodemap.slow-path' b'storage', b'revlog.persistent-nodemap.slow-path'
) )
msg = _( msg = _(
b'unknown value for config ' b'unknown value for config '
b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n' b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n'
) )
ui.warn(msg % slow_path) ui.warn(msg % slow_path)
if not ui.quiet: if not ui.quiet:
ui.warn(_(b'falling back to default value: %s\n') % default) ui.warn(_(b'falling back to default value: %s\n') % default)
slow_path = default slow_path = default
msg = _(
b"accessing `persistent-nodemap` repository without associated "
b"fast implementation."
)
hint = _(
b"check `hg help config.format.use-persistent-nodemap` "
b"for details"
)
if slow_path == b'warn' and not revlog.HAS_FAST_PERSISTENT_NODEMAP:
msg = b"warning: " + msg + b'\n'
ui.warn(msg)
if not ui.quiet:
hint = b'(' + hint + b')\n'
ui.warn(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') 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

mercurial/revlog.py

point for extensions to influence the operation.""" point for extensions to influence the operation."""
if skipflags: if skipflags:
state[b'skipread'].add(node) state[b'skipread'].add(node)
else: else:
# Side-effect: read content and verify hash. # Side-effect: read content and verify hash.
rl.revision(node) rl.revision(node)
# True if a fast implementation for persistent-nodemap is available
#
# We also consider we have a "fast" implementation in "pure" python because
# people using pure don't really have performance consideration (and a
# wheelbarrow of other slowness source)
HAS_FAST_PERSISTENT_NODEMAP = rustrevlog is not None or util.safehasattr(
parsers, 'BaseIndexObject'
)
@attr.s(slots=True, frozen=True) @attr.s(slots=True, frozen=True)
class _revisioninfo(object): class _revisioninfo(object):
"""Information about a revision that allows building its fulltext """Information about a revision that allows building its fulltext
node: expected hash of the revision node: expected hash of the revision
p1, p2: parent revs of the revision p1, p2: parent revs of the revision
btext: built text cache consisting of a one-element list btext: built text cache consisting of a one-element list
cachedelta: (baserev, uncompressed_delta) or None cachedelta: (baserev, uncompressed_delta) or None
flags: flags associated to the revision storage flags: flags associated to the revision storage

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 --config storage.revlog.persistent-nodemap.slow-path=allow
$ cd test-repo $ cd test-repo
Check handling of the default slow-path value
#if no-pure no-rust
$ hg id
warning: accessing `persistent-nodemap` repository without associated fast implementation.
(check `hg help config.format.use-persistent-nodemap` for details)
000000000000 tip
Unlock further check (we are here to test the feature)
$ cat << EOF >> $HGRCPATH
> [storage]
> # to avoid spamming the test
> revlog.persistent-nodemap.slow-path=allow
> EOF
#endif
$ hg debugformat $ hg debugformat
format-variant repo format-variant repo
fncache: yes fncache: yes
dotencode: yes dotencode: yes
generaldelta: yes generaldelta: yes
exp-sharesafe: no exp-sharesafe: no
sparserevlog: yes sparserevlog: yes
sidedata: no sidedata: no
persistent-nodemap: yes persistent-nodemap: yes
copies-sdc: no copies-sdc: no
plain-cl-delta: yes plain-cl-delta: yes
compression: zlib compression: zlib
compression-level: default compression-level: default
$ hg debugbuilddag .+5000 --new-file --config "storage.revlog.nodemap.mode=warn" $ hg debugbuilddag .+5000 --new-file
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
data-unused: 0.000% data-unused: 0.000%
$ f --size .hg/store/00changelog.n $ f --size .hg/store/00changelog.n
$ hg add foo $ hg add foo
Check slow-path config value handling Check slow-path config value handling
------------------------------------- -------------------------------------
$ hg id --config "storage.revlog.persistent-nodemap.slow-path=invalid-value" $ hg id --config "storage.revlog.persistent-nodemap.slow-path=invalid-value"
unknown value for 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 falling back to default value: warn
warning: accessing `persistent-nodemap` repository without associated fast implementation. (no-pure no-rust !)
(check `hg help config.format.use-persistent-nodemap` for details) (no-pure no-rust !)
6b02b8c7b966+ tip 6b02b8c7b966+ tip
#if no-pure no-rust #if no-pure no-rust
$ hg log -r . --config "storage.revlog.persistent-nodemap.slow-path=warn"
warning: accessing `persistent-nodemap` repository without associated fast implementation.
(check `hg help config.format.use-persistent-nodemap` for details)
changeset: 5000:6b02b8c7b966
tag: tip
user: debugbuilddag
date: Thu Jan 01 01:23:20 1970 +0000
summary: r5000
$ 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]
#endif #endif

tests/test-share-safe.t

setup setup
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> share = > share =
> [format] > [format]
> exp-share-safe = True > exp-share-safe = True
> [storage]
> revlog.persistent-nodemap.slow-path=allow
> EOF > EOF
prepare source repo prepare source repo
$ hg init source $ hg init source
$ cd source $ cd source
$ cat .hg/requires $ cat .hg/requires
exp-sharesafe exp-sharesafe