X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/6c14f5e457e17da9205588c273d7cb9f92a23b9f..78031f92b0ff064efa82065a3cf6020c1256a5fd:/ui-commit.c diff --git a/ui-commit.c b/ui-commit.c index 2d36015..dd36cc0 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -7,61 +7,207 @@ */ #include "cgit.h" +#include "html.h" +#include "ui-shared.h" +#include "ui-diff.h" -void cgit_print_commit(const char *hex) +static int files, slots; +static int total_adds, total_rems, max_changes; +static int lines_added, lines_removed; +static char *curr_rev; + +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 *class; + + switch (info->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", info->status); + } + + html(""); + htmlf(""); + if (is_null_sha1(info->new_sha1)) { + cgit_print_filemode(info->old_mode); + } else { + cgit_print_filemode(info->new_mode); + } + + if (info->old_mode != info->new_mode && + !is_null_sha1(info->old_sha1) && + !is_null_sha1(info->new_sha1)) { + html("["); + cgit_print_filemode(info->old_mode); + html("]"); + } + htmlf("", class); + cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev, + NULL, info->new_path); + if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) + htmlf(" (%s from %s)", + info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", + info->old_path); + 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 cgit_count_diff_lines(char *line, int len) +{ + if (line && (len > 0)) { + if (line[0] == '+') + lines_added++; + else if (line[0] == '-') + lines_removed++; + } +} + +void inspect_filepair(struct diff_filepair *pair) +{ + 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(char *hex) { - struct commit *commit; + struct commit *commit, *parent; struct commitinfo *info; struct commit_list *p; - unsigned long size; - char type[20]; - char *buf; - unsigned char sha1[20]; + char *tmp; + int i; + + if (!hex) + hex = ctx.qry.head; + curr_rev = hex; if (get_sha1(hex, sha1)) { cgit_print_error(fmt("Bad object id: %s", hex)); return; } - - buf = read_sha1_file(sha1, type, &size); - if (!buf) { - cgit_print_error(fmt("Bad object reference: %s", hex)); - return; - } - - commit = lookup_commit(sha1); + commit = lookup_commit_reference(sha1); if (!commit) { cgit_print_error(fmt("Bad commit reference: %s", hex)); return; } - - commit->buffer = buf; - if (parse_commit_buffer(commit, buf, size)) { - cgit_print_error(fmt("Malformed commit buffer: %s", hex)); - return; - } - info = cgit_parse_commit(commit); - html("\n"); - html("
author"); + html("\n"); + html("\n"); html("\n"); + html("\n"); + html("\n"); - html("\n", sha1_to_hex(commit->tree->object.sha1)); - - for (p = commit->parents; p ; p = p->next) { - html("\n", - sha1_to_hex(p->item->object.sha1)); + for (p = commit->parents; p ; p = p->next) { + parent = lookup_commit_reference(p->item->object.sha1); + if (!parent) { + html(""); + continue; + } + html("" + ""); + } + if (ctx.repo->snapshots) { + html(""); } html("
author"); html_txt(info->author); + html(" "); + html_txt(info->author_email); + html(""); + cgit_print_date(info->author_date, FMT_LONGDATE); html("
committer"); html_txt(info->committer); + html(" "); + html_txt(info->committer_email); html(""); - cgit_print_date(commit->date); + cgit_print_date(info->committer_date, FMT_LONGDATE); + html("
commit"); + tmp = sha1_to_hex(commit->object.sha1); + cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); + html(" ("); + cgit_patch_link("patch", NULL, NULL, NULL, tmp); + html(")
tree"); + tmp = xstrdup(hex); + cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, + ctx.qry.head, tmp, NULL); html("
tree%s
parent%s
"); + cgit_print_error("Error reading parent commit"); + html("
parent"); + cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, + ctx.qry.head, sha1_to_hex(p->item->object.sha1)); + html(" ("); + cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, + sha1_to_hex(p->item->object.sha1), NULL); + html(")
download"); + cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, + hex, ctx.repo->snapshots); + html("
\n"); html("
"); @@ -70,8 +216,21 @@ void cgit_print_commit(const char *hex) html("
"); html_txt(info->msg); html("
"); - free(info->author); - free(info->committer); - free(info->subject); - free(info); + 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); + cgit_print_diff(ctx.qry.sha1, + sha1_to_hex(commit->parents->item->object.sha1), + NULL); + html(")
"); + } + cgit_free_commitinfo(info); }