From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Ben Peart <Ben.Peart@microsoft.com>,
Jonathan Tan <jonathantanmy@google.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Mike Hommey <mh@glandium.org>,
Lars Schneider <larsxschneider@gmail.com>,
Eric Wong <e@80x24.org>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH v5 26/40] odb-helper: add 'script_mode' to 'struct odb_helper'
Date: Thu, 3 Aug 2017 11:19:12 +0200 [thread overview]
Message-ID: <20170803091926.1755-27-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20170803091926.1755-1-chriscool@tuxfamily.org>
to prepare for having a long running odb helper sub-process
handling the communication between Git and an external odb.
We introduce "odb.<name>.subprocesscommand" to make it
possible to define such a sub-process, and we mark such odb
helpers with the new 'script_mode' field set to 0.
Helpers defined using the existing "odb.<name>.scriptcommand"
are marked with the 'script_mode' field set to 1.
Implementation of the different capabilities/instructions in
the new (sub-)process mode is left for following commits.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
external-odb.c | 8 +++++++-
odb-helper.c | 19 ++++++++++++++-----
odb-helper.h | 1 +
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/external-odb.c b/external-odb.c
index 31d21bfe04..ccca67eff5 100644
--- a/external-odb.c
+++ b/external-odb.c
@@ -32,8 +32,14 @@ static int external_odb_config(const char *var, const char *value, void *data)
o = find_or_create_helper(name, namelen);
- if (!strcmp(subkey, "scriptcommand"))
+ if (!strcmp(subkey, "scriptcommand")) {
+ o->script_mode = 1;
return git_config_string(&o->cmd, var, value);
+ }
+ if (!strcmp(subkey, "subprocesscommand")) {
+ o->script_mode = 0;
+ return git_config_string(&o->cmd, var, value);
+ }
return 0;
}
diff --git a/odb-helper.c b/odb-helper.c
index b1f5464214..4c16dd297a 100644
--- a/odb-helper.c
+++ b/odb-helper.c
@@ -123,6 +123,9 @@ int odb_helper_init(struct odb_helper *o)
FILE *fh;
struct strbuf line = STRBUF_INIT;
+ if (!o->script_mode)
+ return 0;
+
if (odb_helper_start(o, &cmd, 0, "init") < 0)
return -1;
@@ -173,16 +176,12 @@ static int odb_helper_object_cmp(const void *va, const void *vb)
return hashcmp(a->sha1, b->sha1);
}
-static void odb_helper_load_have(struct odb_helper *o)
+static void have_object_script(struct odb_helper *o)
{
struct odb_helper_cmd cmd;
FILE *fh;
struct strbuf line = STRBUF_INIT;
- if (o->have_valid)
- return;
- o->have_valid = 1;
-
if (odb_helper_start(o, &cmd, 0, "have") < 0)
return;
@@ -194,6 +193,16 @@ static void odb_helper_load_have(struct odb_helper *o)
strbuf_release(&line);
fclose(fh);
odb_helper_finish(o, &cmd);
+}
+
+static void odb_helper_load_have(struct odb_helper *o)
+{
+ if (o->have_valid)
+ return;
+ o->have_valid = 1;
+
+ if (o->script_mode)
+ have_object_script(o);
qsort(o->have, o->have_nr, sizeof(*o->have), odb_helper_object_cmp);
}
diff --git a/odb-helper.h b/odb-helper.h
index f2fd2b7c9c..04b85f1d02 100644
--- a/odb-helper.h
+++ b/odb-helper.h
@@ -15,6 +15,7 @@ struct odb_helper {
const char *name;
const char *cmd;
unsigned int supported_capabilities;
+ int script_mode;
struct odb_helper_object {
unsigned char sha1[20];
--
2.14.0.rc1.52.gf02fb0ddac.dirty
next prev parent reply other threads:[~2017-08-03 9:21 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-03 9:18 [PATCH v5 00/40] Add initial experimental external ODB support Christian Couder
2017-08-03 9:18 ` [PATCH v5 01/40] builtin/clone: get rid of 'value' strbuf Christian Couder
2017-08-03 9:18 ` [PATCH v5 02/40] t0021/rot13-filter: refactor packet reading functions Christian Couder
2017-08-03 9:18 ` [PATCH v5 03/40] t0021/rot13-filter: improve 'if .. elsif .. else' style Christian Couder
2017-08-03 9:18 ` [PATCH v5 04/40] Add Git/Packet.pm from parts of t0021/rot13-filter.pl Christian Couder
2017-08-03 19:11 ` Junio C Hamano
2017-08-04 6:32 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 05/40] t0021/rot13-filter: use Git/Packet.pm Christian Couder
2017-08-03 9:18 ` [PATCH v5 06/40] Git/Packet.pm: improve error message Christian Couder
2017-08-03 9:18 ` [PATCH v5 07/40] Git/Packet.pm: add packet_initialize() Christian Couder
2017-08-03 9:18 ` [PATCH v5 08/40] Git/Packet.pm: add capability functions Christian Couder
2017-08-03 19:14 ` Junio C Hamano
2017-08-04 20:34 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 09/40] sha1_file: prepare for external odbs Christian Couder
2017-08-03 9:18 ` [PATCH v5 10/40] Add initial external odb support Christian Couder
2017-08-03 19:34 ` Junio C Hamano
2017-08-03 20:17 ` Jeff King
2017-09-14 10:14 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 11/40] odb-helper: add odb_helper_init() to send 'init' instruction Christian Couder
2017-09-10 12:12 ` Lars Schneider
2017-09-14 7:18 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 12/40] t0400: add 'put_raw_obj' instruction to odb-helper script Christian Couder
2017-09-10 12:12 ` Lars Schneider
2017-09-14 7:09 ` Christian Couder
2017-08-03 9:18 ` [PATCH v5 13/40] external odb: add 'put_raw_obj' support Christian Couder
2017-08-03 19:50 ` Junio C Hamano
2017-09-14 9:17 ` Christian Couder
2017-08-03 9:19 ` [PATCH v5 14/40] external-odb: accept only blobs for now Christian Couder
2017-08-03 19:52 ` Junio C Hamano
2017-09-14 9:59 ` Christian Couder
2017-08-03 9:19 ` [PATCH v5 15/40] t0400: add test for external odb write support Christian Couder
2017-08-03 9:19 ` [PATCH v5 16/40] Add GIT_NO_EXTERNAL_ODB env variable Christian Couder
2017-08-03 9:19 ` [PATCH v5 17/40] Add t0410 to test external ODB transfer Christian Couder
2017-08-03 9:19 ` [PATCH v5 18/40] lib-httpd: pass config file to start_httpd() Christian Couder
2017-08-03 9:19 ` [PATCH v5 19/40] lib-httpd: add upload.sh Christian Couder
2017-08-03 20:07 ` Junio C Hamano
2017-09-14 7:43 ` Christian Couder
2017-08-03 9:19 ` [PATCH v5 20/40] lib-httpd: add list.sh Christian Couder
2017-08-03 9:19 ` [PATCH v5 21/40] lib-httpd: add apache-e-odb.conf Christian Couder
2017-08-03 9:19 ` [PATCH v5 22/40] odb-helper: add odb_helper_get_raw_object() Christian Couder
2017-08-03 9:19 ` [PATCH v5 23/40] pack-objects: don't pack objects in external odbs Christian Couder
2017-08-03 9:19 ` [PATCH v5 24/40] Add t0420 to test transfer to HTTP external odb Christian Couder
2017-08-03 9:19 ` [PATCH v5 25/40] external-odb: add 'get_direct' support Christian Couder
2017-08-03 21:40 ` Junio C Hamano
2017-09-14 8:39 ` Christian Couder
2017-09-14 18:19 ` Jonathan Tan
2017-09-15 11:24 ` Christian Couder
2017-09-15 20:54 ` Jonathan Tan
2017-08-03 9:19 ` Christian Couder [this message]
2017-08-03 9:19 ` [PATCH v5 27/40] odb-helper: add init_object_process() Christian Couder
2017-08-03 9:19 ` [PATCH v5 28/40] Add t0450 to test 'get_direct' mechanism Christian Couder
2017-08-03 9:19 ` [PATCH v5 29/40] Add t0460 to test passing git objects Christian Couder
2017-08-03 9:19 ` [PATCH v5 30/40] odb-helper: add put_object_process() Christian Couder
2017-08-03 9:19 ` [PATCH v5 31/40] Add t0470 to test passing raw objects Christian Couder
2017-08-03 9:19 ` [PATCH v5 32/40] odb-helper: add have_object_process() Christian Couder
2017-08-03 9:19 ` [PATCH v5 33/40] Add t0480 to test "have" capability and raw objects Christian Couder
2017-08-03 9:19 ` [PATCH v5 34/40] external-odb: use 'odb=magic' attribute to mark odb blobs Christian Couder
2017-08-03 9:19 ` [PATCH v5 35/40] Add Documentation/technical/external-odb.txt Christian Couder
2017-08-03 18:38 ` Stefan Beller
2017-08-25 6:14 ` Christian Couder
2017-08-25 21:23 ` Jonathan Tan
2017-08-29 9:37 ` Christian Couder
2017-08-28 18:59 ` Ben Peart
2017-08-29 15:43 ` Christian Couder
2017-08-30 12:50 ` Ben Peart
2017-08-30 14:15 ` Christian Couder
2017-08-03 9:19 ` [PATCH v5 36/40] clone: add 'initial' param to write_remote_refs() Christian Couder
2017-08-03 9:19 ` [PATCH v5 37/40] clone: add --initial-refspec option Christian Couder
2017-08-03 9:19 ` [PATCH v5 38/40] clone: disable external odb before initial clone Christian Couder
2017-08-03 9:19 ` [PATCH v5 39/40] Add tests for 'clone --initial-refspec' Christian Couder
2017-08-03 9:19 ` [PATCH v5 40/40] Add t0430 to test cloning using bundles Christian Couder
2017-09-10 12:30 ` [PATCH v5 00/40] Add initial experimental external ODB support Lars Schneider
2017-09-14 7:02 ` Christian Couder
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=20170803091926.1755-27-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=larsxschneider@gmail.com \
--cc=mh@glandium.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).