git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>
Subject: [PATCH v5 03/14] trailer: read and process config information
Date: Thu, 06 Feb 2014 21:19:52 +0100	[thread overview]
Message-ID: <20140206202004.325.65208.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140206194123.325.99451.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 ba0cfe0..f844f46 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 inline int same_token(struct trailer_item *a, struct trailer_item *b, int alnum_len)
 {
 	return !strncasecmp(a->token, b->token, alnum_len);
@@ -233,3 +235,135 @@ static void process_trailers_lists(struct trailer_item **infile_tok_first,
 		apply_arg_if_missing(infile_tok_first, infile_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_exist(struct conf_info *item, const char *value)
+{
+	if (!strcasecmp("addIfDifferent", value))
+		item->if_exist = EXIST_ADD_IF_DIFFERENT;
+	else if (!strcasecmp("addIfDifferentNeighbor", value))
+		item->if_exist = EXIST_ADD_IF_DIFFERENT_NEIGHBOR;
+	else if (!strcasecmp("add", value))
+		item->if_exist = EXIST_ADD;
+	else if (!strcasecmp("overwrite", value))
+		item->if_exist = EXIST_OVERWRITE;
+	else if (!strcasecmp("doNothing", value))
+		item->if_exist = EXIST_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_EXIST, 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 = xcalloc(sizeof(struct conf_info), 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, ".ifexist", TRAILER_IF_EXIST, &name, &type) &&
+		    !set_name_and_type(conf_key, ".ifmissing", TRAILER_IF_MISSING, &name, &type))
+			return 0;
+
+		item = get_conf_item(name);
+		conf = item->conf;
+
+		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_EXIST:
+			if (set_if_exist(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.206.g98f5689.dirty

  parent reply	other threads:[~2014-02-06 20:21 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-06 20:19 [PATCH v5 00/14] Add interpret-trailers builtin Christian Couder
2014-02-06 20:19 ` [PATCH v5 01/14] Add data structures and basic functions for commit trailers Christian Couder
2014-02-06 23:44   ` Junio C Hamano
2014-02-09 13:48     ` Christian Couder
2014-02-10  7:27       ` Eric Sunshine
2014-02-06 23:46   ` Junio C Hamano
2014-02-09 13:51     ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 02/14] trailer: process trailers from file and arguments Christian Couder
2014-02-07  0:03   ` Junio C Hamano
2014-02-09 13:52     ` Christian Couder
2014-02-10 18:14       ` Junio C Hamano
2014-02-10 19:59         ` Christian Couder
2014-02-10 20:51           ` Junio C Hamano
2014-02-11 15:02             ` Christian Couder
2014-02-11 18:07               ` Junio C Hamano
2014-02-14 21:41                 ` Christian Couder
2014-02-14 21:46                   ` Junio C Hamano
2014-02-14 23:29                     ` Christian Couder
2014-02-14 23:39                       ` Junio C Hamano
2014-02-14 23:57                   ` Junio C Hamano
2014-02-15  0:16                     ` Junio C Hamano
2014-02-21  0:22                       ` Junio C Hamano
2014-02-23 10:44                         ` Christian Couder
2014-02-06 20:19 ` Christian Couder [this message]
2014-02-06 20:19 ` [PATCH v5 04/14] trailer: process command line trailer arguments Christian Couder
2014-02-07  0:08   ` Junio C Hamano
2014-02-09 14:06     ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 05/14] trailer: parse trailers from input file Christian Couder
2014-02-06 20:19 ` [PATCH v5 06/14] trailer: put all the processing together and print Christian Couder
2014-02-06 20:19 ` [PATCH v5 07/14] trailer: add interpret-trailers command Christian Couder
2014-02-07  0:10   ` Junio C Hamano
2014-02-07  8:34     ` Christian Couder
2014-02-07 18:09       ` Junio C Hamano
2014-02-07 20:35         ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 08/14] trailer: add tests for "git interpret-trailers" Christian Couder
2014-02-07  0:11   ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 09/14] trailer: if no input file is passed, read from stdin Christian Couder
2014-02-07  0:12   ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 10/14] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-02-07  0:18   ` Junio C Hamano
2014-02-07 18:17   ` Junio C Hamano
2014-02-06 20:20 ` [PATCH v5 11/14] trailer: add tests for trailer command Christian Couder
2014-02-06 20:20 ` [PATCH v5 12/14] trailer: set author and committer env variables Christian Couder
2014-02-07  0:20   ` Junio C Hamano
2014-02-07  0:26   ` Junio C Hamano
2014-02-06 20:20 ` [PATCH v5 13/14] trailer: add tests for commands using " Christian Couder
2014-02-06 20:20 ` [PATCH v5 14/14] Documentation: add documentation for 'git interpret-trailers' Christian Couder
2014-02-10  7:17   ` Eric Sunshine

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=20140206202004.325.65208.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).