Simplify ui-commit.c

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 1c0e7e5f593361e19712070e0367886eb99e1830..b441e143b3ac1daec60b3b416b14610aef82785e 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,24 +1,18 @@
-#include "cgit.h"
-
-void cgit_print_date(unsigned long secs)
-{
-       char buf[32];
-       struct tm *time;
+/* ui-commit.c: generate commit view
+ *
+ * Copyright (C) 2006 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
 
-       time = gmtime(&secs);
-       strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
-       html_txt(buf);
-       
-}
+#include "cgit.h"
 
 void cgit_print_commit(const char *hex)
 {
        struct commit *commit;
        struct commitinfo *info;
        struct commit_list *p;
-       unsigned long size;
-       char type[20];
-       char *buf;
 
        unsigned char sha1[20];
 
@@ -27,34 +21,28 @@ void cgit_print_commit(const char *hex)
                return;
        }
 
-       buf = read_sha1_file(sha1, type, &size);
-       if (!buf) {
-               cgit_print_error(fmt("Bad object reference: %s", hex));
-               return;
-       }
-
-       commit = lookup_commit(sha1);
+       commit = lookup_commit_reference(sha1);
        if (!commit) {
                cgit_print_error(fmt("Bad commit reference: %s", hex));
                return;
        }
 
-       commit->buffer = buf;
-       if (parse_commit_buffer(commit, buf, size)) {
-               cgit_print_error(fmt("Malformed commit buffer: %s", hex));
-               return;
-       }
-
        info = cgit_parse_commit(commit);
 
        html("<table class='commit-info'>\n");
-       html("<tr><th>author</th><td colspan='2'>");
+       html("<tr><th>author</th><td>");
        html_txt(info->author);
+       html(" ");
+       html_txt(info->author_email);
+       html("</td><td class='right'>");
+       cgit_print_date(info->author_date);
        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");
        html_txt(info->committer);
+       html(" ");
+       html_txt(info->committer_email);
        html("</td><td class='right'>");
-       cgit_print_date(commit->date);
+       cgit_print_date(info->committer_date);
        html("</td></tr>\n");
        html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
        html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("id=%s", sha1_to_hex(commit->tree->object.sha1))));