ui-diff: close td/tr/table properly

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index b6a106fb0681a9e93638787f54443dff93dc17f8..1d12bbbcaf4a0ab5b7d7fd9c033aa529c099498e 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -29,7 +29,6 @@ void print_fileinfo(struct fileinfo *info)
 {
        char *query, *query2;
        char *class;
 {
        char *query, *query2;
        char *class;

-       double width;

 
        switch (info->status) {
        case DIFF_STATUS_ADDED:
 
        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);
                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);
                    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='right'>");
        htmlf("%d", info->added + info->removed);

-

        html("</td><td class='graph'>");
        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)
 }
 
 void cgit_count_diff_lines(char *line, int len)


@@ -176,17 +172,17 @@ void cgit_print_commit(const char *hex)
        html(" ");
        html_txt(info->author_email);
        html("</td><td class='right'>");
        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>tree</th><td colspan='2' class='sha1'><a href='");
        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),
+       query = fmt("h=%s&amp;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));
                    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));


@@ -201,11 +197,11 @@ void cgit_print_commit(const char *hex)
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>"
                     "<a href='");
                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));
                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>");
                            sha1_to_hex(commit->tree->object.sha1));
                html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
                html("'>diff</a>)</td></tr>");


@@ -214,7 +210,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",
                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");
                htmlf("'>%s</a></td></tr>", filename);
        }
        html("</table>\n");


@@ -225,6 +221,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_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);
                html("<table class='diffstat'>");
                max_changes = 0;
                cgit_diff_commit(commit, inspect_filepair);


@@ -232,8 +229,11 @@ void cgit_print_commit(const char *hex)
                        print_fileinfo(&items[i]);
                html("</table>");
                html("<div class='diffstat-summary'>");
                        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);
                      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);
                html("</div>");
        }
        cgit_free_commitinfo(info);