X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/fa82b03e05366e3c6ca1b74c8c83d6e00e0ef1e6..ae4c1ee11379e353f2a94201181a3a9dab75b646:/ui-commit.c?ds=sidebyside

diff --git a/ui-commit.c b/ui-commit.c
index b441e14..f1a22d3 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -8,25 +8,102 @@
 
 #include "cgit.h"
 
+int files = 0;
+
+void print_filepair(struct diff_filepair *pair)
+{
+	char *query;
+	char *class;
+
+	switch (pair->status) {
+	case DIFF_STATUS_ADDED:
+		class = "add";
+		break;
+	case DIFF_STATUS_COPIED:
+		class = "cpy";
+		break;
+	case DIFF_STATUS_DELETED:
+		class = "del";
+		break;
+	case DIFF_STATUS_MODIFIED:
+		class = "upd";
+		break;
+	case DIFF_STATUS_RENAMED:
+		class = "mov";
+		break;
+	case DIFF_STATUS_TYPE_CHANGED:
+		class = "typ";
+		break;
+	case DIFF_STATUS_UNKNOWN:
+		class = "unk";
+		break;
+	case DIFF_STATUS_UNMERGED:
+		class = "stg";
+		break;
+	default:
+		die("bug: unhandled diff status %c", pair->status);
+	}
+
+	html("<tr>");
+	htmlf("<td class='mode'>");
+	if (is_null_sha1(pair->two->sha1)) {
+		html_filemode(pair->one->mode);
+	} else {
+		html_filemode(pair->two->mode);
+	}
+
+	if (pair->one->mode != pair->two->mode &&
+	    !is_null_sha1(pair->one->sha1) &&
+	    !is_null_sha1(pair->two->sha1)) {
+		html("<span class='modechange'>[");
+		html_filemode(pair->one->mode);
+		html("]</span>");
+	}
+	htmlf("</td><td class='%s'>", class);
+	query = fmt("id=%s&id2=%s", sha1_to_hex(pair->one->sha1),
+		    sha1_to_hex(pair->two->sha1));
+	html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
+		       NULL, NULL);
+	if (pair->status == DIFF_STATUS_COPIED ||
+	    pair->status == DIFF_STATUS_RENAMED) {
+		html_txt(pair->two->path);
+		htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ?
+		      "copied" : "renamed");
+		query = fmt("id=%s", sha1_to_hex(pair->one->sha1));
+		html_link_open(cgit_pageurl(cgit_query_repo, "view", query),
+			       NULL, NULL);
+		html_txt(pair->one->path);
+		html("</a>)");
+	} else {
+		html_txt(pair->two->path);
+		html("</a>");
+	}
+	html("<td>");
+
+	//TODO: diffstat graph
+
+	html("</td></tr>\n");
+	files++;
+}
+
 void cgit_print_commit(const char *hex)
 {
 	struct commit *commit;
 	struct commitinfo *info;
 	struct commit_list *p;
-
 	unsigned char sha1[20];
+	char *query;
+	char *filename;
 
 	if (get_sha1(hex, sha1)) {
 		cgit_print_error(fmt("Bad object id: %s", hex));
 		return;
 	}
-
 	commit = lookup_commit_reference(sha1);
 	if (!commit) {
 		cgit_print_error(fmt("Bad commit reference: %s", hex));
 		return;
 	}
-
 	info = cgit_parse_commit(commit);
 
 	html("<table class='commit-info'>\n");
@@ -45,15 +122,25 @@ void cgit_print_commit(const char *hex)
 	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))));
-		htmlf("'>%s</a></td></tr>\n", 
+      	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));
 	}
+	if (cgit_repo->snapshots) {
+		htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
+		filename = fmt("%s-%s.zip", cgit_query_repo, hex);
+		html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
+				       fmt("id=%s&name=%s", hex, filename)));
+		htmlf("'>%s</a></td></tr>", filename);
+	}
 	html("</table>\n");
 	html("<div class='commit-subject'>");
 	html_txt(info->subject);
@@ -61,8 +148,11 @@ 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);
+	html("<table class='diffstat'>");
+	html("<tr><th colspan='3'>Affected files</tr>\n");
+	cgit_diff_commit(commit, print_filepair);
+	htmlf("<tr><td colspan='3' class='summary'>"
+	      "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : "");
+	html("</table>");
+	cgit_free_commitinfo(info);
 }