git-rev-parse: parse ".." before simple SHA1's

diff --git a/pull.c b/pull.c
index 86a7b6901fe69a82c12c3470b456982ef52cebd0..395ca45328d1f17c795839d3cbfd405852933f5a 100644 (file)
--- a/pull.c
+++ b/pull.c
@@ -3,10 +3,59 @@
 #include "cache.h"
 #include "commit.h"
 #include "tree.h"
+#include "refs.h"
+
+const char *write_ref = NULL;
+
+const unsigned char *current_ref = NULL;
 
 int get_tree = 0;
 int get_history = 0;
+/* 1 means "get delta", 2 means "really check delta harder */
+int get_delta = 1;
 int get_all = 0;
+int get_verbosely = 0;
+static unsigned char current_commit_sha1[20];
+
+static const char commitS[] = "commit";
+static const char treeS[] = "tree";
+static const char blobS[] = "blob";
+
+void pull_say(const char *fmt, const char *hex) {
+       if (get_verbosely)
+               fprintf(stderr, fmt, hex);
+}
+
+static void report_missing(const char *what, const unsigned char *missing)
+{
+       char missing_hex[41];
+
+       strcpy(missing_hex, sha1_to_hex(missing));;
+       fprintf(stderr,
+               "Cannot obtain needed %s %s\nwhile processing commit %s.\n",
+               what, missing_hex, sha1_to_hex(current_commit_sha1));
+}
+
+static int make_sure_we_have_it(const char *what, unsigned char *sha1)
+{
+       int status = 0;
+
+       if (!has_sha1_file(sha1)) {
+               status = fetch(sha1);
+               if (status && what)
+                       report_missing(what, sha1);
+       }
+       else if (get_delta < 2)
+               return 0;
+
+       if (get_delta) {
+               char delta_sha1[20];
+               status = sha1_delta_base(sha1, delta_sha1);
+               if (0 < status)
+                       status = make_sure_we_have_it(what, delta_sha1);
+       }
+       return status;
+}
 
 static int process_tree(unsigned char *sha1)
 {
@@ -17,7 +66,8 @@ static int process_tree(unsigned char *sha1)
                return -1;
 
        for (entries = tree->entries; entries; entries = entries->next) {
-               if (fetch(entries->item.tree->object.sha1))
+               const char *what = entries->directory ? treeS : blobS;
+               if (make_sure_we_have_it(what, entries->item.tree->object.sha1))
                        return -1;
                if (entries->directory) {
                        if (process_tree(entries->item.tree->object.sha1))
@@ -31,14 +81,14 @@ static int process_commit(unsigned char *sha1)
 {
        struct commit *obj = lookup_commit(sha1);
 
-       if (fetch(sha1))
+       if (make_sure_we_have_it(commitS, sha1))
                return -1;
 
        if (parse_commit(obj))
                return -1;
 
        if (get_tree) {
-               if (fetch(obj->tree->object.sha1))
+               if (make_sure_we_have_it(treeS, obj->tree->object.sha1))
                        return -1;
                if (process_tree(obj->tree->object.sha1))
                        return -1;
@@ -50,7 +100,8 @@ static int process_commit(unsigned char *sha1)
                for (; parents; parents = parents->next) {
                        if (has_sha1_file(parents->item->object.sha1))
                                continue;
-                       if (fetch(parents->item->object.sha1)) {
+                       if (make_sure_we_have_it(NULL,
+                                                parents->item->object.sha1)) {
                                /* The server might not have it, and
                                 * we don't mind. 
                                 */
@@ -58,20 +109,48 @@ static int process_commit(unsigned char *sha1)
                        }
                        if (process_commit(parents->item->object.sha1))
                                return -1;
+                       memcpy(current_commit_sha1, sha1, 20);
                }
        }
        return 0;
 }
 
+static int interpret_target(char *target, unsigned char *sha1)
+{
+       if (!get_sha1_hex(target, sha1))
+               return 0;
+       if (!check_ref_format(target)) {
+               if (!fetch_ref(target, sha1)) {
+                       return 0;
+               }
+       }
+       return -1;
+}
+
+
 int pull(char *target)
 {
-       int retval;
        unsigned char sha1[20];
-       retval = get_sha1_hex(target, sha1);
-       if (retval)
-               return retval;
-       retval = fetch(sha1);
-       if (retval)
-               return retval;
-       return process_commit(sha1);
+       int fd = -1;
+
+       if (write_ref && current_ref) {
+               fd = lock_ref_sha1(write_ref, current_ref);
+               if (fd < 0)
+                       return -1;
+       }
+
+       if (interpret_target(target, sha1))
+               return error("Could not interpret %s as something to pull",
+                            target);
+       if (process_commit(sha1))
+               return -1;
+       
+       if (write_ref) {
+               if (current_ref) {
+                       write_ref_sha1(write_ref, fd, sha1);
+               } else {
+                       write_ref_sha1_unlocked(write_ref, sha1);
+               }
+       }
+       return 0;
 }