ui-log: add support for showing the full commit message

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index db0bef6cd9d7b02cacea510a72ac0917d8547c9f..051db7cb28cbf2321ca67582aac866596743a465 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;


@@ -15,8 +17,9 @@ int header = 0;
 static void print_object(const unsigned char *sha1, char *path)
 {
        enum object_type type;
 static void print_object(const unsigned char *sha1, char *path)
 {
        enum object_type type;

-       unsigned char *buf;
+       char *buf;

        unsigned long size, lineno, start, idx;
        unsigned long size, lineno, start, idx;

+       const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";

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


@@ -32,78 +35,86 @@ static void print_object(const unsigned char *sha1, char *path)
                return;
        }
 
                return;
        }
 

-       html("<table class='blob'>\n");
+       html(" (");
+       cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
+                       curr_rev, path);
+       htmlf(")<br/>blob: %s", sha1_to_hex(sha1));
+
+       html("<table summary='blob content' class='blob'>\n");

        idx = 0;
        start = 0;
        lineno = 0;
        while(idx < size) {
                if (buf[idx] == '\n') {
                        buf[idx] = '\0';
        idx = 0;
        start = 0;
        lineno = 0;
        while(idx < size) {
                if (buf[idx] == '\n') {
                        buf[idx] = '\0';

-                       htmlf("<tr><td class='no'>%d</td><td class='txt'>",
-                             ++lineno);
+                       htmlf(linefmt, ++lineno);

                        html_txt(buf + start);
                        html("</td></tr>\n");
                        start = idx + 1;
                }
                idx++;
        }
                        html_txt(buf + start);
                        html("</td></tr>\n");
                        start = idx + 1;
                }
                idx++;
        }

+       htmlf(linefmt, ++lineno);
+       html_txt(buf + start);
+       html("</td></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 *name;

+       char *fullpath;

        enum object_type type;
        unsigned long size = 0;
        enum object_type type;
        unsigned long size = 0;

-       char *url, *qry;

 
        name = xstrdup(pathname);
 
        name = xstrdup(pathname);

-       type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
-               htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
-                     name,
-                     sha1_to_hex(sha1));
-               return 0;
+       fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
+                      ctx.qry.path ? "/" : "", name);
+
+       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;
+               }

        }
        }

-       qry = fmt("h=%s&amp;path=%s%s%s", curr_rev,
-                 cgit_query_path ? cgit_query_path : "",
-                 cgit_query_path ? "/" : "", pathname);
-       url = cgit_pageurl(cgit_query_repo, "tree", qry);
-       html("<tr><td class='filemode'>");
-       html_filemode(mode);
-       html("</td><td ");
-       if (S_ISDIRLNK(mode)) {
-               htmlf("class='ls-mod'><a href='");
-               html_attr(fmt(cgit_repo->module_link,
+
+       html("<tr><td class='ls-mode'>");
+       cgit_print_filemode(mode);
+       html("</td><td>");
+       if (S_ISGITLINK(mode)) {
+               htmlf("<a class='ls-mod' href='");
+               html_attr(fmt(ctx.repo->module_link,

                              name,
                              sha1_to_hex(sha1)));
                              name,
                              sha1_to_hex(sha1)));

+               html("'>");
+               html_txt(name);
+               html("</a>");

        } else if (S_ISDIR(mode)) {
        } else if (S_ISDIR(mode)) {

-               html("class='ls-dir'><a href='");
-               html_attr(url);
+               cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
+                              curr_rev, fullpath);

        } else {
        } else {

-               html("class='ls-blob'><a href='");
-               html_attr(url);
+               cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
+                              curr_rev, fullpath);

        }
        }

-       htmlf("'>%s</a></td>", name);
-       htmlf("<td class='filesize'>%li</td>", size);
-
-       html("<td class='links'><a href='");
-       qry = fmt("h=%s&amp;path=%s%s%s", curr_rev,
-                 cgit_query_path ? cgit_query_path : "",
-                 cgit_query_path ? "/" : "", pathname);
-       url = cgit_pageurl(cgit_query_repo, "log", qry);
-       html_attr(url);
-       html("' class='button'>H</a></td>");
-       html("</tr>\n");
+       htmlf("</td><td class='ls-size'>%li</td>", size);
+
+       html("<td>");
+       cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
+                     fullpath, 0, NULL, NULL, ctx.qry.showmsg);
+       html("</td></tr>\n");

        free(name);
        return 0;
 }
 
 static void ls_head()
 {
        free(name);
        return 0;
 }
 
 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>");


@@ -133,13 +144,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];


@@ -148,13 +160,11 @@ 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));
                                   fmt("h=%s&amp;path=%s", curr_rev, buffer));

-               htmlf(" / <a href='");
-               html_attr(url);
-               html("'>");
-               html_txt(xstrdup(pathname));
-               html("</a>");
+               html("/");
+               cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
+                              curr_rev, buffer);

 
                if (strcmp(match_path, buffer))
                        return READ_TREE_RECURSIVE;
 
                if (strcmp(match_path, buffer))
                        return READ_TREE_RECURSIVE;


@@ -168,7 +178,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;
 }
 


@@ -185,7 +195,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)) {


@@ -199,7 +209,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) {


@@ -208,6 +218,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();
 }