Merge branch 'stable'

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index c22e30b82ef08f0901fe32d8ebe72afdc7b6e919..c26ba4c682802b0a0c09745511cc072e23c6ce3b 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "html.h"
+#include "ui-shared.h"

 
 char *curr_rev;
 char *match_path;
 
 char *curr_rev;
 char *match_path;


@@ -16,8 +18,8 @@ static void print_object(const unsigned char *sha1, char *path)
 {
        enum object_type type;
        char *buf;
 {
        enum object_type type;
        char *buf;

-       unsigned long size, lineno, start, idx;
-       const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>";
+       unsigned long size, lineno, idx;
+       const char *numberfmt = "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n";

 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {


@@ -33,33 +35,38 @@ 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(" (");
+       cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
+                       curr_rev, path);
+       htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));

 
 

-       html("<table class='blob'>\n");
+       html("<table summary='blob content' class='blob'>\n");
+       html("<tr>\n");
+
+       html("<td class='linenumbers'><pre>");

        idx = 0;
        idx = 0;

-       start = 0;

        lineno = 0;
        lineno = 0;

-       while(idx < size) {
+       htmlf(numberfmt, ++lineno);
+       while(idx < size - 1) { // skip absolute last newline

                if (buf[idx] == '\n') {
                if (buf[idx] == '\n') {

-                       buf[idx] = '\0';
-                       htmlf(linefmt, ++lineno);
-                       html_txt(buf + start);
-                       html("</td></tr>\n");
-                       start = idx + 1;
+                       htmlf(numberfmt, ++lineno);

                }
                idx++;
        }
                }
                idx++;
        }

-       htmlf(linefmt, ++lineno);
-       html_txt(buf + start);
-       html("</td></tr>\n");
+       html("</pre></td>\n");
+
+       html("<td class='lines'><pre><code>");
+       html_txt(buf);
+       html("</code></pre></td>\n");
+
+       html("</tr>\n");

        html("</table>\n");
 }
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        html("</table>\n");
 }
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,

-                  const char *pathname, unsigned int mode, int stage)
+                  const char *pathname, unsigned int mode, int stage,
+                  void *cbdata)

 {
        char *name;
        char *fullpath;
 {
        char *name;
        char *fullpath;


@@ -67,40 +74,45 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        unsigned long size = 0;
 
        name = xstrdup(pathname);
        unsigned long size = 0;
 
        name = xstrdup(pathname);

-       fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
-                      cgit_query_path ? "/" : "", name);
+       fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
+                      ctx.qry.path ? "/" : "", name);

 
 

-       type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
-               htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
-                     name,
-                     sha1_to_hex(sha1));
-               return 0;
+       if (!S_ISGITLINK(mode)) {
+               type = sha1_object_info(sha1, &size);
+               if (type == OBJ_BAD) {
+                       htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
+                             name,
+                             sha1_to_hex(sha1));
+                       return 0;
+               }

        }
 
        html("<tr><td class='ls-mode'>");
        }
 
        html("<tr><td class='ls-mode'>");

-       html_filemode(mode);
+       cgit_print_filemode(mode);

        html("</td><td>");
        if (S_ISGITLINK(mode)) {
                htmlf("<a class='ls-mod' href='");
        html("</td><td>");
        if (S_ISGITLINK(mode)) {
                htmlf("<a class='ls-mod' href='");

-               html_attr(fmt(cgit_repo->module_link,
+               html_attr(fmt(ctx.repo->module_link,

                              name,
                              sha1_to_hex(sha1)));
                html("'>");
                html_txt(name);
                html("</a>");
        } else if (S_ISDIR(mode)) {
                              name,
                              sha1_to_hex(sha1)));
                html("'>");
                html_txt(name);
                html("</a>");
        } else if (S_ISDIR(mode)) {

-               cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
+               cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,

                               curr_rev, fullpath);
        } else {
                               curr_rev, fullpath);
        } else {

-               cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
+               cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,

                               curr_rev, fullpath);
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");
                               curr_rev, fullpath);
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");

-       cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
-                     fullpath, 0, NULL, NULL);
+       cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
+                     fullpath, 0, NULL, NULL, ctx.qry.showmsg);
+       if (ctx.repo->max_stats)
+               cgit_stats_link("stats", NULL, "button", ctx.qry.head,
+                               fullpath);

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


@@ -108,7 +120,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
 static void ls_head()
 {
 
 static void ls_head()
 {

-       html("<table class='list'>\n");
+       html("<table summary='tree listing' class='list'>\n");

        html("<tr class='nohover'>");
        html("<th class='left'>Mode</th>");
        html("<th class='left'>Name</th>");
        html("<tr class='nohover'>");
        html("<th class='left'>Mode</th>");
        html("<th class='left'>Name</th>");


@@ -138,13 +150,14 @@ static void ls_tree(const unsigned char *sha1, char *path)
        }
 
        ls_head();
        }
 
        ls_head();

-       read_tree_recursive(tree, "", 0, 1, NULL, ls_item);
+       read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);

        ls_tail();
 }
 
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
        ls_tail();
 }
 
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,

-                    const char *pathname, unsigned mode, int stage)
+                    const char *pathname, unsigned mode, int stage,
+                    void *cbdata)

 {
        static int state;
        static char buffer[PATH_MAX];
 {
        static int state;
        static char buffer[PATH_MAX];


@@ -153,10 +166,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
        if (state == 0) {
                memcpy(buffer, base, baselen);
                strcpy(buffer+baselen, pathname);
        if (state == 0) {
                memcpy(buffer, base, baselen);
                strcpy(buffer+baselen, pathname);

-               url = cgit_pageurl(cgit_query_repo, "tree",
+               url = cgit_pageurl(ctx.qry.repo, "tree",

                                   fmt("h=%s&amp;path=%s", curr_rev, buffer));
                html("/");
                                   fmt("h=%s&amp;path=%s", curr_rev, buffer));
                html("/");

-               cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head,
+               cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,

                               curr_rev, buffer);
 
                if (strcmp(match_path, buffer))
                               curr_rev, buffer);
 
                if (strcmp(match_path, buffer))


@@ -171,7 +184,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                        return 0;
                }
        }
                        return 0;
                }
        }

-       ls_item(sha1, base, baselen, pathname, mode, stage);
+       ls_item(sha1, base, baselen, pathname, mode, stage, NULL);

        return 0;
 }
 
        return 0;
 }
 


@@ -188,7 +201,7 @@ void cgit_print_tree(const char *rev, char *path)
        const char *paths[] = {path, NULL};
 
        if (!rev)
        const char *paths[] = {path, NULL};
 
        if (!rev)

-               rev = cgit_query_head;
+               rev = ctx.qry.head;

 
        curr_rev = xstrdup(rev);
        if (get_sha1(rev, sha1)) {
 
        curr_rev = xstrdup(rev);
        if (get_sha1(rev, sha1)) {


@@ -202,7 +215,7 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        html("path: <a href='");
        }
 
        html("path: <a href='");

-       html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s", rev)));
+       html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));

        html("'>root</a>");
 
        if (path == NULL) {
        html("'>root</a>");
 
        if (path == NULL) {


@@ -211,6 +224,6 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        match_path = path;
        }
 
        match_path = path;

-       read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree);
+       read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);

        ls_tail();
 }
        ls_tail();
 }