git: update to v2.39.2

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 314ac5299fc5dca99949d2cb24394c52fb2c91d5..98ce1ca09ab9ffb3101517db8e858878869dfe26 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -89,6 +89,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
        enum object_type type;
        char *buf;
        unsigned long size;
        enum object_type type;
        char *buf;
        unsigned long size;

+       bool is_binary;

 
        type = oid_object_info(the_repository, oid, &size);
        if (type == OBJ_BAD) {
 
        type = oid_object_info(the_repository, oid, &size);
        if (type == OBJ_BAD) {


@@ -103,6 +104,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
                        "Error reading object %s", oid_to_hex(oid));
                return;
        }
                        "Error reading object %s", oid_to_hex(oid));
                return;
        }

+       is_binary = buffer_is_binary(buf, size);

 
        cgit_set_title_from_path(path);
 
 
        cgit_set_title_from_path(path);
 


@@ -110,7 +112,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
        htmlf("blob: %s (", oid_to_hex(oid));
        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                        rev, path);
        htmlf("blob: %s (", oid_to_hex(oid));
        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                        rev, path);

-       if (ctx.cfg.enable_blame) {
+       if (ctx.repo->enable_blame && !is_binary) {

                html(") (");
                cgit_blame_link("blame", NULL, NULL, ctx.qry.head,
                                rev, path);
                html(") (");
                cgit_blame_link("blame", NULL, NULL, ctx.qry.head,
                                rev, path);


@@ -123,7 +125,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
                return;
        }
 
                return;
        }
 

-       if (buffer_is_binary(buf, size))
+       if (is_binary)

                print_binary_buffer(buf, size);
        else
                print_text_buffer(basename, buf, size);
                print_binary_buffer(buf, size);
        else
                print_text_buffer(basename, buf, size);


@@ -139,8 +141,7 @@ struct single_tree_ctx {
 };
 
 static int single_tree_cb(const struct object_id *oid, struct strbuf *base,
 };
 
 static int single_tree_cb(const struct object_id *oid, struct strbuf *base,

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

 {
        struct single_tree_ctx *ctx = cbdata;
 
 {
        struct single_tree_ctx *ctx = cbdata;
 


@@ -185,8 +186,7 @@ static void write_tree_link(const struct object_id *oid, char *name,
                tree_ctx.name = NULL;
                tree_ctx.count = 0;
 
                tree_ctx.name = NULL;
                tree_ctx.count = 0;
 

-               read_tree_recursive(tree, "", 0, 1, &paths, single_tree_cb,
-                                   &tree_ctx);
+               read_tree(the_repository, tree, &paths, single_tree_cb, &tree_ctx);

 
                if (tree_ctx.count != 1)
                        break;
 
                if (tree_ctx.count != 1)
                        break;


@@ -199,14 +199,16 @@ static void write_tree_link(const struct object_id *oid, char *name,
 }
 
 static int ls_item(const struct object_id *oid, struct strbuf *base,
 }
 
 static int ls_item(const struct object_id *oid, struct strbuf *base,

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

 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
        char *name;
        struct strbuf fullpath = STRBUF_INIT;
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
        char *name;
        struct strbuf fullpath = STRBUF_INIT;

+       struct strbuf linkpath = STRBUF_INIT;

        struct strbuf class = STRBUF_INIT;
        enum object_type type;
        unsigned long size = 0;
        struct strbuf class = STRBUF_INIT;
        enum object_type type;
        unsigned long size = 0;

+       char *buf;

 
        name = xstrdup(pathname);
        strbuf_addf(&fullpath, "%s%s%s", ctx.qry.path ? ctx.qry.path : "",
 
        name = xstrdup(pathname);
        strbuf_addf(&fullpath, "%s%s%s", ctx.qry.path ? ctx.qry.path : "",


@@ -218,8 +220,7 @@ static int ls_item(const struct object_id *oid, struct strbuf *base,
                        htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                              name,
                              oid_to_hex(oid));
                        htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                              name,
                              oid_to_hex(oid));

-                       free(name);
-                       return 0;
+                       goto cleanup;

                }
        }
 
                }
        }
 


@@ -239,6 +240,21 @@ static int ls_item(const struct object_id *oid, struct strbuf *base,
                cgit_tree_link(name, NULL, class.buf, ctx.qry.head,
                               walk_tree_ctx->curr_rev, fullpath.buf);
        }
                cgit_tree_link(name, NULL, class.buf, ctx.qry.head,
                               walk_tree_ctx->curr_rev, fullpath.buf);
        }

+       if (S_ISLNK(mode)) {
+               html(" -> ");
+               buf = read_object_file(oid, &type, &size);
+               if (!buf) {
+                       htmlf("Error reading object: %s", oid_to_hex(oid));
+                       goto cleanup;
+               }
+               strbuf_addbuf(&linkpath, &fullpath);
+               strbuf_addf(&linkpath, "/../%s", buf);
+               strbuf_normalize_path(&linkpath);
+               cgit_tree_link(buf, NULL, class.buf, ctx.qry.head,
+                       walk_tree_ctx->curr_rev, linkpath.buf);
+               free(buf);
+               strbuf_release(&linkpath);
+       }

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


@@ -251,10 +267,12 @@ static int ls_item(const struct object_id *oid, struct strbuf *base,
        if (!S_ISGITLINK(mode))
                cgit_plain_link("plain", NULL, "button", ctx.qry.head,
                                walk_tree_ctx->curr_rev, fullpath.buf);
        if (!S_ISGITLINK(mode))
                cgit_plain_link("plain", NULL, "button", ctx.qry.head,
                                walk_tree_ctx->curr_rev, fullpath.buf);

-       if (!S_ISDIR(mode) && ctx.cfg.enable_blame)
+       if (!S_ISDIR(mode) && ctx.repo->enable_blame)

                cgit_blame_link("blame", NULL, "button", ctx.qry.head,
                                walk_tree_ctx->curr_rev, fullpath.buf);
        html("</td></tr>\n");
                cgit_blame_link("blame", NULL, "button", ctx.qry.head,
                                walk_tree_ctx->curr_rev, fullpath.buf);
        html("</td></tr>\n");

+
+cleanup:

        free(name);
        strbuf_release(&fullpath);
        strbuf_release(&class);
        free(name);
        strbuf_release(&fullpath);
        strbuf_release(&class);


@@ -294,13 +312,13 @@ static void ls_tree(const struct object_id *oid, const char *path, struct walk_t
        }
 
        ls_head();
        }
 
        ls_head();

-       read_tree_recursive(tree, "", 0, 1, &paths, ls_item, walk_tree_ctx);
+       read_tree(the_repository, tree, &paths, ls_item, walk_tree_ctx);

        ls_tail();
 }
 
 
 static int walk_tree(const struct object_id *oid, struct strbuf *base,
        ls_tail();
 }
 
 
 static int walk_tree(const struct object_id *oid, struct strbuf *base,

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

 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
 
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
 


@@ -325,7 +343,7 @@ static int walk_tree(const struct object_id *oid, struct strbuf *base,
                        return 0;
                }
        }
                        return 0;
                }
        }

-       ls_item(oid, base, pathname, mode, stage, walk_tree_ctx);
+       ls_item(oid, base, pathname, mode, walk_tree_ctx);

        return 0;
 }
 
        return 0;
 }
 


@@ -369,11 +387,12 @@ void cgit_print_tree(const char *rev, char *path)
        walk_tree_ctx.curr_rev = xstrdup(rev);
 
        if (path == NULL) {
        walk_tree_ctx.curr_rev = xstrdup(rev);
 
        if (path == NULL) {

-               ls_tree(&commit->maybe_tree->object.oid, NULL, &walk_tree_ctx);
+               ls_tree(get_commit_tree_oid(commit), NULL, &walk_tree_ctx);

                goto cleanup;
        }
 
                goto cleanup;
        }
 

-       read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+       read_tree(the_repository, repo_get_commit_tree(the_repository, commit),
+                 &paths, walk_tree, &walk_tree_ctx);

        if (walk_tree_ctx.state == 1)
                ls_tail();
        else if (walk_tree_ctx.state == 2)
        if (walk_tree_ctx.state == 1)
                ls_tail();
        else if (walk_tree_ctx.state == 2)