undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"

Browse Source 
Have the last users of "USE_THE_INDEX_COMPATIBILITY_MACROS" use the
underlying *_index() variants instead. Now all previous users of
"USE_THE_INDEX_COMPATIBILITY_MACROS" have been migrated away from the
wrapper macros, and if applicable to use the "USE_THE_INDEX_VARIABLE"
added in [1].

Let's leave the "index-compatibility.cocci" in place, even though it
won't be doing anything on "master". It will benefit any out-of-tree
code that need to use these compatibility macros. We can eventually
remove it.

1. bdafeae0b9 (cache.h & test-tool.h: add & use
   "USE_THE_INDEX_VARIABLE", 2022-11-19)

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2023-02-10 11:28:39 +01:00 committed by Junio C Hamano
parent fcb864bce7
commit dfd0a89374
5 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/commit.c
View File

@ -5,7 +5,7 @@
* Based on git-commit.sh by Junio C Hamano and Linus Torvalds * Based on git-commit.sh by Junio C Hamano and Linus Torvalds
*/ */
#define USE_THE_INDEX_COMPATIBILITY_MACROS #define USE_THE_INDEX_VARIABLE
#include "cache.h" #include "cache.h"
#include "config.h" #include "config.h"
#include "lockfile.h" #include "lockfile.h"
@ -992,8 +992,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
const char *parent = "HEAD"; const char *parent = "HEAD";
if (!the_index.cache_nr) { if (!the_index.cache_nr) {
discard_cache(); discard_index(&the_index);
if (read_cache() < 0) if (repo_read_index(the_repository) < 0)
die(_("Cannot read index")); die(_("Cannot read index"));
} }

6
builtin/merge.c
View File

@ -6,7 +6,7 @@
* Based on git-merge.sh by Junio C Hamano. * Based on git-merge.sh by Junio C Hamano.
*/ */
#define USE_THE_INDEX_COMPATIBILITY_MACROS #define USE_THE_INDEX_VARIABLE
#include "cache.h" #include "cache.h"
#include "config.h" #include "config.h"
#include "parse-options.h" #include "parse-options.h"
@ -390,8 +390,8 @@ static void restore_state(const struct object_id *head,
run_command(&cmd); run_command(&cmd);
refresh_cache: refresh_cache:
discard_cache(); discard_index(&the_index);
if (read_cache() < 0) if (repo_read_index(the_repository) < 0)
die(_("could not read index")); die(_("could not read index"));
} }

9
cache.h
View File

@ -449,15 +449,8 @@ typedef int (*must_prefetch_predicate)(const struct cache_entry *);
void prefetch_cache_entries(const struct index_state *istate, void prefetch_cache_entries(const struct index_state *istate,
must_prefetch_predicate must_prefetch); must_prefetch_predicate must_prefetch);
#if defined(USE_THE_INDEX_COMPATIBILITY_MACROS) || defined(USE_THE_INDEX_VARIABLE) #ifdef USE_THE_INDEX_VARIABLE
extern struct index_state the_index; extern struct index_state the_index;
#ifndef USE_THE_INDEX_VARIABLE
#ifdef USE_THE_INDEX_COMPATIBILITY_MACROS
#define read_cache() repo_read_index(the_repository)
#define discard_cache() discard_index(&the_index)
#endif
#endif
#endif #endif
#define TYPE_BITS 3 #define TYPE_BITS 3

6
contrib/coccinelle/index-compatibility.cocci
View File

@ -23,6 +23,9 @@ identifier ACT = active_cache_tree;
@@ @@
@@ @@
( (
- read_cache
+ repo_read_index
|
- read_cache_unmerged - read_cache_unmerged
+ repo_read_index_unmerged + repo_read_index_unmerged
| |
@ -97,6 +100,9 @@ identifier ACT = active_cache_tree;
| |
- update_main_cache_tree - update_main_cache_tree
+ cache_tree_update + cache_tree_update
|
- discard_cache
+ discard_index
) )
( (
+ &the_index, + &the_index,

21
contrib/coccinelle/index-compatibility.pending.cocci
View File

@ -1,21 +0,0 @@
// "the_repository" simple cases
@@
@@
(
- read_cache
+ repo_read_index
)
(
+ the_repository,
...)
// "the_index" simple cases
@@
@@
(
- discard_cache
+ discard_index
)
(
+ &the_index,
...)