X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/8a3685bcf2612206fc24a2421acb53dd83aeab85..f135569b2be3fb1816f802f9a162b3743b735d1c:/ui-commit.c diff --git a/ui-commit.c b/ui-commit.c index ce33cf9..8019e36 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -7,12 +7,15 @@ */ #include "cgit.h" +#include "html.h" +#include "ui-shared.h" -int files = 0, slots = 0; -int total_adds = 0, total_rems = 0, max_changes = 0; -int lines_added, lines_removed; +static int files, slots; +static int total_adds, total_rems, max_changes; +static int lines_added, lines_removed; +static char *curr_rev; -struct fileinfo { +static struct fileinfo { char status; unsigned char old_sha1[20]; unsigned char new_sha1[20]; @@ -27,9 +30,7 @@ struct fileinfo { void print_fileinfo(struct fileinfo *info) { - char *query, *query2; char *class; - double width; switch (info->status) { case DIFF_STATUS_ADDED: @@ -63,51 +64,36 @@ void print_fileinfo(struct fileinfo *info) html(""); htmlf(""); if (is_null_sha1(info->new_sha1)) { - html_filemode(info->old_mode); + cgit_print_filemode(info->old_mode); } else { - html_filemode(info->new_mode); + 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("["); - html_filemode(info->old_mode); + cgit_print_filemode(info->old_mode); html("]"); } htmlf("", class); - query = fmt("id=%s&id2=%s", sha1_to_hex(info->old_sha1), - sha1_to_hex(info->new_sha1)); - html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), - NULL, NULL); - 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"); - query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); - html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), - NULL, NULL); - html_txt(info->old_path); - html(")"); - } else { - html_txt(info->new_path); - html(""); - } + 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(""); - width = (info->added + info->removed) * 100.0 / max_changes; - if (width < 0.1) - width = 0.1; - html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), - NULL, NULL); - htmlf("", - info->added * width / (info->added + info->removed)); - htmlf("", - info->removed * width / (info->added + info->removed)); - html("\n"); + 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) @@ -149,16 +135,19 @@ void inspect_filepair(struct diff_filepair *pair) } -void cgit_print_commit(const char *hex) +void cgit_print_commit(char *hex) { - struct commit *commit; + struct commit *commit, *parent; struct commitinfo *info; struct commit_list *p; unsigned char sha1[20]; - char *query; - char *filename; + 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; @@ -170,40 +159,48 @@ void cgit_print_commit(const char *hex) } info = cgit_parse_commit(commit); - 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) { + parent = lookup_commit_reference(p->item->object.sha1); + if (!parent) { + html(""); + continue; + } html("" - "\n", - sha1_to_hex(p->item->object.sha1)); + ""); } - if (cgit_repo->snapshots) { - htmlf("", filename); + if (ctx.repo->snapshots) { + html(""); } html("
author"); html_txt(info->author); html(" "); html_txt(info->author_email); html(""); - cgit_print_date(info->author_date); + cgit_print_date(info->author_date, FMT_LONGDATE); html("
committer"); html_txt(info->committer); html(" "); html_txt(info->committer_email); html(""); - cgit_print_date(info->committer_date); + cgit_print_date(info->committer_date, FMT_LONGDATE); + 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
"); + cgit_print_error("Error reading parent commit"); + html("
parent" - "%s
"); + 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%s
download"); + cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, + hex, ctx.repo->snapshots); + html("
\n"); html("
"); @@ -213,16 +210,19 @@ void cgit_print_commit(const char *hex) html_txt(info->msg); html("
"); if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { - html(""); + 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\n", + htmlf("%d files changed, %d insertions, %d deletions (", files, total_adds, total_rems); - html("
"); + cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex, + NULL, NULL); + html(")"); } cgit_free_commitinfo(info); }