remote-helpers: Fetch more than one ref in a batch

diff --git a/remote-curl.c b/remote-curl.c
index ad6a1637b52dedeeb461315e9cc0d313b1c6087f..22cd5c5fd2a64b0ed4f6a74b38598bbcd2072efa 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -3,8 +3,19 @@
 #include "strbuf.h"
 #include "walker.h"
 #include "http.h"
+#include "exec_cmd.h"
 
-static struct ref *get_refs(struct walker *walker, const char *url)
+static struct remote *remote;
+static const char *url;
+static struct walker *walker;
+
+static void init_walker(void)
+{
+       if (!walker)
+               walker = get_http_walker(url, remote);
+}
+
+static struct ref *get_refs(void)
 {
        struct strbuf buffer = STRBUF_INIT;
        char *data, *start, *mid;
@@ -20,6 +31,7 @@ static struct ref *get_refs(struct walker *walker, const char *url)
        refs_url = xmalloc(strlen(url) + 11);
        sprintf(refs_url, "%s/info/refs", url);
 
+       init_walker();
        http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
        switch (http_ret) {
        case HTTP_OK:
@@ -75,13 +87,86 @@ static struct ref *get_refs(struct walker *walker, const char *url)
        return refs;
 }
 
+static int fetch_dumb(int nr_heads, struct ref **to_fetch)
+{
+       char **targets = xmalloc(nr_heads * sizeof(char*));
+       int ret, i;
+
+       for (i = 0; i < nr_heads; i++)
+               targets[i] = xstrdup(sha1_to_hex(to_fetch[i]->old_sha1));
+
+       init_walker();
+       walker->get_all = 1;
+       walker->get_tree = 1;
+       walker->get_history = 1;
+       walker->get_verbosely = 0;
+       walker->get_recover = 0;
+       ret = walker_fetch(walker, nr_heads, targets, NULL, NULL);
+
+       for (i = 0; i < nr_heads; i++)
+               free(targets[i]);
+       free(targets);
+
+       return ret ? error("Fetch failed.") : 0;
+}
+
+static void parse_fetch(struct strbuf *buf)
+{
+       struct ref **to_fetch = NULL;
+       struct ref *list_head = NULL;
+       struct ref **list = &list_head;
+       int alloc_heads = 0, nr_heads = 0;
+
+       do {
+               if (!prefixcmp(buf->buf, "fetch ")) {
+                       char *p = buf->buf + strlen("fetch ");
+                       char *name;
+                       struct ref *ref;
+                       unsigned char old_sha1[20];
+
+                       if (strlen(p) < 40 || get_sha1_hex(p, old_sha1))
+                               die("protocol error: expected sha/ref, got %s'", p);
+                       if (p[40] == ' ')
+                               name = p + 41;
+                       else if (!p[40])
+                               name = "";
+                       else
+                               die("protocol error: expected sha/ref, got %s'", p);
+
+                       ref = alloc_ref(name);
+                       hashcpy(ref->old_sha1, old_sha1);
+
+                       *list = ref;
+                       list = &ref->next;
+
+                       ALLOC_GROW(to_fetch, nr_heads + 1, alloc_heads);
+                       to_fetch[nr_heads++] = ref;
+               }
+               else
+                       die("http transport does not support %s", buf->buf);
+
+               strbuf_reset(buf);
+               if (strbuf_getline(buf, stdin, '\n') == EOF)
+                       return;
+               if (!*buf->buf)
+                       break;
+       } while (1);
+
+       if (fetch_dumb(nr_heads, to_fetch))
+               exit(128); /* error already reported */
+       free_refs(list_head);
+       free(to_fetch);
+
+       printf("\n");
+       fflush(stdout);
+       strbuf_reset(buf);
+}
+
 int main(int argc, const char **argv)
 {
-       struct remote *remote;
        struct strbuf buf = STRBUF_INIT;
-       const char *url;
-       struct walker *walker = NULL;
 
+       git_extract_argv0_path(argv[0]);
        setup_git_directory();
        if (argc < 2) {
                fprintf(stderr, "Remote needed\n");
@@ -100,24 +185,11 @@ int main(int argc, const char **argv)
                if (strbuf_getline(&buf, stdin, '\n') == EOF)
                        break;
                if (!prefixcmp(buf.buf, "fetch ")) {
-                       char *obj = buf.buf + strlen("fetch ");
-                       if (!walker)
-                               walker = get_http_walker(url, remote);
-                       walker->get_all = 1;
-                       walker->get_tree = 1;
-                       walker->get_history = 1;
-                       walker->get_verbosely = 0;
-                       walker->get_recover = 0;
-                       if (walker_fetch(walker, 1, &obj, NULL, NULL))
-                               die("Fetch failed.");
-                       printf("\n");
-                       fflush(stdout);
+                       parse_fetch(&buf);
+
                } else if (!strcmp(buf.buf, "list")) {
-                       struct ref *refs;
+                       struct ref *refs = get_refs();
                        struct ref *posn;
-                       if (!walker)
-                               walker = get_http_walker(url, remote);
-                       refs = get_refs(walker, url);
                        for (posn = refs; posn; posn = posn->next) {
                                if (posn->symref)
                                        printf("@%s %s\n", posn->symref, posn->name);