#include "cache.h"
#include "object.h"
#include "delta.h"
+#include "pack.h"
+#include "blob.h"
+#include "commit.h"
+#include "tag.h"
+#include "tree.h"
-static int dry_run;
-static int nr_entries;
-static const char *base_name;
-static const char unpack_usage[] = "git-unpack-objects basename";
+#include <sys/time.h>
-struct pack_entry {
- unsigned int offset; /* network byte order */
- unsigned char sha1[20];
-};
-
-static void *pack_base;
-static unsigned long pack_size;
-static void *index_base;
-static unsigned long index_size;
+static int dry_run, quiet;
+static const char unpack_usage[] = "git-unpack-objects [-n] [-q] < pack-file";
-static struct pack_entry **pack_list;
+/* We always read in 4kB chunks. */
+static unsigned char buffer[4096];
+static unsigned long offset, len, eof;
+static SHA_CTX ctx;
-static void *map_file(const char *suffix, unsigned long *sizep)
+/*
+ * Make sure at least "min" bytes are available in the buffer, and
+ * return the pointer to the buffer.
+ */
+static void * fill(int min)
{
- static char pathname[PATH_MAX];
- unsigned long len;
- int fd;
- struct stat st;
- void *map;
-
- len = snprintf(pathname, PATH_MAX, "%s.%s", base_name, suffix);
- if (len >= PATH_MAX)
- die("bad pack base-name");
- fd = open(pathname, O_RDONLY);
- if (fd < 0 || fstat(fd, &st))
- die("unable to open '%s'", pathname);
- len = st.st_size;
- if (!len)
- die("bad pack file '%s'", pathname);
- map = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
- if (-1 == (int)(long)map)
- die("unable to mmap '%s'", pathname);
- close(fd);
- *sizep = len;
- return map;
+ if (min <= len)
+ return buffer + offset;
+ if (eof)
+ die("unable to fill input");
+ if (min > sizeof(buffer))
+ die("cannot fill %d bytes", min);
+ if (offset) {
+ SHA1_Update(&ctx, buffer, offset);
+ memcpy(buffer, buffer + offset, len);
+ offset = 0;
+ }
+ do {
+ int ret = xread(0, buffer + len, sizeof(buffer) - len);
+ if (ret <= 0) {
+ if (!ret)
+ die("early EOF");
+ die("read error on input: %s", strerror(errno));
+ }
+ len += ret;
+ } while (len < min);
+ return buffer;
}
-static int sort_by_offset(const void *_a, const void *_b)
+static void use(int bytes)
{
- struct pack_entry *a = *(struct pack_entry **)_a;
- struct pack_entry *b = *(struct pack_entry **)_b;
- unsigned int o1, o2;
-
- o1 = ntohl(a->offset);
- o2 = ntohl(b->offset);
- return o1 < o2 ? -1 : 1;
+ if (bytes > len)
+ die("used more bytes than were available");
+ len -= bytes;
+ offset += bytes;
}
-static int check_index(void)
+static void *get_data(unsigned long size)
{
- unsigned int *array = index_base;
- unsigned int nr;
- int i;
+ z_stream stream;
+ void *buf = xmalloc(size);
- if (index_size < 4*256)
- return error("index file too small");
- nr = 0;
- for (i = 0; i < 256; i++) {
- unsigned int n = ntohl(array[i]);
- if (n < nr)
- return error("non-monotonic index");
- nr = n;
- }
- if (index_size != 4*256 + nr * 24) {
- printf("index_size=%lu, expected %u (%u)\n",
- index_size, 4*256 + nr * 24, nr);
- return error("wrong index file size");
+ memset(&stream, 0, sizeof(stream));
+
+ stream.next_out = buf;
+ stream.avail_out = size;
+ stream.next_in = fill(1);
+ stream.avail_in = len;
+ inflateInit(&stream);
+
+ for (;;) {
+ int ret = inflate(&stream, 0);
+ use(len - stream.avail_in);
+ if (stream.total_out == size && ret == Z_STREAM_END)
+ break;
+ if (ret != Z_OK)
+ die("inflate returned %d\n", ret);
+ stream.next_in = fill(1);
+ stream.avail_in = len;
}
+ inflateEnd(&stream);
+ return buf;
+}
- nr_entries = nr;
- pack_list = xmalloc(nr * sizeof(struct pack_entry *));
- for (i = 0; i < nr; i++)
- pack_list[i] = index_base + 4*256 + i*24;
+struct delta_info {
+ unsigned char base_sha1[20];
+ unsigned long size;
+ void *delta;
+ struct delta_info *next;
+};
- qsort(pack_list, nr, sizeof(*pack_list), sort_by_offset);
+static struct delta_info *delta_list;
- printf("%d entries\n", nr);
- return 0;
+static void add_delta_to_list(unsigned char *base_sha1, void *delta, unsigned long size)
+{
+ struct delta_info *info = xmalloc(sizeof(*info));
+
+ memcpy(info->base_sha1, base_sha1, 20);
+ info->size = size;
+ info->delta = delta;
+ info->next = delta_list;
+ delta_list = info;
}
-static int unpack_non_delta_entry(struct pack_entry *entry,
- unsigned char *pack)
+static void added_object(unsigned char *sha1, const char *type, void *data, unsigned long size);
+
+static void write_object(void *buf, unsigned long size, const char *type)
{
- int st, kind;
- unsigned long size;
- z_stream stream;
- char *buffer;
unsigned char sha1[20];
- char *type_s;
- unsigned long offset = ntohl(entry->offset);
+ if (write_sha1_file(buf, size, type, sha1) < 0)
+ die("failed to write object");
+ added_object(sha1, type, buf, size);
+}
- kind = pack[0];
- size = (pack[1] << 24) + (pack[2] << 16) + (pack[3] << 8) + pack[4];
- printf("%s %c %lu\n", sha1_to_hex(entry->sha1), kind, size);
- pack += 5;
+static int resolve_delta(const char *type,
+ void *base, unsigned long base_size,
+ void *delta, unsigned long delta_size)
+{
+ void *result;
+ unsigned long result_size;
- buffer = xmalloc(size + 1);
- buffer[size] = 0;
- memset(&stream, 0, sizeof(stream));
- stream.next_in = pack;
- stream.avail_in = pack_size - offset; /* sheesh. */
- stream.next_out = buffer;
- stream.avail_out = size;
+ result = patch_delta(base, base_size,
+ delta, delta_size,
+ &result_size);
+ if (!result)
+ die("failed to apply delta");
+ free(delta);
+ write_object(result, result_size, type);
+ free(result);
+ return 0;
+}
- inflateInit(&stream);
- st = inflate(&stream, Z_FINISH);
- inflateEnd(&stream);
- if ((st != Z_STREAM_END) || stream.total_out != size)
- goto err_finish;
- switch (kind) {
- case 'C': type_s = "commit"; break;
- case 'T': type_s = "tree"; break;
- case 'B': type_s = "blob"; break;
- default: goto err_finish;
+static void added_object(unsigned char *sha1, const char *type, void *data, unsigned long size)
+{
+ struct delta_info **p = &delta_list;
+ struct delta_info *info;
+
+ while ((info = *p) != NULL) {
+ if (!memcmp(info->base_sha1, sha1, 20)) {
+ *p = info->next;
+ p = &delta_list;
+ resolve_delta(type, data, size, info->delta, info->size);
+ free(info);
+ continue;
+ }
+ p = &info->next;
}
- if (write_sha1_file(buffer, size, type_s, sha1) < 0)
- die("failed to write %s (%s)",
- sha1_to_hex(entry->sha1), type_s);
- printf("%s %s\n", sha1_to_hex(sha1), type_s);
- if (memcmp(sha1, entry->sha1, 20))
- die("resulting %s have wrong SHA1", type_s);
-
- finish:
- st = 0;
- free(buffer);
- return st;
- err_finish:
- st = -1;
- goto finish;
}
-static int find_pack_entry(unsigned char *sha1, struct pack_entry **ent)
+static int unpack_non_delta_entry(enum object_type kind, unsigned long size)
{
- int *level1_ofs = index_base;
- int hi = ntohl(level1_ofs[*sha1]);
- int lo = ((*sha1 == 0x0) ? 0 : ntohl(level1_ofs[*sha1 - 1]));
- void *index = index_base + 4*256;
+ void *buf = get_data(size);
+ const char *type;
- do {
- int mi = (lo + hi) / 2;
- int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
- if (!cmp) {
- *ent = index + 24 * mi;
- return 1;
- }
- if (cmp < 0)
- hi = mi;
- else
- lo = mi;
- } while (lo < hi);
+ switch (kind) {
+ 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)
+ write_object(buf, size, type);
+ free(buf);
return 0;
}
-/* forward declaration for a mutually recursive function */
-static void unpack_entry(struct pack_entry *);
-
-static int unpack_delta_entry(struct pack_entry *entry, unsigned char *pack)
+static int unpack_delta_entry(unsigned long delta_size)
{
- void *delta_data, *result, *base;
- unsigned long delta_alloc, delta_size, result_size, base_size;
- z_stream stream;
- int st;
+ void *delta_data, *base;
+ unsigned long base_size;
char type[20];
- unsigned char sha1[20];
-
- printf("%s D", sha1_to_hex(entry->sha1));
- printf(" %s\n", sha1_to_hex(pack+1));
-
- /* pack+1 is the base sha1, unless we have it, we need to
- * unpack it first.
- */
- if (!has_sha1_file(pack+1)) {
- struct pack_entry *base;
- if (!find_pack_entry(pack+1, &base))
- die("cannot find delta-pack base object");
- unpack_entry(base);
- }
+ unsigned char base_sha1[20];
+ int result;
- /* pack+1 thru pack+20 is the base sha1 and
- * pack+21 thru unknown number is the delta data.
- * we do not even have size of the delta data uncompressed.
- * sheesh!
- */
- delta_alloc = 1024;
- delta_data = xmalloc(delta_alloc);
-
- memset(&stream, 0, sizeof(stream));
-
- stream.next_in = pack + 21;
- stream.avail_in = pack_size - ntohl(entry->offset); /* sheesh. */
- stream.next_out = delta_data;
- stream.avail_out = delta_alloc;
- delta_size = 0;
-
- inflateInit(&stream);
- while (1) {
- st = inflate(&stream, Z_FINISH);
- if (st == Z_STREAM_END) {
- delta_size = stream.total_out;
- break;
- }
- if (st < 0)
- break;
+ memcpy(base_sha1, fill(20), 20);
+ use(20);
- if (delta_alloc <= stream.total_out) {
- delta_alloc = (delta_alloc +1024) * 3 / 2;
- delta_data = xrealloc(delta_data, delta_alloc);
- stream.next_out = delta_data + stream.total_out;
- stream.avail_out = delta_alloc - stream.total_out;
- }
- }
- inflateEnd(&stream);
- if (st != Z_STREAM_END) {
+ delta_data = get_data(delta_size);
+ if (dry_run) {
free(delta_data);
- return -1;
+ return 0;
}
- base = read_sha1_file(pack+1, type, &base_size);
+ if (!has_sha1_file(base_sha1)) {
+ add_delta_to_list(base_sha1, delta_data, delta_size);
+ return 0;
+ }
+ base = read_sha1_file(base_sha1, type, &base_size);
if (!base)
- die("failed to read delta-pack base object");
- result = patch_delta(base, base_size,
- delta_data, delta_size,
- &result_size);
- if (!result)
- die("failed to apply delta");
- free(delta_data);
-
- if (write_sha1_file(result, result_size, type, sha1) < 0)
- die("failed to write %s (%s)",
- sha1_to_hex(entry->sha1), type);
- free(result);
- printf("%s %s\n", sha1_to_hex(sha1), type);
- if (memcmp(sha1, entry->sha1, 20))
- die("resulting %s have wrong SHA1", type);
- return 0;
+ die("failed to read delta-pack base object %s", sha1_to_hex(base_sha1));
+ result = resolve_delta(type, base, base_size, delta_data, delta_size);
+ free(base);
+ return result;
}
-static void unpack_entry(struct pack_entry *entry)
+static void unpack_one(unsigned nr, unsigned total)
{
- unsigned long offset;
- unsigned char *pack;
-
- /* Have we done this one already due to deltas based on it? */
- if (lookup_object(entry->sha1))
+ unsigned shift;
+ unsigned char *pack, c;
+ unsigned long size;
+ enum object_type type;
+
+ pack = fill(1);
+ c = *pack;
+ use(1);
+ type = (c >> 4) & 7;
+ size = (c & 15);
+ shift = 4;
+ while (c & 0x80) {
+ pack = fill(1);
+ c = *pack++;
+ use(1);
+ size += (c & 0x7f) << shift;
+ shift += 7;
+ }
+ if (!quiet) {
+ static unsigned long last_sec;
+ static unsigned last_percent;
+ struct timeval now;
+ unsigned percentage = (nr * 100) / total;
+
+ gettimeofday(&now, NULL);
+ if (percentage != last_percent || now.tv_sec != last_sec) {
+ last_sec = now.tv_sec;
+ last_percent = percentage;
+ fprintf(stderr, "%4u%% (%u/%u) done\r", percentage, nr, total);
+ }
+ }
+ switch (type) {
+ case OBJ_COMMIT:
+ case OBJ_TREE:
+ case OBJ_BLOB:
+ case OBJ_TAG:
+ unpack_non_delta_entry(type, size);
+ return;
+ case OBJ_DELTA:
+ unpack_delta_entry(size);
return;
-
- offset = ntohl(entry->offset);
- if (offset > pack_size - 5)
- die("object offset outside of pack file");
- pack = pack_base + offset;
- offset = pack_size - offset;
- switch (*pack) {
- case 'C': case 'T': case 'B':
- unpack_non_delta_entry(entry, pack);
- break;
- case 'D':
- unpack_delta_entry(entry, pack);
- break;
default:
- die("corrupted pack file");
+ die("bad object type %d", type);
}
}
*/
static void unpack_all(void)
{
- int i = nr_entries;
-
- while (--i >= 0) {
- struct pack_entry *entry = pack_list[i];
- unpack_entry(entry);
- }
+ int i;
+ struct pack_header *hdr = fill(sizeof(struct pack_header));
+ unsigned nr_objects = ntohl(hdr->hdr_entries);
+
+ if (ntohl(hdr->hdr_signature) != PACK_SIGNATURE)
+ die("bad pack file");
+ 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+1, nr_objects);
+ if (delta_list)
+ die("unresolved deltas left after unpacking");
}
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];
dry_run = 1;
continue;
}
+ if (!strcmp(arg, "-q")) {
+ quiet = 1;
+ continue;
+ }
usage(unpack_usage);
}
- if (base_name)
- usage(unpack_usage);
- base_name = arg;
- }
- if (!base_name)
+
+ /* We don't take any non-flag arguments now.. Maybe some day */
usage(unpack_usage);
- index_base = map_file("idx", &index_size);
- pack_base = map_file("pack", &pack_size);
- if (check_index() < 0)
- die("bad index file");
+ }
+ SHA1_Init(&ctx);
unpack_all();
+ SHA1_Update(&ctx, buffer, offset);
+ SHA1_Final(sha1, &ctx);
+ if (memcmp(fill(20), sha1, 20))
+ die("final sha1 did not match");
+ use(20);
+
+ /* Write the last part of the buffer to stdout */
+ while (len) {
+ int ret = xwrite(1, buffer + offset, len);
+ if (ret <= 0)
+ break;
+ len -= ret;
+ offset += ret;
+ }
+
+ /* All done */
+ if (!quiet)
+ fprintf(stderr, "\n");
return 0;
}