From: Matthew John Cheetham <mjcheetham@xxxxxxxxxxx>
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).
Signed-off-by: Matthew John Cheetham <mjcheetham@xxxxxxxxxxx>
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
Signed-off-by: Victoria Dye <vdye@xxxxxxxxxx>
---
contrib/scalar/scalar.c | 39 ++++++++++++++++++++++++++++++++
contrib/scalar/t/t9099-scalar.sh | 11 +++++++++
2 files changed, 50 insertions(+)
diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c
index 97e71fe19cd..219e414ab4e 100644
--- a/contrib/scalar/scalar.c
+++ b/contrib/scalar/scalar.c
@@ -7,6 +7,8 @@
#include "parse-options.h"
#include "config.h"
#include "run-command.h"
+#include "simple-ipc.h"
+#include "fsmonitor-ipc.h"
#include "refs.h"
#include "dir.h"
#include "packfile.h"
@@ -169,6 +171,12 @@ static int set_recommended_config(int reconfigure)
{ "core.autoCRLF", "false" },
{ "core.safeCRLF", "false" },
{ "fetch.showForcedUpdates", "false" },
+#ifdef HAVE_FSMONITOR_DAEMON_BACKEND
+ /*
+ * Enable the built-in FSMonitor on supported platforms.
+ */
+ { "core.fsmonitor", "true" },
+#endif
{ NULL, NULL },
};
int i;
@@ -236,6 +244,34 @@ static int add_or_remove_enlistment(int add)
"scalar.repo", the_repository->worktree, NULL);
}
+static int start_fsmonitor_daemon(void)
+{
+ int res = 0;
+ if (fsmonitor_ipc__is_supported() &&
+ fsmonitor_ipc__get_state() != IPC_STATE__LISTENING) {
+ struct strbuf err = STRBUF_INIT;
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ /* Try to start the FSMonitor daemon */
+ cp.git_cmd = 1;
+ strvec_pushl(&cp.args, "fsmonitor--daemon", "start", NULL);
+ if (!pipe_command(&cp, NULL, 0, NULL, 0, &err, 0)) {
+ /* Successfully started FSMonitor */
+ strbuf_release(&err);
+ return 0;
+ }
+
+ /* If FSMonitor really hasn't started, emit error */
+ if (fsmonitor_ipc__get_state() != IPC_STATE__LISTENING)
+ res = error(_("could not start the FSMonitor daemon: %s"),
+ err.buf);
+
+ strbuf_release(&err);
+ }
+
+ return res;
+}
+
static int register_dir(void)
{
int res = add_or_remove_enlistment(1);
@@ -246,6 +282,9 @@ static int register_dir(void)
if (!res)
res = toggle_maintenance(1);
+ if (!res)
+ res = start_fsmonitor_daemon();
+
return res;
}
diff --git a/contrib/scalar/t/t9099-scalar.sh b/contrib/scalar/t/t9099-scalar.sh
index 10b1172a8aa..526f64d001c 100755
--- a/contrib/scalar/t/t9099-scalar.sh
+++ b/contrib/scalar/t/t9099-scalar.sh
@@ -13,10 +13,21 @@ PATH=$PWD/..:$PATH
GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab ../cron.txt,launchctl:true,schtasks:true"
export GIT_TEST_MAINT_SCHEDULER
+test_lazy_prereq BUILTIN_FSMONITOR '
+ git version --build-options | grep -q "feature:.*fsmonitor--daemon"
+'
+
test_expect_success 'scalar shows a usage' '
test_expect_code 129 scalar -h
'
+test_expect_success BUILTIN_FSMONITOR '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_expect_success 'scalar unregister' '
git init vanish/src &&
scalar register vanish/src &&
--
gitgitgadget
