X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=unpack-objects.c;h=8490895cf02df538327fa79bc0b2ffff2f06bd84;hb=f8348be3be8493a62110a09ab0343213990b416b;hp=0d15c0038713bfc5bdd732293a434e7921719e48;hpb=cca7081a93b192219e8f4f7252c7fc7c2cabfd9a;p=git.git

diff --git a/unpack-objects.c b/unpack-objects.c
index 0d15c003..8490895c 100644
--- a/unpack-objects.c
+++ b/unpack-objects.c
@@ -3,8 +3,10 @@
 #include "delta.h"
 #include "pack.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];
@@ -55,8 +57,6 @@ static void *get_data(unsigned long size)
 	z_stream stream;
 	void *buf = xmalloc(size);
 
-	if (!size)
-		return buf;
 	memset(&stream, 0, sizeof(stream));
 
 	stream.next_out = buf;
@@ -75,6 +75,7 @@ static void *get_data(unsigned long size)
 		stream.next_in = fill(1);
 		stream.avail_in = len;
 	}
+	inflateEnd(&stream);
 	return buf;
 }
 
@@ -155,7 +156,8 @@ static int unpack_non_delta_entry(enum object_type kind, unsigned long size)
 	case OBJ_TAG:    type = "tag"; break;
 	default: die("bad type %d", kind);
 	}
-	write_object(buf, size, type);
+	if (!dry_run)
+		write_object(buf, size, type);
 	free(buf);
 	return 0;
 }
@@ -166,11 +168,16 @@ 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);
 
 	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);
@@ -179,10 +186,12 @@ 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(void)
+static void unpack_one(unsigned nr, unsigned total)
 {
 	unsigned shift;
 	unsigned char *pack, c;
@@ -202,6 +211,19 @@ static void unpack_one(void)
 		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:
@@ -237,7 +259,7 @@ static void unpack_all(void)
 
 	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");
 }
@@ -255,6 +277,10 @@ int main(int argc, char **argv)
 				dry_run = 1;
 				continue;
 			}
+			if (!strcmp(arg, "-q")) {
+				quiet = 1;
+				continue;
+			}
 			usage(unpack_usage);
 		}
 
@@ -284,5 +310,7 @@ int main(int argc, char **argv)
 	}
 
 	/* All done */
+	if (!quiet)
+		fprintf(stderr, "\n");
 	return 0;
 }