From 6cb326c83b3c0b35d472305294afee3105b3088d Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 17 Dec 2006 23:07:28 +0100 Subject: 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 --- ui-commit.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) (limited to 'ui-commit.c') 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(""); + htmlf(""); + html_filemode(pair->two->mode); + if (pair->one->mode != pair->two->mode) { + html("["); + html_filemode(pair->one->mode); + html("]"); + } + htmlf("", 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(" (%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(")"); + } else { + html_txt(pair->two->path); + html(""); + } + html(""); + + //TODO: diffstat graph + + html("\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("
"); html_txt(info->msg); html("
"); + html(""); + html("\n"); + cgit_diffstat(commit); + htmlf("\n", files, files > 1 ? "s" : ""); + html("
Affected files
" + "%d file%s changed
"); cgit_free_commitinfo(info); } -- cgit v1.2.3-70-g09d2