X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/ae4c1ee11379e353f2a94201181a3a9dab75b646..205837d4684f331afa93c946cbdfa1fa9b3d1ce9:/ui-commit.c diff --git a/ui-commit.c b/ui-commit.c index f1a22d3..783211f 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -1,158 +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; - -void print_filepair(struct diff_filepair *pair) +void cgit_print_commit(char *hex, const char *prefix) { - 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(""); - if (is_null_sha1(pair->two->sha1)) { - html_filemode(pair->one->mode); - } else { - html_filemode(pair->two->mode); - } - - if (pair->one->mode != pair->two->mode && - !is_null_sha1(pair->one->sha1) && - !is_null_sha1(pair->two->sha1)) { - html("["); - html_filemode(pair->one->mode); - html("]"); - } - htmlf("", class); - query = fmt("id=%s&id2=%s", sha1_to_hex(pair->one->sha1), - sha1_to_hex(pair->two->sha1)); - 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 ? - "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 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; + 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"); + html("\n"); - html("\n", sha1_to_hex(commit->tree->object.sha1)); - for (p = commit->parents; p ; p = p->next) { + 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("
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(get_commit_tree_oid(commit)), NULL, NULL, + ctx.qry.head, tmp, NULL); + if (prefix) { + html(" /"); + cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix); + } + free(tmp); html("
tree%s
"); + 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("
"); - html(""); - html("\n"); - cgit_diff_commit(commit, print_filepair); - htmlf("\n", files, files > 1 ? "s" : ""); - html("
Affected files
" - "%d file%s changed
"); + 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(); }