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.c272
1 files changed, 175 insertions, 97 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 972e9bc..2679b59 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,96 +1,185 @@
/* 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"
-#include "ui-shared.h"
-#include "ui-diff.h"
-#include "ui-log.h"
-void cgit_print_commit(char *hex, const char *prefix)
+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("<tr>");
+ htmlf("<td class='mode'>");
+ 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("<span class='modechange'>[");
+ html_filemode(info->old_mode);
+ html("]</span>");
+ }
+ htmlf("</td><td class='%s'>", class);
+ cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
+ 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("</td><td class='right'>");
+ htmlf("%d", info->added + info->removed);
+ html("</td><td class='graph'>");
+ htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
+ htmlf("<td class='add' style='width: %.1f%%;'/>",
+ info->added * 100.0 / max_changes);
+ htmlf("<td class='rem' style='width: %.1f%%;'/>",
+ info->removed * 100.0 / max_changes);
+ htmlf("<td class='none' style='width: %.1f%%;'/>",
+ (max_changes - info->removed - info->added) * 100.0 / max_changes);
+ html("</tr></table></td></tr>\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, *parent;
- struct commitinfo *info, *parent_info;
+ struct commitinfo *info;
struct commit_list *p;
- struct strbuf notes = STRBUF_INIT;
- struct object_id oid;
- char *tmp, *tmp2;
- int parents = 0;
+ unsigned char sha1[20];
+ char *filename;
+ char *tmp;
+ int i;
if (!hex)
- hex = ctx.qry.head;
+ hex = cgit_query_head;
+ curr_rev = hex;
- 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);
-
- load_ref_decorations(NULL, 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("<table 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(" ");
+ html_txt(info->author_email);
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);
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(" ");
+ html_txt(info->committer_email);
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);
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(" (");
- 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,
- ctx.qry.head, tmp, NULL);
- if (prefix) {
- html(" /");
- cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
- }
- free(tmp);
+ cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
+ cgit_query_head, tmp, NULL);
html("</td></tr>\n");
- for (p = commit->parents; p; p = p->next) {
- parent = lookup_commit_reference(the_repository, &p->item->object.oid);
+ for (p = commit->parents; p ; p = p->next) {
+ parent = lookup_commit_reference(p->item->object.sha1);
if (!parent) {
html("<tr><td colspan='3'>");
cgit_print_error("Error reading parent commit");
@@ -98,53 +187,42 @@ 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);
- 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);
+ "<td colspan='2' class='sha1'>");
+ cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
+ cgit_query_head, sha1_to_hex(p->item->object.sha1));
html(" (");
- cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
- oid_to_hex(&p->item->object.oid), prefix);
+ cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
+ sha1_to_hex(p->item->object.sha1), NULL);
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("</td></tr>");
+ if (cgit_repo->snapshots) {
+ htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
+ filename = fmt("%s-%s.zip", cgit_query_repo, hex);
+ html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
+ fmt("id=%s&amp;name=%s", hex, filename)));
+ htmlf("'>%s</a></td></tr>", filename);
}
html("</table>\n");
html("<div class='commit-subject'>");
- cgit_open_filter(ctx.repo->commit_filter);
html_txt(info->subject);
- 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);
html_txt(info->msg);
- 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);
- html_txt(notes.buf);
- 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);
- else
- tmp = NULL;
- cgit_print_diff(ctx.qry.oid, tmp, prefix, 0, 0);
+ if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
+ html("<div class='diffstat-header'>Diffstat</div>");
+ html("<table class='diffstat'>");
+ max_changes = 0;
+ cgit_diff_commit(commit, inspect_filepair);
+ for(i = 0; i<files; i++)
+ print_fileinfo(&items[i]);
+ html("</table>");
+ html("<div class='diffstat-summary'>");
+ htmlf("%d files changed, %d insertions, %d deletions (",
+ files, total_adds, total_rems);
+ cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
+ NULL, NULL);
+ html(")</div>");
}
- 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 22:52:00 +0000