fixup! Merge pull request #3234 from dscho/fsmonitor-v2

In preparation for taking FSMonitor v4, let's revert the merge of v2.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

.gitignore

@@ -72,7 +72,6 @@
 /git-format-patch
 /git-fsck
 /git-fsck-objects
-/git-fsmonitor--daemon
 /git-gc
 /git-get-tar-commit-id
 /git-grep

Documentation/config/core.txt

@@ -62,50 +62,22 @@ core.protectNTFS::
 	Defaults to `true` on Windows, and `false` elsewhere.
 
 core.fsmonitor::
-	If set, this variable contains the pathname of the "fsmonitor"
-	hook command.
-+
-This hook command is used to identify all files that may have changed
-since the requested date/time. This information is used to speed up
-git by avoiding unnecessary scanning of files that have not changed.
-+
-See the "fsmonitor-watchman" section of linkgit:githooks[5].
-+
-Note: The value of this config setting is ignored if the (experimental)
-built-in file system monitor is enabled (see `core.useBuiltinFSMonitor`).
+	If set, the value of this variable is used as a command which
+	will identify all files that may have changed since the
+	requested date/time. This information is used to speed up git by
+	avoiding unnecessary processing of files that have not changed.
+	See the "fsmonitor-watchman" section of linkgit:githooks[5].
 
 core.fsmonitorHookVersion::
-	Sets the protocol version to be used when invoking the
-	"fsmonitor" hook.
-+
-There are currently versions 1 and 2. When this is not set,
-version 2 will be tried first and if it fails then version 1
-will be tried. Version 1 uses a timestamp as input to determine
-which files have changes since that time but some monitors
-like Watchman have race conditions when used with a timestamp.
-Version 2 uses an opaque string so that the monitor can return
-something that can be used to determine what files have changed
-without race conditions.
-+
-Note: The value of this config setting is ignored if the
-built-in file system monitor is enabled (see `core.useBuiltinFSMonitor`).
-
-core.useBuiltinFSMonitor::
-	(EXPERIMENTAL) If set to true, enable the built-in file system monitor
-	daemon for this working directory (linkgit:git-fsmonitor--daemon[1]).
-+
-Like hook-based file system monitors, the built-in file system monitor
-can speed up Git commands that need to refresh the Git index
-(e.g. `git status`) in a working directory with many files.  The
-built-in monitor eliminates the need to install and maintain an
-external third-party tool.
-+
-The built-in file system monitor is currently available only on a
-limited set of supported platforms.  Currently, this includes Windows
-and MacOS.
-+
-Note: if this config setting is set to `true`, the values of
-`core.fsmonitor` and `core.fsmonitorHookVersion` are ignored.
+	Sets the version of hook that is to be used when calling fsmonitor.
+	There are currently versions 1 and 2. When this is not set,
+	version 2 will be tried first and if it fails then version 1
+	will be tried. Version 1 uses a timestamp as input to determine
+	which files have changes since that time but some monitors
+	like watchman have race conditions when used with a timestamp.
+	Version 2 uses an opaque string so that the monitor can return
+	something that can be used to determine what files have changed
+	without race conditions.
 
 core.trustctime::
 	If false, the ctime differences between the index and the

Documentation/git-fsmonitor--daemon.txt

@@ -498,9 +498,7 @@ FILE SYSTEM MONITOR
 This feature is intended to speed up git operations for repos that have
 large working directories.
 
-It enables git to work together with a file system monitor (see
-linkgit:git-fsmonitor--daemon[1]
-and the
+It enables git to work together with a file system monitor (see the
 "fsmonitor-watchman" section of linkgit:githooks[5]) that can
 inform it as to what files have been modified. This enables git to avoid
 having to lstat() every file to find modified files.
@@ -510,18 +508,17 @@ performance by avoiding the cost of scanning the entire working directory
 looking for new files.
 
 If you want to enable (or disable) this feature, it is easier to use
-the `core.fsmonitor` or `core.useBuiltinFSMonitor` configuration
-variable (see linkgit:git-config[1]) than using the `--fsmonitor`
-option to `git update-index` in each repository, especially if you
-want to do so across all repositories you use, because you can set the
-configuration variable in your `$HOME/.gitconfig` just once and have
-it affect all repositories you touch.
-
-When the `core.fsmonitor` or `core.useBuiltinFSMonitor` configuration
-variable is changed, the file system monitor is added to or removed
-from the index the next time a command reads the index. When
-`--[no-]fsmonitor` are used, the file system monitor is immediately
-added to or removed from the index.
+the `core.fsmonitor` configuration variable (see
+linkgit:git-config[1]) than using the `--fsmonitor` option to
+`git update-index` in each repository, especially if you want to do so
+across all repositories you use, because you can set the configuration
+variable in your `$HOME/.gitconfig` just once and have it affect all
+repositories you touch.
+
+When the `core.fsmonitor` configuration variable is changed, the
+file system monitor is added to or removed from the index the next time
+a command reads the index. When `--[no-]fsmonitor` are used, the file
+system monitor is immediately added to or removed from the index.
 
 CONFIGURATION
 -------------

Documentation/git-update-index.txt

@@ -593,8 +593,7 @@ fsmonitor-watchman
 
 This hook is invoked when the configuration option `core.fsmonitor` is
 set to `.git/hooks/fsmonitor-watchman` or `.git/hooks/fsmonitor-watchmanv2`
-depending on the version of the hook to use, unless overridden via
-`core.useBuiltinFSMonitor` (see linkgit:git-config[1]).
+depending on the version of the hook to use.
 
 Version 1 takes two arguments, a version (1) and the time in elapsed
 nanoseconds since midnight, January 1, 1970.

Documentation/githooks.txt

@@ -471,11 +471,6 @@ all::
 # directory, and the JSON compilation database 'compile_commands.json' will be
 # created at the root of the repository.
 #
-# If your platform supports a built-in fsmonitor backend, set
-# FSMONITOR_DAEMON_BACKEND to the "<name>" of the corresponding
-# `compat/fsmonitor/fsmonitor-fs-listen-<name>.c` that implements the
-# `fsmonitor_fs_listen__*()` routines.
-#
 # Define DEVELOPER to enable more compiler warnings. Compiler version
 # and family are auto detected, but could be overridden by defining
 # COMPILER_FEATURES (see config.mak.dev). You can still set
@@ -719,7 +714,6 @@ TEST_BUILTINS_OBJS += test-dump-split-index.o
 TEST_BUILTINS_OBJS += test-dump-untracked-cache.o
 TEST_BUILTINS_OBJS += test-example-decorate.o
 TEST_BUILTINS_OBJS += test-fast-rebase.o
-TEST_BUILTINS_OBJS += test-fsmonitor-client.o
 TEST_BUILTINS_OBJS += test-genrandom.o
 TEST_BUILTINS_OBJS += test-genzeros.o
 TEST_BUILTINS_OBJS += test-hash-speed.o
@@ -908,7 +902,6 @@ LIB_OBJS += fetch-pack.o
 LIB_OBJS += fmt-merge-msg.o
 LIB_OBJS += fsck.o
 LIB_OBJS += fsmonitor.o
-LIB_OBJS += fsmonitor-ipc.o
 LIB_OBJS += gettext.o
 LIB_OBJS += gpg-interface.o
 LIB_OBJS += graph.o
@@ -1113,7 +1106,6 @@ BUILTIN_OBJS += builtin/fmt-merge-msg.o
 BUILTIN_OBJS += builtin/for-each-ref.o
 BUILTIN_OBJS += builtin/for-each-repo.o
 BUILTIN_OBJS += builtin/fsck.o
-BUILTIN_OBJS += builtin/fsmonitor--daemon.o
 BUILTIN_OBJS += builtin/gc.o
 BUILTIN_OBJS += builtin/get-tar-commit-id.o
 BUILTIN_OBJS += builtin/grep.o
@@ -1944,11 +1936,6 @@ ifdef NEED_ACCESS_ROOT_HANDLER
 	COMPAT_OBJS += compat/access.o
 endif
 
-ifdef FSMONITOR_DAEMON_BACKEND
-	COMPAT_CFLAGS += -DHAVE_FSMONITOR_DAEMON_BACKEND
-	COMPAT_OBJS += compat/fsmonitor/fsmonitor-fs-listen-$(FSMONITOR_DAEMON_BACKEND).o
-endif
-
 ifeq ($(TCLTK_PATH),)
 NO_TCLTK = NoThanks
 endif
@@ -2830,9 +2817,6 @@ GIT-BUILD-OPTIONS: FORCE
 	@echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+
 	@echo DC_SHA1=\''$(subst ','\'',$(subst ','\'',$(DC_SHA1)))'\' >>$@+
 	@echo X=\'$(X)\' >>$@+
-ifdef FSMONITOR_DAEMON_BACKEND
-	@echo FSMONITOR_DAEMON_BACKEND=\''$(subst ','\'',$(subst ','\'',$(FSMONITOR_DAEMON_BACKEND)))'\' >>$@+
-endif
 ifdef TEST_OUTPUT_DIRECTORY
 	@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
 endif

Makefile

@@ -159,7 +159,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
 int cmd_for_each_repo(int argc, const char **argv, const char *prefix);
 int cmd_format_patch(int argc, const char **argv, const char *prefix);
 int cmd_fsck(int argc, const char **argv, const char *prefix);
-int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix);
 int cmd_gc(int argc, const char **argv, const char *prefix);
 int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
 int cmd_grep(int argc, const char **argv, const char *prefix);