X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/8a3685bcf2612206fc24a2421acb53dd83aeab85..bfabd4519c80f39eedba3dd5d522563899e364c9:/ui-commit.c?ds=sidebyside diff --git a/ui-commit.c b/ui-commit.c index ce33cf9..9a47b54 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -1,228 +1,147 @@ /* ui-commit.c: generate commit view * - * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2006-2014 cgit Development Team * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" +#include "ui-commit.h" +#include "html.h" +#include "ui-shared.h" +#include "ui-diff.h" +#include "ui-log.h" -int files = 0, slots = 0; -int total_adds = 0, total_rems = 0, max_changes = 0; -int lines_added, lines_removed; - -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, *query2; - char *class; - double width; - - 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)) { - html_filemode(info->old_mode); - } else { - html_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); - 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(""); - } - 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"); -} - -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) +void cgit_print_commit(char *hex, const char *prefix) { - 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 commitinfo *info; + struct commit *commit, *parent; + struct commitinfo *info, *parent_info; struct commit_list *p; - unsigned char sha1[20]; - char *query; - char *filename; - int i; + struct strbuf notes = STRBUF_INIT; + struct object_id oid; + char *tmp, *tmp2; + int parents = 0; + + if (!hex) + hex = ctx.qry.head; - if (get_sha1(hex, sha1)) { - cgit_print_error(fmt("Bad object id: %s", hex)); + if (get_oid(hex, &oid)) { + cgit_print_error_page(400, "Bad request", + "Bad object id: %s", hex); return; } - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference(the_repository, &oid); if (!commit) { - cgit_print_error(fmt("Bad commit reference: %s", hex)); + cgit_print_error_page(404, "Not found", + "Bad commit reference: %s", hex); return; } info = cgit_parse_commit(commit); - html("\n"); + format_display_notes(&oid, ¬es, PAGE_ENCODING, 0); + + load_ref_decorations(NULL, DECORATE_FULL_REFS); + + cgit_print_layout_start(); + cgit_print_diff_ctrls(); + 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"); + html("\n"); + for (p = commit->parents; p; p = p->next) { + parent = lookup_commit_reference(the_repository, &p->item->object.oid); + if (!parent) { + html(""); + continue; + } html("" - "\n", - sha1_to_hex(p->item->object.sha1)); + ""); + parents++; } - if (cgit_repo->snapshots) { - htmlf("", filename); + if (ctx.repo->snapshots) { + html(""); } html("
author"); + cgit_open_filter(ctx.repo->email_filter, info->author_email, "commit"); html_txt(info->author); - html(" "); - html_txt(info->author_email); + if (!ctx.cfg.noplainemail) { + html(" "); + html_txt(info->author_email); + } + cgit_close_filter(ctx.repo->email_filter); html(""); - cgit_print_date(info->author_date); + html_txt(show_date(info->author_date, info->author_tz, + cgit_date_mode(DATE_ISO8601))); html("
committer"); + cgit_open_filter(ctx.repo->email_filter, info->committer_email, "commit"); html_txt(info->committer); - html(" "); - html_txt(info->committer_email); + if (!ctx.cfg.noplainemail) { + html(" "); + html_txt(info->committer_email); + } + cgit_close_filter(ctx.repo->email_filter); html(""); - cgit_print_date(info->committer_date); + html_txt(show_date(info->committer_date, info->committer_tz, + cgit_date_mode(DATE_ISO8601))); html("
tree%s
commit"); + tmp = oid_to_hex(&commit->object.oid); + cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix); + html(" ("); + cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); + html(")
tree"); + tmp = xstrdup(hex); + cgit_tree_link(oid_to_hex(&commit->maybe_tree->object.oid), NULL, NULL, + ctx.qry.head, tmp, NULL); + if (prefix) { + html(" /"); + cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix); + } + free(tmp); + html("
"); + cgit_print_error("Error reading parent commit"); + html("
parent" - "%s
"); + tmp = tmp2 = oid_to_hex(&p->item->object.oid); + if (ctx.repo->enable_subject_links) { + parent_info = cgit_parse_commit(parent); + tmp2 = parent_info->subject; + } + cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix); + html(" ("); + cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, + oid_to_hex(&p->item->object.oid), prefix); + html(")
download%s
download"); + cgit_print_snapshot_links(ctx.repo, hex, "
"); + html("
\n"); html("
"); + cgit_open_filter(ctx.repo->commit_filter); html_txt(info->subject); + cgit_close_filter(ctx.repo->commit_filter); + show_commit_decorations(commit); html("
"); html("
"); + cgit_open_filter(ctx.repo->commit_filter); html_txt(info->msg); + cgit_close_filter(ctx.repo->commit_filter); html("
"); - if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { - html(""); - max_changes = 0; - cgit_diff_commit(commit, inspect_filepair); - for(i = 0; i"); - html("
"); - htmlf("%d files changed, %d insertions, %d deletions\n", - files, total_adds, total_rems); + if (notes.len != 0) { + html("
Notes
"); + html("
"); + cgit_open_filter(ctx.repo->commit_filter); + html_txt(notes.buf); + cgit_close_filter(ctx.repo->commit_filter); html("
"); + html("
"); + } + if (parents < 3) { + if (parents) + tmp = oid_to_hex(&commit->parents->item->object.oid); + else + tmp = NULL; + cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0); } + strbuf_release(¬es); cgit_free_commitinfo(info); + cgit_print_layout_end(); }