1 files changed, 155 insertions, 111 deletions

diff --git a/ui-commit.c b/ui-commit.c
index 972e9bc..3618800 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,150 +1,194 @@
 /* ui-commit.c: generate commit view
  *
- * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
+ * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
-#define USE_THE_REPOSITORY_VARIABLE
-
 #include "cgit.h"
-#include "ui-commit.h"
-#include "html.h"
-#include "ui-shared.h"
-#include "ui-diff.h"
-#include "ui-log.h"
 
-void cgit_print_commit(char *hex, const char *prefix)
+int files = 0;
+
+void print_filepair(struct diff_filepair *pair)
 {
-	struct commit *commit, *parent;
-	struct commitinfo *info, *parent_info;
-	struct commit_list *p;
-	struct strbuf notes = STRBUF_INIT;
-	struct object_id oid;
-	char *tmp, *tmp2;
-	int parents = 0;
+	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 diff_format_cb(struct diff_queue_struct *q,
+		    struct diff_options *options, void *data)
+{
+	int i;
+
+	for (i = 0; i < q->nr; i++) {
+		if (q->queue[i]->status == 'U')
+			continue;
+		print_filepair(q->queue[i]);
+	}
+}
+
+void cgit_diffstat(struct commit *commit)
+{
+	struct diff_options opt;
+	int ret;
 
-	if (!hex)
-		hex = ctx.qry.head;
+	diff_setup(&opt);
+	opt.output_format = DIFF_FORMAT_CALLBACK;
+	opt.detect_rename = 1;
+	opt.recursive = 1;
+	opt.format_callback = diff_format_cb;
+	diff_setup_done(&opt);
+	
+	if (commit->parents)
+		ret = diff_tree_sha1(commit->parents->item->object.sha1,
+				     commit->object.sha1,
+				     "", &opt);
+	else
+		ret = diff_root_tree_sha1(commit->object.sha1, "", &opt);
+
+	diffcore_std(&opt);
+	diff_flush(&opt);
+}
 
-	if (repo_get_oid(the_repository, hex, &oid)) {
-		cgit_print_error_page(400, "Bad request",
-				"Bad object id: %s", hex);
+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(the_repository, &oid);
+	commit = lookup_commit_reference(sha1);
 	if (!commit) {
-		cgit_print_error_page(404, "Not found",
-				"Bad commit reference: %s", hex);
+		cgit_print_error(fmt("Bad commit reference: %s", hex));
 		return;
 	}
 	info = cgit_parse_commit(commit);
 
-	format_display_notes(&oid, &notes, PAGE_ENCODING, 1);
-
-	load_ref_decorations(NULL, DECORATE_FULL_REFS);
-
-	ctx.page.title = fmtalloc("%s - %s", info->subject, ctx.page.title);
-	cgit_print_layout_start();
-	cgit_print_diff_ctrls();
-	html("<table summary='commit info' class='commit-info'>\n");
+	html("<table class='commit-info'>\n");
 	html("<tr><th>author</th><td>");
-	cgit_open_filter(ctx.repo->email_filter, info->author_email, "commit");
 	html_txt(info->author);
-	if (!ctx.cfg.noplainemail) {
-		html(" ");
-		html_txt(info->author_email);
-	}
-	cgit_close_filter(ctx.repo->email_filter);
+	html(" ");
+	html_txt(info->author_email);
 	html("</td><td class='right'>");
-	html_txt(show_date(info->author_date, info->author_tz,
-				cgit_date_mode(DATE_ISO8601)));
+	cgit_print_date(info->author_date);
 	html("</td></tr>\n");
 	html("<tr><th>committer</th><td>");
-	cgit_open_filter(ctx.repo->email_filter, info->committer_email, "commit");
 	html_txt(info->committer);
-	if (!ctx.cfg.noplainemail) {
-		html(" ");
-		html_txt(info->committer_email);
-	}
-	cgit_close_filter(ctx.repo->email_filter);
+	html(" ");
+	html_txt(info->committer_email);
 	html("</td><td class='right'>");
-	html_txt(show_date(info->committer_date, info->committer_tz,
-				cgit_date_mode(DATE_ISO8601)));
-	html("</td></tr>\n");
-	html("<tr><th>commit</th><td colspan='2' class='oid'>");
-	tmp = oid_to_hex(&commit->object.oid);
-	cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
-	html(" (");
-	cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
-	html(")</td></tr>\n");
-	html("<tr><th>tree</th><td colspan='2' class='oid'>");
-	tmp = xstrdup(hex);
-	cgit_tree_link(oid_to_hex(get_commit_tree_oid(commit)), NULL, NULL,
-		       ctx.qry.head, tmp, NULL);
-	if (prefix) {
-		html(" /");
-		cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
-	}
-	free(tmp);
+	cgit_print_date(info->committer_date);
 	html("</td></tr>\n");
-	for (p = commit->parents; p; p = p->next) {
-		parent = lookup_commit_reference(the_repository, &p->item->object.oid);
-		if (!parent) {
-			html("<tr><td colspan='3'>");
-			cgit_print_error("Error reading parent commit");
-			html("</td></tr>");
-			continue;
-		}
+	html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
+	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='oid'>");
-		tmp = tmp2 = oid_to_hex(&p->item->object.oid);
-		if (ctx.repo->enable_subject_links) {
-			parent_info = cgit_parse_commit(parent);
-			tmp2 = parent_info->subject;
-		}
-		cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix);
-		html(" (");
-		cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
-			       oid_to_hex(&p->item->object.oid), prefix);
-		html(")</td></tr>");
-		parents++;
+		     "<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 (ctx.repo->snapshots) {
-		html("<tr><th>download</th><td colspan='2' class='oid'>");
-		cgit_print_snapshot_links(ctx.repo, hex, "<br/>");
-		html("</td></tr>");
+	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'>");
-	cgit_open_filter(ctx.repo->commit_filter);
 	html_txt(info->subject);
-	cgit_close_filter(ctx.repo->commit_filter);
-	show_commit_decorations(commit);
 	html("</div>");
 	html("<div class='commit-msg'>");
-	cgit_open_filter(ctx.repo->commit_filter);
 	html_txt(info->msg);
-	cgit_close_filter(ctx.repo->commit_filter);
 	html("</div>");
-	if (notes.len != 0) {
-		html("<div class='notes-header'>Notes</div>");
-		html("<div class='notes'>");
-		cgit_open_filter(ctx.repo->commit_filter);
-		html_txt(notes.buf);
-		cgit_close_filter(ctx.repo->commit_filter);
-		html("</div>");
-		html("<div class='notes-footer'></div>");
-	}
-	if (parents < 3) {
-		if (parents)
-			tmp = oid_to_hex(&commit->parents->item->object.oid);
-		else
-			tmp = NULL;
-		cgit_print_diff(ctx.qry.oid, tmp, prefix, 0, 0);
-	}
-	strbuf_release(&notes);
+	html("<table class='diffstat'>");
+	html("<tr><th colspan='3'>Affected files</tr>\n");
+	cgit_diffstat(commit);
+	htmlf("<tr><td colspan='3' class='summary'>"
+	      "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : "");
+	html("</table>");
 	cgit_free_commitinfo(info);
-	cgit_print_layout_end();
 }