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

diff --git a/ui-commit.c b/ui-commit.c
index 93eb8fd..885f870 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -75,7 +75,7 @@ void print_fileinfo(struct fileinfo *info)
 		html("]</span>");
 	}
 	htmlf("</td><td class='%s'>", class);
-	query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1),
+	query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1),
 		    sha1_to_hex(info->new_sha1), info->new_path);
 	html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
 		       NULL, NULL);
@@ -103,7 +103,7 @@ void print_fileinfo(struct fileinfo *info)
 	      info->removed * 100.0 / max_changes);
 	htmlf("<td class='none' style='width: %.1f%%;'/>",
 	      (max_changes - info->removed - info->added) * 100.0 / max_changes);
-	html("</tr></table></a></td></tr>\n");
+	html("</tr></table></td></tr>\n");
 }
 
 void cgit_count_diff_lines(char *line, int len)
@@ -153,6 +153,7 @@ void cgit_print_commit(const char *hex)
 	unsigned char sha1[20];
 	char *query;
 	char *filename;
+	char *tmp;
 	int i;
 
 	if (get_sha1(hex, sha1)) {
@@ -172,20 +173,20 @@ void cgit_print_commit(const char *hex)
 	html(" ");
 	html_txt(info->author_email);
 	html("</td><td class='right'>");
-	cgit_print_date(info->author_date);
+	cgit_print_date(info->author_date, FMT_LONGDATE);
 	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(info->committer_date);
+	cgit_print_date(info->committer_date, FMT_LONGDATE);
+	html("</td></tr>\n");
+	html("<tr><th>tree</th><td colspan='2' class='sha1'>");
+	tmp = xstrdup(hex);
+	cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
+		       cgit_query_head, tmp, NULL);
 	html("</td></tr>\n");
-	html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
-	query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1),
-		    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) {
 		parent = lookup_commit_reference(p->item->object.sha1);
 		if (!parent) {
@@ -201,7 +202,7 @@ void cgit_print_commit(const char *hex)
 		html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
 		htmlf("'>%s</a> (<a href='",
 		      sha1_to_hex(p->item->object.sha1));
-		query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1),
+		query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1),
 			    sha1_to_hex(commit->tree->object.sha1));
 		html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
 		html("'>diff</a>)</td></tr>");
@@ -210,7 +211,7 @@ void cgit_print_commit(const char *hex)
 		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)));
+				       fmt("id=%s&amp;name=%s", hex, filename)));
 		htmlf("'>%s</a></td></tr>", filename);
 	}
 	html("</table>\n");
@@ -221,6 +222,7 @@ void cgit_print_commit(const char *hex)
 	html_txt(info->msg);
 	html("</div>");
 	if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
+		html("<div class='diffstat-header'>Diffstat</div>");
 		html("<table class='diffstat'>");
 		max_changes = 0;
 		cgit_diff_commit(commit, inspect_filepair);
@@ -228,8 +230,11 @@ void cgit_print_commit(const char *hex)
 			print_fileinfo(&items[i]);
 		html("</table>");
 		html("<div class='diffstat-summary'>");
-		htmlf("%d files changed, %d insertions, %d deletions\n",
+		htmlf("%d files changed, %d insertions, %d deletions (",
 		      files, total_adds, total_rems);
+		query = fmt("h=%s", hex);
+		html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL);
+		html("show diff</a>)");
 		html("</div>");
 	}
 	cgit_free_commitinfo(info);