Fix doc-related glitches in Makefile and .gitignore

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 2d360158c5c1b504d4faac699f719da4220e866e..41ce70e2a9964839b5bf8f03ba6698b7d1ac69d1 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -7,71 +7,100 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
+#include "ui-diff.h"
+#include "ui-log.h"
 
-void cgit_print_commit(const char *hex)
+void cgit_print_commit(char *hex)
 {
-       struct commit *commit;
+       struct commit *commit, *parent;
        struct commitinfo *info;
        struct commit_list *p;
-       unsigned long size;
-       char type[20];
-       char *buf;
-
        unsigned char sha1[20];
+       char *tmp;
+       int parents = 0;
+
+       if (!hex)
+               hex = ctx.qry.head;
 
        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'>");
+       load_ref_decorations();
+
+       html("<table summary='commit info' class='commit-info'>\n");
+       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, FMT_LONGDATE, ctx.cfg.local_time);
        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, FMT_LONGDATE, ctx.cfg.local_time);
        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))));
-       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", 
-                     sha1_to_hex(p->item->object.sha1));
+       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);
+       html(" (");
+       cgit_patch_link("patch", NULL, NULL, NULL, tmp);
+       html(")</td></tr>\n");
+       html("<tr><th>tree</th><td colspan='2' class='sha1'>");
+       tmp = xstrdup(hex);
+       cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
+                      ctx.qry.head, tmp, NULL);
+       html("</td></tr>\n");
+       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");
+                       html("</td></tr>");
+                       continue;
+               }
+               html("<tr><th>parent</th>"
+                    "<td colspan='2' class='sha1'>");
+               cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
+                                ctx.qry.head, sha1_to_hex(p->item->object.sha1));
+               html(" (");
+               cgit_diff_link("diff", NULL, NULL, ctx.qry.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='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'>");
        html_txt(info->subject);
+       show_commit_decorations(commit);
        html("</div>");
        html("<div class='commit-msg'>");
        html_txt(info->msg);
        html("</div>");
-       free(info->author);
-       free(info->committer);
-       free(info->subject);
-       free(info);
+       if (parents < 3) {
+               if (parents)
+                       tmp = sha1_to_hex(commit->parents->item->object.sha1);
+               else
+                       tmp = NULL;
+               cgit_print_diff(ctx.qry.sha1, tmp, NULL);
+       }
+       cgit_free_commitinfo(info);
 }