This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9021

fsmonitor: increase the threshold before we recommend it, when using rust
ClosedPublic

Authored by valentin.gatienbaron on Sep 14 2020, 12:00 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc1d6e930ac8a: fsmonitor: increase the threshold before we recommend it, when using rust
Summary

50k files works just fine with the rust status, and it's annoying to
get told "consider using fsmonitor" when we have another solution to
the status speed.

400k files was not chosen in any rigorous way. I know 200k files is
fine. Twice as many files should still be fine.

Diff Detail

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

Revision Contents
Changeset List

Diff 22642

hgext/fsmonitor/__init__.py

Whether to print a warning during certain operations when fsmonitor would be Whether to print a warning during certain operations when fsmonitor would be
beneficial to performance but isn't enabled. beneficial to performance but isn't enabled.
:: ::
[fsmonitor] [fsmonitor]
warn_update_file_count = (integer) warn_update_file_count = (integer)
# or when mercurial is built with rust support
warn_update_file_count_rust = (integer)
If ``warn_when_unused`` is set and fsmonitor isn't enabled, a warning will If ``warn_when_unused`` is set and fsmonitor isn't enabled, a warning will
be printed during working directory updates if this many files will be be printed during working directory updates if this many files will be
created. created.
''' '''
# Platforms Supported # Platforms Supported
# =================== # ===================

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'fsmonitor', b'warn_when_unused', default=True, b'fsmonitor', b'warn_when_unused', default=True,
) )
coreconfigitem( coreconfigitem(
b'fsmonitor', b'warn_update_file_count', default=50000, b'fsmonitor', b'warn_update_file_count', default=50000,
) )
coreconfigitem( coreconfigitem(
b'fsmonitor', b'warn_update_file_count_rust', default=400000,
)
coreconfigitem(
b'help', br'hidden-command\..*', default=False, generic=True, b'help', br'hidden-command\..*', default=False, generic=True,
) )
coreconfigitem( coreconfigitem(
b'help', br'hidden-topic\..*', default=False, generic=True, b'help', br'hidden-topic\..*', default=False, generic=True,
) )
coreconfigitem( coreconfigitem(
b'hooks', b'.*', default=dynamicdefault, generic=True, b'hooks', b'.*', default=dynamicdefault, generic=True,
) )

mercurial/merge.py

# annoying. # annoying.
# #
# We only allow on Linux and MacOS because that's where fsmonitor is # We only allow on Linux and MacOS because that's where fsmonitor is
# considered stable. # considered stable.
fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused') fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused')
fsmonitorthreshold = repo.ui.configint( fsmonitorthreshold = repo.ui.configint(
b'fsmonitor', b'warn_update_file_count' b'fsmonitor', b'warn_update_file_count'
) )
# avoid cycle dirstate -> sparse -> merge -> dirstate
from . import dirstate
if dirstate.rustmod is not None:
# When using rust status, fsmonitor becomes necessary at higher sizes
fsmonitorthreshold = repo.ui.configint(
b'fsmonitor', b'warn_update_file_count_rust',
)
try: try:
# avoid cycle: extensions -> cmdutil -> merge # avoid cycle: extensions -> cmdutil -> merge
from . import extensions from . import extensions
extensions.find(b'fsmonitor') extensions.find(b'fsmonitor')
fsmonitorenabled = repo.ui.config(b'fsmonitor', b'mode') != b'off' fsmonitorenabled = repo.ui.config(b'fsmonitor', b'mode') != b'off'
# We intentionally don't look at whether fsmonitor has disabled # We intentionally don't look at whether fsmonitor has disabled
# itself because a) fsmonitor may have already printed a warning # itself because a) fsmonitor may have already printed a warning

tests/test-clone.t

updating to bookmark @ on branch stable updating to bookmark @ on branch stable
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Lower the warning threshold to simulate a large repo Lower the warning threshold to simulate a large repo
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [fsmonitor] > [fsmonitor]
> warn_update_file_count = 2 > warn_update_file_count = 2
> warn_update_file_count_rust = 2
> EOF > EOF
We should see a warning about no fsmonitor on supported platforms We should see a warning about no fsmonitor on supported platforms
#if linuxormacos no-fsmonitor #if linuxormacos no-fsmonitor
$ hg clone a nofsmonitor $ hg clone a nofsmonitor
updating to bookmark @ on branch stable updating to bookmark @ on branch stable
(warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor") (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor")