On Thu, Jul 01 2021, Jeff Hostetler via GitGitGadget wrote:
In a reference to a discussion[1] about an earlier version of this patch
you said:
I'm going to ignore all of the thread responses to this patch
dealing with how we acquire config settings and macros and etc.
Those issues are completely independent of FSMonitor (which is
already way too big).
Since then the changes to repo-settings.c have become a lot larger, so
let's take a look...
1. https://lore.kernel.org/git/87mttkyrqq.fsf@xxxxxxxxxxxxxxxxxxx/
2. https://lore.kernel.org/git/4552971c-0a23-c19a-6a23-cb5737e43b2a@xxxxxxxxxxxxxxxxx/
> diff --git a/repo-settings.c b/repo-settings.c
> index 0cfe8b787db..faf197ff60a 100644
> --- a/repo-settings.c
> +++ b/repo-settings.c
> @@ -5,10 +5,42 @@
>
> #define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
>
> +/*
> + * Return 1 if the repo/workdir is incompatible with FSMonitor.
> + */
> +static int is_repo_incompatible_with_fsmonitor(struct repository *r)
> +{
> + const char *const_strval;
> +
> + /*
> + * Bare repositories don't have a working directory and
> + * therefore, nothing to watch.
> + */
> + if (!r->worktree)
> + return 1;
Looking ahead in this series you end up using
FSMONITOR_MODE_INCOMPATIBLE in two places in the codebase. In
builtin/update-index.c to throw a "repository is incompatible with
fsmonitor" error.
Can't that case just be replaced with setup_work_tree()? Other sub-modes
of update-index already die implicitly on that, e.g.:
$ git update-index test
fatal: this operation must be run in a work tree
The other case is:
+ prepare_repo_settings(the_repository);
+ if (!the_repository->worktree)
+ return error(_("fsmonitor-daemon does not support bare repos '%s'"),
+ xgetcwd());
+ if (the_repository->settings.fsmonitor_mode == FSMONITOR_MODE_INCOMPATIBLE)
+ return error(_("fsmonitor-daemon is incompatible with this repo '%s'"),
+ the_repository->worktree);
I.e. we just checked the_repository->worktree, but it's not that, but....
> +
> + /*
> + * GVFS (aka VFS for Git) is incompatible with FSMonitor.
> + *
> + * Granted, core Git does not know anything about GVFS and
> + * we shouldn't make assumptions about a downstream feature,
> + * but users can install both versions. And this can lead
> + * to incorrect results from core Git commands. So, without
> + * bringing in any of the GVFS code, do a simple config test
> + * for a published config setting. (We do not look at the
> + * various *_TEST_* environment variables.)
> + */
> + if (!repo_config_get_value(r, "core.virtualfilesystem", &const_strval))
> + return 1;
I'm skeptical of us hardcoding a third-party software config
variable. Can't GitVFS handle this somehow on its end?
But just in terms of implementation it seems the end result of that is
to emit a very confusing error to the user. Sinc we already checked for
bare repos we run into this and instead of sayingwhen we should really
say "hey, maybe disable your core.virtualFileSystem setting", we say
"your repo is incompatible".
> +
> + return 0;
> +}
> +
> void prepare_repo_settings(struct repository *r)
> {
> int value;
> char *strval;
> + const char *const_strval;
Can be declared in the "else" below.
>
> if (r->settings.initialized)
> return;
> @@ -26,6 +58,22 @@ void prepare_repo_settings(struct repository *r)
> UPDATE_DEFAULT_BOOL(r->settings.commit_graph_read_changed_paths, 1);
> UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1);
>
> + r->settings.fsmonitor_hook_path = NULL;
> + r->settings.fsmonitor_mode = FSMONITOR_MODE_DISABLED;
With the memset earlier (b.t.w. I've got a patch to fix all this bizarre
behavior in repo-settings.c, but have been waiting on this series we
implicitly set it to FSMONITOR_MODE_UNSET (-1) with the memset, but then
never use that ever.
Your code in update-index.c then for a check against
"FSMONITOR_MODE_DISABLED" says "core.useBuiltinFSMonitor is unset;".
> + if (is_repo_incompatible_with_fsmonitor(r))
> + r->settings.fsmonitor_mode = FSMONITOR_MODE_INCOMPATIBLE;
Style: should have {} braces on all arms.
> + else if (!repo_config_get_bool(r, "core.usebuiltinfsmonitor", &value)
> + && value)
> + r->settings.fsmonitor_mode = FSMONITOR_MODE_IPC;
Here you're conflating false with whether the variable is set at all. I
guess that works out here since if it's false we want to fall through
to...
> + else {
...ignoring it and looing at core.fsmonitor instead.
> + if (repo_config_get_pathname(r, "core.fsmonitor", &const_strval))
> + const_strval = getenv("GIT_TEST_FSMONITOR");
If it's not set we pay attention to GIT_TEST_FSMONITOR, so the behavior
from the old git_config_get_fsmonitor(). So even if the env variable is
set we want to take the config variable over it, correct?
> + if (const_strval && *const_strval) {
> + r->settings.fsmonitor_hook_path = strdup(const_strval);
We had a strbuf_detach()'d string in the case of
repo_config_get_pathname(), but here we strdup() it again in case we
were in the getenv() codepath. This code probably leaks memory now
anyway, but perhaps it's better to split up the two so we make it easier
to deal with who owns/frees what in the future.
