diff --git a/unpack-objects.c b/unpack-objects.c
index 0d15c0038713bfc5bdd732293a434e7921719e48..19874d004a03531b12922f1bd48a28f18e8d2897 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
#include "delta.h"
#include "pack.h"
#include "delta.h"
#include "pack.h"
-static int dry_run;
+#include <sys/time.h>
+
+static int dry_run, quiet;
static const char unpack_usage[] = "git-unpack-objects < pack-file";
/* We always read in 4kB chunks. */
static const char unpack_usage[] = "git-unpack-objects < pack-file";
/* We always read in 4kB chunks. */
z_stream stream;
void *buf = xmalloc(size);
z_stream stream;
void *buf = xmalloc(size);
- if (!size)
- return buf;
memset(&stream, 0, sizeof(stream));
stream.next_out = buf;
memset(&stream, 0, sizeof(stream));
stream.next_out = buf;
case OBJ_TAG: type = "tag"; break;
default: die("bad type %d", kind);
}
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;
}
free(buf);
return 0;
}
use(20);
delta_data = get_data(delta_size);
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);
if (!has_sha1_file(base_sha1)) {
add_delta_to_list(base_sha1, delta_data, delta_size);
return resolve_delta(type, base, base_size, delta_data, delta_size);
}
return resolve_delta(type, base, base_size, delta_data, delta_size);
}
-static void unpack_one(void)
+static void unpack_one(unsigned nr, unsigned total)
{
unsigned shift;
unsigned char *pack, c;
{
unsigned shift;
unsigned char *pack, c;
size += (c & 0x7f) << shift;
shift += 7;
}
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:
switch (type) {
case OBJ_COMMIT:
case OBJ_TREE:
use(sizeof(struct pack_header));
for (i = 0; i < nr_objects; i++)
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");
}
if (delta_list)
die("unresolved deltas left after unpacking");
}
dry_run = 1;
continue;
}
dry_run = 1;
continue;
}
+ if (!strcmp(arg, "-q")) {
+ quiet = 1;
+ continue;
+ }
usage(unpack_usage);
}
usage(unpack_usage);
}
}
/* All done */
}
/* All done */
+ if (!quiet)
+ fprintf(stderr, "\n");
return 0;
}
return 0;
}