From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, pclouds@gmail.com
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v9 11/19] update-index: enable/disable watchman support
Date: Mon, 9 May 2016 16:48:41 -0400 [thread overview]
Message-ID: <1462826929-7567-12-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1462826929-7567-1-git-send-email-dturner@twopensource.com>
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>
---
Documentation/git-index-helper.txt | 3 +++
Documentation/git-update-index.txt | 6 ++++++
builtin/update-index.c | 16 ++++++++++++++++
3 files changed, 25 insertions(+)
diff --git a/Documentation/git-index-helper.txt b/Documentation/git-index-helper.txt
index cce00cb..55a8a5a 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..a3b4b5d 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,19 @@ 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 -- I'm "
+ "adding the extension here, but it probably won't "
+ "do you any good.");
+#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)
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-05-09 20:49 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 20:48 [PATCH v9 00/19] index-helper/watchman David Turner
2016-05-09 20:48 ` [PATCH v9 01/19] read-cache.c: fix constness of verify_hdr() David Turner
2016-05-09 20:48 ` [PATCH v9 02/19] read-cache: allow to keep mmap'd memory after reading David Turner
2016-05-09 20:48 ` [PATCH v9 03/19] index-helper: new daemon for caching index and related stuff David Turner
2016-05-10 10:13 ` SZEDER Gábor
2016-05-10 10:31 ` Duy Nguyen
2016-05-10 11:12 ` SZEDER Gábor
2016-05-10 11:31 ` Duy Nguyen
2016-05-10 17:19 ` David Turner
2016-05-09 20:48 ` [PATCH v9 04/19] index-helper: add --strict David Turner
2016-05-09 20:48 ` [PATCH v9 05/19] index-helper: log warnings David Turner
2016-05-09 20:48 ` [PATCH v9 06/19] daemonize(): set a flag before exiting the main process David Turner
2016-05-09 20:48 ` [PATCH v9 07/19] index-helper: add --detach David Turner
2016-05-09 20:48 ` [PATCH v9 08/19] read-cache: add watchman 'WAMA' extension David Turner
2016-05-09 20:48 ` [PATCH v9 09/19] watchman: support watchman to reduce index refresh cost David Turner
2016-05-09 20:48 ` [PATCH v9 10/19] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-05-09 20:48 ` David Turner [this message]
2016-05-09 20:48 ` [PATCH v9 12/19] unpack-trees: preserve index extensions David Turner
2016-05-09 20:48 ` [PATCH v9 13/19] watchman: add a config option to enable the extension David Turner
2016-05-09 20:48 ` [PATCH v9 14/19] index-helper: kill mode David Turner
2016-05-09 20:48 ` [PATCH v9 15/19] index-helper: don't run if already running David Turner
2016-05-09 20:48 ` [PATCH v9 16/19] index-helper: autorun mode David Turner
2016-05-09 20:48 ` [PATCH v9 17/19] index-helper: optionally automatically run David Turner
2016-05-09 20:48 ` [PATCH v9 18/19] trace: measure where the time is spent in the index-heavy operations David Turner
2016-05-09 20:48 ` [PATCH v9 19/19] untracked-cache: config option David Turner
2016-05-09 21:40 ` [PATCH v9 00/19] index-helper/watchman Junio C Hamano
2016-05-09 22:15 ` David Turner
2016-05-09 22:22 ` Junio C Hamano
2016-05-09 22:32 ` Junio C Hamano
2016-05-09 23:12 ` David Turner
2016-05-09 23:46 ` Ramsay Jones
2016-05-10 12:45 ` Duy Nguyen
2016-05-10 12:57 ` Duy Nguyen
2016-05-10 17:28 ` Dennis Kaarsemaker
2016-05-10 17:44 ` Dennis Kaarsemaker
2016-05-10 11:52 ` Dennis Kaarsemaker
2016-05-10 15:35 ` Ramsay Jones
2016-05-10 20:30 ` Junio C Hamano
2016-05-10 22:09 ` Ramsay Jones
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462826929-7567-12-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).