2006-08-03 17:24:37 +02:00
|
|
|
#include "builtin.h"
|
2005-06-26 00:27:14 +02:00
|
|
|
#include "cache.h"
|
2005-06-26 00:59:31 +02:00
|
|
|
#include "object.h"
|
2005-06-26 13:29:18 +02:00
|
|
|
#include "delta.h"
|
2005-06-28 23:21:02 +02:00
|
|
|
#include "pack.h"
|
2006-04-02 14:44:09 +02:00
|
|
|
#include "blob.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tag.h"
|
|
|
|
#include "tree.h"
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2005-07-09 19:43:02 +02:00
|
|
|
#include <sys/time.h>
|
|
|
|
|
2006-09-04 07:55:54 +02:00
|
|
|
static int dry_run, quiet, desperate, has_errors;
|
2005-11-15 00:20:01 +01:00
|
|
|
static const char unpack_usage[] = "git-unpack-objects [-n] [-q] < pack-file";
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
/* We always read in 4kB chunks. */
|
|
|
|
static unsigned char buffer[4096];
|
2006-08-29 12:50:29 +02:00
|
|
|
static unsigned long offset, len;
|
2005-06-29 05:34:23 +02:00
|
|
|
static SHA_CTX ctx;
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
/*
|
|
|
|
* Make sure at least "min" bytes are available in the buffer, and
|
|
|
|
* return the pointer to the buffer.
|
|
|
|
*/
|
|
|
|
static void * fill(int min)
|
|
|
|
{
|
|
|
|
if (min <= len)
|
|
|
|
return buffer + offset;
|
|
|
|
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 {
|
2005-12-20 01:18:28 +01:00
|
|
|
int ret = xread(0, buffer + len, sizeof(buffer) - len);
|
2005-06-29 05:34:23 +02:00
|
|
|
if (ret <= 0) {
|
|
|
|
if (!ret)
|
|
|
|
die("early EOF");
|
|
|
|
die("read error on input: %s", strerror(errno));
|
|
|
|
}
|
|
|
|
len += ret;
|
|
|
|
} while (len < min);
|
|
|
|
return buffer;
|
|
|
|
}
|
2005-06-26 00:59:31 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
static void use(int bytes)
|
|
|
|
{
|
|
|
|
if (bytes > len)
|
|
|
|
die("used more bytes than were available");
|
|
|
|
len -= bytes;
|
|
|
|
offset += bytes;
|
|
|
|
}
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
static void *get_data(unsigned long size)
|
2005-06-26 00:27:14 +02:00
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
z_stream stream;
|
|
|
|
void *buf = xmalloc(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;
|
2006-09-04 07:55:54 +02:00
|
|
|
if (ret != Z_OK) {
|
|
|
|
error("inflate returned %d\n", ret);
|
|
|
|
free(buf);
|
|
|
|
buf = NULL;
|
|
|
|
if (!desperate)
|
|
|
|
exit(1);
|
|
|
|
has_errors = 1;
|
|
|
|
break;
|
|
|
|
}
|
2005-06-29 05:34:23 +02:00
|
|
|
stream.next_in = fill(1);
|
|
|
|
stream.avail_in = len;
|
|
|
|
}
|
2005-08-03 14:11:00 +02:00
|
|
|
inflateEnd(&stream);
|
2005-06-29 05:34:23 +02:00
|
|
|
return buf;
|
2005-06-26 00:27:14 +02:00
|
|
|
}
|
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
struct delta_info {
|
|
|
|
unsigned char base_sha1[20];
|
|
|
|
unsigned long size;
|
|
|
|
void *delta;
|
|
|
|
struct delta_info *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct delta_info *delta_list;
|
|
|
|
|
|
|
|
static void add_delta_to_list(unsigned char *base_sha1, void *delta, unsigned long size)
|
2005-06-26 00:27:14 +02:00
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
struct delta_info *info = xmalloc(sizeof(*info));
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2006-08-23 08:49:00 +02:00
|
|
|
hashcpy(info->base_sha1, base_sha1);
|
2005-06-29 05:34:23 +02:00
|
|
|
info->size = size;
|
|
|
|
info->delta = delta;
|
|
|
|
info->next = delta_list;
|
|
|
|
delta_list = info;
|
2005-06-26 00:27:14 +02:00
|
|
|
}
|
|
|
|
|
2005-06-29 18:38:02 +02:00
|
|
|
static void added_object(unsigned char *sha1, const char *type, void *data, unsigned long size);
|
2005-06-29 05:34:23 +02:00
|
|
|
|
2005-06-29 18:38:02 +02:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2006-09-04 07:55:54 +02:00
|
|
|
static void resolve_delta(const char *type,
|
|
|
|
void *base, unsigned long base_size,
|
|
|
|
void *delta, unsigned long delta_size)
|
2005-06-26 00:27:14 +02:00
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
void *result;
|
|
|
|
unsigned long result_size;
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
result = patch_delta(base, base_size,
|
|
|
|
delta, delta_size,
|
|
|
|
&result_size);
|
|
|
|
if (!result)
|
|
|
|
die("failed to apply delta");
|
|
|
|
free(delta);
|
2005-06-29 18:38:02 +02:00
|
|
|
write_object(result, result_size, type);
|
2005-06-29 05:34:23 +02:00
|
|
|
free(result);
|
2005-06-26 00:27:14 +02:00
|
|
|
}
|
|
|
|
|
2005-06-29 18:38:02 +02:00
|
|
|
static void added_object(unsigned char *sha1, const char *type, void *data, unsigned long size)
|
2005-06-26 00:59:31 +02:00
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
struct delta_info **p = &delta_list;
|
|
|
|
struct delta_info *info;
|
|
|
|
|
|
|
|
while ((info = *p) != NULL) {
|
2006-08-17 20:54:57 +02:00
|
|
|
if (!hashcmp(info->base_sha1, sha1)) {
|
2005-06-29 05:34:23 +02:00
|
|
|
*p = info->next;
|
|
|
|
p = &delta_list;
|
|
|
|
resolve_delta(type, data, size, info->delta, info->size);
|
|
|
|
free(info);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
p = &info->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-04 07:55:54 +02:00
|
|
|
static void unpack_non_delta_entry(enum object_type kind, unsigned long size)
|
2005-06-29 05:34:23 +02:00
|
|
|
{
|
|
|
|
void *buf = get_data(size);
|
2005-06-29 18:38:02 +02:00
|
|
|
const char *type;
|
2005-06-26 13:29:18 +02:00
|
|
|
|
|
|
|
switch (kind) {
|
2006-04-02 14:44:09 +02:00
|
|
|
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;
|
2005-06-29 05:34:23 +02:00
|
|
|
default: die("bad type %d", kind);
|
2005-06-26 13:29:18 +02:00
|
|
|
}
|
2006-09-04 07:55:54 +02:00
|
|
|
if (!dry_run && buf)
|
2005-06-29 18:53:20 +02:00
|
|
|
write_object(buf, size, type);
|
2005-06-29 05:34:23 +02:00
|
|
|
free(buf);
|
2005-06-26 13:29:18 +02:00
|
|
|
}
|
|
|
|
|
2006-09-04 07:55:54 +02:00
|
|
|
static void unpack_delta_entry(unsigned long delta_size)
|
2005-06-26 13:29:18 +02:00
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
void *delta_data, *base;
|
|
|
|
unsigned long base_size;
|
2005-06-26 13:29:18 +02:00
|
|
|
char type[20];
|
2005-06-29 05:34:23 +02:00
|
|
|
unsigned char base_sha1[20];
|
2005-06-26 13:29:18 +02:00
|
|
|
|
2006-08-23 08:49:00 +02:00
|
|
|
hashcpy(base_sha1, fill(20));
|
2005-06-29 05:34:23 +02:00
|
|
|
use(20);
|
2005-06-26 17:40:08 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
delta_data = get_data(delta_size);
|
2006-09-04 07:55:54 +02:00
|
|
|
if (dry_run || !delta_data) {
|
2005-06-29 18:53:20 +02:00
|
|
|
free(delta_data);
|
2006-09-04 07:55:54 +02:00
|
|
|
return;
|
2005-06-29 18:53:20 +02:00
|
|
|
}
|
2005-06-26 13:29:18 +02:00
|
|
|
|
2005-06-26 17:40:08 +02:00
|
|
|
if (!has_sha1_file(base_sha1)) {
|
2005-06-29 05:34:23 +02:00
|
|
|
add_delta_to_list(base_sha1, delta_data, delta_size);
|
2006-09-04 07:55:54 +02:00
|
|
|
return;
|
2005-06-26 13:29:18 +02:00
|
|
|
}
|
2005-06-26 17:40:08 +02:00
|
|
|
base = read_sha1_file(base_sha1, type, &base_size);
|
2006-09-04 07:55:54 +02:00
|
|
|
if (!base) {
|
|
|
|
error("failed to read delta-pack base object %s",
|
|
|
|
sha1_to_hex(base_sha1));
|
|
|
|
if (!desperate)
|
|
|
|
exit(1);
|
|
|
|
has_errors = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
resolve_delta(type, base, base_size, delta_data, delta_size);
|
2005-08-03 14:11:00 +02:00
|
|
|
free(base);
|
2005-06-26 13:29:18 +02:00
|
|
|
}
|
|
|
|
|
2005-07-09 19:43:02 +02:00
|
|
|
static void unpack_one(unsigned nr, unsigned total)
|
2005-06-26 13:29:18 +02:00
|
|
|
{
|
2005-06-29 07:15:57 +02:00
|
|
|
unsigned shift;
|
2005-06-28 23:21:02 +02:00
|
|
|
unsigned char *pack, c;
|
2005-06-29 05:34:23 +02:00
|
|
|
unsigned long size;
|
|
|
|
enum object_type type;
|
2005-06-26 00:59:31 +02:00
|
|
|
|
2005-06-29 05:34:23 +02:00
|
|
|
pack = fill(1);
|
|
|
|
c = *pack;
|
|
|
|
use(1);
|
2005-06-28 23:21:02 +02:00
|
|
|
type = (c >> 4) & 7;
|
|
|
|
size = (c & 15);
|
2005-06-29 07:15:57 +02:00
|
|
|
shift = 4;
|
2005-06-28 23:21:02 +02:00
|
|
|
while (c & 0x80) {
|
2005-06-29 05:34:23 +02:00
|
|
|
pack = fill(1);
|
2005-06-28 23:21:02 +02:00
|
|
|
c = *pack++;
|
2005-06-29 05:34:23 +02:00
|
|
|
use(1);
|
2005-06-29 07:15:57 +02:00
|
|
|
size += (c & 0x7f) << shift;
|
|
|
|
shift += 7;
|
2005-06-28 23:21:02 +02:00
|
|
|
}
|
2005-07-09 19:43:02 +02:00
|
|
|
if (!quiet) {
|
|
|
|
static unsigned long last_sec;
|
|
|
|
static unsigned last_percent;
|
|
|
|
struct timeval now;
|
2005-07-11 01:14:22 +02:00
|
|
|
unsigned percentage = (nr * 100) / total;
|
2005-07-09 19:43:02 +02:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
2005-06-28 23:21:02 +02:00
|
|
|
switch (type) {
|
|
|
|
case OBJ_COMMIT:
|
|
|
|
case OBJ_TREE:
|
|
|
|
case OBJ_BLOB:
|
|
|
|
case OBJ_TAG:
|
2005-06-29 05:34:23 +02:00
|
|
|
unpack_non_delta_entry(type, size);
|
2005-06-28 23:21:02 +02:00
|
|
|
return;
|
|
|
|
case OBJ_DELTA:
|
2005-06-29 05:34:23 +02:00
|
|
|
unpack_delta_entry(size);
|
2005-06-28 23:21:02 +02:00
|
|
|
return;
|
2005-06-29 05:34:23 +02:00
|
|
|
default:
|
2006-09-04 07:55:54 +02:00
|
|
|
error("bad object type %d", type);
|
|
|
|
has_errors = 1;
|
|
|
|
if (desperate)
|
|
|
|
return;
|
|
|
|
exit(1);
|
2005-06-26 00:59:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void unpack_all(void)
|
|
|
|
{
|
2005-06-29 05:34:23 +02:00
|
|
|
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");
|
2006-02-09 23:50:04 +01:00
|
|
|
if (!pack_version_ok(hdr->hdr_version))
|
|
|
|
die("unknown pack file version %d", ntohl(hdr->hdr_version));
|
2005-06-29 05:34:23 +02:00
|
|
|
fprintf(stderr, "Unpacking %d objects\n", nr_objects);
|
|
|
|
|
|
|
|
use(sizeof(struct pack_header));
|
|
|
|
for (i = 0; i < nr_objects; i++)
|
2005-07-11 01:14:22 +02:00
|
|
|
unpack_one(i+1, nr_objects);
|
2005-06-29 05:34:23 +02:00
|
|
|
if (delta_list)
|
|
|
|
die("unresolved deltas left after unpacking");
|
2005-06-26 00:59:31 +02:00
|
|
|
}
|
|
|
|
|
2006-08-03 17:24:37 +02:00
|
|
|
int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
|
2005-06-26 00:27:14 +02:00
|
|
|
{
|
|
|
|
int i;
|
2005-06-29 05:34:23 +02:00
|
|
|
unsigned char sha1[20];
|
2005-06-26 00:27:14 +02:00
|
|
|
|
2006-07-18 00:10:10 +02:00
|
|
|
git_config(git_default_config);
|
2005-11-26 09:50:02 +01:00
|
|
|
|
2006-01-07 03:53:16 +01:00
|
|
|
quiet = !isatty(2);
|
|
|
|
|
2005-06-26 00:27:14 +02:00
|
|
|
for (i = 1 ; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
|
|
|
|
|
|
|
if (*arg == '-') {
|
2005-06-26 00:59:31 +02:00
|
|
|
if (!strcmp(arg, "-n")) {
|
|
|
|
dry_run = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-07-09 19:43:02 +02:00
|
|
|
if (!strcmp(arg, "-q")) {
|
|
|
|
quiet = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2006-09-04 07:55:54 +02:00
|
|
|
if (!strcmp(arg, "-r")) {
|
|
|
|
desperate = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-26 00:27:14 +02:00
|
|
|
usage(unpack_usage);
|
|
|
|
}
|
2005-06-29 05:34:23 +02:00
|
|
|
|
|
|
|
/* We don't take any non-flag arguments now.. Maybe some day */
|
2005-06-26 00:27:14 +02:00
|
|
|
usage(unpack_usage);
|
2005-06-29 05:34:23 +02:00
|
|
|
}
|
|
|
|
SHA1_Init(&ctx);
|
2005-06-26 00:59:31 +02:00
|
|
|
unpack_all();
|
2005-06-29 05:34:23 +02:00
|
|
|
SHA1_Update(&ctx, buffer, offset);
|
|
|
|
SHA1_Final(sha1, &ctx);
|
2006-08-17 20:54:57 +02:00
|
|
|
if (hashcmp(fill(20), sha1))
|
2005-06-29 05:34:23 +02:00
|
|
|
die("final sha1 did not match");
|
|
|
|
use(20);
|
|
|
|
|
|
|
|
/* Write the last part of the buffer to stdout */
|
|
|
|
while (len) {
|
2005-12-20 01:18:28 +01:00
|
|
|
int ret = xwrite(1, buffer + offset, len);
|
|
|
|
if (ret <= 0)
|
2005-06-29 05:34:23 +02:00
|
|
|
break;
|
|
|
|
len -= ret;
|
|
|
|
offset += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* All done */
|
2005-07-09 19:43:02 +02:00
|
|
|
if (!quiet)
|
|
|
|
fprintf(stderr, "\n");
|
2006-09-04 07:55:54 +02:00
|
|
|
return has_errors;
|
2005-06-26 00:27:14 +02:00
|
|
|
}
|