+#define _XOPEN_SOURCE /* glibc2 needs this */
+#include <time.h>
+#include <ctype.h>
#include "cache.h"
-struct relationship {
+/*
+ * 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.
+ */
+#define MAX_COMMITS (16)
+#define marked(rev) ((rev)->flags & 0xffff)
+#define SEEN 0x10000
+
+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 char parent[20];
+ unsigned long date;
+ struct parent *parent;
};
-static struct relationship **rels;
-static int nr_rels, rel_allocs;
+static struct revision **revs;
+static int nr_revs, rev_allocs;
-static int find_relationship(unsigned char *sha1, unsigned char *parent)
+static int find_rev(unsigned char *sha1)
{
- int first = 0, last = nr_rels;
+ int first = 0, last = nr_revs;
while (first < last) {
int next = (first + last) / 2;
- struct relationship *rel = rels[next];
+ struct revision *rev = revs[next];
int cmp;
- cmp = memcmp(sha1, rel->sha1, 20);
- if (!cmp) {
- cmp = memcmp(parent, rel->parent, 20);
- if (!cmp)
- return next;
- }
+ cmp = memcmp(sha1, rev->sha1, 20);
+ if (!cmp)
+ return next;
if (cmp < 0) {
last = next;
continue;
return -first-1;
}
-static int add_relationship(unsigned char *sha1, unsigned char *parent)
+static struct revision *lookup_rev(unsigned char *sha1)
{
- struct relationship *n;
- int pos;
+ int pos = find_rev(sha1);
+ struct revision *n;
- pos = find_relationship(sha1, parent);
if (pos >= 0)
- return 0;
+ return revs[pos];
+
pos = -pos-1;
- if (rel_allocs == nr_rels) {
- rel_allocs = alloc_nr(rel_allocs);
- rels = realloc(rels, rel_allocs * sizeof(struct relationship *));
+ if (rev_allocs == nr_revs) {
+ rev_allocs = alloc_nr(rev_allocs);
+ revs = realloc(revs, rev_allocs * sizeof(struct revision *));
}
- n = malloc(sizeof(struct relationship));
-
- memmove(rels + pos + 1, rels + pos, (nr_rels - pos) * sizeof(struct relationship *));
- rels[pos] = n;
- nr_rels++;
+ n = malloc(sizeof(struct revision));
+
+ n->flags = 0;
memcpy(n->sha1, sha1, 20);
- memcpy(n->parent, parent, 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 int already_seen(unsigned char *sha1)
+static unsigned long parse_time(const char *buf)
{
- static char null_sha[20];
- int pos = find_relationship(sha1, null_sha);
+ char c, *p;
+ char buffer[100];
+ struct tm tm;
+ const char *formats[] = {
+ "%c",
+ "%a %b %d %T %y",
+ NULL
+ };
+ const char **fmt = formats;
- if (pos < 0)
- pos = -pos-1;
- if (pos < nr_rels && !memcmp(sha1, rels[pos]->sha1, 20))
- return 1;
- return 0;
+ 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)
{
- if (!already_seen(sha1)) {
- void *buffer;
+ struct revision *rev = lookup_rev(sha1);
+
+ if (!(rev->flags & SEEN)) {
+ void *buffer, *bufptr;
unsigned long size;
char type[20];
unsigned char parent[20];
- buffer = read_sha1_file(sha1, type, &size);
+ rev->flags |= SEEN;
+ buffer = bufptr = 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);
+ bufptr += 46; /* "tree " + "hex sha1" + "\n" */
+ while (!memcmp(bufptr, "parent ", 7) && !get_sha1_hex(bufptr+7, parent)) {
+ add_relationship(rev, parent);
parse_commit(parent);
- buffer += 48; /* "parent " + "hex sha1" + "\n" */
+ 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[100];
+ char line[500];
+
+ if (!file)
+ usage("bad revtree cache file (%s)", path);
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);
+ 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;
+ }
+}
+
+/*
+ * 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)
+{
+ unsigned mask = marked(rev);
+
+ 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;
+ }
+ if (mask & basemask)
+ return 0;
+
+ return 1;
+}
+
/*
- * Usage: rev-tree [--cache <cache-file>] <commit-id>
+ * Usage: rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]
*
* The cache-file can be quite important for big trees. This is an
* expensive operation if you have to walk the whole chain of
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<<nr;
+ }
+ if (nr >= MAX_COMMITS || get_sha1_hex(arg, sha1[nr]))
+ usage("rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]");
+ parse_commit(sha1[nr]);
+ nr++;
}
- if (argc != 2 || get_sha1_hex(argv[1], sha1))
- usage("rev-tree [--cache <cache-file>] <commit-id>");
- 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_sha1_path(lookup_rev(sha1[i]), 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;
}
projects / git.git / blobdiff