[PATCH] Un unoptimize ls-tree behaviour

[git.git] / rev-tree.c

diff --git a/rev-tree.c b/rev-tree.c
index 82bf5aa..33caac3 100644 (file)
--- a/rev-tree.c
+++ b/rev-tree.c
@@ -1,112 +1,28 @@
 #define _XOPEN_SOURCE /* glibc2 needs this */
+#define _BSD_SOURCE /* for tm.tm_gmtoff */
 #include <time.h>
 #include <ctype.h>
+
 #include "cache.h"
+#include "revision.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[] = {
+               "%s",
                "%c",
                "%a %b %d %T %y",
                NULL
@@ -116,7 +32,7 @@ static unsigned long parse_time(const char *buf)
        p = buffer;
        while (isspace(c = *buf))
                buf++;
-       while ((c = *buf++) != '\n')
+       while ((c = *buf++) != '\n' && c)
                *p++ = c;
        *p++ = 0;
        buf = buffer;
@@ -136,6 +52,8 @@ static unsigned long parse_time(const char *buf)
 
 static unsigned long parse_commit_date(const char *buf)
 {
+       unsigned long time;
+
        if (memcmp(buf, "author", 6))
                return 0;
        while (*buf++ != '\n')
@@ -144,7 +62,11 @@ static unsigned long parse_commit_date(const char *buf)
                return 0;
        while (*buf++ != '>')
                /* nada */;
-       return parse_time(buf);
+
+       time = strtoul(buf, NULL, 10);
+       if (!time)
+               time = parse_time(buf);
+       return time;
 }
 
 static int parse_commit(unsigned char *sha1)
@@ -152,22 +74,22 @@ static int parse_commit(unsigned char *sha1)
        struct revision *rev = lookup_rev(sha1);
 
        if (!(rev->flags & SEEN)) {
-               void *buffer;
+               void *buffer, *bufptr;
                unsigned long size;
                char type[20];
                unsigned char parent[20];
 
                rev->flags |= SEEN;
-               buffer = read_sha1_file(sha1, type, &size);
+               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)) {
+               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(buffer);
+               rev->date = parse_commit_date(bufptr);
                free(buffer);
        }
        return 0;       
@@ -179,7 +101,7 @@ static void read_cache_file(const char *path)
        char line[500];
 
        if (!file)
-               usage("bad revtree cache file (%s)", path);
+               die("bad revtree cache file (%s)", path);
 
        while (fgets(line, sizeof(line), file)) {
                unsigned long date;