From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Tan Subject: [PATCH v3 02/19] parse-options-cb: implement parse_opt_passthru_argv() Date: Sun, 14 Jun 2015 16:41:49 +0800 Message-ID: <1434271326-11349-3-git-send-email-pyokagan@gmail.com> References: <1434271326-11349-1-git-send-email-pyokagan@gmail.com> Cc: Johannes Schindelin , Stefan Beller , Stephen Robin , Paul Tan To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jun 14 10:42:44 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Z43V4-00067n-NH for gcvg-git-2@plane.gmane.org; Sun, 14 Jun 2015 10:42:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752179AbbFNImh (ORCPT ); Sun, 14 Jun 2015 04:42:37 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:34210 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751712AbbFNIma (ORCPT ); Sun, 14 Jun 2015 04:42:30 -0400 Received: by pdbki1 with SMTP id ki1so51404018pdb.1 for ; Sun, 14 Jun 2015 01:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/RQVZ8pdODVpXCH9JgPySJAUxRf7NYfd4pvais3g7gg=; b=RnAlwTpNeUEkh0EtS3pt7XJ/RnCOqnlZ3kKN6RwrCYnXgKRk9ZWcGK+KWV2sgksIt8 4ucNiU/z2AmEBqmTi7hnqK2bhK8FHbPhLA2oWMs+DiImyV121hetCuJtlr92rLIoUofL srVjtjnDgUwBnAnDyf6A1ZWoPbtJ7p9WkZ/goVvBV9ywWLlFmI8bGmmzEyISYqrd49hw m9AE1Ns73fLY+yS0bzAapsrHwc1emF4Yr+ytOSSPRJfpXoPq9q4m6ooRUzxejGuaXibc 5th+e2+TsQoNiolD2kDhq20zatGTDQF4ClLsbDCurpr5ALT4L6zycq0PQEYS6MiWiZny 4NfA== X-Received: by 10.68.216.10 with SMTP id om10mr37665807pbc.152.1434271350249; Sun, 14 Jun 2015 01:42:30 -0700 (PDT) Received: from yoshi.pyokagan.tan ([116.86.132.138]) by mx.google.com with ESMTPSA id kk6sm8622549pdb.94.2015.06.14.01.42.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Jun 2015 01:42:28 -0700 (PDT) X-Mailer: git-send-email 2.1.4 In-Reply-To: <1434271326-11349-1-git-send-email-pyokagan@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Certain git commands, such as git-pull, are simply wrappers around other git commands like git-fetch, git-merge and git-rebase. As such, these wrapper commands will typically need to "pass through" command-line options of the commands they wrap. Implement the parse_opt_passthru_argv() parse-options callback, which will reconstruct all the provided command-line options into an argv_array, such that it can be passed to another git command. This is useful for passing command-line options that can be specified multiple times. Helped-by: Stefan Beller Signed-off-by: Paul Tan --- Notes: v3 * Renamed function to the more descriptive parse_opt_passthru_argv(). * Introduced and documented OPT_PASSTHRU_ARGV() macro, which saves the user from having to specify OPTION_CALLBACK and parse_opt_passthru_argv() for each option. Documentation/technical/api-parse-options.txt | 6 ++++++ parse-options-cb.c | 20 ++++++++++++++++++++ parse-options.h | 3 +++ 3 files changed, 29 insertions(+) diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt index 85d10ab..0b0ab01 100644 --- a/Documentation/technical/api-parse-options.txt +++ b/Documentation/technical/api-parse-options.txt @@ -219,6 +219,12 @@ There are some macros to easily define options: will be overwritten, so this should only be used for options where the last one specified on the command line wins. +`OPT_PASSTHRU_ARGV(short, long, &argv_array_var, arg_str, description, flags)`:: + Introduce an option where all instances of it on the command-line will + be reconstructed into an argv_array. This is useful when you need to + pass the command-line option, which can be specified multiple times, + to another command. + The last element of the array must be `OPT_END()`. diff --git a/parse-options-cb.c b/parse-options-cb.c index 68bc593..5ab6ed6 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -4,6 +4,7 @@ #include "commit.h" #include "color.h" #include "string-list.h" +#include "argv-array.h" /*----- some often used options -----*/ @@ -183,3 +184,22 @@ int parse_opt_passthru(const struct option *opt, const char *arg, int unset) return 0; } + +/** + * For an option opt, recreate the command-line option, appending it to + * opt->value which must be a argv_array. This is useful when we need to pass + * the command-line option, which can be specified multiple times, to another + * command. + */ +int parse_opt_passthru_argv(const struct option *opt, const char *arg, int unset) +{ + static struct strbuf sb = STRBUF_INIT; + struct argv_array *opt_value = opt->value; + + if (recreate_opt(&sb, opt, arg, unset) < 0) + return -1; + + argv_array_push(opt_value, sb.buf); + + return 0; +} diff --git a/parse-options.h b/parse-options.h index 5b0f886..aba06688 100644 --- a/parse-options.h +++ b/parse-options.h @@ -225,6 +225,7 @@ extern int parse_opt_tertiary(const struct option *, const char *, int); extern int parse_opt_string_list(const struct option *, const char *, int); extern int parse_opt_noop_cb(const struct option *, const char *, int); extern int parse_opt_passthru(const struct option *, const char *, int); +extern int parse_opt_passthru_argv(const struct option *, const char *, int); #define OPT__VERBOSE(var, h) OPT_COUNTUP('v', "verbose", (var), (h)) #define OPT__QUIET(var, h) OPT_COUNTUP('q', "quiet", (var), (h)) @@ -245,5 +246,7 @@ extern int parse_opt_passthru(const struct option *, const char *, int); { OPTION_CALLBACK, (s), (l), (v), N_("style"), (h), PARSE_OPT_OPTARG, parseopt_column_callback } #define OPT_PASSTHRU(s, l, v, a, h, f) \ { OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), parse_opt_passthru } +#define OPT_PASSTHRU_ARGV(s, l, v, a, h, f) \ + { OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), parse_opt_passthru_argv } #endif -- 2.1.4