X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=fsck-cache.c;h=3fbcd2c7e99fa5e27fa7edad0e2bd65d3b557fe7;hb=13e897e58072678cdae3ec1db51cc91110dc559d;hp=87366f0e535386771b734f02fe5257a5b0e1c9c9;hpb=f1257f3a33c49ea4f3fd43c7aed97d8a270190dd;p=git.git

diff --git a/fsck-cache.c b/fsck-cache.c
index 87366f0e..3fbcd2c7 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -3,114 +3,49 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-struct needs {
-	unsigned char parent[20];
-	unsigned char needs[20];
-	char tag[10];
-};
+#include "revision.h"
 
-struct seen {
-	unsigned char sha1[20];
-	char tag[10];
-	unsigned needed;
-};
-
-static struct needs *needs;
-static struct seen *seen;
-
-static int nr_seen, alloc_seen, nr_needs, alloc_needs;
-
-/*
- * These two functions build up a graph in memory about
- * what objects we've referenced, and found, and types..
- */
-static int compare_seen(const void *s1, const void *s2)
-{
-	return memcmp(s1, s2, 20);
-}
-
-static int lookup_seen(unsigned char *sha1, char *tag)
-{
-	int first = 0, last = nr_seen;
-
-	while (last > first) {
-		int next = (last + first) / 2;
-		struct seen *s = seen + next;
-		int cmp = memcmp(sha1, s->sha1, 20);
-
-		if (cmp < 0) {
-			last = next;
-			continue;
-		}
-		if (cmp > 0) {
-			first = next+1;
-			continue;
-		}
-		if (strcmp(tag, s->tag))
-			break;
-		s->needed++;
-		return 1;
-	}
-	return 0;
-}
+static int show_unreachable = 0;
+static unsigned char head_sha1[20];
 
 static void check_connectivity(void)
 {
 	int i;
 
-	/* Sort the "seen" tags for quicker lookup */
-	qsort(seen, nr_seen, sizeof(struct seen), compare_seen);
-
 	/* Look up all the requirements, warn about missing objects.. */
-	for (i = 0; i < nr_needs; i++) {
-		struct needs *n = needs + i;
-		char hex[60];
+	for (i = 0; i < nr_revs; i++) {
+		struct revision *rev = revs[i];
 
-		if (lookup_seen(n->needs, n->tag))
+		if (show_unreachable && !(rev->flags & REACHABLE)) {
+			printf("unreachable %s\n", sha1_to_hex(rev->sha1));
 			continue;
-		strcpy(hex, sha1_to_hex(n->parent));
-		printf("missing %s: %s referenced by %s\n", n->tag, sha1_to_hex(n->needs), hex);
-	}
-
-	/* Tell the user about things not referenced.. */
-	for (i = 0; i < nr_seen; i++) {
-		struct seen *s = seen + i;
+		}
 
-		if (s->needed)
-			continue;
-		printf("unreferenced %s: %s\n", s->tag, sha1_to_hex(s->sha1));
+		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 needs *n;
-
-	if (nr_needs == alloc_needs) {
-		alloc_needs = alloc_nr(alloc_needs);
-		needs = realloc(needs, alloc_needs*sizeof(struct needs));
-	}
-	n = needs + nr_needs;
-	nr_needs++;
-	memcpy(n->parent, parent, 20);
-	memcpy(n->needs, child, 20);
-	strncpy(n->tag, tag, sizeof(n->tag));
+	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 seen *s;
+	struct revision *rev = lookup_rev(sha1);
 
-	if (nr_seen == alloc_seen) {
-		alloc_seen = alloc_nr(alloc_seen);
-		seen = realloc(seen, alloc_seen*sizeof(struct seen));
-	}
-	s = seen + nr_seen;
-	memset(s, 0, sizeof(s));
-	nr_seen++;
-	memcpy(s->sha1, sha1, 20);
-	strncpy(s->tag, tag, sizeof(s->tag));
-	
+	rev->flags |= SEEN;
 	return 0;
 }
 
@@ -160,7 +95,7 @@ static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
 		parents++;
 	}
 	if (!parents)
-		printf("root: %s\n", sha1_to_hex(sha1));
+		printf("root %s\n", sha1_to_hex(sha1));
 	return 0;
 }
 
@@ -205,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) {
@@ -235,17 +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;
 }