git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v6 13/19] watchman: add a config option to enable the extension

From
David Turner <dturner@twopensource.com>
Date
Apr 27, 2016, 20:04 UTC
Message-ID
<1461787481-877-14-git-send-email-dturner@twopensource.com>
In-Reply-To
<1461787481-877-1-git-send-email-dturner@twopensource.com>

For installations that have centrally-managed configuration, it's easier to set a config once than to run update-index on every repository.

Signed-off-by: David Turner <dturner@twopensource.com>
---
 .gitignore                    |  1 +
 Documentation/config.txt      |  4 ++++
 Makefile                      |  1 +
 read-cache.c                  |  6 ++++++
 t/t1701-watchman-extension.sh | 37 +++++++++++++++++++++++++++++++++++++
 test-dump-watchman.c          | 16 ++++++++++++++++
 6 files changed, 65 insertions(+)
 create mode 100755 t/t1701-watchman-extension.sh
 create mode 100644 test-dump-watchman.c
diff --git a/.gitignore b/.gitignore
index b92f122..e6a5b2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,6 +188,7 @@
 /test-dump-cache-tree
 /test-dump-split-index
 /test-dump-untracked-cache
+/test-dump-watchman
 /test-fake-ssh
 /test-scrap-cache-tree
 /test-genrandom
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2cd6bdd..15001ce 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1848,6 +1848,10 @@ imap::
 	The configuration variables in the 'imap' section are described
 	in linkgit:git-imap-send[1].
 
+index.addwatchmanextension::
+	Automatically add the watchman extension to the index whenever
+	it is written.
+
 index.version::
 	Specify the version with which new index files should be
 	initialized.  This does not affect existing repositories.
diff --git a/Makefile b/Makefile
index 65ab0f4..5f0a954 100644
--- a/Makefile
+++ b/Makefile
@@ -599,6 +599,7 @@ TEST_PROGRAMS_NEED_X += test-delta
 TEST_PROGRAMS_NEED_X += test-dump-cache-tree
 TEST_PROGRAMS_NEED_X += test-dump-split-index
 TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
+TEST_PROGRAMS_NEED_X += test-dump-watchman
 TEST_PROGRAMS_NEED_X += test-fake-ssh
 TEST_PROGRAMS_NEED_X += test-genrandom
 TEST_PROGRAMS_NEED_X += test-hashmap
diff --git a/read-cache.c b/read-cache.c
index 470a27d..252299d 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2427,6 +2427,7 @@ static int do_write_index(struct index_state *istate, int newfd,
 	int entries = istate->cache_nr;
 	struct stat st;
 	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
+	int watchman = 0;
 
 	for (i = removed = extended = 0; i < entries; i++) {
 		if (cache[i]->ce_flags & CE_REMOVE)
@@ -2450,6 +2451,11 @@ static int do_write_index(struct index_state *istate, int newfd,
 	if (istate->version == 3 || istate->version == 2)
 		istate->version = extended ? 3 : 2;
 
+	if (!git_config_get_bool("index.addwatchmanextension", &watchman) &&
+	    watchman &&
+	    !the_index.last_update)
+		the_index.last_update = xstrdup("");
+
 	hdr_version = istate->version;
 
 	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
diff --git a/t/t1701-watchman-extension.sh b/t/t1701-watchman-extension.sh
new file mode 100755
index 0000000..71f1d46
--- /dev/null
+++ b/t/t1701-watchman-extension.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+test_description='watchman extension smoke tests'
+
+# These don't actually test watchman interaction -- just the
+# index extension
+
+. ./test-lib.sh
+
+test_expect_success 'enable watchman' '
+	test_commit a &&
+	test-dump-watchman .git/index >actual &&
+	echo "last_update: (null)" >expect &&
+	test_cmp expect actual &&
+	git update-index --watchman &&
+	test-dump-watchman .git/index >actual &&
+	echo "last_update: " >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'disable watchman' '
+	git update-index --no-watchman &&
+	test-dump-watchman .git/index >actual &&
+	echo "last_update: (null)" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'auto-enable watchman' '
+	test_config index.addwatchmanextension true &&
+	test_commit c &&
+	test-dump-watchman .git/index >actual &&
+	echo "last_update: " >expect &&
+	test_cmp expect actual
+'
+
+
+test_done
diff --git a/test-dump-watchman.c b/test-dump-watchman.c
new file mode 100644
index 0000000..0314fa5
--- /dev/null
+++ b/test-dump-watchman.c
@@ -0,0 +1,16 @@
+#include "cache.h"
+#include "ewah/ewok.h"
+
+int main(int argc, char **argv)
+{
+	do_read_index(&the_index, argv[1], 1);
+	printf("last_update: %s\n", the_index.last_update ?
+	       the_index.last_update : "(null)");
+
+	/*
+	 * For now, we just dump last_update, since it is not reasonable
+	 * to populate the extension itself in tests.
+	 */
+
+	return 0;
+}

-- 
2.4.2.767.g62658d5-twtrsrc
Previous: David TurnerNext: David Turner
Message 18 of 24 in “index-helper/watchman”
  1. 00/19 index-helper/watchmanDavid Turner, Apr 27, 2016
  2. 01/19 read-cache.c: fix constness of verify_hdr()David Turner, Apr 27, 2016
  3. 02/19 read-cache: allow to keep mmap'd memory after readingDavid Turner, Apr 27, 2016
  4. 03/19 index-helper: new daemon for caching index and related stuffDavid Turner, Apr 27, 2016
  5. Junio C HamanoApr 28, 2016
  6. David TurnerApr 29, 2016
  7. Junio C HamanoApr 29, 2016
  8. Duy NguyenMay 1, 2016
  9. 04/19 index-helper: add --strictDavid Turner, Apr 27, 2016
  10. 05/19 index-helper: log warningsDavid Turner, Apr 27, 2016
  11. 06/19 daemonize(): set a flag before exiting the main processDavid Turner, Apr 27, 2016
  12. 07/19 index-helper: add --detachDavid Turner, Apr 27, 2016
  13. 08/19 read-cache: add watchman 'WAMA' extensionDavid Turner, Apr 27, 2016
  14. 09/19 Add watchman support to reduce index refresh costDavid Turner, Apr 27, 2016
  15. 10/19 index-helper: use watchman to avoid refreshing index with lstat()David Turner, Apr 27, 2016
  16. 11/19 update-index: enable/disable watchman supportDavid Turner, Apr 27, 2016
  17. 12/19 unpack-trees: preserve index extensionsDavid Turner, Apr 27, 2016
  18. 13/19 watchman: add a config option to enable the extensionDavid Turner, Apr 27, 2016
  19. 14/19 index-helper: kill modeDavid Turner, Apr 27, 2016
  20. 15/19 index-helper: don't run if already runningDavid Turner, Apr 27, 2016
  21. 16/19 index-helper: autorun modeDavid Turner, Apr 27, 2016
  22. 17/19 index-helper: optionally automatically runDavid Turner, Apr 27, 2016
  23. 18/19 Add tracing to measure where most of the time is spentDavid Turner, Apr 27, 2016
  24. 19/19 untracked-cache: config optionDavid Turner, Apr 27, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.