X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-tree.c;h=3c54769258b82a9384248fbf10530e25d8b2dd8f;hb=d9f98eebcd31e123e859a4b8c6506bf3f3c4bad6;hp=bbf6281f64ff1a3eac982e0c56f88d3a2c08f538;hpb=84fe972055398ba0790ac0a8f159c79c83efcef4;p=git.git diff --git a/rev-tree.c b/rev-tree.c index bbf6281f..3c547692 100644 --- a/rev-tree.c +++ b/rev-tree.c @@ -1,110 +1,89 @@ -#include "cache.h" +#define _XOPEN_SOURCE /* glibc2 needs this */ +#define _BSD_SOURCE /* for tm.tm_gmtoff */ +#include +#include -struct relationship { - unsigned char sha1[20]; - unsigned char parent[20]; -}; +#include "cache.h" +#include "revision.h" -static struct relationship **rels; -static int nr_rels, rel_allocs; +/* + * 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 -static int find_relationship(unsigned char *sha1, unsigned char *parent) -{ - int first = 0, last = nr_rels; - - while (first < last) { - int next = (first + last) / 2; - struct relationship *rel = rels[next]; - int cmp; - - cmp = memcmp(sha1, rel->sha1, 20); - if (!cmp) { - cmp = memcmp(parent, rel->parent, 20); - if (!cmp) - return next; - } - if (cmp < 0) { - last = next; - continue; - } - first = next+1; - } - return -first-1; -} +static int show_edges = 0; +static int basemask = 0; -static int add_relationship(unsigned char *sha1, unsigned char *parent) +static void read_cache_file(const char *path) { - struct relationship *n; - int pos; + FILE *file = fopen(path, "r"); + char line[500]; - pos = find_relationship(sha1, parent); - if (pos >= 0) - return 0; - pos = -pos-1; + if (!file) + die("bad revtree cache file (%s)", path); - if (rel_allocs == nr_rels) { - rel_allocs = alloc_nr(rel_allocs); - rels = realloc(rels, rel_allocs * sizeof(struct relationship *)); + 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; + 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"); + } } - n = malloc(sizeof(struct relationship)); - - memmove(rels + pos + 1, rels + pos, (nr_rels - pos) * sizeof(struct relationship *)); - rels[pos] = n; - nr_rels++; - memcpy(n->sha1, sha1, 20); - memcpy(n->parent, parent, 20); - return 1; + fclose(file); } -static int already_seen(unsigned char *sha1) +/* + * 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) { - static char null_sha[20]; - int pos = find_relationship(sha1, null_sha); - - if (pos < 0) - pos = -pos-1; - if (pos < nr_rels && !memcmp(sha1, rels[pos]->sha1, 20)) - return 1; - return 0; -} + unsigned mask = marked(rev); -static int parse_commit(unsigned char *sha1) -{ - if (!already_seen(sha1)) { - void *buffer; - unsigned long size; - char type[20]; - unsigned char parent[20]; - - 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(sha1, parent); - parse_commit(parent); - buffer += 48; /* "parent " + "hex sha1" + "\n" */ + 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; } - return 0; -} - -static void read_cache_file(const char *path) -{ - FILE *file = fopen(path, "r"); - char line[100]; + if (mask & basemask) + return 0; - 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(sha1, parent); - } - fclose(file); + 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 @@ -113,26 +92,60 @@ 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]; + + /* + * 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]; - while (argc > 2) { - if (!strcmp(argv[1], "--cache")) { + if (!strcmp(arg, "--cache")) { read_cache_file(argv[2]); - argv += 2; - argc -= 2; + i++; + continue; + } + + if (!strcmp(arg, "--edges")) { + show_edges = 1; continue; } - usage("unknown option %s", argv[1]); + + 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); - for (i = 0; i < nr_rels; i++) { - char parent[60]; - struct relationship *rel = rels[i]; - strcpy(parent, sha1_to_hex(rel->parent)); - printf("%s %s\n", sha1_to_hex(rel->sha1), parent); + /* + * 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; + + if (!interesting(rev)) + continue; + + printf("%lu %s:%d", rev->date, sha1_to_hex(rev->sha1), marked(rev)); + p = rev->parent; + while (p) { + printf(" %s:%d", sha1_to_hex(p->parent->sha1), marked(p->parent)); + p = p->next; + } + printf("\n"); } return 0; }