This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11668

dirstate-v2: add an option to prevent unintentional slow dirstate-v2
ClosedPublic

Authored by marmoute on Oct 14 2021, 10:08 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5c567aca080d: dirstate-v2: add an option to prevent unintentional slow dirstate-v2
Summary

This is the project policy discussed in November 2020 and already put to use for
the persistent nodemap.

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.Oct 14 2021, 10:08 PM
pulkit accepted this revision.Oct 15 2021, 8:48 AM
This revision is now accepted and ready to land.Oct 15 2021, 8:48 AM

Revision Contents
Changeset List

Diff 30842

mercurial/configitems.py

default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'rewrite', b'rewrite',
b'empty-successor', b'empty-successor',
default=b'skip', default=b'skip',
experimental=True, experimental=True,
) )
# experimental as long as format.exp-dirstate-v2 is.
coreconfigitem(
b'storage',
b'dirstate-v2.slow-path',
default=b"abort",
experimental=True,
)
coreconfigitem( coreconfigitem(
b'storage', b'storage',
b'new-repo-backend', b'new-repo-backend',
default=b'revlogv1', default=b'revlogv1',
experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'storage', b'storage',

mercurial/dirstate.py

from .interfaces import ( from .interfaces import (
dirstate as intdirstate, dirstate as intdirstate,
util as interfaceutil, util as interfaceutil,
) )
parsers = policy.importmod('parsers') parsers = policy.importmod('parsers')
rustmod = policy.importrust('dirstate') rustmod = policy.importrust('dirstate')
HAS_FAST_DIRSTATE_V2 = rustmod is not None
propertycache = util.propertycache propertycache = util.propertycache
filecache = scmutil.filecache filecache = scmutil.filecache
_rangemask = dirstatemap.rangemask _rangemask = dirstatemap.rangemask
DirstateItem = dirstatemap.DirstateItem DirstateItem = dirstatemap.DirstateItem
class repocache(filecache): class repocache(filecache):

mercurial/localrepo.py

msg = b"warning: " + msg + b'\n' msg = b"warning: " + msg + b'\n'
ui.warn(msg) ui.warn(msg)
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 requirementsmod.DIRSTATE_V2_REQUIREMENT in requirements:
slow_path = ui.config(b'storage', b'dirstate-v2.slow-path')
if slow_path not in (b'allow', b'warn', b'abort'):
default = ui.config_default(b'storage', b'dirstate-v2.slow-path')
msg = _(b'unknown value for config "dirstate-v2.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
msg = _(
b"accessing `dirstate-v2` repository without associated "
b"fast implementation."
)
hint = _(
b"check `hg help config.format.exp-dirstate-v2` " b"for details"
)
if not dirstate.HAS_FAST_DIRSTATE_V2:
if slow_path == b'warn':
msg = b"warning: " + msg + b'\n'
ui.warn(msg)
if not ui.quiet:
hint = b'(' + hint + b')\n'
ui.warn(hint)
if slow_path == b'abort':
raise error.Abort(msg, hint=hint)
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
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-dirstate-race.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ echo '[format]' >> $HGRCPATH $ cat >> $HGRCPATH << EOF
$ echo 'exp-dirstate-v2=1' >> $HGRCPATH > [format]
> exp-dirstate-v2=1
> [storage]
> dirstate-v2.slow-path=allow
> EOF
#endif #endif
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg commit -m test $ hg commit -m test

tests/test-dirstate-race2.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ echo '[format]' >> $HGRCPATH $ cat >> $HGRCPATH << EOF
$ echo 'exp-dirstate-v2=1' >> $HGRCPATH > [format]
> exp-dirstate-v2=1
> [storage]
> dirstate-v2.slow-path=allow
> EOF
#endif #endif
Checking the size/permissions/file-type of files stored in the Checking the size/permissions/file-type of files stored in the
dirstate after an update where the files are changed concurrently dirstate after an update where the files are changed concurrently
outside of hg's control. outside of hg's control.
$ hg init repo $ hg init repo
$ cd repo $ cd repo

tests/test-dirstate.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ echo '[format]' >> $HGRCPATH $ cat >> $HGRCPATH << EOF
$ echo 'exp-dirstate-v2=1' >> $HGRCPATH > [format]
> exp-dirstate-v2=1
> [storage]
> dirstate-v2.slow-path=allow
> EOF
#endif #endif
------ Test dirstate._dirs refcounting ------ Test dirstate._dirs refcounting
$ hg init t $ hg init t
$ cd t $ cd t
$ mkdir -p a/b/c/d $ mkdir -p a/b/c/d
$ touch a/b/c/d/x $ touch a/b/c/d/x

tests/test-hgignore.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ echo '[format]' >> $HGRCPATH $ cat >> $HGRCPATH << EOF
$ echo 'exp-dirstate-v2=1' >> $HGRCPATH > [format]
> exp-dirstate-v2=1
> [storage]
> dirstate-v2.slow-path=allow
> EOF
#endif #endif
$ hg init ignorerepo $ hg init ignorerepo
$ cd ignorerepo $ cd ignorerepo
debugignore with no hgignore should be deterministic: debugignore with no hgignore should be deterministic:
$ hg debugignore $ hg debugignore
<nevermatcher> <nevermatcher>

tests/test-permissions.t

#require unix-permissions no-root reporevlogstore #require unix-permissions no-root reporevlogstore
#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ echo '[format]' >> $HGRCPATH $ cat >> $HGRCPATH << EOF
$ echo 'exp-dirstate-v2=1' >> $HGRCPATH > [format]
> exp-dirstate-v2=1
> [storage]
> dirstate-v2.slow-path=allow
> EOF
#endif #endif
$ hg init t $ hg init t
$ cd t $ cd t
$ echo foo > a $ echo foo > a
$ hg add a $ hg add a

tests/test-purge.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ echo '[format]' >> $HGRCPATH $ cat >> $HGRCPATH << EOF
$ echo 'exp-dirstate-v2=1' >> $HGRCPATH > [format]
> exp-dirstate-v2=1
> [storage]
> dirstate-v2.slow-path=allow
> EOF
#endif #endif
init init
$ hg init t $ hg init t
$ cd t $ cd t
setup setup

tests/test-status.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ echo '[format]' >> $HGRCPATH $ cat >> $HGRCPATH << EOF
$ echo 'exp-dirstate-v2=1' >> $HGRCPATH > [format]
> exp-dirstate-v2=1
> [storage]
> dirstate-v2.slow-path=allow
> EOF
#endif #endif
$ hg init repo1 $ hg init repo1
$ cd repo1 $ cd repo1
$ mkdir a b a/1 b/1 b/2 $ mkdir a b a/1 b/1 b/2
$ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2 $ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2
hg status in repo root: hg status in repo root:

tests/test-symlinks.t

#require symlink #require symlink
#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ echo '[format]' >> $HGRCPATH $ cat >> $HGRCPATH << EOF
$ echo 'exp-dirstate-v2=1' >> $HGRCPATH > [format]
> exp-dirstate-v2=1
> [storage]
> dirstate-v2.slow-path=allow
> EOF
#endif #endif
== tests added in 0.7 == == tests added in 0.7 ==
$ hg init test-symlinks-0.7; cd test-symlinks-0.7; $ hg init test-symlinks-0.7; cd test-symlinks-0.7;
$ touch foo; ln -s foo bar; ln -s nonexistent baz $ touch foo; ln -s foo bar; ln -s nonexistent baz
import with add and addremove -- symlink walking should _not_ screwup. import with add and addremove -- symlink walking should _not_ screwup.