bisect.c: remove the_repository reference

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/bisect.c b/bisect.c
index 487675c67249a3164294aae71c1c2a650f3c4947..4c1b80bff666455f63ea6afa60992a3dc6f4b657 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -626,14 +626,15 @@ static struct commit_list *managed_skipped(struct commit_list *list,
        return skip_away(list, count);
 }
 
        return skip_away(list, count);
 }
 

-static void bisect_rev_setup(struct rev_info *revs, const char *prefix,
+static void bisect_rev_setup(struct repository *r, struct rev_info *revs,
+                            const char *prefix,

                             const char *bad_format, const char *good_format,
                             int read_paths)
 {
        struct argv_array rev_argv = ARGV_ARRAY_INIT;
        int i;
 
                             const char *bad_format, const char *good_format,
                             int read_paths)
 {
        struct argv_array rev_argv = ARGV_ARRAY_INIT;
        int i;
 

-       repo_init_revisions(the_repository, revs, prefix);
+       repo_init_revisions(r, revs, prefix);

        revs->abbrev = 0;
        revs->commit_format = CMIT_FMT_UNSPECIFIED;
 
        revs->abbrev = 0;
        revs->commit_format = CMIT_FMT_UNSPECIFIED;
 


@@ -723,23 +724,25 @@ static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
        return run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
 }
 
        return run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
 }
 

-static struct commit *get_commit_reference(const struct object_id *oid)
+static struct commit *get_commit_reference(struct repository *r,
+                                          const struct object_id *oid)

 {
 {

-       struct commit *r = lookup_commit_reference(the_repository, oid);
-       if (!r)
+       struct commit *c = lookup_commit_reference(r, oid);
+       if (!c)

                die(_("Not a valid commit name %s"), oid_to_hex(oid));
                die(_("Not a valid commit name %s"), oid_to_hex(oid));

-       return r;
+       return c;

 }
 
 }
 

-static struct commit **get_bad_and_good_commits(int *rev_nr)
+static struct commit **get_bad_and_good_commits(struct repository *r,
+                                               int *rev_nr)

 {
        struct commit **rev;
        int i, n = 0;
 
        ALLOC_ARRAY(rev, 1 + good_revs.nr);
 {
        struct commit **rev;
        int i, n = 0;
 
        ALLOC_ARRAY(rev, 1 + good_revs.nr);

-       rev[n++] = get_commit_reference(current_bad_oid);
+       rev[n++] = get_commit_reference(r, current_bad_oid);

        for (i = 0; i < good_revs.nr; i++)
        for (i = 0; i < good_revs.nr; i++)

-               rev[n++] = get_commit_reference(good_revs.oid + i);
+               rev[n++] = get_commit_reference(r, good_revs.oid + i);

        *rev_nr = n;
 
        return rev;
        *rev_nr = n;
 
        return rev;


@@ -823,12 +826,13 @@ static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
        free_commit_list(result);
 }
 
        free_commit_list(result);
 }
 

-static int check_ancestors(int rev_nr, struct commit **rev, const char *prefix)
+static int check_ancestors(struct repository *r, int rev_nr,
+                          struct commit **rev, const char *prefix)

 {
        struct rev_info revs;
        int res;
 
 {
        struct rev_info revs;
        int res;
 

-       bisect_rev_setup(&revs, prefix, "^%s", "%s", 0);
+       bisect_rev_setup(r, &revs, prefix, "^%s", "%s", 0);

 
        bisect_common(&revs);
        res = (revs.commits != NULL);
 
        bisect_common(&revs);
        res = (revs.commits != NULL);


@@ -847,7 +851,9 @@ static int check_ancestors(int rev_nr, struct commit **rev, const char *prefix)
  * If a merge base must be tested by the user, its source code will be
  * checked out to be tested by the user and we will exit.
  */
  * If a merge base must be tested by the user, its source code will be
  * checked out to be tested by the user and we will exit.
  */

-static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
+static void check_good_are_ancestors_of_bad(struct repository *r,
+                                           const char *prefix,
+                                           int no_checkout)

 {
        char *filename = git_pathdup("BISECT_ANCESTORS_OK");
        struct stat st;
 {
        char *filename = git_pathdup("BISECT_ANCESTORS_OK");
        struct stat st;


@@ -866,8 +872,8 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
                goto done;
 
        /* Check if all good revs are ancestor of the bad rev. */
                goto done;
 
        /* Check if all good revs are ancestor of the bad rev. */

-       rev = get_bad_and_good_commits(&rev_nr);
-       if (check_ancestors(rev_nr, rev, prefix))
+       rev = get_bad_and_good_commits(r, &rev_nr);
+       if (check_ancestors(r, rev_nr, rev, prefix))

                check_merge_bases(rev_nr, rev, no_checkout);
        free(rev);
 
                check_merge_bases(rev_nr, rev, no_checkout);
        free(rev);
 


@@ -885,12 +891,14 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
 /*
  * This does "git diff-tree --pretty COMMIT" without one fork+exec.
  */
 /*
  * This does "git diff-tree --pretty COMMIT" without one fork+exec.
  */

-static void show_diff_tree(const char *prefix, struct commit *commit)
+static void show_diff_tree(struct repository *r,
+                          const char *prefix,
+                          struct commit *commit)

 {
        struct rev_info opt;
 
        /* diff-tree init */
 {
        struct rev_info opt;
 
        /* diff-tree init */

-       repo_init_revisions(the_repository, &opt, prefix);
+       repo_init_revisions(r, &opt, prefix);

        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        opt.abbrev = 0;
        opt.diff = 1;
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        opt.abbrev = 0;
        opt.diff = 1;


@@ -945,7 +953,7 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
  * If no_checkout is non-zero, the bisection process does not
  * checkout the trial commit but instead simply updates BISECT_HEAD.
  */
  * If no_checkout is non-zero, the bisection process does not
  * checkout the trial commit but instead simply updates BISECT_HEAD.
  */

-int bisect_next_all(const char *prefix, int no_checkout)
+int bisect_next_all(struct repository *r, const char *prefix, int no_checkout)

 {
        struct rev_info revs;
        struct commit_list *tried;
 {
        struct rev_info revs;
        struct commit_list *tried;


@@ -957,9 +965,9 @@ int bisect_next_all(const char *prefix, int no_checkout)
        if (read_bisect_refs())
                die(_("reading bisect refs failed"));
 
        if (read_bisect_refs())
                die(_("reading bisect refs failed"));
 

-       check_good_are_ancestors_of_bad(prefix, no_checkout);
+       check_good_are_ancestors_of_bad(r, prefix, no_checkout);

 
 

-       bisect_rev_setup(&revs, prefix, "%s", "^%s", 1);
+       bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1);

        revs.limited = 1;
 
        bisect_common(&revs);
        revs.limited = 1;
 
        bisect_common(&revs);


@@ -993,7 +1001,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
                exit_if_skipped_commits(tried, current_bad_oid);
                printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
                        term_bad);
                exit_if_skipped_commits(tried, current_bad_oid);
                printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
                        term_bad);

-               show_diff_tree(prefix, revs.commits->item);
+               show_diff_tree(r, prefix, revs.commits->item);

                /* This means the bisection process succeeded. */
                exit(10);
        }
                /* This means the bisection process succeeded. */
                exit(10);
        }

diff --git a/bisect.h b/bisect.h
index 34df20935123065b4b253288ea0e22b1721af0e9..821d16e4ddad71d177190a0e05012c5a509fa17b 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -2,6 +2,7 @@
 #define BISECT_H
 
 struct commit_list;
 #define BISECT_H
 
 struct commit_list;

+struct repository;

 
 /*
  * Find bisection. If something is found, `reaches` will be the number of
 
 /*
  * Find bisection. If something is found, `reaches` will be the number of


@@ -30,7 +31,9 @@ struct rev_list_info {
        const char *header_prefix;
 };
 
        const char *header_prefix;
 };
 

-extern int bisect_next_all(const char *prefix, int no_checkout);
+extern int bisect_next_all(struct repository *r,
+                          const char *prefix,
+                          int no_checkout);

 
 extern int estimate_bisect_steps(int all);
 
 
 extern int estimate_bisect_steps(int all);
 

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 4b5fadcbe1ae6a1b10fe88e80a5fcffd3296cfa7..417d141c09ad2698c17cf4738ad6ce7177456088 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -137,7 +137,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 
        switch (cmdmode) {
        case NEXT_ALL:
 
        switch (cmdmode) {
        case NEXT_ALL:

-               return bisect_next_all(prefix, no_checkout);
+               return bisect_next_all(the_repository, prefix, no_checkout);

        case WRITE_TERMS:
                if (argc != 2)
                        return error(_("--write-terms requires two arguments"));
        case WRITE_TERMS:
                if (argc != 2)
                        return error(_("--write-terms requires two arguments"));