ref-filter: make internal reachable-filter API more precise
The internal reachable-filter API is a bit loose and imprecise; it also bleeds unnecessarily into the public header. Tighten the API by: * renaming do_merge_filter() to reach_filter() * separating parameters to explicitly identify what data is used by the function instead of passing an entire ref_filter_cbdata struct * renaming and moving internal constants from header to source file Signed-off-by: Aaron Lipman <alipman88@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Aaron Lipman committed
Sep 18, 2020 at 17:58 UTC
a1b19aa5d43c46fc570f6946ab5ad001dccc8cdf
2 files changed
+14
-18
ref-filter.c
+14
-15
@@ -2231,19 +2231,18 @@ void ref_array_clear(struct ref_array *array)
2231
}
2232
}
2233
2234
-static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata, int reachable)
2234
+#define EXCLUDE_REACHED 0
2235
+#define INCLUDE_REACHED 1
2236
+static void reach_filter(struct ref_array *array,
2237
+ struct commit_list *check_reachable,
2238
+ int include_reached)
2239
{
2240
struct rev_info revs;
2241
int i, old_nr;
2238
- struct ref_array *array = ref_cbdata->array;
2242
struct commit **to_clear = xcalloc(sizeof(struct commit *), array->nr);
2240
- struct commit_list *rl;
2243
+ struct commit_list *cr;
2244
2242
- struct commit_list *check_reachable_list = reachable ?
2243
- ref_cbdata->filter->reachable_from :
2244
- ref_cbdata->filter->unreachable_from;
2245
-
2246
- if (!check_reachable_list)
2245
+ if (!check_reachable)
2246
return;
2247
2248
repo_init_revisions(the_repository, &revs, NULL);
@@ -2254,8 +2253,8 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata, int reachable)
2253
to_clear[i] = item->commit;
2254
}
2255
2257
- for (rl = check_reachable_list; rl; rl = rl->next) {
2258
- struct commit *merge_commit = rl->item;
2256
+ for (cr = check_reachable; cr; cr = cr->next) {
2257
+ struct commit *merge_commit = cr->item;
2258
merge_commit->object.flags |= UNINTERESTING;
2259
add_pending_object(&revs, &merge_commit->object, "");
2260
}
@@ -2273,7 +2272,7 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata, int reachable)
2272
2273
int is_merged = !!(commit->object.flags & UNINTERESTING);
2274
2276
- if (is_merged == reachable)
2275
+ if (is_merged == include_reached)
2276
array->items[array->nr++] = array->items[i];
2277
else
2278
free_array_item(item);
@@ -2281,8 +2280,8 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata, int reachable)
2280
2281
clear_commit_marks_many(old_nr, to_clear, ALL_REV_FLAGS);
2282
2284
- while (check_reachable_list) {
2285
- struct commit *merge_commit = pop_commit(&check_reachable_list);
2283
+ while (check_reachable) {
2284
+ struct commit *merge_commit = pop_commit(&check_reachable);
2285
clear_commit_marks(merge_commit, ALL_REV_FLAGS);
2286
}
2287
@@ -2337,8 +2336,8 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int
2336
clear_contains_cache(&ref_cbdata.no_contains_cache);
2337
2338
/* Filters that need revision walking */
2340
- do_merge_filter(&ref_cbdata, DO_MERGE_FILTER_REACHABLE);
2341
- do_merge_filter(&ref_cbdata, DO_MERGE_FILTER_UNREACHABLE);
2339
+ reach_filter(array, filter->reachable_from, INCLUDE_REACHED);
2340
+ reach_filter(array, filter->unreachable_from, EXCLUDE_REACHED);
2341
2342
return ret;
2343
}
ref-filter.h
-3
@@ -23,9 +23,6 @@
23
#define FILTER_REFS_DETACHED_HEAD 0x0020
24
#define FILTER_REFS_KIND_MASK (FILTER_REFS_ALL | FILTER_REFS_DETACHED_HEAD)
25
26
-#define DO_MERGE_FILTER_UNREACHABLE 0
27
-#define DO_MERGE_FILTER_REACHABLE 1
28
-
26
struct atom_value;
27
28
struct ref_sorting {