From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: peff@peff.net, chriscool@tuxfamily.org
Subject: [PATCH 1/4] list_objects_filter_options: introduce 'list_object_filter_config_name'
Date: Thu, 2 Jul 2020 16:06:21 -0400 [thread overview]
Message-ID: <738d97be4645435c333111a06560926a701a5bea.1593720075.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1593720075.git.me@ttaylorr.com>
In a subsequent commit, we will add configuration options that are
specific to each kind of object filter, in which case it is handy to
have a function that translates between 'enum
list_objects_filter_choice' and an appropriate configuration-friendly
string.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
list-objects-filter-options.c | 23 +++++++++++++++++++++++
list-objects-filter-options.h | 6 ++++++
2 files changed, 29 insertions(+)
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index 3553ad7b0a..92b408c0c8 100644
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -15,6 +15,29 @@ static int parse_combine_filter(
const char *arg,
struct strbuf *errbuf);
+const char *list_object_filter_config_name(enum list_objects_filter_choice c)
+{
+ switch (c) {
+ case LOFC_DISABLED:
+ /* we have no name for "no filter at all" */
+ break;
+ case LOFC_BLOB_NONE:
+ return "blob:none";
+ case LOFC_BLOB_LIMIT:
+ return "blob:limit";
+ case LOFC_TREE_DEPTH:
+ return "tree";
+ case LOFC_SPARSE_OID:
+ return "sparse:oid";
+ case LOFC_COMBINE:
+ return "combine";
+ case LOFC__COUNT:
+ /* not a real filter type; just the count of all filters */
+ break;
+ }
+ BUG("list_object_filter_choice_name: invalid argument '%d'", c);
+}
+
/*
* Parse value of the argument to the "filter" keyword.
* On the command line this looks like:
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index 73fffa4ad7..01767c3c96 100644
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -17,6 +17,12 @@ enum list_objects_filter_choice {
LOFC__COUNT /* must be last */
};
+/*
+ * Returns a configuration key suitable for describing the given object filter,
+ * e.g.: "blob:none", "combine", etc.
+ */
+const char *list_object_filter_config_name(enum list_objects_filter_choice c);
+
struct list_objects_filter_options {
/*
* 'filter_spec' is the raw argument value given on the command line
--
2.27.0.225.g9fa765a71d
next prev parent reply other threads:[~2020-07-02 20:06 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 20:06 [PATCH 0/4] upload-pack: custom allowed object filters Taylor Blau
2020-07-02 20:06 ` Taylor Blau [this message]
2020-07-02 20:06 ` [PATCH 2/4] upload-pack.c: allow banning certain object filter(s) Taylor Blau
2020-07-08 8:45 ` Jeff King
2020-07-20 20:05 ` Taylor Blau
2020-07-15 10:00 ` SZEDER Gábor
2020-07-15 10:55 ` Jeff King
2020-07-20 20:07 ` Taylor Blau
2020-07-20 20:21 ` Jeff King
2020-07-22 9:17 ` SZEDER Gábor
2020-07-22 20:15 ` Taylor Blau
2020-07-23 1:41 ` Junio C Hamano
2020-07-23 1:50 ` Taylor Blau
2020-07-22 9:21 ` SZEDER Gábor
2020-07-22 20:16 ` Taylor Blau
2020-07-23 7:51 ` SZEDER Gábor
2020-07-23 14:13 ` Taylor Blau
2020-07-02 20:06 ` [PATCH 3/4] upload-pack.c: pass 'struct list_objects_filter_options *' Taylor Blau
2020-07-02 20:06 ` [PATCH 4/4] upload-pack.c: introduce 'uploadpack.filter.tree.maxDepth' Taylor Blau
2020-07-15 10:11 ` SZEDER Gábor
2020-07-08 8:41 ` [PATCH 0/4] upload-pack: custom allowed object filters Jeff King
2020-07-20 20:09 ` Taylor Blau
2020-07-21 20:06 ` Junio C Hamano
2020-07-21 20:27 ` Taylor Blau
2020-07-21 22:05 ` Junio C Hamano
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=738d97be4645435c333111a06560926a701a5bea.1593720075.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).