tree.c: make read_tree*() take 'struct repository *'

These functions call tree_entry_interesting() which will soon require
a 'struct index_state *' to be passed in. Instead of just changing the
function signature to take an index, update to take a repo instead
because these functions do need object database access.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive.c b/archive.c
index fd556c28e420732bbe625b68663f9099a5316f96..bfa9cc20c95d41f133e9d21da5760fdc4bcc4b0d 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -285,7 +285,8 @@ int write_archive_entries(struct archiver_args *args,
                git_attr_set_direction(GIT_ATTR_INDEX);
        }
 
                git_attr_set_direction(GIT_ATTR_INDEX);
        }
 

-       err = read_tree_recursive(args->tree, "", 0, 0, &args->pathspec,
+       err = read_tree_recursive(args->repo, args->tree, "",
+                                 0, 0, &args->pathspec,

                                  queue_or_write_archive_entry,
                                  &context);
        if (err == READ_TREE_RECURSIVE)
                                  queue_or_write_archive_entry,
                                  &context);
        if (err == READ_TREE_RECURSIVE)


@@ -346,7 +347,8 @@ static int path_exists(struct archiver_args *args, const char *path)
        ctx.args = args;
        parse_pathspec(&ctx.pathspec, 0, 0, "", paths);
        ctx.pathspec.recursive = 1;
        ctx.args = args;
        parse_pathspec(&ctx.pathspec, 0, 0, "", paths);
        ctx.pathspec.recursive = 1;

-       ret = read_tree_recursive(args->tree, "", 0, 0, &ctx.pathspec,
+       ret = read_tree_recursive(args->repo, args->tree, "",
+                                 0, 0, &ctx.pathspec,

                                  reject_entry, &ctx);
        clear_pathspec(&ctx.pathspec);
        return ret != 0;
                                  reject_entry, &ctx);
        clear_pathspec(&ctx.pathspec);
        return ret != 0;

diff --git a/builtin/checkout.c b/builtin/checkout.c
index acdafc6e4c4d104aadcbe7492a8045e16e83ba50..c9dda8e82e8ed2a88b93a80c729a5971b9e6a139 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -115,7 +115,8 @@ static int update_some(const struct object_id *oid, struct strbuf *base,
 
 static int read_tree_some(struct tree *tree, const struct pathspec *pathspec)
 {
 
 static int read_tree_some(struct tree *tree, const struct pathspec *pathspec)
 {

-       read_tree_recursive(tree, "", 0, 0, pathspec, update_some, NULL);
+       read_tree_recursive(the_repository, tree, "", 0, 0,
+                           pathspec, update_some, NULL);

 
        /* update the index with the given tree's info
         * for all args, expanding wildcards, and exit
 
        /* update the index with the given tree's info
         * for all args, expanding wildcards, and exit

diff --git a/builtin/log.c b/builtin/log.c
index 9f2d9872946dfd7fe527a7f3822d9be23aa5ec83..7709f2b1d4f15f6ab2631a4317cbe1e590b3c733 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -641,8 +641,9 @@ int cmd_show(int argc, const char **argv, const char *prefix)
                                        diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
                                        name,
                                        diff_get_color_opt(&rev.diffopt, DIFF_RESET));
                                        diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
                                        name,
                                        diff_get_color_opt(&rev.diffopt, DIFF_RESET));

-                       read_tree_recursive((struct tree *)o, "", 0, 0, &match_all,
-                                       show_tree_object, rev.diffopt.file);
+                       read_tree_recursive(the_repository, (struct tree *)o, "",
+                                           0, 0, &match_all, show_tree_object,
+                                           rev.diffopt.file);

                        rev.shown_one = 1;
                        break;
                case OBJ_COMMIT:
                        rev.shown_one = 1;
                        break;
                case OBJ_COMMIT:

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index c70a9c71588a76b2ef04689fc6cd805cee4ae0b8..7e0dcaa3599da68c62d05655e488467b7756409b 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -441,7 +441,7 @@ void overlay_tree_on_index(struct index_state *istate,
                               PATHSPEC_PREFER_CWD, prefix, matchbuf);
        } else
                memset(&pathspec, 0, sizeof(pathspec));
                               PATHSPEC_PREFER_CWD, prefix, matchbuf);
        } else
                memset(&pathspec, 0, sizeof(pathspec));

-       if (read_tree(tree, 1, &pathspec, istate))
+       if (read_tree(the_repository, tree, 1, &pathspec, istate))

                die("unable to read tree entries %s", tree_name);
 
        for (i = 0; i < istate->cache_nr; i++) {
                die("unable to read tree entries %s", tree_name);
 
        for (i = 0; i < istate->cache_nr; i++) {

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index fe3b952cb3007d12c2e94a08b10486ed301c4769..6855f7fea56cb9cbceaad93afcfea3a8faf5da7e 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -185,5 +185,6 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
        tree = parse_tree_indirect(&oid);
        if (!tree)
                die("not a tree object");
        tree = parse_tree_indirect(&oid);
        if (!tree)
                die("not a tree object");

-       return !!read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL);
+       return !!read_tree_recursive(the_repository, tree, "", 0, 0,
+                                    &pathspec, show_tree, NULL);

 }
 }

diff --git a/merge-recursive.c b/merge-recursive.c
index acc2f64a4e9d03f49165e3c46396ce00a09dc6bd..b9467f5ecf2aa6188220987eaaf7f002b181ad8a 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -463,7 +463,8 @@ static void get_files_dirs(struct merge_options *o, struct tree *tree)
 {
        struct pathspec match_all;
        memset(&match_all, 0, sizeof(match_all));
 {
        struct pathspec match_all;
        memset(&match_all, 0, sizeof(match_all));

-       read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
+       read_tree_recursive(the_repository, tree, "", 0, 0,
+                           &match_all, save_files_dirs, o);

 }
 
 static int get_tree_entry_if_blob(const struct object_id *tree,
 }
 
 static int get_tree_entry_if_blob(const struct object_id *tree,

diff --git a/tree.c b/tree.c
index 215d3fdc7c4af2ef2faca1cf5d5d0b5de52b84a8..ecd8c8ac29cc96a12a36270c7c25245149745e74 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -60,7 +60,8 @@ static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base
                                  ADD_CACHE_JUST_APPEND);
 }
 
                                  ADD_CACHE_JUST_APPEND);
 }
 

-static int read_tree_1(struct tree *tree, struct strbuf *base,
+static int read_tree_1(struct repository *r,
+                      struct tree *tree, struct strbuf *base,

                       int stage, const struct pathspec *pathspec,
                       read_tree_fn_t fn, void *context)
 {
                       int stage, const struct pathspec *pathspec,
                       read_tree_fn_t fn, void *context)
 {


@@ -99,7 +100,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
                else if (S_ISGITLINK(entry.mode)) {
                        struct commit *commit;
 
                else if (S_ISGITLINK(entry.mode)) {
                        struct commit *commit;
 

-                       commit = lookup_commit(the_repository, entry.oid);
+                       commit = lookup_commit(r, entry.oid);

                        if (!commit)
                                die("Commit %s in submodule path %s%s not found",
                                    oid_to_hex(entry.oid),
                        if (!commit)
                                die("Commit %s in submodule path %s%s not found",
                                    oid_to_hex(entry.oid),


@@ -118,7 +119,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
                len = tree_entry_len(&entry);
                strbuf_add(base, entry.path, len);
                strbuf_addch(base, '/');
                len = tree_entry_len(&entry);
                strbuf_add(base, entry.path, len);
                strbuf_addch(base, '/');

-               retval = read_tree_1(lookup_tree(the_repository, &oid),
+               retval = read_tree_1(r, lookup_tree(r, &oid),

                                     base, stage, pathspec,
                                     fn, context);
                strbuf_setlen(base, oldlen);
                                     base, stage, pathspec,
                                     fn, context);
                strbuf_setlen(base, oldlen);


@@ -128,7 +129,8 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
        return 0;
 }
 
        return 0;
 }
 

-int read_tree_recursive(struct tree *tree,
+int read_tree_recursive(struct repository *r,
+                       struct tree *tree,

                        const char *base, int baselen,
                        int stage, const struct pathspec *pathspec,
                        read_tree_fn_t fn, void *context)
                        const char *base, int baselen,
                        int stage, const struct pathspec *pathspec,
                        read_tree_fn_t fn, void *context)


@@ -137,7 +139,7 @@ int read_tree_recursive(struct tree *tree,
        int ret;
 
        strbuf_add(&sb, base, baselen);
        int ret;
 
        strbuf_add(&sb, base, baselen);

-       ret = read_tree_1(tree, &sb, stage, pathspec, fn, context);
+       ret = read_tree_1(r, tree, &sb, stage, pathspec, fn, context);

        strbuf_release(&sb);
        return ret;
 }
        strbuf_release(&sb);
        return ret;
 }


@@ -152,8 +154,8 @@ static int cmp_cache_name_compare(const void *a_, const void *b_)
                                  ce2->name, ce2->ce_namelen, ce_stage(ce2));
 }
 
                                  ce2->name, ce2->ce_namelen, ce_stage(ce2));
 }
 

-int read_tree(struct tree *tree, int stage, struct pathspec *match,
-             struct index_state *istate)
+int read_tree(struct repository *r, struct tree *tree, int stage,
+             struct pathspec *match, struct index_state *istate)

 {
        read_tree_fn_t fn = NULL;
        int i, err;
 {
        read_tree_fn_t fn = NULL;
        int i, err;


@@ -181,7 +183,7 @@ int read_tree(struct tree *tree, int stage, struct pathspec *match,
 
        if (!fn)
                fn = read_one_entry_quick;
 
        if (!fn)
                fn = read_one_entry_quick;

-       err = read_tree_recursive(tree, "", 0, stage, match, fn, istate);
+       err = read_tree_recursive(r, tree, "", 0, stage, match, fn, istate);

        if (fn == read_one_entry || err)
                return err;
 
        if (fn == read_one_entry || err)
                return err;
 

diff --git a/tree.h b/tree.h
index d4807dc805827e6fe07fd01721a8a4680af3403f..93837450739c23e69f3040b8747a54ede26df646 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -3,7 +3,7 @@
 
 #include "object.h"
 
 
 #include "object.h"
 

-extern const char *tree_type;
+struct repository;

 struct strbuf;
 
 struct tree {
 struct strbuf;
 
 struct tree {


@@ -12,6 +12,8 @@ struct tree {
        unsigned long size;
 };
 
        unsigned long size;
 };
 

+extern const char *tree_type;
+

 struct tree *lookup_tree(struct repository *r, const struct object_id *oid);
 
 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
 struct tree *lookup_tree(struct repository *r, const struct object_id *oid);
 
 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);


@@ -29,12 +31,14 @@ struct tree *parse_tree_indirect(const struct object_id *oid);
 #define READ_TREE_RECURSIVE 1
 typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, int, void *);
 
 #define READ_TREE_RECURSIVE 1
 typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, int, void *);
 

-extern int read_tree_recursive(struct tree *tree,
-                              const char *base, int baselen,
-                              int stage, const struct pathspec *pathspec,
-                              read_tree_fn_t fn, void *context);
+int read_tree_recursive(struct repository *r,
+                       struct tree *tree,
+                       const char *base, int baselen,
+                       int stage, const struct pathspec *pathspec,
+                       read_tree_fn_t fn, void *context);

 
 

-extern int read_tree(struct tree *tree, int stage, struct pathspec *pathspec,
-                    struct index_state *istate);
+int read_tree(struct repository *r, struct tree *tree,
+             int stage, struct pathspec *pathspec,
+             struct index_state *istate);

 
 #endif /* TREE_H */
 
 #endif /* TREE_H */