mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scalar: enable built-in FSMonitor on register

Browse Source 
Using the built-in FSMonitor makes many common commands quite a bit
faster. So let's teach the `scalar register` command to enable the
built-in FSMonitor and kick-start the fsmonitor--daemon process (for
convenience).

For simplicity, we only support the built-in FSMonitor (and no external
file system monitor such as e.g. Watchman).

Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthew John Cheetham
2022-08-18 21:40:51 +00:00
committed by Junio C Hamano
parent d934a11c71
commit 3f1917dc60
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/scalar/scalar.c
View File

@ -7,6 +7,9 @@
#include "parse-options.h" #include "parse-options.h"
#include "config.h" #include "config.h"
#include "run-command.h" #include "run-command.h"
#include "simple-ipc.h"
#include "fsmonitor-ipc.h"
#include "fsmonitor-settings.h"
#include "refs.h" #include "refs.h"
#include "dir.h" #include "dir.h"
#include "packfile.h" #include "packfile.h"
@ -109,6 +112,12 @@ static int set_scalar_config(const struct scalar_config *config, int reconfigure
return res; return res;
} }
static int have_fsmonitor_support(void)
{
return fsmonitor_ipc__is_supported() &&
fsm_settings__get_reason(the_repository) == FSMONITOR_REASON_OK;
}
static int set_recommended_config(int reconfigure) static int set_recommended_config(int reconfigure)
{ {
struct scalar_config config[] = { struct scalar_config config[] = {
@ -170,6 +179,13 @@ static int set_recommended_config(int reconfigure)
config[i].key, config[i].value); config[i].key, config[i].value);
} }
if (have_fsmonitor_support()) {
struct scalar_config fsmonitor = { "core.fsmonitor", "true" };
if (set_scalar_config(&fsmonitor, reconfigure))
return error(_("could not configure %s=%s"),
fsmonitor.key, fsmonitor.value);
}
/* /*
* The `log.excludeDecoration` setting is special because it allows * The `log.excludeDecoration` setting is special because it allows
* for multiple values. * for multiple values.
@ -218,6 +234,16 @@ static int add_or_remove_enlistment(int add)
"scalar.repo", the_repository->worktree, NULL); "scalar.repo", the_repository->worktree, NULL);
} }
static int start_fsmonitor_daemon(void)
{
assert(have_fsmonitor_support());
if (fsmonitor_ipc__get_state() != IPC_STATE__LISTENING)
return run_git("fsmonitor--daemon", "start", NULL);
return 0;
}
static int register_dir(void) static int register_dir(void)
{ {
if (add_or_remove_enlistment(1)) if (add_or_remove_enlistment(1))
@ -229,6 +255,10 @@ static int register_dir(void)
if (toggle_maintenance(1)) if (toggle_maintenance(1))
return error(_("could not turn on maintenance")); return error(_("could not turn on maintenance"));
if (have_fsmonitor_support() && start_fsmonitor_daemon()) {
return error(_("could not start the FSMonitor daemon"));
}
return 0; return 0;
} }

8
contrib/scalar/t/t9099-scalar.sh
View File

@ -102,6 +102,14 @@ test_expect_success 'scalar enlistments need a worktree' '
grep "Scalar enlistments require a worktree" err grep "Scalar enlistments require a worktree" err
' '
test_expect_success FSMONITOR_DAEMON 'scalar register starts fsmon daemon' '
git init test/src &&
test_must_fail git -C test/src fsmonitor--daemon status &&
scalar register test/src &&
git -C test/src fsmonitor--daemon status &&
test_cmp_config -C test/src true core.fsmonitor
'
test_expect_success 'scalar unregister' ' test_expect_success 'scalar unregister' '
git init vanish/src && git init vanish/src &&
scalar register vanish/src && scalar register vanish/src &&