Add ui-shared.h

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index d489d7c2dfb66f90f3b2e94bbe748940345391e9..8019e3608f0fd35911024d2b8294e61e864831a2 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -7,10 +7,13 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
 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;
@@ -27,7 +30,6 @@ static struct fileinfo {
 
 void print_fileinfo(struct fileinfo *info)
 {
-       char *query, *query2;
        char *class;
 
        switch (info->status) {
@@ -62,41 +64,29 @@ 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);
-       query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1),
-                   sha1_to_hex(info->new_sha1), info->new_path);
-       html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
-                      NULL, NULL);
-       if (info->status == DIFF_STATUS_COPIED ||
-           info->status == DIFF_STATUS_RENAMED) {
-               html_txt(info->new_path);
-               htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ?
-                     "copied" : "renamed");
-               query2 = fmt("id=%s", sha1_to_hex(info->old_sha1));
-               html_link_open(cgit_pageurl(cgit_query_repo, "view", query2),
-                              NULL, NULL);
-               html_txt(info->old_path);
-               html("</a>)");
-       } else {
-               html_txt(info->new_path);
-               html("</a>");
-       }
+       cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev,
+                      NULL, 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("<table summary='file diffstat' 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%%;'/>",
@@ -145,19 +135,18 @@ void inspect_filepair(struct diff_filepair *pair)
 }
 
 
-void cgit_print_commit(const char *hex)
+void cgit_print_commit(char *hex)
 {
        struct commit *commit, *parent;
        struct commitinfo *info;
        struct commit_list *p;
        unsigned char sha1[20];
-       char *query;
-       char *filename;
        char *tmp;
        int i;
 
        if (!hex)
-               hex = cgit_query_head;
+               hex = ctx.qry.head;
+       curr_rev = hex;
 
        if (get_sha1(hex, sha1)) {
                cgit_print_error(fmt("Bad object id: %s", hex));
@@ -170,7 +159,7 @@ void cgit_print_commit(const char *hex)
        }
        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(" ");
@@ -188,7 +177,7 @@ void cgit_print_commit(const char *hex)
        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,
-                      cgit_query_head, tmp, 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);
@@ -201,19 +190,17 @@ void cgit_print_commit(const char *hex)
                html("<tr><th>parent</th>"
                     "<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(" (<a href='");
-               query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1),
-                           sha1_to_hex(commit->tree->object.sha1));
-               html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
-               html("'>diff</a>)</td></tr>");
+                                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 (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);
+       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'>");
@@ -224,7 +211,7 @@ void cgit_print_commit(const char *hex)
        html("</div>");
        if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
                html("<div class='diffstat-header'>Diffstat</div>");
-               html("<table class='diffstat'>");
+               html("<table summary='diffstat' class='diffstat'>");
                max_changes = 0;
                cgit_diff_commit(commit, inspect_filepair);
                for(i = 0; i<files; i++)
@@ -233,10 +220,9 @@ void cgit_print_commit(const char *hex)
                html("<div class='diffstat-summary'>");
                htmlf("%d files changed, %d insertions, %d deletions (",
                      files, total_adds, total_rems);
-               query = fmt("h=%s", hex);
-               html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL);
-               html("show diff</a>)");
-               html("</div>");
+               cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex,
+                              NULL, NULL);
+               html(")</div>");
        }
        cgit_free_commitinfo(info);
 }