Merge branch 'jo/dirlink'

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index e16b63828dcf7b29c32da71454276b809174d404..1cb09f717a56826dfd2cb132cdd78f72c3aad341 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -32,6 +32,10 @@ static void print_object(const unsigned char *sha1, char *path)
                return;
        }
 
                return;
        }
 

+       html(" blob: <a href='");
+       html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
+       htmlf("'>%s</a>",sha1_to_hex(sha1));
+

        html("<table class='blob'>\n");
        idx = 0;
        start = 0;
        html("<table class='blob'>\n");
        idx = 0;
        start = 0;


@@ -39,7 +43,7 @@ static void print_object(const unsigned char *sha1, char *path)
        while(idx < size) {
                if (buf[idx] == '\n') {
                        buf[idx] = '\0';
        while(idx < size) {
                if (buf[idx] == '\n') {
                        buf[idx] = '\0';

-                       htmlf("<tr><td class='no'>%d</td><td class='txt'>",
+                       htmlf("<tr><td class='no'><a name='%d'>%1$d</a></td><td class='txt'>",

                              ++lineno);
                        html_txt(buf + start);
                        html("</td></tr>\n");
                              ++lineno);
                        html_txt(buf + start);
                        html("</td></tr>\n");


@@ -58,14 +62,13 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        char *fullpath;
        enum object_type type;
        unsigned long size = 0;
        char *fullpath;
        enum object_type type;
        unsigned long size = 0;

-       char *url, *qry;

 
        name = xstrdup(pathname);
        fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
                       cgit_query_path ? "/" : "", name);
 
        type = sha1_object_info(sha1, &size);
 
        name = xstrdup(pathname);
        fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
                       cgit_query_path ? "/" : "", name);
 
        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));
                htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                      name,
                      sha1_to_hex(sha1));


@@ -75,7 +78,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        html("<tr><td class='ls-mode'>");
        html_filemode(mode);
        html("</td><td>");
        html("<tr><td class='ls-mode'>");
        html_filemode(mode);
        html("</td><td>");

-       if (S_ISDIRLNK(mode)) {
+       if (S_ISGITLINK(mode)) {

                htmlf("<a class='ls-mod' href='");
                html_attr(fmt(cgit_repo->module_link,
                              name,
                htmlf("<a class='ls-mod' href='");
                html_attr(fmt(cgit_repo->module_link,
                              name,


@@ -93,8 +96,8 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");

-       cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev,
-                     fullpath);
+       cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
+                     fullpath, 0);

        html("</td></tr>\n");
        free(name);
        return 0;
        html("</td></tr>\n");
        free(name);
        return 0;