From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johan Herland <johan@herland.net>,
Josh Triplett <josh@joshtriplett.org>,
Thomas Rast <tr@thomasrast.ch>,
Michael Haggerty <mhagger@alum.mit.edu>,
Dan Carpenter <dan.carpenter@oracle.com>,
Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v6 03/11] trailer: read and process config information
Date: Tue, 04 Mar 2014 20:48:01 +0100 [thread overview]
Message-ID: <20140304194810.14249.68328.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140304193250.14249.56949.chriscool@tuxfamily.org>
This patch implements reading the configuration
to get trailer information, and then processing
it and storing it in a doubly linked list.
The config information is stored in the list
whose first item is pointed to by:
static struct trailer_item *first_conf_item;
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
trailer.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 134 insertions(+)
diff --git a/trailer.c b/trailer.c
index a0124f2..5b8e28b 100644
--- a/trailer.c
+++ b/trailer.c
@@ -25,6 +25,8 @@ struct trailer_item {
struct conf_info conf;
};
+static struct trailer_item *first_conf_item;
+
static int same_token(struct trailer_item *a, struct trailer_item *b, int alnum_len)
{
return !strncasecmp(a->token, b->token, alnum_len);
@@ -244,3 +246,135 @@ static void process_trailers_lists(struct trailer_item **in_tok_first,
apply_arg_if_missing(in_tok_first, in_tok_last, arg_tok);
}
}
+
+static int set_where(struct conf_info *item, const char *value)
+{
+ if (!strcasecmp("after", value))
+ item->where = WHERE_AFTER;
+ else if (!strcasecmp("before", value))
+ item->where = WHERE_BEFORE;
+ else
+ return 1;
+ return 0;
+}
+
+static int set_if_exists(struct conf_info *item, const char *value)
+{
+ if (!strcasecmp("addIfDifferent", value))
+ item->if_exists = EXISTS_ADD_IF_DIFFERENT;
+ else if (!strcasecmp("addIfDifferentNeighbor", value))
+ item->if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
+ else if (!strcasecmp("add", value))
+ item->if_exists = EXISTS_ADD;
+ else if (!strcasecmp("overwrite", value))
+ item->if_exists = EXISTS_OVERWRITE;
+ else if (!strcasecmp("doNothing", value))
+ item->if_exists = EXISTS_DO_NOTHING;
+ else
+ return 1;
+ return 0;
+}
+
+static int set_if_missing(struct conf_info *item, const char *value)
+{
+ if (!strcasecmp("doNothing", value))
+ item->if_missing = MISSING_DO_NOTHING;
+ else if (!strcasecmp("add", value))
+ item->if_missing = MISSING_ADD;
+ else
+ return 1;
+ return 0;
+}
+
+enum trailer_info_type { TRAILER_KEY, TRAILER_COMMAND, TRAILER_WHERE,
+ TRAILER_IF_EXISTS, TRAILER_IF_MISSING };
+
+static int set_name_and_type(const char *conf_key, const char *suffix,
+ enum trailer_info_type type,
+ char **pname, enum trailer_info_type *ptype)
+{
+ int ret = ends_with(conf_key, suffix);
+ if (ret) {
+ *pname = xstrndup(conf_key, strlen(conf_key) - strlen(suffix));
+ *ptype = type;
+ }
+ return ret;
+}
+
+static struct trailer_item *get_conf_item(const char *name)
+{
+ struct trailer_item *item;
+ struct trailer_item *previous;
+
+ /* Look up item with same name */
+ for (previous = NULL, item = first_conf_item;
+ item;
+ previous = item, item = item->next) {
+ if (!strcasecmp(item->conf.name, name))
+ return item;
+ }
+
+ /* Item does not already exists, create it */
+ item = xcalloc(sizeof(struct trailer_item), 1);
+ item->conf.name = xstrdup(name);
+
+ if (!previous)
+ first_conf_item = item;
+ else {
+ previous->next = item;
+ item->previous = previous;
+ }
+
+ return item;
+}
+
+static int git_trailer_config(const char *conf_key, const char *value, void *cb)
+{
+ if (starts_with(conf_key, "trailer.")) {
+ const char *orig_conf_key = conf_key;
+ struct trailer_item *item;
+ struct conf_info *conf;
+ char *name;
+ enum trailer_info_type type;
+
+ conf_key += 8;
+ if (!set_name_and_type(conf_key, ".key", TRAILER_KEY, &name, &type) &&
+ !set_name_and_type(conf_key, ".command", TRAILER_COMMAND, &name, &type) &&
+ !set_name_and_type(conf_key, ".where", TRAILER_WHERE, &name, &type) &&
+ !set_name_and_type(conf_key, ".ifexists", TRAILER_IF_EXISTS, &name, &type) &&
+ !set_name_and_type(conf_key, ".ifmissing", TRAILER_IF_MISSING, &name, &type))
+ return 0;
+
+ item = get_conf_item(name);
+ conf = &item->conf;
+ free(name);
+
+ switch (type) {
+ case TRAILER_KEY:
+ if (conf->key)
+ warning(_("more than one %s"), orig_conf_key);
+ conf->key = xstrdup(value);
+ break;
+ case TRAILER_COMMAND:
+ if (conf->command)
+ warning(_("more than one %s"), orig_conf_key);
+ conf->command = xstrdup(value);
+ break;
+ case TRAILER_WHERE:
+ if (set_where(conf, value))
+ warning(_("unknown value '%s' for key '%s'"), value, orig_conf_key);
+ break;
+ case TRAILER_IF_EXISTS:
+ if (set_if_exists(conf, value))
+ warning(_("unknown value '%s' for key '%s'"), value, orig_conf_key);
+ break;
+ case TRAILER_IF_MISSING:
+ if (set_if_missing(conf, value))
+ warning(_("unknown value '%s' for key '%s'"), value, orig_conf_key);
+ break;
+ default:
+ die("internal bug in trailer.c");
+ }
+ }
+ return 0;
+}
--
1.8.5.2.204.gcfe299d.dirty
next prev parent reply other threads:[~2014-03-04 19:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 19:47 [PATCH v6 00/11] Add interpret-trailers builtin Christian Couder
2014-03-04 19:47 ` [PATCH v6 01/11] Add data structures and basic functions for commit trailers Christian Couder
2014-03-04 19:48 ` [PATCH v6 02/11] trailer: process trailers from stdin and arguments Christian Couder
2014-03-05 22:52 ` Junio C Hamano
2014-03-07 6:19 ` Christian Couder
2014-03-07 8:08 ` Dan Carpenter
2014-03-07 12:41 ` Christian Couder
2014-03-04 19:48 ` Christian Couder [this message]
2014-03-04 19:48 ` [PATCH v6 04/11] trailer: process command line trailer arguments Christian Couder
2014-03-05 22:55 ` Junio C Hamano
2014-03-04 19:48 ` [PATCH v6 05/11] trailer: parse trailers from stdin Christian Couder
2014-03-05 22:56 ` Junio C Hamano
2014-03-04 19:48 ` [PATCH v6 06/11] trailer: put all the processing together and print Christian Couder
2014-03-04 19:48 ` [PATCH v6 07/11] trailer: add interpret-trailers command Christian Couder
2014-03-04 19:48 ` [PATCH v6 08/11] trailer: add tests for "git interpret-trailers" Christian Couder
2014-03-05 22:59 ` Junio C Hamano
2014-03-04 19:48 ` [PATCH v6 09/11] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-03-05 22:57 ` Junio C Hamano
2014-03-04 19:48 ` [PATCH v6 10/11] trailer: add tests for commands in config file Christian Couder
2014-03-04 19:48 ` [PATCH v6 11/11] Documentation: add documentation for 'git interpret-trailers' Christian Couder
2014-03-06 1:18 ` [PATCH v6 00/11] Add interpret-trailers builtin Ramsay Jones
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140304194810.14249.68328.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=dan.carpenter@oracle.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=greg@kroah.com \
--cc=johan@herland.net \
--cc=josh@joshtriplett.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=tr@thomasrast.ch \
/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.
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 NNTP newsgroup(s).