X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=pack-check.c;h=84ed90d36912fc4ad6589cd2792e85a470418d04;hb=bb996614de4fddfa73286479f3c6a901107a2629;hp=9c723972b7081df1b893f1c79b075166fa0f0752;hpb=f3bf92240956241e6b21e80a1c281ec7716b9f23;p=git.git

diff --git a/pack-check.c b/pack-check.c
index 9c723972..84ed90d3 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -15,10 +15,10 @@ static int verify_packfile(struct packed_git *p)
 	/* Header consistency check */
 	hdr = p->pack_base;
 	if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
-		return error("Packfile signature mismatch", p->pack_name);
-	if (hdr->hdr_version != htonl(PACK_VERSION))
-		return error("Packfile version %d different from ours %d",
-			     ntohl(hdr->hdr_version), PACK_VERSION);
+		return error("Packfile %s signature mismatch", p->pack_name);
+	if (!pack_version_ok(hdr->hdr_version))
+		return error("Packfile version %d unsupported",
+			     ntohl(hdr->hdr_version));
 	nr_objects = ntohl(hdr->hdr_entries);
 	if (num_packed_objects(p) != nr_objects)
 		return error("Packfile claims to have %d objects, "
@@ -58,7 +58,7 @@ static int verify_packfile(struct packed_git *p)
 			continue;
 		}
 		if (check_sha1_signature(sha1, data, size, type)) {
-			err = error("cannot packed %s from %s corrupt",
+			err = error("packed %s from %s is corrupt",
 				    sha1_to_hex(sha1), p->pack_name);
 			free(data);
 			continue;
@@ -70,9 +70,56 @@ static int verify_packfile(struct packed_git *p)
 }
 
 
+#define MAX_CHAIN 40
+
 static void show_pack_info(struct packed_git *p)
 {
-	/* Next round */
+	struct pack_header *hdr;
+	int nr_objects, i;
+	unsigned int chain_histogram[MAX_CHAIN];
+
+	hdr = p->pack_base;
+	nr_objects = ntohl(hdr->hdr_entries);
+	memset(chain_histogram, 0, sizeof(chain_histogram));
+
+	for (i = 0; i < nr_objects; i++) {
+		unsigned char sha1[20], base_sha1[20];
+		struct pack_entry e;
+		char type[20];
+		unsigned long size;
+		unsigned long store_size;
+		unsigned int delta_chain_length;
+
+		if (nth_packed_object_sha1(p, i, sha1))
+			die("internal error pack-check nth-packed-object");
+		if (!find_pack_entry_one(sha1, &e, p))
+			die("internal error pack-check find-pack-entry-one");
+
+		packed_object_info_detail(&e, type, &size, &store_size,
+					  &delta_chain_length,
+					  base_sha1);
+		printf("%s ", sha1_to_hex(sha1));
+		if (!delta_chain_length)
+			printf("%-6s %lu %u\n", type, size, e.offset);
+		else {
+			printf("%-6s %lu %u %u %s\n", type, size, e.offset,
+			       delta_chain_length, sha1_to_hex(base_sha1));
+			if (delta_chain_length < MAX_CHAIN)
+				chain_histogram[delta_chain_length]++;
+			else
+				chain_histogram[0]++;
+		}
+	}
+
+	for (i = 0; i < MAX_CHAIN; i++) {
+		if (!chain_histogram[i])
+			continue;
+		printf("chain length %s %d: %d object%s\n",
+		       i ? "=" : ">=",
+		       i ? i : MAX_CHAIN,
+		       chain_histogram[i],
+		       1 < chain_histogram[i] ? "s" : "");
+	}
 }
 
 int verify_pack(struct packed_git *p, int verbose)
@@ -103,7 +150,9 @@ int verify_pack(struct packed_git *p, int verbose)
 		if (ret)
 			printf("%s: bad\n", p->pack_name);
 		else {
+			use_packed_git(p);
 			show_pack_info(p);
+			unuse_packed_git(p);
 			printf("%s: ok\n", p->pack_name);
 		}
 	}