[PATCH] fix scalability problems with git-deltafy-script

diff --git a/object.c b/object.c
index b5a62e7f87f24c2ab0ea83f3c445d81bcbff027a..5e8378857028afeb4d1cd91c0de26c8414e137de 100644 (file)
--- a/object.c
+++ b/object.c
@@ -4,14 +4,13 @@
 #include "commit.h"
 #include "cache.h"
 #include "tag.h"
-#include <stdlib.h>
-#include <string.h>
+#include "delta.h"
 
 struct object **objs;
 int nr_objs;
 static int obj_allocs;
 
-static int find_object(unsigned char *sha1)
+static int find_object(const unsigned char *sha1)
 {
        int first = 0, last = nr_objs;
 
@@ -32,7 +31,7 @@ static int find_object(unsigned char *sha1)
         return -first-1;
 }
 
-struct object *lookup_object(unsigned char *sha1)
+struct object *lookup_object(const unsigned char *sha1)
 {
        int pos = find_object(sha1);
        if (pos >= 0)
@@ -40,7 +39,7 @@ struct object *lookup_object(unsigned char *sha1)
        return NULL;
 }
 
-void created_object(unsigned char *sha1, struct object *obj)
+void created_object(const unsigned char *sha1, struct object *obj)
 {
        int pos = find_object(sha1);
 
@@ -99,11 +98,12 @@ void mark_reachable(struct object *obj, unsigned int mask)
        }
 }
 
-struct object *parse_object(unsigned char *sha1)
+struct object *parse_object(const unsigned char *sha1)
 {
        unsigned long mapsize;
        void *map = map_sha1_file(sha1, &mapsize);
        if (map) {
+               int is_delta;
                struct object *obj;
                char type[100];
                unsigned long size;
@@ -111,9 +111,14 @@ struct object *parse_object(unsigned char *sha1)
                munmap(map, mapsize);
                if (!buffer)
                        return NULL;
-               if (check_sha1_signature(sha1, buffer, size, type) < 0)
+               is_delta = !strcmp(type, "delta");
+               if (!is_delta && check_sha1_signature(sha1, buffer, size, type) < 0)
                        printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
-               if (!strcmp(type, "blob")) {
+               if (is_delta) {
+                       struct delta *delta = lookup_delta(sha1);
+                       parse_delta_buffer(delta, buffer, size);
+                       obj = (struct object *) delta;
+               } else if (!strcmp(type, "blob")) {
                        struct blob *blob = lookup_blob(sha1);
                        parse_blob_buffer(blob, buffer, size);
                        obj = &blob->object;
@@ -124,6 +129,10 @@ struct object *parse_object(unsigned char *sha1)
                } else if (!strcmp(type, "commit")) {
                        struct commit *commit = lookup_commit(sha1);
                        parse_commit_buffer(commit, buffer, size);
+                       if (!commit->buffer) {
+                               commit->buffer = buffer;
+                               buffer = NULL;
+                       }
                        obj = &commit->object;
                } else if (!strcmp(type, "tag")) {
                        struct tag *tag = lookup_tag(sha1);