aboutsummaryrefslogtreecommitdiff
path: root/ui-commit.c
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'ui-commit.c')
-rw-r--r--ui-commit.c81
1 files changed, 38 insertions, 43 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 972e9bc..8310ce6 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,13 +1,11 @@
/* ui-commit.c: generate commit view
*
- * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
+ * Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
-#define USE_THE_REPOSITORY_VARIABLE
-
#include "cgit.h"
#include "ui-commit.h"
#include "html.h"
@@ -21,67 +19,58 @@ void cgit_print_commit(char *hex, const char *prefix)
struct commitinfo *info, *parent_info;
struct commit_list *p;
struct strbuf notes = STRBUF_INIT;
- struct object_id oid;
+ unsigned char sha1[20];
char *tmp, *tmp2;
int parents = 0;
if (!hex)
hex = ctx.qry.head;
- if (repo_get_oid(the_repository, hex, &oid)) {
- cgit_print_error_page(400, "Bad request",
- "Bad object id: %s", hex);
+ if (get_sha1(hex, sha1)) {
+ cgit_print_error(fmt("Bad object id: %s", hex));
return;
}
- commit = lookup_commit_reference(the_repository, &oid);
+ commit = lookup_commit_reference(sha1);
if (!commit) {
- cgit_print_error_page(404, "Not found",
- "Bad commit reference: %s", hex);
+ cgit_print_error(fmt("Bad commit reference: %s", hex));
return;
}
info = cgit_parse_commit(commit);
- format_display_notes(&oid, &notes, PAGE_ENCODING, 1);
+ init_display_notes(NULL);
+ format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
- load_ref_decorations(NULL, DECORATE_FULL_REFS);
+ load_ref_decorations(DECORATE_FULL_REFS);
- ctx.page.title = fmtalloc("%s - %s", info->subject, ctx.page.title);
- cgit_print_layout_start();
cgit_print_diff_ctrls();
html("<table summary='commit info' class='commit-info'>\n");
html("<tr><th>author</th><td>");
- cgit_open_filter(ctx.repo->email_filter, info->author_email, "commit");
html_txt(info->author);
if (!ctx.cfg.noplainemail) {
html(" ");
html_txt(info->author_email);
}
- cgit_close_filter(ctx.repo->email_filter);
html("</td><td class='right'>");
- html_txt(show_date(info->author_date, info->author_tz,
- cgit_date_mode(DATE_ISO8601)));
+ cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
html("</td></tr>\n");
html("<tr><th>committer</th><td>");
- cgit_open_filter(ctx.repo->email_filter, info->committer_email, "commit");
html_txt(info->committer);
if (!ctx.cfg.noplainemail) {
html(" ");
html_txt(info->committer_email);
}
- cgit_close_filter(ctx.repo->email_filter);
html("</td><td class='right'>");
- html_txt(show_date(info->committer_date, info->committer_tz,
- cgit_date_mode(DATE_ISO8601)));
+ cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
html("</td></tr>\n");
- html("<tr><th>commit</th><td colspan='2' class='oid'>");
- tmp = oid_to_hex(&commit->object.oid);
- cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
+ html("<tr><th>commit</th><td colspan='2' class='sha1'>");
+ tmp = sha1_to_hex(commit->object.sha1);
+ cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
html(" (");
cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
html(")</td></tr>\n");
- html("<tr><th>tree</th><td colspan='2' class='oid'>");
+ html("<tr><th>tree</th><td colspan='2' class='sha1'>");
tmp = xstrdup(hex);
- cgit_tree_link(oid_to_hex(get_commit_tree_oid(commit)), NULL, NULL,
+ cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
ctx.qry.head, tmp, NULL);
if (prefix) {
html(" /");
@@ -90,7 +79,7 @@ void cgit_print_commit(char *hex, const char *prefix)
free(tmp);
html("</td></tr>\n");
for (p = commit->parents; p; p = p->next) {
- parent = lookup_commit_reference(the_repository, &p->item->object.oid);
+ parent = lookup_commit_reference(p->item->object.sha1);
if (!parent) {
html("<tr><td colspan='3'>");
cgit_print_error("Error reading parent commit");
@@ -98,53 +87,59 @@ void cgit_print_commit(char *hex, const char *prefix)
continue;
}
html("<tr><th>parent</th>"
- "<td colspan='2' class='oid'>");
- tmp = tmp2 = oid_to_hex(&p->item->object.oid);
+ "<td colspan='2' class='sha1'>");
+ tmp = tmp2 = sha1_to_hex(p->item->object.sha1);
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);
+ cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
html(" (");
cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
- oid_to_hex(&p->item->object.oid), prefix);
+ sha1_to_hex(p->item->object.sha1), prefix, 0);
html(")</td></tr>");
parents++;
}
if (ctx.repo->snapshots) {
- html("<tr><th>download</th><td colspan='2' class='oid'>");
- cgit_print_snapshot_links(ctx.repo, hex, "<br/>");
+ html("<tr><th>download</th><td colspan='2' class='sha1'>");
+ cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
+ hex, ctx.repo->snapshots);
html("</td></tr>");
}
html("</table>\n");
html("<div class='commit-subject'>");
- cgit_open_filter(ctx.repo->commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_open_filter(ctx.repo->commit_filter);
html_txt(info->subject);
- cgit_close_filter(ctx.repo->commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_close_filter(ctx.repo->commit_filter);
show_commit_decorations(commit);
html("</div>");
html("<div class='commit-msg'>");
- cgit_open_filter(ctx.repo->commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_open_filter(ctx.repo->commit_filter);
html_txt(info->msg);
- cgit_close_filter(ctx.repo->commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_close_filter(ctx.repo->commit_filter);
html("</div>");
if (notes.len != 0) {
html("<div class='notes-header'>Notes</div>");
html("<div class='notes'>");
- cgit_open_filter(ctx.repo->commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_open_filter(ctx.repo->commit_filter);
html_txt(notes.buf);
- cgit_close_filter(ctx.repo->commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_close_filter(ctx.repo->commit_filter);
html("</div>");
html("<div class='notes-footer'></div>");
}
if (parents < 3) {
if (parents)
- tmp = oid_to_hex(&commit->parents->item->object.oid);
+ tmp = sha1_to_hex(commit->parents->item->object.sha1);
else
tmp = NULL;
- cgit_print_diff(ctx.qry.oid, tmp, prefix, 0, 0);
+ cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0);
}
strbuf_release(&notes);
cgit_free_commitinfo(info);
- cgit_print_layout_end();
}
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 20:34:23 +0000