Merge branch 'stable'

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 9be3140c40b7583bfa07a435735f958c6d39b723..9876c9972e9558f82632d03280997cc8db234fac 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -35,9 +35,10 @@ static void print_object(const unsigned char *sha1, char *path)
                return;
        }
 
                return;
        }
 

-       html(" blob: <a href='");
-       html_attr(cgit_pageurl(ctx.qry.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", sha1_to_hex(sha1));

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


@@ -53,15 +54,18 @@ static void print_object(const unsigned char *sha1, char *path)
                }
                idx++;
        }
                }
                idx++;
        }

-       htmlf(linefmt, ++lineno);
-       html_txt(buf + start);
+       if (start < 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("</td></tr>\n");
        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;


@@ -72,12 +76,14 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
                       ctx.qry.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'>");


@@ -102,7 +108,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
        html("<td>");
        cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
 
        html("<td>");
        cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,

-                     fullpath, 0, NULL, NULL);
+                     fullpath, 0, NULL, NULL, ctx.qry.showmsg);

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


@@ -140,13 +146,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];


@@ -173,7 +180,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;
 }
 


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