[PATCH] fork optional branch point normazilation

diff --git a/fsck-cache.c b/fsck-cache.c
index c35acaa82c93824f952327e12727d0c92edc5bd7..b8b66d7d1d5cd4d1795e53a0ff04ae1693498eab 100644 (file)
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -3,18 +3,49 @@
 #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 %s\n", rev->tag, sha1_to_hex(rev->sha1));
+                       continue;
+               }
+
+               switch (rev->flags & (SEEN | USED)) {
+               case 0:
+                       printf("bad %s %s\n", rev->tag, sha1_to_hex(rev->sha1));
+                       break;
+               case USED:
+                       printf("missing %s, %s\n", rev->tag, sha1_to_hex(rev->sha1));
+                       break;
+               case SEEN:
+                       printf("dangling %s %s\n", rev->tag, sha1_to_hex(rev->sha1));
+                       break;
+               }
+       }
+}
+
+static void mark_needs_sha1(unsigned char *parent, const char *ptag, unsigned char *child, const char *ctag)
 {
+       struct revision * child_rev = add_relationship(lookup_rev(parent, ptag), child, ctag);
+       child_rev->flags |= USED;
 }
 
-static int mark_sha1_seen(unsigned char *sha1, char *tag)
+static int mark_sha1_seen(unsigned char *sha1, const char *tag)
 {
+       struct revision *rev = lookup_rev(sha1, tag);
+
+       rev->flags |= SEEN;
        return 0;
 }
 
@@ -38,7 +69,7 @@ static int fsck_tree(unsigned char *sha1, void *data, unsigned long size)
 
                data += len + 20;
                size -= len + 20;
-               mark_needs_sha1(sha1, S_ISDIR(mode) ? "tree" : "blob", file_sha1);
+               mark_needs_sha1(sha1, "tree", file_sha1, S_ISDIR(mode) ? "tree" : "blob");
        }
        return 0;
 }
@@ -53,18 +84,18 @@ static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
                return -1;
        if (get_sha1_hex(data + 5, tree_sha1) < 0)
                return -1;
-       mark_needs_sha1(sha1, "tree", tree_sha1);
+       mark_needs_sha1(sha1, "commit", tree_sha1, "tree");
        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);
+               mark_needs_sha1(sha1, "commit", parent_sha1, "commit");
                data += 7 + 40 + 1;     /* "parent " + <hex sha1> + '\n' */
                parents++;
        }
        if (!parents)
-               printf("root: %s\n", sha1_to_hex(sha1));
+               printf("root %s\n", sha1_to_hex(sha1));
        return 0;
 }
 
@@ -109,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) {
@@ -139,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, "commit"), REACHABLE);
+                       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;
 }