-#define _XOPEN_SOURCE /* glibc2 needs this */
-#include <time.h>
-#include <ctype.h>
#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 <N>" bitmask.
*/
-#define MAX_COMMITS (16)
-#define marked(rev) ((rev)->flags & 0xffff)
-#define SEEN 0x10000
+#define MAX_COMMITS 16
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;
- unsigned long size;
- char type[20];
- unsigned char parent[20];
-
- 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 = parse_commit_date(buffer);
- free(buffer);
- }
- return 0;
-}
-
static void read_cache_file(const char *path)
{
- FILE *file = fopen(path, "r");
- char line[500];
-
- if (!file)
- usage("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");
}
/*
* 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 = rev->object.flags;
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 != p->item->object.flags)
return 1;
p = p->next;
}
return 1;
}
+void process_commit(unsigned char *sha1)
+{
+ struct commit_list *parents;
+ struct commit *obj = lookup_commit(sha1);
+
+ if (obj->object.parsed)
+ return;
+
+ parse_commit(obj);
+
+ parents = obj->parents;
+ while (parents) {
+ process_commit(parents->item->object.sha1);
+ parents = parents->next;
+ }
+}
+
/*
* Usage: rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]
*
char *arg = argv[i];
if (!strcmp(arg, "--cache")) {
- read_cache_file(argv[2]);
- i++;
+ read_cache_file(argv[++i]);
continue;
}
arg++;
basemask |= 1<<nr;
}
- if (nr >= MAX_COMMITS || get_sha1_hex(arg, sha1[nr]))
+ if (nr >= MAX_COMMITS || get_sha1(arg, sha1[nr]))
usage("rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]");
- parse_commit(sha1[nr]);
+ process_commit(sha1[nr]);
nr++;
}
* 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(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),
+ obj->flags);
+ 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),
+ p->item->object.flags);
p = p->next;
}
printf("\n");