cgit.css: set form margins

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 3b0919ba831a05d6fc0c920e3ebd446e3d186b58..dd36cc013244abb58a4516d7a929c659af39b41a 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -7,6 +7,9 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
+#include "ui-diff.h"
 
 static int files, slots;
 static int total_adds, total_rems, max_changes;
@@ -62,16 +65,16 @@ void print_fileinfo(struct fileinfo *info)
        html("<tr>");
        htmlf("<td class='mode'>");
        if (is_null_sha1(info->new_sha1)) {
-               html_filemode(info->old_mode);
+               cgit_print_filemode(info->old_mode);
        } else {
-               html_filemode(info->new_mode);
+               cgit_print_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);
+               cgit_print_filemode(info->old_mode);
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);
@@ -172,6 +175,12 @@ void cgit_print_commit(char *hex)
        html("</td><td class='right'>");
        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,
@@ -194,10 +203,10 @@ void cgit_print_commit(char *hex)
                               sha1_to_hex(p->item->object.sha1), NULL);
                html(")</td></tr>");
        }
-       if (cgit_repo->snapshots) {
+       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, cgit_repo->snapshots);
+                                         hex, ctx.repo->snapshots);
                html("</td></tr>");
        }
        html("</table>\n");
@@ -216,10 +225,11 @@ void cgit_print_commit(char *hex)
                        print_fileinfo(&items[i]);
                html("</table>");
                html("<div class='diffstat-summary'>");
-               htmlf("%d files changed, %d insertions, %d deletions (",
+               htmlf("%d files changed, %d insertions, %d deletions",
                      files, total_adds, total_rems);
-               cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex,
-                              NULL, NULL);
+               cgit_print_diff(ctx.qry.sha1,
+                               sha1_to_hex(commit->parents->item->object.sha1),
+                               NULL);
                html(")</div>");
        }
        cgit_free_commitinfo(info);