+/* ui-commit.c: generate commit view
+ *
+ * Copyright (C) 2006 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ * (see COPYING for full license text)
+ */
+
#include "cgit.h"
-void cgit_print_date(unsigned long secs)
+int files = 0;
+
+void print_filepair(struct diff_filepair *pair)
{
- char buf[32];
- struct tm *time;
+ 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("<tr>");
+ htmlf("<td class='mode'>");
+ if (is_null_sha1(pair->two->sha1)) {
+ html_filemode(pair->one->mode);
+ } else {
+ html_filemode(pair->two->mode);
+ }
- time = gmtime(&secs);
- strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
- html_txt(buf);
-
+ if (pair->one->mode != pair->two->mode &&
+ !is_null_sha1(pair->one->sha1) &&
+ !is_null_sha1(pair->two->sha1)) {
+ html("<span class='modechange'>[");
+ html_filemode(pair->one->mode);
+ html("]</span>");
+ }
+ htmlf("</td><td class='%s'>", 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("</a> (%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("</a>)");
+ } else {
+ html_txt(pair->two->path);
+ html("</a>");
+ }
+ html("<td>");
+
+ //TODO: diffstat graph
+
+ html("</td></tr>\n");
+ files++;
}
void cgit_print_commit(const char *hex)
struct commit *commit;
struct commitinfo *info;
struct commit_list *p;
- unsigned long size;
- char type[20];
- char *buf;
-
unsigned char sha1[20];
+ char *query;
+ char *filename;
if (get_sha1(hex, sha1)) {
cgit_print_error(fmt("Bad object id: %s", hex));
return;
}
-
- buf = read_sha1_file(sha1, type, &size);
- if (!buf) {
- cgit_print_error(fmt("Bad object reference: %s", hex));
- return;
- }
-
- commit = lookup_commit(sha1);
+ commit = lookup_commit_reference(sha1);
if (!commit) {
cgit_print_error(fmt("Bad commit reference: %s", hex));
return;
}
-
- commit->buffer = buf;
- if (parse_commit_buffer(commit, buf, size)) {
- cgit_print_error(fmt("Malformed commit buffer: %s", hex));
- return;
- }
-
info = cgit_parse_commit(commit);
html("<table class='commit-info'>\n");
- html("<tr><th>author</th><td colspan='2'>");
+ html("<tr><th>author</th><td>");
html_txt(info->author);
+ html(" ");
+ html_txt(info->author_email);
+ html("</td><td class='right'>");
+ cgit_print_date(info->author_date);
html("</td></tr>\n");
html("<tr><th>committer</th><td>");
html_txt(info->committer);
+ html(" ");
+ html_txt(info->committer_email);
html("</td><td class='right'>");
- cgit_print_date(commit->date);
+ cgit_print_date(info->committer_date);
html("</td></tr>\n");
html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
- html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("id=%s", sha1_to_hex(commit->tree->object.sha1))));
+ query = fmt("id=%s", sha1_to_hex(commit->tree->object.sha1));
+ html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
-
- for (p = commit->parents; p ; p = p->next) {
- html("<tr><th>parent</th><td colspan='2' class='sha1'><a href='");
- html_attr(cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(p->item->object.sha1))));
- htmlf("'>%s</a></td></tr>\n",
+ for (p = commit->parents; p ; p = p->next) {
+ html("<tr><th>parent</th>"
+ "<td colspan='2' class='sha1'>"
+ "<a href='");
+ query = fmt("id=%s", sha1_to_hex(p->item->object.sha1));
+ html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
+ htmlf("'>%s</a></td></tr>\n",
sha1_to_hex(p->item->object.sha1));
}
+ 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&name=%s", hex, filename)));
+ htmlf("'>%s</a></td></tr>", filename);
+ }
html("</table>\n");
html("<div class='commit-subject'>");
html_txt(info->subject);
html("<div class='commit-msg'>");
html_txt(info->msg);
html("</div>");
- free(info->author);
- free(info->committer);
- free(info->subject);
- free(info);
+ html("<table class='diffstat'>");
+ html("<tr><th colspan='3'>Affected files</tr>\n");
+ cgit_diff_commit(commit, print_filepair);
+ htmlf("<tr><td colspan='3' class='summary'>"
+ "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : "");
+ html("</table>");
+ cgit_free_commitinfo(info);
}
projects / ps-cgit / blobdiff