cocci: fix incorrect & verbose "the_repository" rules

When these rules started being added in [1] they didn't use a ";" after the ")", and would thus catch uses of these macros within expressions. But as of [2] the new additions were broken in that they'd only match a subset of the users of these macros. Rather than narrowly fixing that, let's have these use the much less verbose pattern introduced in my recent [3]: There's no need to exhaustively enumerate arguments if we use the "..." syntax. This means that we can fold all of these different rules into one. 1. afd69dcc219 (object-store: prepare read_object_file to deal with any repo, 2018-11-13) 2. 21a9651ba3f (commit-reach: prepare get_merge_bases to handle any repo, 2018-11-13) 3. 0e6550a2c63 (cocci: add a index-compatibility.pending.cocci, 2022-11-19) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Mar 28, 2023 at 15:58 UTC 6f1436ba2a72bfcbeac9688fa7fe374870a49779
1 file changed +46 -114
contrib/coccinelle/the_repository.pending.cocci
+46 -114
@@ -3,118 +3,50 @@
3 // our code base.
4
5 @@
6 -expression E;
7 -expression F;
8 -expression G;
6 @@
10 -- read_object_file(
11 -+ repo_read_object_file(the_repository,
12 - E, F, G)
13 -
14 -@@
15 -expression E;
16 -@@
17 -- has_object_file(
18 -+ repo_has_object_file(the_repository,
19 - E)
20 -
21 -@@
22 -expression E;
23 -@@
24 -- has_object_file_with_flags(
25 -+ repo_has_object_file_with_flags(the_repository,
26 - E)
27 -
28 -@@
29 -expression E;
30 -expression F;
31 -expression G;
32 -@@
33 -- parse_commit_internal(
34 -+ repo_parse_commit_internal(the_repository,
35 - E, F, G)
36 -
37 -@@
38 -expression E;
39 -@@
40 -- parse_commit(
41 -+ repo_parse_commit(the_repository,
42 - E)
43 -
44 -@@
45 -expression E;
46 -expression F;
47 -@@
48 -- get_merge_bases(
49 -+ repo_get_merge_bases(the_repository,
50 - E, F);
51 -
52 -@@
53 -expression E;
54 -expression F;
55 -expression G;
56 -@@
57 -- get_merge_bases_many(
58 -+ repo_get_merge_bases_many(the_repository,
59 - E, F, G);
60 -
61 -@@
62 -expression E;
63 -expression F;
64 -expression G;
65 -@@
66 -- get_merge_bases_many_dirty(
67 -+ repo_get_merge_bases_many_dirty(the_repository,
68 - E, F, G);
69 -
70 -@@
71 -expression E;
72 -expression F;
73 -@@
74 -- in_merge_bases(
75 -+ repo_in_merge_bases(the_repository,
76 - E, F);
77 -
78 -@@
79 -expression E;
80 -expression F;
81 -expression G;
82 -@@
83 -- in_merge_bases_many(
84 -+ repo_in_merge_bases_many(the_repository,
85 - E, F, G);
86 -
87 -@@
88 -expression E;
89 -expression F;
90 -@@
91 -- get_commit_buffer(
92 -+ repo_get_commit_buffer(the_repository,
93 - E, F);
94 -
95 -@@
96 -expression E;
97 -expression F;
98 -@@
99 -- unuse_commit_buffer(
100 -+ repo_unuse_commit_buffer(the_repository,
101 - E, F);
102 -
103 -@@
104 -expression E;
105 -expression F;
106 -expression G;
107 -@@
108 -- logmsg_reencode(
109 -+ repo_logmsg_reencode(the_repository,
110 - E, F, G);
111 -
112 -@@
113 -expression E;
114 -expression F;
115 -expression G;
116 -expression H;
117 -@@
118 -- format_commit_message(
119 -+ repo_format_commit_message(the_repository,
120 - E, F, G, H);
7 +(
8 +- read_object_file
9 ++ repo_read_object_file
10 +|
11 +- has_object_file
12 ++ repo_has_object_file
13 +|
14 +- has_object_file_with_flags
15 ++ repo_has_object_file_with_flags
16 +|
17 +- parse_commit_internal
18 ++ repo_parse_commit_internal
19 +|
20 +- parse_commit
21 ++ repo_parse_commit
22 +|
23 +- get_merge_bases
24 ++ repo_get_merge_bases
25 +|
26 +- get_merge_bases_many
27 ++ repo_get_merge_bases_many
28 +|
29 +- get_merge_bases_many_dirty
30 ++ repo_get_merge_bases_many_dirty
31 +|
32 +- in_merge_bases
33 ++ repo_in_merge_bases
34 +|
35 +- in_merge_bases_many
36 ++ repo_in_merge_bases_many
37 +|
38 +- get_commit_buffer
39 ++ repo_get_commit_buffer
40 +|
41 +- unuse_commit_buffer
42 ++ repo_unuse_commit_buffer
43 +|
44 +- logmsg_reencode
45 ++ repo_logmsg_reencode
46 +|
47 +- format_commit_message
48 ++ repo_format_commit_message
49 +)
50 + (
51 ++ the_repository,
52 + ...)