[PATCH] Factor out useful test case infrastructure from t/t6001... into t/t6000-lib.sh

diff --git a/fetch-pack.c b/fetch-pack.c
index e9035a1dc1e71fbac6e530eda3810848404f0f2d..ec5bad89cdb3f6eae038877856f2eefb1125bf6f 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1,33 +1,25 @@
 #include "cache.h"
+#include "refs.h"
 #include "pkt-line.h"
+#include <sys/wait.h>
 
 static const char fetch_pack_usage[] = "git-fetch-pack [host:]directory [heads]* < mycommitlist";
 static const char *exec = "git-upload-pack";
 
-static int get_ack(int fd, unsigned char *result_sha1)
+static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *remote)
 {
        static char line[1000];
-       int len = packet_read_line(fd, line, sizeof(line));
+       int count = 0, flushes = 0, retval;
+       FILE *revs;
 
-       if (!len)
-               die("git-fetch-pack: expected ACK/NAK, got EOF");
-       if (line[len-1] == '\n')
-               line[--len] = 0;
-       if (!strcmp(line, "NAK"))
-               return 0;
-       if (!strncmp(line, "ACK ", 3)) {
-               if (!get_sha1_hex(line+4, result_sha1))
-                       return 1;
-       }
-       die("git-fetch_pack: expected ACK/NAK, got '%s'", line);
-}
-
-static int find_common(int fd[2], unsigned char *result_sha1)
-{
-       static char line[1000];
-       int count = 0, flushes = 0;
-
-       while (fgets(line, sizeof(line), stdin) != NULL) {
+       revs = popen("git-rev-list $(git-rev-parse --all)", "r");
+       if (!revs)
+               die("unable to run 'git-rev-list'");
+       packet_write(fd[1], "want %s\n", sha1_to_hex(remote));
+       packet_flush(fd[1]);
+       flushes = 1;
+       retval = -1;
+       while (fgets(line, sizeof(line), revs) != NULL) {
                unsigned char sha1[20];
                if (get_sha1_hex(line, sha1))
                        die("git-fetch-pack: expected object name, got crud");
@@ -42,23 +34,28 @@ static int find_common(int fd[2], unsigned char *result_sha1)
                         */
                        if (count == 32)
                                continue;
-                       if (get_ack(fd[0], result_sha1))
-                               return 0;
+                       if (get_ack(fd[0], result_sha1)) {
+                               flushes = 0;
+                               retval = 0;
+                               break;
+                       }
                        flushes--;
                }
        }
-       flushes++;
-       packet_flush(fd[1]);
+       pclose(revs);
+       packet_write(fd[1], "done\n");
        while (flushes) {
                flushes--;
                if (get_ack(fd[0], result_sha1))
                        return 0;
        }
-       return -1;
+       return retval;
 }
 
-static int get_remote_heads(int fd, int nr_match, char **match)
+static int get_remote_heads(int fd, int nr_match, char **match, unsigned char *result)
 {
+       int count = 0;
+
        for (;;) {
                static char line[1000];
                unsigned char sha1[20];
@@ -71,24 +68,57 @@ static int get_remote_heads(int fd, int nr_match, char **match)
                if (line[len-1] == '\n')
                        line[--len] = 0;
                if (len < 42 || get_sha1_hex(line, sha1))
-                       die("git-fetch-pack: protocol error - expected ref descriptor, got '%sä'", line);
+                       die("git-fetch-pack: protocol error - expected ref descriptor, got '%s¤'", line);
                refname = line+41;
                if (nr_match && !path_match(refname, nr_match, match))
                        continue;
-               printf("%s %s\n", sha1_to_hex(sha1), refname);
+               count++;
+               memcpy(result, sha1, 20);
        }
-       return 0;
+       return count;
 }
 
 static int fetch_pack(int fd[2], int nr_match, char **match)
 {
-       unsigned char sha1[20];
+       unsigned char sha1[20], remote[20];
+       int heads, status;
+       pid_t pid;
 
-       get_remote_heads(fd[0], nr_match, match);
-       if (find_common(fd, sha1) < 0)
+       heads = get_remote_heads(fd[0], nr_match, match, remote);
+       if (heads != 1) {
+               packet_flush(fd[1]);
+               die(heads ? "multiple remote heads" : "no matching remote head");
+       }
+       if (find_common(fd, sha1, remote) < 0)
                die("git-fetch-pack: no common commits");
-       printf("common commit: %s\n", sha1_to_hex(sha1));
-       return 0;
+       pid = fork();
+       if (pid < 0)
+               die("git-fetch-pack: unable to fork off git-unpack-objects");
+       if (!pid) {
+               close(fd[1]);
+               dup2(fd[0], 0);
+               close(fd[0]);
+               execlp("git-unpack-objects", "git-unpack-objects", NULL);
+               die("git-unpack-objects exec failed");
+       }
+       close(fd[0]);
+       close(fd[1]);
+       while (waitpid(pid, &status, 0) < 0) {
+               if (errno != EINTR)
+                       die("waiting for git-unpack-objects: %s", strerror(errno));
+       }
+       if (WIFEXITED(status)) {
+               int code = WEXITSTATUS(status);
+               if (code)
+                       die("git-unpack-objects died with error code %d", code);
+               puts(sha1_to_hex(remote));
+               return 0;
+       }
+       if (WIFSIGNALED(status)) {
+               int sig = WTERMSIG(status);
+               die("git-unpack-objects died of signal %d", sig);
+       }
+       die("Sherlock Holmes! git-unpack-objects died of unnatural causes %d!", status);
 }
 
 int main(int argc, char **argv)