X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/fb6e5869dcc81b775d5ac79dd3afac7220c366dd..30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de:/ui-commit.c?ds=sidebyside diff --git a/ui-commit.c b/ui-commit.c index b49b2e9..ff1fad3 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -8,14 +8,29 @@ #include "cgit.h" -int files = 0; +static int files, slots; +static int total_adds, total_rems, max_changes; +static int lines_added, lines_removed; -void print_filepair(struct diff_filepair *pair) +static struct fileinfo { + char status; + unsigned char old_sha1[20]; + unsigned char new_sha1[20]; + unsigned short old_mode; + unsigned short new_mode; + char *old_path; + char *new_path; + unsigned int added; + unsigned int removed; +} *items; + + +void print_fileinfo(struct fileinfo *info) { - char *query; + char *query, *query2; char *class; - - switch (pair->status) { + + switch (info->status) { case DIFF_STATUS_ADDED: class = "add"; break; @@ -41,92 +56,104 @@ void print_filepair(struct diff_filepair *pair) class = "stg"; break; default: - die("bug: unhandled diff status %c", pair->status); + die("bug: unhandled diff status %c", info->status); } html(""); htmlf(""); - if (is_null_sha1(pair->two->sha1)) { - html_filemode(pair->one->mode); + if (is_null_sha1(info->new_sha1)) { + html_filemode(info->old_mode); } else { - html_filemode(pair->two->mode); + html_filemode(info->new_mode); } - if (pair->one->mode != pair->two->mode && - !is_null_sha1(pair->one->sha1) && - !is_null_sha1(pair->two->sha1)) { + if (info->old_mode != info->new_mode && + !is_null_sha1(info->old_sha1) && + !is_null_sha1(info->new_sha1)) { html("["); - html_filemode(pair->one->mode); + html_filemode(info->old_mode); html("]"); } htmlf("", class); - query = fmt("id=%s", sha1_to_hex(pair->two->sha1)); - html_link_open(cgit_pageurl(cgit_query_repo, "view", query), + query = fmt("id=%s&id2=%s&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); - if (pair->status == DIFF_STATUS_COPIED || - pair->status == DIFF_STATUS_RENAMED) { - html_txt(pair->two->path); - htmlf(" (%s from ", pair->status == DIFF_STATUS_COPIED ? + if (info->status == DIFF_STATUS_COPIED || + info->status == DIFF_STATUS_RENAMED) { + html_txt(info->new_path); + htmlf(" (%s from ", info->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), + query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); + html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), NULL, NULL); - html_txt(pair->one->path); + html_txt(info->old_path); html(")"); } else { - html_txt(pair->two->path); + html_txt(info->new_path); html(""); } - html(""); - - //TODO: diffstat graph - - html("\n"); - files++; + html(""); + htmlf("%d", info->added + info->removed); + html(""); + htmlf("", (max_changes > 100 ? 100 : max_changes)); + htmlf("
", + info->added * 100.0 / max_changes); + htmlf("", + info->removed * 100.0 / max_changes); + htmlf("", + (max_changes - info->removed - info->added) * 100.0 / max_changes); + html("
\n"); } -void diff_format_cb(struct diff_queue_struct *q, - struct diff_options *options, void *data) +void cgit_count_diff_lines(char *line, int len) { - int i; - - for (i = 0; i < q->nr; i++) { - if (q->queue[i]->status == 'U') - continue; - print_filepair(q->queue[i]); + if (line && (len > 0)) { + if (line[0] == '+') + lines_added++; + else if (line[0] == '-') + lines_removed++; } } -void cgit_diffstat(struct commit *commit) +void inspect_filepair(struct diff_filepair *pair) { - 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); + files++; + lines_added = 0; + lines_removed = 0; + cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines); + if (files >= slots) { + if (slots == 0) + slots = 4; + else + slots = slots * 2; + items = xrealloc(items, slots * sizeof(struct fileinfo)); + } + items[files-1].status = pair->status; + hashcpy(items[files-1].old_sha1, pair->one->sha1); + hashcpy(items[files-1].new_sha1, pair->two->sha1); + items[files-1].old_mode = pair->one->mode; + items[files-1].new_mode = pair->two->mode; + items[files-1].old_path = xstrdup(pair->one->path); + items[files-1].new_path = xstrdup(pair->two->path); + items[files-1].added = lines_added; + items[files-1].removed = lines_removed; + if (lines_added + lines_removed > max_changes) + max_changes = lines_added + lines_removed; + total_adds += lines_added; + total_rems += lines_removed; } + void cgit_print_commit(const char *hex) { - struct commit *commit; + struct commit *commit, *parent; struct commitinfo *info; struct commit_list *p; unsigned char sha1[20]; char *query; + char *filename; + int i; if (get_sha1(hex, sha1)) { cgit_print_error(fmt("Bad object id: %s", hex)); @@ -155,17 +182,36 @@ void cgit_print_commit(const char *hex) cgit_print_date(info->committer_date); html("\n"); html("tree%s\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) { + html(""); + cgit_print_error("Error reading parent commit"); + html(""); + continue; + } html("parent" "" "%s\n", + htmlf("'>%s (diff)"); + } + if (cgit_repo->snapshots) { + htmlf("download%s", filename); } html("\n"); html("
"); @@ -174,11 +220,21 @@ 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
"); + if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { + html("
Diffstat
"); + html(""); + max_changes = 0; + cgit_diff_commit(commit, inspect_filepair); + for(i = 0; i"); + html("
"); + 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)"); + html("
"); + } cgit_free_commitinfo(info); }