[PATCH] Fix local pull that uses packs.

diff --git a/ssh-pull.c b/ssh-pull.c
index 3556d89a33cc68e8c369f2189bf068dc3ae3a96d..b7f313bf277fc2f2c2cfb84048cd077728da9dd9 100644 (file)
--- a/ssh-pull.c
+++ b/ssh-pull.c
@@ -2,6 +2,7 @@
 #include "commit.h"
 #include "rsh.h"
 #include "pull.h"
+#include "refs.h"
 
 static int fd_in;
 static int fd_out;
@@ -9,26 +10,55 @@ static int fd_out;
 static unsigned char remote_version = 0;
 static unsigned char local_version = 1;
 
+static ssize_t force_write(int fd, void *buffer, size_t length)
+{
+       ssize_t ret = 0;
+       while (ret < length) {
+               ssize_t size = write(fd, buffer + ret, length - ret);
+               if (size < 0) {
+                       return size;
+               }
+               if (size == 0) {
+                       return ret;
+               }
+               ret += size;
+       }
+       return ret;
+}
+
+void prefetch(unsigned char *sha1)
+{
+       char type = 'o';
+       force_write(fd_out, &type, 1);
+       force_write(fd_out, sha1, 20);
+       //memcpy(requested + 20 * prefetches++, sha1, 20);
+}
+
+static char conn_buf[4096];
+static size_t conn_buf_posn = 0;
+
 int fetch(unsigned char *sha1)
 {
        int ret;
        signed char remote;
-       char type = 'o';
-       if (has_sha1_file(sha1))
-               return 0;
-       write(fd_out, &type, 1);
-       write(fd_out, sha1, 20);
-       if (read(fd_in, &remote, 1) < 1)
-               return -1;
+
+       if (conn_buf_posn) {
+               remote = conn_buf[0];
+               memmove(conn_buf, conn_buf + 1, --conn_buf_posn);
+       } else {
+               if (read(fd_in, &remote, 1) < 1)
+                       return -1;
+       }
+       //fprintf(stderr, "Got %d\n", remote);
        if (remote < 0)
                return remote;
-       ret = write_sha1_from_fd(sha1, fd_in);
+       ret = write_sha1_from_fd(sha1, fd_in, conn_buf, 4096, &conn_buf_posn);
        if (!ret)
                pull_say("got %s\n", sha1_to_hex(sha1));
        return ret;
 }
 
-int get_version(void)
+static int get_version(void)
 {
        char type = 'v';
        write(fd_out, &type, 1);
@@ -39,38 +69,51 @@ int get_version(void)
        return 0;
 }
 
+int fetch_ref(char *ref, unsigned char *sha1)
+{
+       signed char remote;
+       char type = 'r';
+       write(fd_out, &type, 1);
+       write(fd_out, ref, strlen(ref) + 1);
+       read(fd_in, &remote, 1);
+       if (remote < 0)
+               return remote;
+       read(fd_in, sha1, 20);
+       return 0;
+}
+
 int main(int argc, char **argv)
 {
        char *commit_id;
        char *url;
        int arg = 1;
+       const char *prog = getenv("GIT_SSH_PUSH") ? : "git-ssh-push";
 
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't') {
                        get_tree = 1;
                } else if (argv[arg][1] == 'c') {
                        get_history = 1;
-               } else if (argv[arg][1] == 'd') {
-                       get_delta = 0;
-               } else if (!strcmp(argv[arg], "--recover")) {
-                       get_delta = 2;
                } else if (argv[arg][1] == 'a') {
                        get_all = 1;
                        get_tree = 1;
                        get_history = 1;
                } else if (argv[arg][1] == 'v') {
                        get_verbosely = 1;
+               } else if (argv[arg][1] == 'w') {
+                       write_ref = argv[arg + 1];
+                       arg++;
                }
                arg++;
        }
        if (argc < arg + 2) {
-               usage("git-ssh-pull [-c] [-t] [-a] [-v] [-d] [--recover] commit-id url");
+               usage("git-ssh-pull [-c] [-t] [-a] [-v] [-d] [--recover] [-w ref] commit-id url");
                return 1;
        }
        commit_id = argv[arg];
        url = argv[arg + 1];
 
-       if (setup_connection(&fd_in, &fd_out, "git-ssh-push", url, arg, argv + 1))
+       if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
                return 1;
 
        if (get_version())