From: Aaron Lipman <alipman88@gmail.com>
To: git@vger.kernel.org
Cc: Aaron Lipman <alipman88@gmail.com>
Subject: [PATCH v2 1/2] ref-filter: make internal reachable-filter API more precise
Date: Fri, 18 Sep 2020 17:58:41 -0400 [thread overview]
Message-ID: <20200918215842.62232-2-alipman88@gmail.com> (raw)
In-Reply-To: <20200918215842.62232-1-alipman88@gmail.com>
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>
---
ref-filter.c | 29 ++++++++++++++---------------
ref-filter.h | 3 ---
2 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 785785a757..5550a0d34c 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -2231,19 +2231,18 @@ void ref_array_clear(struct ref_array *array)
}
}
-static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata, int reachable)
+#define EXCLUDE_REACHED 0
+#define INCLUDE_REACHED 1
+static void reach_filter(struct ref_array *array,
+ struct commit_list *check_reachable,
+ int include_reached)
{
struct rev_info revs;
int i, old_nr;
- struct ref_array *array = ref_cbdata->array;
struct commit **to_clear = xcalloc(sizeof(struct commit *), array->nr);
- struct commit_list *rl;
+ struct commit_list *cr;
- struct commit_list *check_reachable_list = reachable ?
- ref_cbdata->filter->reachable_from :
- ref_cbdata->filter->unreachable_from;
-
- if (!check_reachable_list)
+ if (!check_reachable)
return;
repo_init_revisions(the_repository, &revs, NULL);
@@ -2254,8 +2253,8 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata, int reachable)
to_clear[i] = item->commit;
}
- for (rl = check_reachable_list; rl; rl = rl->next) {
- struct commit *merge_commit = rl->item;
+ for (cr = check_reachable; cr; cr = cr->next) {
+ struct commit *merge_commit = cr->item;
merge_commit->object.flags |= UNINTERESTING;
add_pending_object(&revs, &merge_commit->object, "");
}
@@ -2273,7 +2272,7 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata, int reachable)
int is_merged = !!(commit->object.flags & UNINTERESTING);
- if (is_merged == reachable)
+ if (is_merged == include_reached)
array->items[array->nr++] = array->items[i];
else
free_array_item(item);
@@ -2281,8 +2280,8 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata, int reachable)
clear_commit_marks_many(old_nr, to_clear, ALL_REV_FLAGS);
- while (check_reachable_list) {
- struct commit *merge_commit = pop_commit(&check_reachable_list);
+ while (check_reachable) {
+ struct commit *merge_commit = pop_commit(&check_reachable);
clear_commit_marks(merge_commit, ALL_REV_FLAGS);
}
@@ -2337,8 +2336,8 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int
clear_contains_cache(&ref_cbdata.no_contains_cache);
/* Filters that need revision walking */
- do_merge_filter(&ref_cbdata, DO_MERGE_FILTER_REACHABLE);
- do_merge_filter(&ref_cbdata, DO_MERGE_FILTER_UNREACHABLE);
+ reach_filter(array, filter->reachable_from, INCLUDE_REACHED);
+ reach_filter(array, filter->unreachable_from, EXCLUDE_REACHED);
return ret;
}
diff --git a/ref-filter.h b/ref-filter.h
index 2d13928455..feaef4a8fd 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -23,9 +23,6 @@
#define FILTER_REFS_DETACHED_HEAD 0x0020
#define FILTER_REFS_KIND_MASK (FILTER_REFS_ALL | FILTER_REFS_DETACHED_HEAD)
-#define DO_MERGE_FILTER_UNREACHABLE 0
-#define DO_MERGE_FILTER_REACHABLE 1
-
struct atom_value;
struct ref_sorting {
--
2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2020-09-18 22:00 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 15:37 [PATCH] ref-filter: allow merged and no-merged filters Aaron Lipman
2020-09-08 22:46 ` Junio C Hamano
2020-09-08 23:57 ` Aaron Lipman
2020-09-09 0:00 ` Junio C Hamano
2020-09-11 18:57 ` [PATCH v2 0/2] git branch: allow combining " Aaron Lipman
2020-09-11 18:57 ` [PATCH v2 1/2] t3201: test multiple branch filter combinations Aaron Lipman
2020-09-11 18:57 ` [PATCH v2 2/2] ref-filter: allow merged and no-merged filters Aaron Lipman
2020-09-11 21:47 ` Junio C Hamano
2020-09-13 19:31 ` [PATCH v3 0/3] git branch: allow combining " Aaron Lipman
2020-09-13 19:31 ` [PATCH v3 1/3] t3201: test multiple branch filter combinations Aaron Lipman
2020-09-13 20:58 ` Eric Sunshine
2020-09-14 20:07 ` Junio C Hamano
2020-09-13 19:31 ` [PATCH v3 2/3] Doc: cover multiple contains/no-contains filters Aaron Lipman
2020-09-13 21:10 ` Eric Sunshine
2020-09-14 20:07 ` Junio C Hamano
2020-09-13 19:31 ` [PATCH v3 3/3] ref-filter: allow merged and no-merged filters Aaron Lipman
2020-09-13 21:36 ` Eric Sunshine
2020-09-13 21:56 ` Junio C Hamano
2020-09-13 22:31 ` Eric Sunshine
2020-09-16 2:08 ` [PATCH v4 0/3] git branch: allow combining " Aaron Lipman
2020-09-16 2:08 ` [PATCH v4 1/3] t3201: test multiple branch filter combinations Aaron Lipman
2020-09-16 2:08 ` [PATCH v4 2/3] Doc: cover multiple contains/no-contains filters Aaron Lipman
2020-09-16 19:45 ` Junio C Hamano
2020-09-16 2:08 ` [PATCH v4 3/3] ref-filter: allow merged and no-merged filters Aaron Lipman
2020-09-16 4:53 ` [PATCH v4 0/3] git branch: allow combining " Junio C Hamano
2020-09-16 5:08 ` Eric Sunshine
2020-09-18 0:49 ` [PATCH 0/2] ref-filter: merged & no-merged touch-ups Aaron Lipman
2020-09-18 0:49 ` [PATCH 1/2] ref-filter: refactor do_merge_filter() Aaron Lipman
2020-09-18 5:03 ` Eric Sunshine
2020-09-18 5:04 ` Eric Sunshine
2020-09-18 17:01 ` Junio C Hamano
2020-09-18 0:49 ` [PATCH 2/2] Doc: prefer more specific file name Aaron Lipman
2020-09-18 2:52 ` [PATCH 0/2] ref-filter: merged & no-merged touch-ups Eric Sunshine
2020-09-18 21:58 ` [PATCH v2 " Aaron Lipman
2020-09-18 21:58 ` Aaron Lipman [this message]
2020-09-18 21:58 ` [PATCH v2 2/2] Doc: prefer more specific file name Aaron Lipman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200918215842.62232-2-alipman88@gmail.com \
--to=alipman88@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).