X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-tree.c;h=7f9281985086971d3877aca27704f2aaf9c448ce;hb=6511cce24b932eba33d8e13b54664673121a8b7e;hp=8c19b3161fd5032eb57cac081c454afc8b822989;hpb=2de381f919829aec1e35d6c7cc33519295dcd053;p=git.git diff --git a/rev-tree.c b/rev-tree.c index 8c19b316..7f928198 100644 --- a/rev-tree.c +++ b/rev-tree.c @@ -1,227 +1,22 @@ -#define _XOPEN_SOURCE /* glibc2 needs this */ -#include -#include #include "cache.h" +#include "commit.h" /* - * The low 16 bits of the "flags" field shows whether - * a commit is part of the path to the root for that - * parent. - * - * Bit 16 is an internal flag that we've seen the - * definition for this rev, and not just seen it as - * a parent target. + * 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) -#define marked(rev) ((rev)->flags & 0xffff) -#define SEEN 0x10000 +#define MAX_COMMITS 16 +#define REACHABLE (1U << 16) + +#define cmit_flags(cmit) ((cmit)->object.flags & ~REACHABLE) static int show_edges = 0; static int basemask = 0; -struct parent { - struct revision *parent; - struct parent *next; -}; - -struct revision { - unsigned int flags; - unsigned char sha1[20]; - unsigned long date; - 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; - - 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; - - while ((p = *pp) != NULL) { - if (p->parent == parent_rev) - return 0; - pp = &p->next; - } - - p = malloc(sizeof(*p)); - p->parent = parent_rev; - p->next = NULL; - *pp = p; - return 1; -} - -static unsigned long parse_time(const char *buf) -{ - char c, *p; - char buffer[100]; - struct tm tm; - const char *formats[] = { - "%c", - "%a %b %d %T %y", - NULL - }; - const char **fmt = formats; - - p = buffer; - while (isspace(c = *buf)) - buf++; - while ((c = *buf++) != '\n') - *p++ = c; - *p++ = 0; - buf = buffer; - memset(&tm, 0, sizeof(tm)); - do { - const char *next = strptime(buf, *fmt, &tm); - fmt++; - if (next) { - if (!*next) - return mktime(&tm); - buf = next; - } - } while (*buf && *fmt); - return mktime(&tm); -} - - -static unsigned long parse_commit_date(const char *buf) -{ - if (memcmp(buf, "author", 6)) - return 0; - while (*buf++ != '\n') - /* nada */; - if (memcmp(buf, "committer", 9)) - return 0; - while (*buf++ != '>') - /* nada */; - return parse_time(buf); -} - -static int parse_commit(unsigned char *sha1) -{ - struct revision *rev = lookup_rev(sha1); - - if (!(rev->flags & SEEN)) { - void *buffer, *bufptr; - unsigned long size; - char type[20]; - unsigned char parent[20]; - - rev->flags |= SEEN; - buffer = bufptr = read_sha1_file(sha1, type, &size); - if (!buffer || strcmp(type, "commit")) - return -1; - bufptr += 46; /* "tree " + "hex sha1" + "\n" */ - while (!memcmp(bufptr, "parent ", 7) && !get_sha1_hex(bufptr+7, parent)) { - add_relationship(rev, parent); - parse_commit(parent); - bufptr += 48; /* "parent " + "hex sha1" + "\n" */ - } - rev->date = parse_commit_date(bufptr); - free(buffer); - } - return 0; -} - static void read_cache_file(const char *path) { - FILE *file = fopen(path, "r"); - char line[500]; - - 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); - 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); - } - } - fclose(file); -} - -static void mark_sha1_path(struct revision *rev, unsigned int mask) -{ - struct parent *p; - - if (rev->flags & mask) - return; - - rev->flags |= mask; - p = rev->parent; - while (p) { - mark_sha1_path(p->parent, mask); - p = p->next; - } + die("no revtree cache file yet"); } /* @@ -233,16 +28,16 @@ static void mark_sha1_path(struct revision *rev, unsigned int mask) * 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 int interesting(struct commit *rev) { - unsigned mask = marked(rev); + unsigned mask = cmit_flags(rev); if (!mask) return 0; if (show_edges) { - struct parent *p = rev->parent; + struct commit_list *p = rev->parents; while (p) { - if (mask != marked(p->parent)) + if (mask != cmit_flags(p->item)) return 1; p = p->next; } @@ -255,7 +50,7 @@ static int interesting(struct revision *rev) } /* - * Usage: rev-tree [--edges] [--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 @@ -266,6 +61,7 @@ int main(int argc, char **argv) int i; int nr = 0; unsigned char sha1[MAX_COMMITS][20]; + struct commit_list *list = NULL; /* * First - pick up all the revisions we can (both from @@ -273,10 +69,10 @@ int main(int argc, char **argv) */ for (i = 1; i < argc ; i++) { char *arg = argv[i]; + struct commit *commit; if (!strcmp(arg, "--cache")) { - read_cache_file(argv[2]); - i++; + read_cache_file(argv[++i]); continue; } @@ -289,32 +85,53 @@ int main(int argc, char **argv) arg++; basemask |= 1<= MAX_COMMITS || get_sha1_hex(arg, sha1[nr])) - usage("rev-tree [--edges] [--cache ] []"); - parse_commit(sha1[nr]); + if (nr >= MAX_COMMITS || get_sha1(arg, sha1[nr])) + usage("git-rev-tree [--edges] [--cache ] []"); + + commit = lookup_commit_reference(sha1[nr]); + if (!commit || parse_commit(commit) < 0) + die("bad commit object"); + commit_list_insert(commit, &list); nr++; } /* + * Parse all the commits in date order. + * + * We really should stop once we know enough, but that's a + * decision that isn't trivial to make. + */ + while (list) + pop_most_recent_commit(&list, REACHABLE); + + /* * Now we have the maximal tree. Walk the different sha files back to the root. */ for (i = 0; i < nr; i++) - mark_sha1_path(lookup_rev(sha1[i]), 1 << i); + mark_reachable(&lookup_commit_reference(sha1[i])->object, 1 << i); /* * Now print out the results.. */ - for (i = 0; i < nr_revs; i++) { - struct revision *rev = revs[i]; - struct parent *p; + 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(rev)) + if (!interesting(commit)) continue; - printf("%lu %s:%d", rev->date, sha1_to_hex(rev->sha1), marked(rev)); - p = rev->parent; + printf("%lu %s:%d", commit->date, sha1_to_hex(obj->sha1), + cmit_flags(commit)); + p = commit->parents; while (p) { - printf(" %s:%d", sha1_to_hex(p->parent->sha1), marked(p->parent)); + printf(" %s:%d", sha1_to_hex(p->item->object.sha1), + cmit_flags(p->item)); p = p->next; } printf("\n");