Add cgit_commit_link() + support for id=sha1 to commit view

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 6b135aa716fc2b643f111a5336dd33b998d94d09..8864fc65a0d62281cfd2839d3b5bc672fe6ee9d4 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -75,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);
@@ -153,8 +153,12 @@ void cgit_print_commit(const char *hex)
        unsigned char sha1[20];
        char *query;
        char *filename;
+       char *tmp;
        int i;
 
+       if (!hex)
+               hex = cgit_query_head;
+
        if (get_sha1(hex, sha1)) {
                cgit_print_error(fmt("Bad object id: %s", hex));
                return;
@@ -181,11 +185,11 @@ void cgit_print_commit(const char *hex)
        html("</td><td class='right'>");
        cgit_print_date(info->committer_date, FMT_LONGDATE);
        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));
+       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");
        for (p = commit->parents; p ; p = p->next) {
                parent = lookup_commit_reference(p->item->object.sha1);
                if (!parent) {
@@ -201,7 +205,7 @@ void cgit_print_commit(const char *hex)
                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>");
@@ -210,7 +214,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");