Rename dirlink to gitlink.

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index db63e13fe7e2b5d13d28f55c75345a79bd0422e7..21dd533cf8edfb9432cd8a88d9f5d762340e7462 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -20,7 +20,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
 
        name = xstrdup(pathname);
        type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
+       if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
                htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                      name,
                      sha1_to_hex(sha1));
@@ -29,7 +29,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
        html("<tr><td class='filemode'>");
        html_filemode(mode);
        html("</td><td ");
-       if (S_ISDIRLNK(mode)) {
+       if (S_ISGITLINK(mode)) {
                htmlf("class='ls-mod'><a href='");
                html_attr(fmt(cgit_repo->module_link,
                              name,
@@ -37,7 +37,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
        } else if (S_ISDIR(mode)) {
                html("class='ls-dir'><a href='");
                html_attr(cgit_pageurl(cgit_query_repo, "tree",
-                                      fmt("h=%s&id=%s&path=%s%s/",
+                                      fmt("h=%s&amp;id=%s&amp;path=%s%s/",
                                           curr_rev,
                                           sha1_to_hex(sha1),
                                           cgit_query_path ? cgit_query_path : "",
@@ -45,17 +45,17 @@ static int print_entry(const unsigned char *sha1, const char *base,
        } else {
                html("class='ls-blob'><a href='");
                html_attr(cgit_pageurl(cgit_query_repo, "view",
-                                     fmt("h=%s&id=%s&path=%s%s", curr_rev,
+                                     fmt("h=%s&amp;id=%s&amp;path=%s%s", curr_rev,
                                          sha1_to_hex(sha1),
                                          cgit_query_path ? cgit_query_path : "",
                                          pathname)));
        }
-       htmlf("'>%s</a></div></td>", name);
+       htmlf("'>%s</a></td>", name);
        htmlf("<td class='filesize'>%li</td>", size);
 
        html("<td class='links'><a href='");
        html_attr(cgit_pageurl(cgit_query_repo, "log",
-                              fmt("h=%s&path=%s%s",
+                              fmt("h=%s&amp;path=%s%s",
                                   curr_rev,
                                   cgit_query_path ? cgit_query_path : "",
                                   pathname)));
@@ -69,8 +69,18 @@ void cgit_print_tree(const char *rev, const char *hex, char *path)
 {
        struct tree *tree;
        unsigned char sha1[20];
+       struct commit *commit;
 
        curr_rev = xstrdup(rev);
+       get_sha1(rev, sha1);
+       commit = lookup_commit_reference(sha1);
+       if (!commit || parse_commit(commit)) {
+               cgit_print_error(fmt("Invalid head: %s", rev));
+               return;
+       }
+       if (!hex)
+               hex = sha1_to_hex(commit->tree->object.sha1);
+
        if (get_sha1_hex(hex, sha1)) {
                cgit_print_error(fmt("Invalid object id: %s", hex));
                return;