From: David Turner <novalis@novalis.org>
To: git@vger.kernel.org, pclouds@gmail.com, kmaggg@gmail.com
Cc: David Turner <dturner@twopensource.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v14 12/21] update-index: enable/disable watchman support
Date: Sun, 3 Jul 2016 03:58:04 -0400 [thread overview]
Message-ID: <1467532693-20017-13-git-send-email-novalis@novalis.org> (raw)
In-Reply-To: <1467532693-20017-1-git-send-email-novalis@novalis.org>
From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-index-helper.txt | 3 +++
Documentation/git-update-index.txt | 6 ++++++
builtin/update-index.c | 15 +++++++++++++++
3 files changed, 24 insertions(+)
diff --git a/Documentation/git-index-helper.txt b/Documentation/git-index-helper.txt
index 2982e03..b2ca511 100644
--- a/Documentation/git-index-helper.txt
+++ b/Documentation/git-index-helper.txt
@@ -18,6 +18,9 @@ each with a submodule, you might need four index-helpers. (In practice,
this is only worthwhile for large indexes, so only use it if you notice
that git status is slow).
+If you want the index-helper to accelerate untracked file checking,
+run git update-index --watchman before using it.
+
OPTIONS
-------
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index c6cbed1..6736487 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -19,6 +19,7 @@ SYNOPSIS
[--ignore-submodules]
[--[no-]split-index]
[--[no-|test-|force-]untracked-cache]
+ [--[no-]watchman]
[--really-refresh] [--unresolve] [--again | -g]
[--info-only] [--index-info]
[-z] [--stdin] [--index-version <n>]
@@ -176,6 +177,11 @@ may not support it yet.
--no-untracked-cache::
Enable or disable untracked cache feature. Please use
`--test-untracked-cache` before enabling it.
+
+--watchman::
+--no-watchman::
+ Enable or disable watchman support. This is, at present,
+ only useful with git index-helper.
+
These options take effect whatever the value of the `core.untrackedCache`
configuration variable (see linkgit:git-config[1]). But a warning is
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 1c94ca5..55722b9 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -914,6 +914,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
{
int newfd, entries, has_errors = 0, nul_term_line = 0;
enum uc_mode untracked_cache = UC_UNSPECIFIED;
+ int use_watchman = -1;
int read_from_stdin = 0;
int prefix_length = prefix ? strlen(prefix) : 0;
int preferred_index_format = 0;
@@ -1012,6 +1013,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
N_("test if the filesystem supports untracked cache"), UC_TEST),
OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
N_("enable untracked cache without testing the filesystem"), UC_FORCE),
+ OPT_BOOL(0, "watchman", &use_watchman,
+ N_("use or not use watchman to reduce refresh cost")),
OPT_END()
};
@@ -1149,6 +1152,18 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
die("Bug: bad untracked_cache value: %d", untracked_cache);
}
+ if (use_watchman > 0) {
+ the_index.last_update = xstrdup("");
+ the_index.cache_changed |= WATCHMAN_CHANGED;
+#ifndef USE_WATCHMAN
+ warning(_("git was built without watchman support, so this "
+ "command will probably not result in any speedup."));
+#endif
+ } else if (!use_watchman) {
+ the_index.last_update = NULL;
+ the_index.cache_changed |= WATCHMAN_CHANGED;
+ }
+
if (active_cache_changed) {
if (newfd < 0) {
if (refresh_args.flags & REFRESH_QUIET)
--
1.9.1
next prev parent reply other threads:[~2016-07-03 8:00 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-03 7:57 [PATCH v14 00/21] index-helper/watchman David Turner
2016-07-03 7:57 ` [PATCH v14 01/21] read-cache: allow to keep mmap'd memory after reading David Turner
2016-07-03 7:57 ` [PATCH v14 02/21] pkt-line: add gentle version of packet_write David Turner
2016-07-03 7:57 ` [PATCH v14 03/21] unix-socket.c: add stub implementation when unix sockets are not supported David Turner
2016-07-03 7:57 ` [PATCH v14 04/21] index-helper: new daemon for caching index and related stuff David Turner
2016-07-03 7:57 ` [PATCH v14 05/21] index-helper: add --strict David Turner
2016-07-03 7:57 ` [PATCH v14 06/21] daemonize(): set a flag before exiting the main process David Turner
2016-07-03 7:57 ` [PATCH v14 07/21] index-helper: add --detach David Turner
2016-07-03 7:58 ` [PATCH v14 08/21] index-helper: log warnings David Turner
2016-07-03 7:58 ` [PATCH v14 09/21] read-cache: add watchman 'WAMA' extension David Turner
2016-07-03 7:58 ` [PATCH v14 10/21] watchman: support watchman to reduce index refresh cost David Turner
2016-07-03 7:58 ` [PATCH v14 11/21] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-07-03 7:58 ` David Turner [this message]
2016-07-03 7:58 ` [PATCH v14 13/21] unpack-trees: preserve index extensions David Turner
2016-07-03 7:58 ` [PATCH v14 14/21] watchman: add a config option to enable the extension David Turner
2016-07-03 7:58 ` [PATCH v14 15/21] index-helper: kill mode David Turner
2016-07-06 8:20 ` Johannes Schindelin
2016-07-06 15:33 ` Duy Nguyen
2016-07-03 7:58 ` [PATCH v14 16/21] index-helper: don't run if already running David Turner
2016-07-03 7:58 ` [PATCH v14 17/21] index-helper: autorun mode David Turner
2016-07-03 7:58 ` [PATCH v14 18/21] index-helper: optionally automatically run David Turner
2016-07-03 7:58 ` [PATCH v14 19/21] trace: measure where the time is spent in the index-heavy operations David Turner
2016-07-03 11:51 ` [PATCH v14 00/21] index-helper/watchman Johannes Schindelin
2016-07-04 6:40 ` Johannes Schindelin
2016-07-06 18:11 ` Junio C Hamano
2016-07-12 18:24 ` Duy Nguyen
2016-07-13 21:59 ` David Turner
2016-07-14 15:56 ` Duy Nguyen
2016-07-14 15:58 ` Duy Nguyen
2016-07-15 1:20 ` Ben Peart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467532693-20017-13-git-send-email-novalis@novalis.org \
--to=novalis@novalis.org \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kmaggg@gmail.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).