зеркало из https://github.com/microsoft/git.git
Enable the built-in FSMonitor as an experimental feature
If `feature.experimental` and `feature.manyFiles` are set and the user has not explicitly turned off the builtin FSMonitor, we now start the built-in FSMonitor by default. Only forcing it when UNSET matches the behavior of UPDATE_DEFAULT_BOOL() used for other repo settings. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This commit is contained in:
Родитель
b222580858
Коммит
70d087e709
|
@ -2,7 +2,8 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "repository.h"
|
#include "repository.h"
|
||||||
#include "midx.h"
|
#include "midx.h"
|
||||||
#include "compat/fsmonitor/fsm-listen.h"
|
#include "fsmonitor-ipc.h"
|
||||||
|
#include "fsmonitor-settings.h"
|
||||||
|
|
||||||
static void repo_cfg_bool(struct repository *r, const char *key, int *dest,
|
static void repo_cfg_bool(struct repository *r, const char *key, int *dest,
|
||||||
int def)
|
int def)
|
||||||
|
@ -43,6 +44,30 @@ void prepare_repo_settings(struct repository *r)
|
||||||
/* Defaults modified by feature.* */
|
/* Defaults modified by feature.* */
|
||||||
if (experimental) {
|
if (experimental) {
|
||||||
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
|
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Force enable the builtin FSMonitor (unless the repo
|
||||||
|
* is incompatible or they've already selected it or
|
||||||
|
* the hook version). But only if they haven't
|
||||||
|
* explicitly turned it off -- so only if our config
|
||||||
|
* value is UNSET.
|
||||||
|
*
|
||||||
|
* lookup_fsmonitor_settings() and check_for_ipc() do
|
||||||
|
* not distinguish between explicitly set FALSE and
|
||||||
|
* UNSET, so we re-test for an UNSET config key here.
|
||||||
|
*
|
||||||
|
* I'm not sure I want to fix fsmonitor-settings.c to
|
||||||
|
* have more than one _DISABLED state since our usage
|
||||||
|
* here is only to support this experimental period
|
||||||
|
* (and I don't want to overload the _reason field
|
||||||
|
* because it describes incompabilities).
|
||||||
|
*/
|
||||||
|
if (manyfiles &&
|
||||||
|
fsmonitor_ipc__is_supported() &&
|
||||||
|
fsm_settings__get_mode(r) == FSMONITOR_MODE_DISABLED &&
|
||||||
|
repo_config_get_maybe_bool(r, "core.fsmonitor", &value) > 0 &&
|
||||||
|
repo_config_get_bool(r, "core.useBuiltinFSMonitor", &value))
|
||||||
|
fsm_settings__set_ipc(r);
|
||||||
}
|
}
|
||||||
if (manyfiles) {
|
if (manyfiles) {
|
||||||
r->settings.index_version = 4;
|
r->settings.index_version = 4;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче