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 v4 13/17] trailer: execute command from 'trailer.<name>.command'
Date: Thu, 30 Jan 2014 07:49:16 +0100	[thread overview]
Message-ID: <20140130064921.7504.39622.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140130064217.7504.473.chriscool@tuxfamily.org>

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 trailer.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/trailer.c b/trailer.c
index 430ff39..dc8908a 100644
--- a/trailer.c
+++ b/trailer.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "run-command.h"
 /*
  * Copyright (c) 2013 Christian Couder <chriscool@tuxfamily.org>
  */
@@ -12,11 +13,14 @@ struct conf_info {
 	char *name;
 	char *key;
 	char *command;
+	unsigned command_uses_arg : 1;
 	enum action_where where;
 	enum action_if_exist if_exist;
 	enum action_if_missing if_missing;
 };
 
+#define TRAILER_ARG_STRING "$ARG"
+
 struct trailer_item {
 	struct trailer_item *previous;
 	struct trailer_item *next;
@@ -368,6 +372,7 @@ static int git_trailer_config(const char *conf_key, const char *value, void *cb)
 			if (conf->command)
 				warning(_("more than one %s"), orig_conf_key);
 			conf->command = xstrdup(value);
+			conf->command_uses_arg = !!strstr(conf->command, TRAILER_ARG_STRING);
 		} else if (type == TRAILER_WHERE) {
 			if (set_where(conf, value))
 				warning(_("unknown value '%s' for key '%s'"), value, orig_conf_key);
@@ -399,6 +404,45 @@ static void parse_trailer(struct strbuf *tok, struct strbuf *val, const char *tr
 	}
 }
 
+static int read_from_command(struct child_process *cp, struct strbuf *buf)
+{
+	if (run_command(cp))
+		return error("running trailer command '%s' failed", cp->argv[0]);
+	if (strbuf_read(buf, cp->out, 1024) < 1)
+		return error("reading from trailer command '%s' failed", cp->argv[0]);
+	strbuf_trim(buf);
+	return 0;
+}
+
+static const char *apply_command(const char *command, const char *arg)
+{
+	struct strbuf cmd = STRBUF_INIT;
+	struct strbuf buf = STRBUF_INIT;
+	struct child_process cp;
+	const char *argv[] = {NULL, NULL};
+	const char *result = "";
+
+	strbuf_addstr(&cmd, command);
+	if (arg)
+		strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
+
+	argv[0] = cmd.buf;
+	memset(&cp, 0, sizeof(cp));
+	cp.argv = argv;
+	cp.env = local_repo_env;
+	cp.no_stdin = 1;
+	cp.out = -1;
+	cp.use_shell = 1;
+
+	if (read_from_command(&cp, &buf))
+		strbuf_release(&buf);
+	else
+		result = strbuf_detach(&buf, NULL);
+
+	strbuf_release(&cmd);
+	return result;
+}
+
 static struct trailer_item *new_trailer_item(struct trailer_item *conf_item,
 					     const char* tok, const char* val)
 {
@@ -408,6 +452,8 @@ static struct trailer_item *new_trailer_item(struct trailer_item *conf_item,
 	if (conf_item) {
 		new->conf = conf_item->conf;
 		new->token = xstrdup(conf_item->conf->key);
+		if (conf_item->conf->command_uses_arg || !val)
+			new->value = apply_command(conf_item->conf->command, val);
 	} else {
 		new->conf = xcalloc(sizeof(struct conf_info), 1);
 		new->token = tok;
@@ -458,12 +504,22 @@ static struct trailer_item *process_command_line_args(int argc, const char **arg
 	int i;
 	struct trailer_item *arg_tok_first = NULL;
 	struct trailer_item *arg_tok_last = NULL;
+	struct trailer_item *item;
 
 	for (i = 0; i < argc; i++) {
 		struct trailer_item *new = create_trailer_item(argv[i]);
 		add_trailer_item(&arg_tok_first, &arg_tok_last, new);
 	}
 
+	/* Add conf commands that don't use $ARG */
+	for (item = first_conf_item; item; item = item->next) {
+		if (item->conf->command && !item->conf->command_uses_arg)
+		{
+			struct trailer_item *new = new_trailer_item(item, NULL, NULL);
+			add_trailer_item(&arg_tok_first, &arg_tok_last, new);
+		}
+	}
+
 	return arg_tok_first;
 }
 
-- 
1.8.5.2.201.gacc5987

  parent reply	other threads:[~2014-01-30  7:38 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-30  6:49 [PATCH v4 00/17] Add interpret-trailers builtin Christian Couder
2014-01-30  6:49 ` [PATCH v4 01/17] Add data structures and basic functions for commit trailers Christian Couder
2014-01-30  9:10   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 02/17] trailer: process trailers from file and arguments Christian Couder
2014-01-31  4:02   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 03/17] trailer: read and process config information Christian Couder
2014-01-31 15:43   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 04/17] trailer: process command line trailer arguments Christian Couder
2014-01-31 16:30   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 05/17] strbuf: add strbuf_isspace() Christian Couder
2014-01-31  2:51   ` Eric Sunshine
2014-01-31  3:09   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 06/17] trailer: parse trailers from input file Christian Couder
2014-01-31 16:45   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 07/17] trailer: put all the processing together and print Christian Couder
2014-01-30  6:49 ` [PATCH v4 08/17] trailer: add interpret-trailers command Christian Couder
2014-01-31 16:10   ` Eric Sunshine
2014-02-06 20:12     ` Christian Couder
2014-01-30  6:49 ` [PATCH v4 09/17] trailer: add tests for "git interpret-trailers" Christian Couder
2014-01-30  6:49 ` [PATCH v4 10/17] trailer: if no input file is passed, read from stdin Christian Couder
2014-02-02  9:50   ` Eric Sunshine
2014-02-06 20:16     ` Christian Couder
2014-02-06 21:51   ` Junio C Hamano
2014-02-09 13:55     ` Christian Couder
2014-01-30  6:49 ` [PATCH v4 11/17] trailer: add new_trailer_item() function Christian Couder
2014-02-02 10:10   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 12/17] strbuf: add strbuf_replace() Christian Couder
2014-01-31  3:11   ` Eric Sunshine
2014-01-30  6:49 ` Christian Couder [this message]
2014-01-30  6:49 ` [PATCH v4 14/17] trailer: add tests for trailer command Christian Couder
2014-01-30  6:49 ` [PATCH v4 15/17] trailer: set author and committer env variables Christian Couder
2014-01-30  6:49 ` [PATCH v4 16/17] trailer: add tests for commands using " Christian Couder
2014-01-30  6:49 ` [PATCH v4 17/17] Documentation: add documentation for 'git interpret-trailers' Christian Couder

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