git-upload-pack: More efficient usage of the has_sha1 array

diff --git a/pack-objects.c b/pack-objects.c
index 9e9c5788fd2770a67af230c3313b6980cb3fa2bd..b3e61520339231f6d9a43c545100f4d5f87e0aac 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -1,11 +1,10 @@
-#include <ctype.h>
 #include "cache.h"
 #include "object.h"
 #include "delta.h"
 #include "pack.h"
 #include "csum-file.h"
 
-static const char pack_usage[] = "git-pack-objects [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
+static const char pack_usage[] = "git-pack-objects [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
 
 struct object_entry {
        unsigned char sha1[20];
@@ -18,7 +17,9 @@ struct object_entry {
        struct object_entry *delta;
 };
 
+static unsigned char object_list_sha1[20];
 static int non_empty = 0;
+static int local = 0;
 static int incremental = 0;
 static struct object_entry **sorted_by_sha, **sorted_by_type;
 static struct object_entry *objects = NULL;
@@ -135,7 +136,7 @@ static void write_pack_file(void)
        if (!base_name)
                f = sha1fd(1, "<stdout>");
        else
-               f = sha1create("%s.%s", base_name, "pack");
+               f = sha1create("%s-%s.%s", base_name, sha1_to_hex(object_list_sha1), "pack");
        hdr.hdr_signature = htonl(PACK_SIGNATURE);
        hdr.hdr_version = htonl(PACK_VERSION);
        hdr.hdr_entries = htonl(nr_objects);
@@ -152,7 +153,7 @@ static void write_pack_file(void)
 static void write_index_file(void)
 {
        int i;
-       struct sha1file *f = sha1create("%s.%s", base_name, "idx");
+       struct sha1file *f = sha1create("%s-%s.%s", base_name, sha1_to_hex(object_list_sha1), "idx");
        struct object_entry **list = sorted_by_sha;
        struct object_entry **last = list + nr_objects;
        unsigned int array[256];
@@ -189,13 +190,25 @@ static void write_index_file(void)
        sha1close(f, NULL, 1);
 }
 
-static void add_object_entry(unsigned char *sha1, unsigned int hash)
+static int add_object_entry(unsigned char *sha1, unsigned int hash)
 {
        unsigned int idx = nr_objects;
        struct object_entry *entry;
 
-       if (incremental && has_sha1_pack(sha1))
-               return;
+       if (incremental || local) {
+               struct packed_git *p;
+
+               for (p = packed_git; p; p = p->next) {
+                       struct pack_entry e;
+
+                       if (find_pack_entry_one(sha1, &e, p)) {
+                               if (incremental)
+                                       return 0;
+                               if (local && !p->pack_local)
+                                       return 0;
+                       }
+               }
+       }
 
        if (idx >= nr_alloc) {
                unsigned int needed = (idx + 1024) * 3 / 2;
@@ -207,6 +220,7 @@ static void add_object_entry(unsigned char *sha1, unsigned int hash)
        memcpy(entry->sha1, sha1, 20);
        entry->hash = hash;
        nr_objects = idx+1;
+       return 1;
 }
 
 static void check_object(struct object_entry *entry)
@@ -380,12 +394,18 @@ static void find_deltas(struct object_entry **list, int window, int depth)
                if (idx >= window)
                        idx = 0;
        }
+
+       for (i = 0; i < window; ++i)
+               free(array[i].data);
+       free(array);
 }
 
 int main(int argc, char **argv)
 {
+       SHA_CTX ctx;
        char line[PATH_MAX + 20];
        int window = 10, depth = 10, pack_to_stdout = 0;
+       struct object_entry **list;
        int i;
 
        for (i = 1; i < argc; i++) {
@@ -396,6 +416,10 @@ int main(int argc, char **argv)
                                non_empty = 1;
                                continue;
                        }
+                       if (!strcmp("--local", arg)) {
+                               local = 1;
+                               continue;
+                       }
                        if (!strcmp("--incremental", arg)) {
                                incremental = 1;
                                continue;
@@ -428,6 +452,7 @@ int main(int argc, char **argv)
        if (pack_to_stdout != !base_name)
                usage(pack_usage);
 
+       prepare_packed_git();
        while (fgets(line, sizeof(line), stdin) != NULL) {
                unsigned int hash;
                char *p;
@@ -452,12 +477,22 @@ int main(int argc, char **argv)
        fprintf(stderr, "Packing %d objects\n", nr_objects);
 
        sorted_by_sha = create_sorted_list(sha1_sort);
+       SHA1_Init(&ctx);
+       list = sorted_by_sha;
+       for (i = 0; i < nr_objects; i++) {
+               struct object_entry *entry = *list++;
+               SHA1_Update(&ctx, entry->sha1, 20);
+       }
+       SHA1_Final(object_list_sha1, &ctx);
+
        sorted_by_type = create_sorted_list(type_size_sort);
        if (window && depth)
                find_deltas(sorted_by_type, window+1, depth);
 
        write_pack_file();
-       if (!pack_to_stdout)
+       if (!pack_to_stdout) {
                write_index_file();
+               puts(sha1_to_hex(object_list_sha1));
+       }
        return 0;
 }