Move "parse_commit()" into common revision.h file.

This also drops the old-style date parsing. We just don't care
enough, since we dropped that format pretty early.

Yes, this could do with some cleanup, and a common library file.
Some day.

diff --git a/rev-tree.c b/rev-tree.c
index 33caac3d0325351f74c624a497e06e35bb0252e0..57fb47edc6d59ed2ec912ea0a8afeda879de5a39 100644 (file)
--- a/rev-tree.c
+++ b/rev-tree.c
@@ -16,85 +16,6 @@
 static int show_edges = 0;
 static int basemask = 0;
 
-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
-       };
-       const char **fmt = formats;
-
-       p = buffer;
-       while (isspace(c = *buf))
-               buf++;
-       while ((c = *buf++) != '\n' && c)
-               *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)
-{
-       unsigned long time;
-
-       if (memcmp(buf, "author", 6))
-               return 0;
-       while (*buf++ != '\n')
-               /* nada */;
-       if (memcmp(buf, "committer", 9))
-               return 0;
-       while (*buf++ != '>')
-               /* nada */;
-
-       time = strtoul(buf, NULL, 10);
-       if (!time)
-               time = parse_time(buf);
-       return time;
-}
-
-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");

diff --git a/revision.h b/revision.h
index 4f140ca611236bdc4dd32c436616cafe7ef02249..2bad6c01a447a67c2013b0a092ca7afe04b7511e 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -111,4 +111,44 @@ static void mark_reachable(struct revision *rev)
        }
 }
 
+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 strtoul(buf, NULL, 10);
+}
+
+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;       
+}
+
 #endif /* REVISION_H */