git: update to v2.46.0

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 001001c4ab4c319f4ed100dddaba09bc0eac7c92..4d6960719a56426ba77a29ccade93808099c8128 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -6,6 +6,8 @@
  *   (see COPYING for full license text)
  */
 
+#define USE_THE_REPOSITORY_VARIABLE
+
 #include "cgit.h"
 #include "ui-plain.h"
 #include "html.h"
@@ -28,7 +30,7 @@ static int print_object(const struct object_id *oid, const char *path)
                return 0;
        }
 
-       buf = read_object_file(oid, &type, &size);
+       buf = repo_read_object_file(the_repository, oid, &type, &size);
        if (!buf) {
                cgit_print_error_page(404, "Not found", "Not found");
                return 0;
@@ -130,7 +132,7 @@ static void print_dir_tail(void)
 }
 
 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;
 
@@ -181,12 +183,12 @@ void cgit_print_plain(void)
        if (!rev)
                rev = ctx.qry.head;
 
-       if (get_oid(rev, &oid)) {
+       if (repo_get_oid(the_repository, rev, &oid)) {
                cgit_print_error_page(404, "Not found", "Not found");
                return;
        }
        commit = lookup_commit_reference(the_repository, &oid);
-       if (!commit || parse_commit(commit)) {
+       if (!commit || repo_parse_commit(the_repository, commit)) {
                cgit_print_error_page(404, "Not found", "Not found");
                return;
        }
@@ -198,9 +200,8 @@ void cgit_print_plain(void)
        }
        else
                walk_tree_ctx.match_baselen = basedir_len(path_items.match);
-       read_tree_recursive(the_repository,
-                           repo_get_commit_tree(the_repository, commit),
-                           "", 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.match)
                cgit_print_error_page(404, "Not found", "Not found");
        else if (walk_tree_ctx.match == 2)