X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/9a8f88658d51aeb86a79ac1121de13562ad2601f..9c5229ea394808f90433ee84439503bee124e1de:/ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 1c0e7e5..8916212 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,68 +1,57 @@
-#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];
+	char *query;
 
 	if (get_sha1(hex, sha1)) {
 		cgit_print_error(fmt("Bad object id: %s", 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))));
+	query = fmt("id=%s", sha1_to_hex(commit->tree->object.sha1));
+	html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
 	htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
-	
-	for (p = commit->parents; p ; p = p->next) {
-		html("<tr><th>parent</th><td colspan='2' class='sha1'><a href='");
-		html_attr(cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(p->item->object.sha1))));
+      	for (p = commit->parents; p ; p = p->next) {
+		html("<tr><th>parent</th>"
+		     "<td colspan='2' class='sha1'>"
+		     "<a href='");
+		query = fmt("id=%s", sha1_to_hex(p->item->object.sha1));
+		html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
 		htmlf("'>%s</a></td></tr>\n", 
 		      sha1_to_hex(p->item->object.sha1));
 	}
@@ -73,8 +62,5 @@ void cgit_print_commit(const char *hex)
 	html("<div class='commit-msg'>");
 	html_txt(info->msg);
 	html("</div>");
-	free(info->author);
-	free(info->committer);
-	free(info->subject);
-	free(info);
+	cgit_free_commitinfo(info);
 }