ui-shared: use strcmp() to compare strings

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 20a7cb2259d978c72dab0084c1f4dd091c857176..885f8707cee24b9c2a0c4e2e5f04dfa10e63f3d5 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -8,11 +8,11 @@
 
 #include "cgit.h"
 
-int files = 0, slots = 0;
-int total_adds = 0, total_rems = 0, max_changes = 0;
-int lines_added, lines_removed;
+static int files, slots;
+static int total_adds, total_rems, max_changes;
+static int lines_added, lines_removed;
 
-struct fileinfo {
+static struct fileinfo {
        char status;
        unsigned char old_sha1[20];
        unsigned char new_sha1[20];
@@ -29,7 +29,6 @@ void print_fileinfo(struct fileinfo *info)
 {
        char *query, *query2;
        char *class;
-       double width;
 
        switch (info->status) {
        case DIFF_STATUS_ADDED:
@@ -76,7 +75,7 @@ void print_fileinfo(struct fileinfo *info)
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);
-       query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1),
+       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);
@@ -96,18 +95,15 @@ void print_fileinfo(struct fileinfo *info)
        }
        html("</td><td class='right'>");
        htmlf("%d", info->added + info->removed);
-
        html("</td><td class='graph'>");
-       width = (info->added + info->removed) * 100.0 / max_changes;
-       if (width < 0.1)
-               width = 0.1;
-       html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
-                      NULL, NULL);
-       htmlf("<img src='/cgit/add.png' style='width: %.1f%%;'/>",
-             info->added * width / (info->added + info->removed));
-       htmlf("<img src='/cgit/del.png' style='width: %.1f%%;'/>",
-             info->removed * width / (info->added + info->removed));
-       html("</a></td></tr>\n");
+       htmlf("<table 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%%;'/>",
+             info->removed * 100.0 / max_changes);
+       htmlf("<td class='none' style='width: %.1f%%;'/>",
+             (max_changes - info->removed - info->added) * 100.0 / max_changes);
+       html("</tr></table></td></tr>\n");
 }
 
 void cgit_count_diff_lines(char *line, int len)
@@ -157,6 +153,7 @@ void cgit_print_commit(const char *hex)
        unsigned char sha1[20];
        char *query;
        char *filename;
+       char *tmp;
        int i;
 
        if (get_sha1(hex, sha1)) {
@@ -176,20 +173,20 @@ void cgit_print_commit(const char *hex)
        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'>");
-       cgit_print_date(info->committer_date);
+       cgit_print_date(info->committer_date, FMT_LONGDATE);
+       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,
+                      cgit_query_head, tmp, NULL);
        html("</td></tr>\n");
-       html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
-       query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1),
-                   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) {
                parent = lookup_commit_reference(p->item->object.sha1);
                if (!parent) {
@@ -201,11 +198,11 @@ void cgit_print_commit(const char *hex)
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>"
                     "<a href='");
-               query = fmt("id=%s", sha1_to_hex(p->item->object.sha1));
+               query = fmt("h=%s", sha1_to_hex(p->item->object.sha1));
                html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
                htmlf("'>%s</a> (<a href='",
                      sha1_to_hex(p->item->object.sha1));
-               query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1),
+               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>");
@@ -214,7 +211,7 @@ void cgit_print_commit(const char *hex)
                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)));
+                                      fmt("id=%s&amp;name=%s", hex, filename)));
                htmlf("'>%s</a></td></tr>", filename);
        }
        html("</table>\n");
@@ -225,6 +222,7 @@ void cgit_print_commit(const char *hex)
        html_txt(info->msg);
        html("</div>");
        if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
+               html("<div class='diffstat-header'>Diffstat</div>");
                html("<table class='diffstat'>");
                max_changes = 0;
                cgit_diff_commit(commit, inspect_filepair);
@@ -232,8 +230,11 @@ void cgit_print_commit(const char *hex)
                        print_fileinfo(&items[i]);
                html("</table>");
                html("<div class='diffstat-summary'>");
-               htmlf("%d files changed, %d insertions, %d deletions\n",
+               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_free_commitinfo(info);