Merge branch 'ew/apply'

diff --git a/unpack-objects.c b/unpack-objects.c
index 355889f65bef73e512cf4c053493ae25c6a77b96..48c1ee7968cc6b40cb02cd99d35e66630f922041 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
@@ -2,11 +2,15 @@
 #include "object.h"
 #include "delta.h"
 #include "pack.h"
+#include "blob.h"
+#include "commit.h"
+#include "tag.h"
+#include "tree.h"
 
 #include <sys/time.h>
 
 static int dry_run, quiet;
-static const char unpack_usage[] = "git-unpack-objects < pack-file";
+static const char unpack_usage[] = "git-unpack-objects [-n] [-q] < pack-file";
 
 /* We always read in 4kB chunks. */
 static unsigned char buffer[4096];
@@ -31,12 +35,10 @@ static void * fill(int min)
                offset = 0;
        }
        do {
-               int ret = read(0, buffer + len, sizeof(buffer) - len);
+               int ret = xread(0, buffer + len, sizeof(buffer) - len);
                if (ret <= 0) {
                        if (!ret)
                                die("early EOF");
-                       if (errno == EAGAIN || errno == EINTR)
-                               continue;
                        die("read error on input: %s", strerror(errno));
                }
                len += ret;
@@ -75,6 +77,7 @@ static void *get_data(unsigned long size)
                stream.next_in = fill(1);
                stream.avail_in = len;
        }
+       inflateEnd(&stream);
        return buf;
 }
 
@@ -149,10 +152,10 @@ static int unpack_non_delta_entry(enum object_type kind, unsigned long size)
        const char *type;
 
        switch (kind) {
-       case OBJ_COMMIT: type = "commit"; break;
-       case OBJ_TREE:   type = "tree"; break;
-       case OBJ_BLOB:   type = "blob"; break;
-       case OBJ_TAG:    type = "tag"; break;
+       case OBJ_COMMIT: type = commit_type; break;
+       case OBJ_TREE:   type = tree_type; break;
+       case OBJ_BLOB:   type = blob_type; break;
+       case OBJ_TAG:    type = tag_type; break;
        default: die("bad type %d", kind);
        }
        if (!dry_run)
@@ -167,6 +170,7 @@ static int unpack_delta_entry(unsigned long delta_size)
        unsigned long base_size;
        char type[20];
        unsigned char base_sha1[20];
+       int result;
 
        memcpy(base_sha1, fill(20), 20);
        use(20);
@@ -184,7 +188,9 @@ static int unpack_delta_entry(unsigned long delta_size)
        base = read_sha1_file(base_sha1, type, &base_size);
        if (!base)
                die("failed to read delta-pack base object %s", sha1_to_hex(base_sha1));
-       return resolve_delta(type, base, base_size, delta_data, delta_size);
+       result = resolve_delta(type, base, base_size, delta_data, delta_size);
+       free(base);
+       return result;
 }
 
 static void unpack_one(unsigned nr, unsigned total)
@@ -211,7 +217,7 @@ static void unpack_one(unsigned nr, unsigned total)
                static unsigned long last_sec;
                static unsigned last_percent;
                struct timeval now;
-               unsigned percentage = ((1+nr) * 100) / total;
+               unsigned percentage = (nr * 100) / total;
 
                gettimeofday(&now, NULL);
                if (percentage != last_percent || now.tv_sec != last_sec) {
@@ -235,27 +241,21 @@ static void unpack_one(unsigned nr, unsigned total)
        }
 }
 
-/*
- * We unpack from the end, older files first. Now, usually
- * there are deltas etc, so we'll not actually write the
- * objects in that order, but we might as well try..
- */
 static void unpack_all(void)
 {
        int i;
        struct pack_header *hdr = fill(sizeof(struct pack_header));
-       unsigned version = ntohl(hdr->hdr_version);
        unsigned nr_objects = ntohl(hdr->hdr_entries);
 
        if (ntohl(hdr->hdr_signature) != PACK_SIGNATURE)
                die("bad pack file");
-       if (version != PACK_VERSION)
-               die("unable to handle pack file version %d", version);
+       if (!pack_version_ok(hdr->hdr_version))
+               die("unknown pack file version %d", ntohl(hdr->hdr_version));
        fprintf(stderr, "Unpacking %d objects\n", nr_objects);
 
        use(sizeof(struct pack_header));
        for (i = 0; i < nr_objects; i++)
-               unpack_one(i, nr_objects);
+               unpack_one(i+1, nr_objects);
        if (delta_list)
                die("unresolved deltas left after unpacking");
 }
@@ -265,6 +265,10 @@ int main(int argc, char **argv)
        int i;
        unsigned char sha1[20];
 
+       setup_git_directory();
+
+       quiet = !isatty(2);
+
        for (i = 1 ; i < argc; i++) {
                const char *arg = argv[i];
 
@@ -293,14 +297,9 @@ int main(int argc, char **argv)
 
        /* Write the last part of the buffer to stdout */
        while (len) {
-               int ret = write(1, buffer + offset, len);
-               if (!ret)
-                       break;
-               if (ret < 0) {
-                       if (errno == EAGAIN || errno == EINTR)
-                               continue;
+               int ret = xwrite(1, buffer + offset, len);
+               if (ret <= 0)
                        break;
-               }
                len -= ret;
                offset += ret;
        }