From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, pclouds@gmail.com, aevarb@gmail.com,
jeffhost@microsoft.com
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v3 14/16] index-helper: autorun mode
Date: Wed, 6 Apr 2016 18:12:00 -0400 [thread overview]
Message-ID: <1459980722-4836-15-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1459980722-4836-1-git-send-email-dturner@twopensource.com>
Soon, we'll want to automatically start index-helper, so we need
a mode that silently exits if it can't start up (either because
it's not in a git dir, or because another one is already running).
Signed-off-by: David Turner <dturner@twopensource.com>
---
index-helper.c | 29 +++++++++++++++++++++++------
t/t7900-index-helper.sh | 8 ++++++++
2 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/index-helper.c b/index-helper.c
index b62d805..4d08ff4 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -382,8 +382,9 @@ static void request_kill(void)
int main(int argc, char **argv)
{
const char *prefix;
- int idle_in_seconds = 600, detach = 0, kill = 0;
+ int idle_in_seconds = 600, detach = 0, kill = 0, autorun = 0;
int fd;
+ int nongit;
struct strbuf socket_path = STRBUF_INIT;
struct option options[] = {
OPT_INTEGER(0, "exit-after", &idle_in_seconds,
@@ -392,6 +393,7 @@ int main(int argc, char **argv)
"verify shared memory after creating"),
OPT_BOOL(0, "detach", &detach, "detach the process"),
OPT_BOOL(0, "kill", &kill, "request that existing index helper processes exit"),
+ OPT_BOOL(0, "autorun", &autorun, "this is an automatic run of git index-helper, so certain errors can be solved by silently exiting"),
OPT_END()
};
@@ -401,7 +403,14 @@ int main(int argc, char **argv)
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(usage_text, options);
- prefix = setup_git_directory();
+ prefix = setup_git_directory_gently(&nongit);
+ if (nongit) {
+ if (autorun)
+ exit(0);
+ else
+ die(_("not a git repository"));
+ }
+
if (parse_options(argc, (const char **)argv, prefix,
options, usage_text, 0))
die(_("too many arguments"));
@@ -415,10 +424,18 @@ int main(int argc, char **argv)
/* check that no other copy is running */
fd = connect_to_index_helper();
- if (fd > 0)
- die(_("Already running"));
- if (errno != ECONNREFUSED && errno != ENOENT)
- die_errno(_("Unexpected error checking socket"));
+ if (fd > 0) {
+ if (autorun)
+ exit(0);
+ else
+ die(_("Already running"));
+ }
+ if (errno != ECONNREFUSED && errno != ENOENT) {
+ if (autorun)
+ return 0;
+ else
+ die_errno(_("Unexpected error checking socket"));
+ }
atexit(cleanup);
sigchain_push_common(cleanup_on_signal);
diff --git a/t/t7900-index-helper.sh b/t/t7900-index-helper.sh
index 3f94d8a..3925ee3 100755
--- a/t/t7900-index-helper.sh
+++ b/t/t7900-index-helper.sh
@@ -42,4 +42,12 @@ test_expect_success 'index-helper will not start if already running' '
grep "Already running" err
'
+test_expect_success 'index-helper is quiet with --autorun' '
+ test_when_finished "git index-helper --kill" &&
+ git index-helper --kill &&
+ git index-helper --detach &&
+ test -L .git/index-helper.path &&
+ git index-helper --autorun
+'
+
test_done
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-04-06 22:13 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 22:11 [PATCH v3 00/16] index-helper, watchman David Turner
2016-04-06 22:11 ` [PATCH v3 01/16] read-cache.c: fix constness of verify_hdr() David Turner
2016-04-06 22:11 ` [PATCH v3 02/16] read-cache: allow to keep mmap'd memory after reading David Turner
2016-04-06 22:11 ` [PATCH v3 03/16] index-helper: new daemon for caching index and related stuff David Turner
2016-04-07 6:21 ` Johannes Sixt
2016-04-07 14:14 ` Johannes Schindelin
2016-04-07 18:47 ` David Turner
2016-04-08 14:17 ` Johannes Schindelin
2016-04-08 11:26 ` Duy Nguyen
2016-04-08 22:16 ` David Turner
2016-04-11 23:27 ` David Turner
2016-04-12 9:40 ` Duy Nguyen
2016-04-12 17:28 ` David Turner
2016-04-12 18:05 ` Junio C Hamano
2016-04-13 0:32 ` David Turner
2016-04-14 10:43 ` Duy Nguyen
2016-04-14 18:12 ` Junio C Hamano
2016-04-14 18:20 ` David Turner
2016-04-15 0:16 ` Duy Nguyen
2016-04-15 1:31 ` Junio C Hamano
2016-04-06 22:11 ` [PATCH v3 04/16] index-helper: add --strict David Turner
2016-04-06 22:11 ` [PATCH v3 05/16] daemonize(): set a flag before exiting the main process David Turner
2016-04-06 22:11 ` [PATCH v3 06/16] index-helper: add --detach David Turner
2016-04-06 22:11 ` [PATCH v3 07/16] read-cache: add watchman 'WAMA' extension David Turner
2016-04-06 22:11 ` [PATCH v3 08/16] Add watchman support to reduce index refresh cost David Turner
2016-04-06 22:11 ` [PATCH v3 09/16] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-04-07 22:47 ` Junio C Hamano
2016-04-07 22:52 ` Junio C Hamano
2016-04-08 0:14 ` David Turner
2016-04-08 6:03 ` Junio C Hamano
2016-04-06 22:11 ` [PATCH v3 10/16] update-index: enable/disable watchman support David Turner
2016-04-06 22:11 ` [PATCH v3 11/16] unpack-trees: preserve index extensions David Turner
2016-04-06 22:11 ` [PATCH v3 12/16] index-helper: kill mode David Turner
2016-04-06 22:11 ` [PATCH v3 13/16] index-helper: don't run if already running David Turner
2016-04-06 22:12 ` David Turner [this message]
2016-04-06 22:12 ` [PATCH v3 15/16] index-helper: optionally automatically run David Turner
2016-04-06 22:12 ` [PATCH v3 16/16] read-cache: config for waiting for index-helper David Turner
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=1459980722-4836-15-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=aevarb@gmail.com \
--cc=git@vger.kernel.org \
--cc=jeffhost@microsoft.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.
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).