Add 'about site' and 'about repo' pages

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 8916212ef1bbacd4c39e312c22f200408302b678..1aa5d3415947cd4b9a12c79ca4695e62a6723bfb 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -7,14 +7,20 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "html.h"
+#include "ui-shared.h"
+#include "ui-diff.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 char sha1[20];
        struct commitinfo *info;
        struct commit_list *p;
        unsigned char sha1[20];

-       char *query;
+       char *tmp;
+
+       if (!hex)
+               hex = ctx.qry.head;

 
        if (get_sha1(hex, sha1)) {
                cgit_print_error(fmt("Bad object id: %s", hex));
 
        if (get_sha1(hex, sha1)) {
                cgit_print_error(fmt("Bad object id: %s", hex));


@@ -27,33 +33,54 @@ void cgit_print_commit(const char *hex)
        }
        info = cgit_parse_commit(commit);
 
        }
        info = cgit_parse_commit(commit);
 

-       html("<table class='commit-info'>\n");
+       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'>");
        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);
+       cgit_print_date(info->author_date, FMT_LONGDATE);

        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'>");
        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(info->committer_date);
+       cgit_print_date(info->committer_date, FMT_LONGDATE);
+       html("</td></tr>\n");
+       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");
        html("</td></tr>\n");

-       html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
-       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) {
        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>"
                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));
+                    "<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>");
+       }
+       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("</table>\n");
        html("<div class='commit-subject'>");


@@ -62,5 +89,10 @@ void cgit_print_commit(const char *hex)
        html("<div class='commit-msg'>");
        html_txt(info->msg);
        html("</div>");
        html("<div class='commit-msg'>");
        html_txt(info->msg);
        html("</div>");

+       if (!(commit->parents && commit->parents->next &&
+             commit->parents->next->next)) {
+               tmp = sha1_to_hex(commit->parents->item->object.sha1);
+               cgit_print_diff(ctx.qry.sha1, tmp, NULL);
+       }

        cgit_free_commitinfo(info);
 }
        cgit_free_commitinfo(info);
 }