X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-tree.c;h=3c54769258b82a9384248fbf10530e25d8b2dd8f;hb=d9f98eebcd31e123e859a4b8c6506bf3f3c4bad6;hp=73c9d1f556103f185e64ff9cffb592c05bd59243;hpb=97d9c3cdeafb9f48075987c76373a71e6874c6eb;p=git.git diff --git a/rev-tree.c b/rev-tree.c index 73c9d1f5..3c547692 100644 --- a/rev-tree.c +++ b/rev-tree.c @@ -1,128 +1,89 @@ -#include "cache.h" - -#define SEEN 1 - -struct parent { - struct revision *parent; - struct parent *next; -}; - -struct revision { - unsigned int flags; - unsigned char sha1[20]; - struct parent *parent; -}; - -static struct revision **revs; -static int nr_revs, rev_allocs; - -static int find_rev(unsigned char *sha1) -{ - int first = 0, last = nr_revs; - - while (first < last) { - int next = (first + last) / 2; - struct revision *rev = revs[next]; - int cmp; - - cmp = memcmp(sha1, rev->sha1, 20); - if (!cmp) - return next; - if (cmp < 0) { - last = next; - continue; - } - first = next+1; - } - return -first-1; -} - -static struct revision *lookup_rev(unsigned char *sha1) -{ - int pos = find_rev(sha1); - struct revision *n; - - if (pos >= 0) - return revs[pos]; - - pos = -pos-1; +#define _XOPEN_SOURCE /* glibc2 needs this */ +#define _BSD_SOURCE /* for tm.tm_gmtoff */ +#include +#include - if (rev_allocs == nr_revs) { - rev_allocs = alloc_nr(rev_allocs); - revs = realloc(revs, rev_allocs * sizeof(struct revision *)); - } - n = malloc(sizeof(struct revision)); - - n->flags = 0; - memcpy(n->sha1, sha1, 20); - n->parent = NULL; - - /* Insert it into the right place */ - memmove(revs + pos + 1, revs + pos, (nr_revs - pos) * sizeof(struct revision *)); - revs[pos] = n; - nr_revs++; - - return n; -} - -static int add_relationship(struct revision *rev, unsigned char *parent_sha) -{ - struct revision *parent_rev = lookup_rev(parent_sha); - struct parent **pp = &rev->parent, *p; +#include "cache.h" +#include "revision.h" - while ((p = *pp) != NULL) { - if (p->parent == parent_rev) - return 0; - pp = &p->next; - } +/* + * revision.h leaves the low 16 bits of the "flags" field of the + * revision data structure unused. We use it for a "reachable from + * this commit " bitmask. + */ +#define MAX_COMMITS 16 - p = malloc(sizeof(*p)); - p->parent = parent_rev; - p->next = NULL; - *pp = p; - return 1; -} +static int show_edges = 0; +static int basemask = 0; -static int parse_commit(unsigned char *sha1) +static void read_cache_file(const char *path) { - struct revision *rev = lookup_rev(sha1); + FILE *file = fopen(path, "r"); + char line[500]; - if (!(rev->flags & SEEN)) { - void *buffer; - unsigned long size; - char type[20]; - unsigned char parent[20]; + if (!file) + die("bad revtree cache file (%s)", path); + while (fgets(line, sizeof(line), file)) { + unsigned long date; + unsigned char sha1[20]; + struct revision *rev; + const char *buf; + + if (sscanf(line, "%lu", &date) != 1) + break; + buf = strchr(line, ' '); + if (!buf) + break; + if (get_sha1_hex(buf+1, sha1)) + break; + rev = lookup_rev(sha1, "commit"); rev->flags |= SEEN; - buffer = read_sha1_file(sha1, type, &size); - if (!buffer || strcmp(type, "commit")) - return -1; - buffer += 46; /* "tree " + "hex sha1" + "\n" */ - while (!memcmp(buffer, "parent ", 7) && !get_sha1_hex(buffer+7, parent)) { - add_relationship(rev, parent); - parse_commit(parent); - buffer += 48; /* "parent " + "hex sha1" + "\n" */ + rev->date = date; + + /* parents? */ + while ((buf = strchr(buf+1, ' ')) != NULL) { + unsigned char parent[20]; + if (get_sha1_hex(buf + 1, parent)) + break; + add_relationship(rev, parent, "commit"); } } - return 0; + fclose(file); } -static void read_cache_file(const char *path) +/* + * Some revisions are less interesting than others. + * + * For example, if we use a cache-file, that one may contain + * revisions that were never used. They are never interesting. + * + * And sometimes we're only interested in "edge" commits, ie + * places where the marking changes between parent and child. + */ +static int interesting(struct revision *rev) { - FILE *file = fopen(path, "r"); - char line[100]; + unsigned mask = marked(rev); - while (fgets(line, sizeof(line), file)) { - unsigned char sha1[20], parent[20]; - if (get_sha1_hex(line, sha1) || get_sha1_hex(line + 41, parent)) - usage("bad rev-tree cache file %s", path); - add_relationship(lookup_rev(sha1), parent); + if (!mask) + return 0; + if (show_edges) { + struct parent *p = rev->parent; + while (p) { + if (mask != marked(p->parent)) + return 1; + p = p->next; + } + return 0; } - fclose(file); + if (mask & basemask) + return 0; + + return 1; } /* - * Usage: rev-tree [--cache ] + * Usage: rev-tree [--edges] [--cache ] [] * * The cache-file can be quite important for big trees. This is an * expensive operation if you have to walk the whole chain of @@ -131,29 +92,57 @@ static void read_cache_file(const char *path) int main(int argc, char **argv) { int i; - unsigned char sha1[20]; + int nr = 0; + unsigned char sha1[MAX_COMMITS][20]; - while (argc > 2) { - if (!strcmp(argv[1], "--cache")) { + /* + * First - pick up all the revisions we can (both from + * caches and from commit file chains). + */ + for (i = 1; i < argc ; i++) { + char *arg = argv[i]; + + if (!strcmp(arg, "--cache")) { read_cache_file(argv[2]); - argv += 2; - argc -= 2; + i++; continue; } - usage("unknown option %s", argv[1]); + + if (!strcmp(arg, "--edges")) { + show_edges = 1; + continue; + } + + if (arg[0] == '^') { + arg++; + basemask |= 1<= MAX_COMMITS || get_sha1_hex(arg, sha1[nr])) + usage("rev-tree [--edges] [--cache ] []"); + parse_commit(sha1[nr]); + nr++; } - if (argc != 2 || get_sha1_hex(argv[1], sha1)) - usage("rev-tree [--cache ] "); - parse_commit(sha1); + /* + * Now we have the maximal tree. Walk the different sha files back to the root. + */ + for (i = 0; i < nr; i++) + mark_reachable(lookup_rev(sha1[i], "commit"), 1 << i); + + /* + * Now print out the results.. + */ for (i = 0; i < nr_revs; i++) { struct revision *rev = revs[i]; struct parent *p; - printf("%s", sha1_to_hex(rev->sha1)); + if (!interesting(rev)) + continue; + + printf("%lu %s:%d", rev->date, sha1_to_hex(rev->sha1), marked(rev)); p = rev->parent; while (p) { - printf(" %s", sha1_to_hex(p->parent->sha1)); + printf(" %s:%d", sha1_to_hex(p->parent->sha1), marked(p->parent)); p = p->next; } printf("\n");