X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-tree.c;h=bc190ebc71bbd923f2b728e505408f5e54bd073a;hb=d6db01075b65da2b8584a0450619390893aae103;hp=bbf6281f64ff1a3eac982e0c56f88d3a2c08f538;hpb=84fe972055398ba0790ac0a8f159c79c83efcef4;p=git.git diff --git a/rev-tree.c b/rev-tree.c index bbf6281f..bc190ebc 100644 --- a/rev-tree.c +++ b/rev-tree.c @@ -1,110 +1,70 @@ #include "cache.h" +#include "commit.h" -struct relationship { - unsigned char sha1[20]; - unsigned char parent[20]; -}; +/* + * 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 struct relationship **rels; -static int nr_rels, rel_allocs; +static int show_edges = 0; +static int basemask = 0; -static int find_relationship(unsigned char *sha1, unsigned char *parent) +static void read_cache_file(const char *path) { - 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; + die("no revtree cache file yet"); } -static int add_relationship(unsigned char *sha1, unsigned char *parent) +/* + * 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 commit *rev) { - struct relationship *n; - int pos; + unsigned mask = rev->object.flags; - pos = find_relationship(sha1, parent); - if (pos >= 0) + if (!mask) return 0; - pos = -pos-1; - - if (rel_allocs == nr_rels) { - rel_allocs = alloc_nr(rel_allocs); - rels = realloc(rels, rel_allocs * sizeof(struct relationship *)); - } - 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; -} - -static int already_seen(unsigned char *sha1) -{ - 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; -} - -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 (show_edges) { + struct commit_list *p = rev->parents; + while (p) { + if (mask != p->item->object.flags) + return 1; + p = p->next; } + return 0; } - return 0; + if (mask & basemask) + return 0; + + return 1; } -static void read_cache_file(const char *path) +static void process_commit(unsigned char *sha1) { - FILE *file = fopen(path, "r"); - char line[100]; - - 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); + struct commit_list *parents; + struct commit *obj = lookup_commit(sha1); + + if (obj && obj->object.parsed) + return; + if (!obj || parse_commit(obj)) + die("unable to parse commit (%s)", sha1_to_hex(sha1)); + + parents = obj->parents; + while (parents) { + process_commit(parents->item->object.sha1); + parents = parents->next; } - fclose(file); } /* - * Usage: rev-tree [--cache ] + * Usage: git-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 +73,67 @@ 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]; + + if (!strcmp(arg, "--cache")) { + read_cache_file(argv[++i]); + continue; + } - while (argc > 2) { - if (!strcmp(argv[1], "--cache")) { - read_cache_file(argv[2]); - argv += 2; - argc -= 2; + if (!strcmp(arg, "--edges")) { + show_edges = 1; continue; } - usage("unknown option %s", argv[1]); + + if (arg[0] == '^') { + arg++; + basemask |= 1<= MAX_COMMITS || get_sha1(arg, sha1[nr])) + usage("git-rev-tree [--edges] [--cache ] []"); + process_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_commit(sha1[i])->object, 1 << i); + + /* + * Now print out the results.. + */ + for (i = 0; i < nr_objs; i++) { + struct object *obj = objs[i]; + struct commit *commit; + struct commit_list *p; + + if (obj->type != commit_type) + continue; + + commit = (struct commit *) obj; + + if (!interesting(commit)) + continue; + + printf("%lu %s:%d", commit->date, sha1_to_hex(obj->sha1), + obj->flags); + p = commit->parents; + while (p) { + printf(" %s:%d", sha1_to_hex(p->item->object.sha1), + p->item->object.flags); + p = p->next; + } + printf("\n"); } return 0; }