Add "git checkout" that does what the name suggests

diff --git a/http-pull.c b/http-pull.c
index a17225719c53508a37905618c624ad8c4d0372ec..f49525c00228b5db9dc2fbd4860883887bb7dbad 100644 (file)
--- a/http-pull.c
+++ b/http-pull.c
@@ -1,11 +1,7 @@
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 #include "cache.h"
 #include "commit.h"
-#include <errno.h>
-#include <stdio.h>
+
+#include "pull.h"
 
 #include <curl/curl.h>
 #include <curl/easy.h>
@@ -14,10 +10,6 @@ static CURL *curl;
 
 static char *base;
 
-static int tree = 0;
-static int commits = 0;
-static int all = 0;
-
 static SHA_CTX c;
 static z_stream stream;
 
@@ -26,7 +18,7 @@ static int zret;
 
 static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb, 
                               void *data) {
-       char expn[4096];
+       unsigned char expn[4096];
        size_t size = eltsize * nmemb;
        int posn = 0;
        do {
@@ -47,18 +39,14 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
        return size;
 }
 
-static int fetch(unsigned char *sha1)
+int fetch(unsigned char *sha1)
 {
        char *hex = sha1_to_hex(sha1);
        char *filename = sha1_file_name(sha1);
-       char real_sha1[20];
+       unsigned char real_sha1[20];
        char *url;
        char *posn;
 
-       if (has_sha1_file(sha1)) {
-               return 0;
-       }
-
        local = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
 
        if (local < 0)
@@ -73,7 +61,7 @@ static int fetch(unsigned char *sha1)
        curl_easy_setopt(curl, CURLOPT_FILE, NULL);
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
 
-       url = malloc(strlen(base) + 50);
+       url = xmalloc(strlen(base) + 50);
        strcpy(url, base);
        posn = url + strlen(base);
        strcpy(posn, "objects/");
@@ -85,8 +73,6 @@ static int fetch(unsigned char *sha1)
 
        curl_easy_setopt(curl, CURLOPT_URL, url);
 
-       /*printf("Getting %s\n", hex);*/
-
        if (curl_easy_perform(curl))
                return error("Couldn't get %s for %s\n", url, hex);
 
@@ -102,62 +88,13 @@ static int fetch(unsigned char *sha1)
                return error("File %s has bad hash\n", hex);
        }
        
+       pull_say("got %s\n", hex);
        return 0;
 }
 
-static int process_tree(unsigned char *sha1)
-{
-       struct tree *tree = lookup_tree(sha1);
-       struct tree_entry_list *entries;
-
-       if (parse_tree(tree))
-               return -1;
-
-       for (entries = tree->entries; entries; entries = entries->next) {
-               if (fetch(entries->item.tree->object.sha1))
-                       return -1;
-               if (entries->directory) {
-                       if (process_tree(entries->item.tree->object.sha1))
-                               return -1;
-               }
-       }
-       return 0;
-}
-
-static int process_commit(unsigned char *sha1)
+int fetch_ref(char *ref, unsigned char *sha1)
 {
-       struct commit *obj = lookup_commit(sha1);
-
-       if (fetch(sha1))
-               return -1;
-
-       if (parse_commit(obj))
-               return -1;
-
-       if (tree) {
-               if (fetch(obj->tree->object.sha1))
-                       return -1;
-               if (process_tree(obj->tree->object.sha1))
-                       return -1;
-               if (!all)
-                       tree = 0;
-       }
-       if (commits) {
-               struct commit_list *parents = obj->parents;
-               for (; parents; parents = parents->next) {
-                       if (has_sha1_file(parents->item->object.sha1))
-                               continue;
-                       if (fetch(parents->item->object.sha1)) {
-                               /* The server might not have it, and
-                                * we don't mind. 
-                                */
-                               continue;
-                       }
-                       if (process_commit(parents->item->object.sha1))
-                               return -1;
-               }
-       }
-       return 0;
+       return -1;
 }
 
 int main(int argc, char **argv)
@@ -165,38 +102,39 @@ int main(int argc, char **argv)
        char *commit_id;
        char *url;
        int arg = 1;
-       unsigned char sha1[20];
 
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't') {
-                       tree = 1;
+                       get_tree = 1;
                } else if (argv[arg][1] == 'c') {
-                       commits = 1;
+                       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') {
-                       all = 1;
-                       tree = 1;
-                       commits = 1;
+                       get_all = 1;
+                       get_tree = 1;
+                       get_history = 1;
+               } else if (argv[arg][1] == 'v') {
+                       get_verbosely = 1;
                }
                arg++;
        }
        if (argc < arg + 2) {
-               usage("http-pull [-c] [-t] [-a] commit-id url");
+               usage("git-http-pull [-c] [-t] [-a] [-d] [-v] [--recover] commit-id url");
                return 1;
        }
        commit_id = argv[arg];
        url = argv[arg + 1];
 
-       get_sha1_hex(commit_id, sha1);
-
        curl_global_init(CURL_GLOBAL_ALL);
 
        curl = curl_easy_init();
 
        base = url;
 
-       if (fetch(sha1))
-               return 1;
-       if (process_commit(sha1))
+       if (pull(commit_id))
                return 1;
 
        curl_global_cleanup();