summaryrefslogtreecommitdiff
path: root/ui-commit.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2006-12-17 22:07:28 +0000
committerLars Hjemli <hjemli@gmail.com>2006-12-17 22:07:28 +0000
commit6cb326c83b3c0b35d472305294afee3105b3088d (patch)
treefcceeec36ae6f1b3b8e9f861064e2d6ba962a6e0 /ui-commit.c
parent9c5229ea394808f90433ee84439503bee124e1de (diff)
downloadcgit-6cb326c83b3c0b35d472305294afee3105b3088d.tar
cgit-6cb326c83b3c0b35d472305294afee3105b3088d.tar.gz
cgit-6cb326c83b3c0b35d472305294afee3105b3088d.zip
Show list of modified files in ui-commit.c
Compare current commit with 1.parent, and for each affected file display current filemode, old filemode if changed, current filename and source filename if it was a copy/rename. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-commit.c')
-rw-r--r--ui-commit.c111
1 files changed, 111 insertions, 0 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 8916212..c5ee8e7 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -8,6 +8,111 @@
#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'>");
+ html_filemode(pair->two->mode);
+ if (pair->one->mode != pair->two->mode) {
+ html("<span class='modechange'>[");
+ html_filemode(pair->one->mode);
+ html("]</span>");
+ }
+ htmlf("</td><td class='%s'>", class);
+ query = fmt("id=%s", sha1_to_hex(pair->two->sha1));
+ html_link_open(cgit_pageurl(cgit_query_repo, "view", 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;
+
+ 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);
+}
+
void cgit_print_commit(const char *hex)
{
struct commit *commit;
@@ -62,5 +167,11 @@ void cgit_print_commit(const char *hex)
html("<div class='commit-msg'>");
html_txt(info->msg);
html("</div>");
+ 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);
}