cocci: apply the "revision.h" part of "the_repository.pending"

Apply the part of "the_repository.pending.cocci" pertaining to
"revision.h".

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/add-interactive.c b/add-interactive.c
index 00a0f6f96f3f5ebc54bbfb841921c5ceff88c1c3..33f41d65a47e131611530dfd8569aacd790dbff5 100644 (file)
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -551,7 +551,7 @@ static int get_modified_files(struct repository *r,
                opt.def = is_initial ?
                        empty_tree_oid_hex() : oid_to_hex(&head_oid);
 
-               init_revisions(&rev, NULL);
+               repo_init_revisions(the_repository, &rev, NULL);
                setup_revisions(0, NULL, &rev, &opt);
 
                rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;

diff --git a/builtin/bisect.c b/builtin/bisect.c
index 34ba7b18f69d03b00b9109d440fb4918bf9cb0ae..0f35361bd161270d7edbc5454a43133e9598712d 100644 (file)
--- a/builtin/bisect.c
+++ b/builtin/bisect.c
@@ -568,7 +568,7 @@ static int prepare_revs(struct bisect_terms *terms, struct rev_info *revs)
         * sets up a revision walk.
         */
        reset_revision_walk();
-       init_revisions(revs, NULL);
+       repo_init_revisions(the_repository, revs, NULL);
        setup_revisions(0, NULL, revs, NULL);
        for_each_glob_ref_in(add_bisect_ref, bad, "refs/bisect/", &cb);
        cb.object_flags = UNINTERESTING;
@@ -1095,7 +1095,7 @@ static enum bisect_error bisect_skip(struct bisect_terms *terms, int argc,
                        struct rev_info revs;
                        struct commit *commit;
 
-                       init_revisions(&revs, NULL);
+                       repo_init_revisions(the_repository, &revs, NULL);
                        setup_revisions(2, argv + i - 1, &revs, NULL);
 
                        if (prepare_revision_walk(&revs))

diff --git a/builtin/stash.c b/builtin/stash.c
index 2017c278df21cbbe62e7613c20f3207c3b993883..888ffa072880dfcb94471f9e7af869fb5279dbab 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -901,7 +901,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 
        init_diff_ui_defaults();
        git_config(git_diff_ui_config, NULL);
-       init_revisions(&rev, prefix);
+       repo_init_revisions(the_repository, &rev, prefix);
 
        argc = parse_options(argc, argv, prefix, options, git_stash_show_usage,
                             PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN_OPT |
@@ -1090,7 +1090,7 @@ static int check_changes_tracked_files(const struct pathspec *ps)
        if (repo_read_index(the_repository) < 0)
                return -1;
 
-       init_revisions(&rev, NULL);
+       repo_init_revisions(the_repository, &rev, NULL);
        copy_pathspec(&rev.prune_data, ps);
 
        rev.diffopt.flags.quick = 1;
@@ -1277,7 +1277,7 @@ static int stash_working_tree(struct stash_info *info, const struct pathspec *ps
        struct strbuf diff_output = STRBUF_INIT;
        struct index_state istate = INDEX_STATE_INIT(the_repository);
 
-       init_revisions(&rev, NULL);
+       repo_init_revisions(the_repository, &rev, NULL);
        copy_pathspec(&rev.prune_data, ps);
 
        set_alternate_index_output(stash_index_path.buf);

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 25c70f415f11eed1992b5c334365db170c3c0295..32b8e49817287c215b83f1229d3de94422d6eb1f 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1108,7 +1108,7 @@ static int compute_summary_module_list(struct object_id *head_oid,
                strvec_pushv(&diff_args, info->argv);
 
        git_config(git_diff_basic_config, NULL);
-       init_revisions(&rev, info->prefix);
+       repo_init_revisions(the_repository, &rev, info->prefix);
        rev.abbrev = 0;
        precompose_argv_prefix(diff_args.nr, diff_args.v, NULL);
        setup_revisions(diff_args.nr, diff_args.v, &rev, &opt);

diff --git a/contrib/coccinelle/the_repository.cocci b/contrib/coccinelle/the_repository.cocci
index 1d1ac7d4fc5499d84c7f4a9c50d2ed5a525c963f..765ad689678f22e070d1ed00e57cc54a390b1f9b 100644 (file)
--- a/contrib/coccinelle/the_repository.cocci
+++ b/contrib/coccinelle/the_repository.cocci
@@ -113,6 +113,10 @@
 |
 - rerere
 + repo_rerere
+// revision.h
+|
+- init_revisions
++ repo_init_revisions
 )
   (
 + the_repository,

diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
deleted file mode 100644 (file)
index 1190a33..0000000
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ /dev/null
@@ -1,14 +0,0 @@
-// This file is used for the ongoing refactoring of
-// bringing the index or repository struct in all of
-// our code base.
-
-@@
-@@
-(
-// revision.h
-- init_revisions
-+ repo_init_revisions
-)
-  (
-+ the_repository,
-  ...)

diff --git a/range-diff.c b/range-diff.c
index 15d0bc35a8782917e3c6ae0ced1188f20987d3e1..ff5d19f8add818d1f674ecc496ba38ec25e8b0c8 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -588,7 +588,7 @@ int is_range_diff_range(const char *arg)
        int i, positive = 0, negative = 0;
        struct rev_info revs;
 
-       init_revisions(&revs, NULL);
+       repo_init_revisions(the_repository, &revs, NULL);
        if (setup_revisions(3, argv, &revs, NULL) == 1) {
                for (i = 0; i < revs.pending.nr; i++)
                        if (revs.pending.objects[i].item->flags & UNINTERESTING)

diff --git a/revision.h b/revision.h
index 30febad09a1e3493ed9b89cd57486134cc120f14..eeb91677d07ecdc4fb442cc11542c9fa804e3cd9 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -415,9 +415,6 @@ struct rev_info {
 void repo_init_revisions(struct repository *r,
                         struct rev_info *revs,
                         const char *prefix);
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
-#endif
 
 /**
  * Parse revision information, filling in the `rev_info` structure, and