X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=fsck-cache.c;h=3fbcd2c7e99fa5e27fa7edad0e2bd65d3b557fe7;hb=aa1c48df8172f844455cc12f25aa49be8ffdd828;hp=0a97566e87480b4e839c692d5d3a405b0cf3643b;hpb=1ea34e365b1ea233be332245bc34a8df415a7d61;p=git.git

diff --git a/fsck-cache.c b/fsck-cache.c
index 0a97566e..3fbcd2c7 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -3,37 +3,80 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-/*
- * These two functions should build up a graph in memory about
- * what objects we've referenced, and found, and types..
- *
- * Right now we don't do that kind of reachability checking. Yet.
- */
-static void mark_needs_sha1(unsigned char *parent, const char * type, unsigned char *child)
+#include "revision.h"
+
+static int show_unreachable = 0;
+static unsigned char head_sha1[20];
+
+static void check_connectivity(void)
+{
+	int i;
+
+	/* Look up all the requirements, warn about missing objects.. */
+	for (i = 0; i < nr_revs; i++) {
+		struct revision *rev = revs[i];
+
+		if (show_unreachable && !(rev->flags & REACHABLE)) {
+			printf("unreachable %s\n", sha1_to_hex(rev->sha1));
+			continue;
+		}
+
+		switch (rev->flags & (SEEN | USED)) {
+		case 0:
+			printf("bad %s\n", sha1_to_hex(rev->sha1));
+			break;
+		case USED:
+			printf("missing %s\n", sha1_to_hex(rev->sha1));
+			break;
+		case SEEN:
+			printf("dangling %s\n", sha1_to_hex(rev->sha1));
+			break;
+		}
+	}
+}
+
+static void mark_needs_sha1(unsigned char *parent, const char * tag, unsigned char *child)
 {
+	struct revision * child_rev = add_relationship(lookup_rev(parent), child);
+	child_rev->flags |= USED;
 }
 
 static int mark_sha1_seen(unsigned char *sha1, char *tag)
 {
+	struct revision *rev = lookup_rev(sha1);
+
+	rev->flags |= SEEN;
 	return 0;
 }
 
 static int fsck_tree(unsigned char *sha1, void *data, unsigned long size)
 {
+	int warn_old_tree = 1;
+
 	while (size) {
 		int len = 1+strlen(data);
 		unsigned char *file_sha1 = data + len;
 		char *path = strchr(data, ' ');
-		if (size < len + 20 || !path)
+		unsigned int mode;
+		if (size < len + 20 || !path || sscanf(data, "%o", &mode) != 1)
 			return -1;
+
+		/* Warn about trees that don't do the recursive thing.. */
+		if (warn_old_tree && strchr(path, '/')) {
+			fprintf(stderr, "warning: fsck-cache: tree %s has full pathnames in it\n", sha1_to_hex(sha1));
+			warn_old_tree = 0;
+		}
+
 		data += len + 20;
 		size -= len + 20;
-		mark_needs_sha1(sha1, "blob", file_sha1);
+		mark_needs_sha1(sha1, S_ISDIR(mode) ? "tree" : "blob", file_sha1);
 	}
+	return 0;
 }
 
 static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
 {
+	int parents;
 	unsigned char tree_sha1[20];
 	unsigned char parent_sha1[20];
 
@@ -43,12 +86,17 @@ static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
 		return -1;
 	mark_needs_sha1(sha1, "tree", tree_sha1);
 	data += 5 + 40 + 1;	/* "tree " + <hex sha1> + '\n' */
+	parents = 0;
 	while (!memcmp(data, "parent ", 7)) {
 		if (get_sha1_hex(data + 7, parent_sha1) < 0)
 			return -1;
 		mark_needs_sha1(sha1, "commit", parent_sha1);
 		data += 7 + 40 + 1; 	/* "parent " + <hex sha1> + '\n' */
+		parents++;
 	}
+	if (!parents)
+		printf("root %s\n", sha1_to_hex(sha1));
+	return 0;
 }
 
 static int fsck_entry(unsigned char *sha1, char *tag, void *data, unsigned long size)
@@ -92,8 +140,7 @@ static int fsck_dir(int i, char *path)
 	struct dirent *de;
 
 	if (!dir) {
-		fprintf(stderr, "missing sha1 directory '%s'", path);
-		return -1;
+		return error("missing sha1 directory '%s'", path);
 	}
 
 	while ((de = readdir(dir)) != NULL) {
@@ -122,16 +169,38 @@ static int fsck_dir(int i, char *path)
 
 int main(int argc, char **argv)
 {
-	int i;
+	int i, heads;
 	char *sha1_dir;
 
-	if (argc != 1)
-		usage("fsck-cache");
 	sha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
 	for (i = 0; i < 256; i++) {
 		static char dir[4096];
 		sprintf(dir, "%s/%02x", sha1_dir, i);
 		fsck_dir(i, dir);
 	}
+
+	heads = 0;
+	for (i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "--unreachable")) {
+			show_unreachable = 1;
+			continue;
+		}
+		if (!get_sha1_hex(argv[i], head_sha1)) {
+			mark_reachable(lookup_rev(head_sha1));
+			heads++;
+			continue;
+		}
+		error("fsck-cache [[--unreachable] <head-sha1>*]");
+	}
+
+	if (!heads) {
+		if (show_unreachable) {
+			fprintf(stderr, "unable to do reachability without a head\n");
+			show_unreachable = 0; 
+		}
+		fprintf(stderr, "expect dangling commits - potential heads - due to lack of head information\n");
+	}
+
+	check_connectivity();
 	return 0;
 }