Index compat macros are going to be removed to expose the_index and then reorganized to use the right index instead of simply the_index because sometimes we want to use a different index. This cocci script can help with the first step. It can be used later on on even builtin/ when we start to reorganize code in there, but for now this is the script that performs all the conversion outside builtin/ Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> --- contrib/coccinelle/index-compat.cocci | 184 ++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) create mode 100644 contrib/coccinelle/index-compat.cocci diff --git a/contrib/coccinelle/index-compat.cocci b/contrib/coccinelle/index-compat.cocci new file mode 100644 index 0000000000..ca46711eb6 --- /dev/null +++ b/contrib/coccinelle/index-compat.cocci @@ -0,0 +1,184 @@ +@@ +@@ +-active_cache ++the_index.cache + +@@ +@@ +-active_nr ++the_index.cache_nr + +@@ +@@ +-active_alloc ++the_index.cache_alloc + +@@ +@@ +-active_cache_changed ++the_index.cache_changed + +@@ +@@ +-active_cache_tree ++the_index.cache_tree + +@@ +@@ +- read_cache() ++ read_index(&the_index) + +@@ +expression path; +@@ +- read_cache_from(path) ++ read_index_from(&the_index, path, get_git_dir()) + +@@ +expression pathspec; +@@ +- read_cache_preload(pathspec) ++ read_index_preload(&the_index, pathspec) + +@@ +@@ +- is_cache_unborn() ++ is_index_unborn(&the_index) + +@@ +@@ +- read_cache_unmerged() ++ read_index_unmerged(&the_index) + +@@ +@@ +- discard_cache() ++ discard_index(&the_index) + +@@ +@@ +- unmerged_cache() ++ unmerged_index(&the_index) + +@@ +expression name; +expression namelen; +@@ +- cache_name_pos(name, namelen) ++ index_name_pos(&the_index, name, namelen) + +@@ +expression ce; +expression option; +@@ +- add_cache_entry(ce, option) ++ add_index_entry(&the_index, ce, option) + +@@ +expression pos; +expression new_name; +@@ +- rename_cache_entry_at(pos, new_name) ++ rename_index_entry_at(&the_index, pos, new_name) + +@@ +expression pos; +@@ +- remove_cache_entry_at(pos) ++ remove_index_entry_at(&the_index, pos) + +@@ +expression path; +@@ +- remove_file_from_cache(path) ++ remove_file_from_index(&the_index, path) + +@@ +expression path; +expression st; +expression flags; +@@ +- add_to_cache(path, st, flags) ++ add_to_index(&the_index, path, st, flags) + +@@ +expression path; +expression flags; +@@ +- add_file_to_cache(path, flags) ++ add_file_to_index(&the_index, path, flags) + +@@ +expression ce; +expression flip; +@@ +-chmod_cache_entry(ce, flip) ++chmod_index_entry(&the_index, ce, flip) + +@@ +expression flags; +@@ +-refresh_cache(flags) ++refresh_index(&the_index, flags, NULL, NULL, NULL) + +@@ +expression ce; +expression st; +expression options; +@@ +-ce_match_stat(ce, st, options) ++ie_match_stat(&the_index, ce, st, options) + +@@ +expression ce; +expression st; +expression options; +@@ +-ce_modified(ce, st, options) ++ie_modified(&the_index, ce, st, options) + +@@ +expression name; +expression namelen; +@@ +-cache_dir_exists(name, namelen) ++index_dir_exists(&the_index, name, namelen) + +@@ +expression name; +expression namelen; +expression igncase; +@@ +-cache_file_exists(name, namelen, igncase) ++index_file_exists(&the_index, name, namelen, igncase) + +@@ +expression name; +expression namelen; +@@ +-cache_name_is_other(name, namelen) ++index_name_is_other(&the_index, name, namelen) + +@@ +@@ +-resolve_undo_clear() ++resolve_undo_clear_index(&the_index) + +@@ +expression at; +@@ +-unmerge_cache_entry_at(at) ++unmerge_index_entry_at(&the_index, at) + +@@ +expression pathspec; +@@ +-unmerge_cache(pathspec) ++unmerge_index(&the_index, pathspec) + +@@ +expression path; +expression sz; +@@ +-read_blob_data_from_cache(path, sz) ++read_blob_data_from_index(&the_index, path, sz) -- 2.18.0.rc0.333.g22e6ee6cdf