From: Kevin Wern <kevin.m.wern@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 08/11] Resumable clone: create transport_download_primer
Date: Thu, 15 Sep 2016 20:12:19 -0400 [thread overview]
Message-ID: <1473984742-12516-9-git-send-email-kevin.m.wern@gmail.com> (raw)
In-Reply-To: <1473984742-12516-1-git-send-email-kevin.m.wern@gmail.com>
Create function transport_download_primer and components
to invoke and pass commands to remote-curl.
Signed-off-by: Kevin Wern <kevin.m.wern@gmail.com>
---
transport-helper.c | 24 ++++++++++++++++++++++++
transport.c | 9 +++++++++
transport.h | 7 +++++++
3 files changed, 40 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c
index eb185d5..2ff96ef 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -29,6 +29,7 @@ struct helper_data {
check_connectivity : 1,
no_disconnect_req : 1,
no_private_update : 1,
+ download_primer : 1,
prime_clone : 1;
char *export_marks;
char *import_marks;
@@ -183,6 +184,8 @@ static struct child_process *get_helper(struct transport *transport)
data->check_connectivity = 1;
else if (!strcmp(capname, "prime-clone"))
data->prime_clone = 1;
+ else if (!strcmp(capname, "download-primer"))
+ data->download_primer = 1;
else if (!data->refspecs && skip_prefix(capname, "refspec ", &arg)) {
ALLOC_GROW(refspecs,
refspec_nr + 1,
@@ -1058,6 +1061,26 @@ static struct ref *get_refs_list(struct transport *transport, int for_push)
return ret;
}
+static const char *download_primer(struct transport *transport,
+ const struct alt_resource *res,
+ const char *base_path)
+{
+ struct helper_data *data = transport->data;
+ struct child_process *helper;
+ struct strbuf buf = STRBUF_INIT, out = STRBUF_INIT;
+ char *ret = NULL;
+
+ helper = get_helper(transport);
+
+ strbuf_addf(&buf, "download-primer %s %s\n", res->url, base_path);
+ sendline(data, &buf);
+ recvline(data, &out);
+ strbuf_release(&buf);
+ if (out.len > 0)
+ ret = strbuf_detach(&out, NULL);
+ return ret;
+}
+
static const struct alt_resource *const get_alt_res_helper(struct transport *transport)
{
struct helper_data *data = transport->data;
@@ -1115,6 +1138,7 @@ int transport_helper_init(struct transport *transport, const char *name)
transport->data = data;
transport->set_option = set_helper_option;
transport->get_refs_list = get_refs_list;
+ transport->download_primer = download_primer;
transport->prime_clone = get_alt_res_helper;
transport->fetch = fetch;
transport->push_refs = push_refs;
diff --git a/transport.c b/transport.c
index dd0d839..3b33029 100644
--- a/transport.c
+++ b/transport.c
@@ -572,6 +572,15 @@ const struct alt_resource *const transport_prime_clone(struct transport *transpo
return transport->alt_res;
}
+const char *transport_download_primer(struct transport *transport,
+ const struct alt_resource *alt_res,
+ const char *base_dir)
+{
+ if (transport->download_primer)
+ return transport->download_primer(transport, alt_res, base_dir);
+ return NULL;
+}
+
static int connect_git(struct transport *transport, const char *name,
const char *executable, int fd[2])
{
diff --git a/transport.h b/transport.h
index 2bb6963..1484d6d 100644
--- a/transport.h
+++ b/transport.h
@@ -83,6 +83,10 @@ struct transport {
**/
const struct alt_resource *const (*prime_clone)(struct transport *transport);
+ const char *(*download_primer)(struct transport *transport,
+ const struct alt_resource *alt_res,
+ const char *base_path);
+
/**
* Fetch the objects for the given refs. Note that this gets
* an array, and should ignore the list structure.
@@ -228,6 +232,9 @@ int transport_push(struct transport *connection,
const struct ref *transport_get_remote_refs(struct transport *transport);
const struct alt_resource *const transport_prime_clone(struct transport *transport);
+const char *transport_download_primer(struct transport *transport,
+ const struct alt_resource *alt_res,
+ const char *base_path);
int transport_fetch_refs(struct transport *transport, struct ref *refs);
void transport_unlock_pack(struct transport *transport);
--
2.7.4
next prev parent reply other threads:[~2016-09-16 0:12 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-16 0:12 [PATCH 00/11] Resumable clone Kevin Wern
2016-09-16 0:12 ` [PATCH 01/11] Resumable clone: create service git-prime-clone Kevin Wern
2016-09-16 20:53 ` Junio C Hamano
2016-09-28 4:40 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 02/11] Resumable clone: add prime-clone endpoints Kevin Wern
2016-09-19 13:15 ` Duy Nguyen
2016-09-28 4:43 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 03/11] pkt-line: create gentle packet_read_line functions Kevin Wern
2016-09-16 22:17 ` Junio C Hamano
2016-09-28 4:42 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 04/11] Resumable clone: add prime-clone to remote-curl Kevin Wern
2016-09-19 13:52 ` Duy Nguyen
2016-09-28 6:45 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 05/11] Resumable clone: add output parsing to connect.c Kevin Wern
2016-09-16 0:12 ` [PATCH 06/11] Resumable clone: implement transport_prime_clone Kevin Wern
2016-09-16 0:12 ` [PATCH 07/11] Resumable clone: add resumable download to http/curl Kevin Wern
2016-09-16 22:45 ` Junio C Hamano
2016-09-28 6:41 ` Kevin Wern
2016-09-16 0:12 ` Kevin Wern [this message]
2016-09-16 0:12 ` [PATCH 09/11] path: add resumable marker Kevin Wern
2016-09-19 13:24 ` Duy Nguyen
2016-09-16 0:12 ` [PATCH 10/11] run command: add RUN_COMMAND_NO_STDOUT Kevin Wern
2016-09-16 23:07 ` Junio C Hamano
2016-09-18 19:22 ` Johannes Schindelin
2016-09-28 4:46 ` Kevin Wern
2016-09-28 17:54 ` Junio C Hamano
2016-09-28 18:06 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 11/11] Resumable clone: implement primer logic in git-clone Kevin Wern
2016-09-16 23:32 ` Junio C Hamano
2016-09-28 5:49 ` Kevin Wern
2016-09-19 14:04 ` Duy Nguyen
2016-09-19 17:16 ` Junio C Hamano
2016-09-28 4:44 ` Kevin Wern
2016-09-16 20:47 ` [PATCH 00/11] Resumable clone Junio C Hamano
2016-09-27 21:51 ` Eric Wong
2016-09-27 22:07 ` Junio C Hamano
2016-09-28 17:32 ` Junio C Hamano
2016-09-28 18:22 ` Junio C Hamano
2016-09-28 20:46 ` Eric Wong
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=1473984742-12516-9-git-send-email-kevin.m.wern@gmail.com \
--to=kevin.m.wern@gmail.com \
--cc=git@vger.kernel.org \
/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).