#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 const char unpack_usage[] = "git-unpack-objects < pack-file";
+#include <sys/time.h>
+
+static int dry_run, quiet;
+static const char unpack_usage[] = "git-unpack-objects [-n] [-q] < pack-file";
/* We always read in 4kB chunks. */
static unsigned char buffer[4096];
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;
z_stream stream;
void *buf = xmalloc(size);
- if (!size)
- return buf;
memset(&stream, 0, sizeof(stream));
stream.next_out = buf;
stream.next_in = fill(1);
stream.avail_in = len;
}
+ inflateEnd(&stream);
return buf;
}
delta_list = info;
}
-static void added_object(unsigned char *sha1, char *type, void *data, unsigned long size);
+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)
+{
+ unsigned char sha1[20];
+ if (write_sha1_file(buf, size, type, sha1) < 0)
+ die("failed to write object");
+ added_object(sha1, type, buf, size);
+}
-static int resolve_delta(char *type,
+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;
- unsigned char sha1[20];
result = patch_delta(base, base_size,
delta, delta_size,
if (!result)
die("failed to apply delta");
free(delta);
-
- if (write_sha1_file(result, result_size, type, sha1) < 0)
- die("failed to write object");
- added_object(sha1, type, result, result_size);
+ write_object(result, result_size, type);
free(result);
return 0;
}
-static void added_object(unsigned char *sha1, char *type, void *data, unsigned long size)
+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;
static int unpack_non_delta_entry(enum object_type kind, unsigned long size)
{
void *buf = get_data(size);
- unsigned char sha1[20];
- char *type;
+ 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 (write_sha1_file(buf, size, type, sha1) < 0)
- die("failed to write object");
- added_object(sha1, type, buf, size);
+ if (!dry_run)
+ write_object(buf, size, type);
free(buf);
return 0;
}
unsigned long base_size;
char type[20];
unsigned char base_sha1[20];
+ int result;
memcpy(base_sha1, fill(20), 20);
use(20);
delta_data = get_data(delta_size);
+ if (dry_run) {
+ free(delta_data);
+ return 0;
+ }
if (!has_sha1_file(base_sha1)) {
add_delta_to_list(base_sha1, delta_data, 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(void)
+static void unpack_one(unsigned nr, unsigned total)
{
unsigned shift;
unsigned char *pack, c;
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:
{
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();
+ unpack_one(i+1, nr_objects);
if (delta_list)
die("unresolved deltas left after unpacking");
}
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);
}
/* Write the last part of the buffer to stdout */
while (len) {
- int ret = write(1, buffer + offset, len);
- if (!ret)
+ int ret = xwrite(1, buffer + offset, len);
+ if (ret <= 0)
break;
- if (ret < 0) {
- if (errno == EAGAIN || errno == EINTR)
- continue;
- break;
- }
len -= ret;
offset += ret;
}
/* All done */
+ if (!quiet)
+ fprintf(stderr, "\n");
return 0;
}