From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_DKIM_INVALID, T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 592A51F404 for ; Wed, 4 Apr 2018 06:08:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751643AbeDDGH7 (ORCPT ); Wed, 4 Apr 2018 02:07:59 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:39252 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751117AbeDDGH6 (ORCPT ); Wed, 4 Apr 2018 02:07:58 -0400 Received: by mail-pl0-f67.google.com with SMTP id s24-v6so12597861plq.6 for ; Tue, 03 Apr 2018 23:07:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D8xYu5wTAq/NouKsvelT0zR1Ea9k8wk+gGW5+Wis5Sw=; b=bx6bPuoGZHzqel6BwiyuOyV0WNHdpZcrw0YhVUz65s5QzAQlj4hDp61z9DixFtB3U6 WEYJS9ClikTt+Z1vx5glWyiOekHPaJYIFPNSZn8atrZ4T9Y2zqtsEQKYVijGnpzmLXdD LCf+/qLDqrGVXg/UA6tDNpdY/YkYHHkqEeJb+yxXqr1D3jiM++QqNUPsHPRBuT7Et0lG n/6XvIMgP7YWdl/qi24DPwC0q1rSr76hFVew1KjZo1W9yuOckqTUWFYcdbccPASAg/Ff vxUd6lXmpFCD8wMfShUDrBA4l9p3J6NaBPt5Rn36x3zN6KPXvOOWtiJRdDUVuZD2uwHl TqsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=D8xYu5wTAq/NouKsvelT0zR1Ea9k8wk+gGW5+Wis5Sw=; b=dnkw0zfqevyEgOVfuRY7DeMNHE2xsOniogwzj7wJN/ksVxHKX5X0ClBSLlVpQxLqfs oSYIJ08Fq8/ByeIxdX5WjgjcAkrIeacFWtdLUbjrfu6tLVwmK9pQ5+d51PsK4XwpAVKI dxKfMzMOJYwIXGt4qNV0RXXWcWbHvZLAx35edggfLNFFdi8IoSxQB//tAhwViNkCEgEY /N9ZLi6/Z/gO8F/kBjjk5LH74ERg7Y9GMsXXvvRCqxrx8jIrx/a2mQiIGVimdHkfX4GJ 2sIYL3grKY2WdQoxGXAV/Aw00ucNosiJI2K9+NVjZ5qWCGpV8CgJiYPDQS0Kf+3biazr 7WWQ== X-Gm-Message-State: AElRT7EzuQQ2lhFGqC2Kuej3ym+1HDtgJUnq75Dk2XJwB3mLCco6FIr4 g0Zt3pzpR1sbOqxq0/NwlZe6f+Ri7pc91A== X-Google-Smtp-Source: AIpwx4+tR97gsVvbGEQTm5fgXE/9GiAVfQ3WIAAEwZtzOQLGzRcNJrnAsWM+Pv9TMeu3kS342umWBA== X-Received: by 10.99.0.200 with SMTP id 191mr11119783pga.33.1522822076320; Tue, 03 Apr 2018 23:07:56 -0700 (PDT) Received: from localhost ([2601:602:9500:3a4f:3471:d3e4:760a:b8dd]) by smtp.gmail.com with ESMTPSA id q17sm7308360pgt.7.2018.04.03.23.07.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Apr 2018 23:07:55 -0700 (PDT) From: Taylor Blau To: git@vger.kernel.org Cc: peff@peff.net, gitster@pobox.com, l.s.r@web.de, --@vger.kernel.org, Taylor Blau Subject: [PATCH v3 2/2] builtin/config.c: prefer `--type=bool` over `--bool`, etc. Date: Tue, 3 Apr 2018 23:07:43 -0700 Message-Id: <20180404060743.39278-3-me@ttaylorr.com> X-Mailer: git-send-email 2.16.2.440.gc6284da4f In-Reply-To: <20180404060743.39278-1-me@ttaylorr.com> References: <20180328234719.595-1-me@ttaylorr.com> <20180404060743.39278-1-me@ttaylorr.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org `git config` has long allowed the ability for callers to provide a 'type specifier', which instructs `git config` to (1) ensure that incoming values are satisfiable under that type, and (2) that outgoing values are canonicalized under that type. In another series, we propose to add extend this functionality with `--color` and `--default` to replace `--get-color`. However, we traditionally use `--color` to mean "colorize this output", instead of "this value should be treated as a color". Currently, `git config` does not support this kind of colorization, but we should be careful to avoid inhabiting this option too soon, so that `git config` can support `--color` (in the traditional sense) in the future, if that is desired. In this patch, we prefer `--type=[int|bool|bool-or-int|...]` over `--int`, `--bool`, and etc. This allows the aforementioned other patch to add `--color` (in the non-traditional sense) via `--type=color`, instead of `--color`. Signed-off-by: Taylor Blau --- Documentation/git-config.txt | 66 +++++++++++++++++++----------------- builtin/config.c | 28 +++++++++++++++ t/t1300-repo-config.sh | 18 ++++++++++ 3 files changed, 80 insertions(+), 32 deletions(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index e09ed5d7d..869999c9b 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -9,13 +9,13 @@ git-config - Get and set repository or global options SYNOPSIS -------- [verse] -'git config' [] [type] [--show-origin] [-z|--null] name [value [value_regex]] -'git config' [] [type] --add name value -'git config' [] [type] --replace-all name value [value_regex] -'git config' [] [type] [--show-origin] [-z|--null] --get name [value_regex] -'git config' [] [type] [--show-origin] [-z|--null] --get-all name [value_regex] -'git config' [] [type] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex] -'git config' [] [type] [-z|--null] --get-urlmatch name URL +'git config' [] [--type] [--show-origin] [-z|--null] name [value [value_regex]] +'git config' [] [--type] --add name value +'git config' [] [--type] --replace-all name value [value_regex] +'git config' [] [--type] [--show-origin] [-z|--null] --get name [value_regex] +'git config' [] [--type] [--show-origin] [-z|--null] --get-all name [value_regex] +'git config' [] [--type] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex] +'git config' [] [--type] [-z|--null] --get-urlmatch name URL 'git config' [] --unset name [value_regex] 'git config' [] --unset-all name [value_regex] 'git config' [] --rename-section old_name new_name @@ -38,12 +38,10 @@ existing values that match the regexp are updated or unset. If you want to handle the lines that do *not* match the regex, just prepend a single exclamation mark in front (see also <>). -The type specifier can be either `--int` or `--bool`, to make -'git config' ensure that the variable(s) are of the given type and -convert the value to the canonical form (simple decimal number for int, -a "true" or "false" string for bool), or `--path`, which does some -path expansion (see `--path` below). If no type specifier is passed, no -checks or transformations are performed on the value. +A type specifier may be given as an argument to `--type` to make 'git config' +ensure that the variable(s) are of the given type and convert the value to the +canonical form. If no type specifier is passed, no checks or transformations are +performed on the value. When reading, the values are read from the system, global and repository local configuration files by default, and options @@ -160,30 +158,34 @@ See also <>. --list:: List all variables set in config file, along with their values. ---bool:: - 'git config' will ensure that the output is "true" or "false" +--type [type]:: + 'git config' will ensure that any input output is valid under the given type + constraint(s), and will canonicalize outgoing values in `[type]`'s canonical + form. ++ +Valid `[type]`'s include: ++ +- 'bool': canonicalize values as either "true" or "false". +- 'int': canonicalize values as simple decimal numbers. An optional suffix of + 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or + 1073741824 prior to output. +- 'bool-or-int': canonicalize according to either 'bool' or 'int', as described + above. +- 'path': canonicalize by adding a leading `~` to the value of `$HOME` and + `~user` to the home directory for the specified user. This specifier has no + effect when setting the value (but you can use `git config section.variable + ~/` from the command line to let your shell do the expansion.) +- 'expiry-date': canonicalize by converting from a fixed or relative date-string + to a timestamp. This specifier has no effect when setting the value. ++ +--bool:: --int:: - 'git config' will ensure that the output is a simple - decimal number. An optional value suffix of 'k', 'm', or 'g' - in the config file will cause the value to be multiplied - by 1024, 1048576, or 1073741824 prior to output. - --bool-or-int:: - 'git config' will ensure that the output matches the format of - either --bool or --int, as described above. - --path:: - `git config` will expand a leading `~` to the value of - `$HOME`, and `~user` to the home directory for the - specified user. This option has no effect when setting the - value (but you can use `git config section.variable ~/` - from the command line to let your shell do the expansion). - --expiry-date:: - `git config` will ensure that the output is converted from - a fixed or relative date-string to a timestamp. This option - has no effect when setting the value. + Historical options for selecting a type specifier. Prefer instead `--type`, + (see: above). -z:: --null:: diff --git a/builtin/config.c b/builtin/config.c index 92fb8d56b..942fcf4bd 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -61,6 +61,33 @@ static int show_origin; #define TYPE_PATH 4 #define TYPE_EXPIRY_DATE 5 +static int option_parse_type(const struct option *opt, const char *arg, + int unset) +{ + int *type = opt->value; + + if (unset) { + *type = 0; + return 0; + } + + if (!strcmp(arg, "bool")) + *type = TYPE_BOOL; + else if (!strcmp(arg, "int")) + *type = TYPE_INT; + else if (!strcmp(arg, "bool-or-int")) + *type = TYPE_BOOL_OR_INT; + else if (!strcmp(arg, "path")) + *type = TYPE_PATH; + else if (!strcmp(arg, "expiry-date")) + *type = TYPE_EXPIRY_DATE; + else { + die(_("unexpected --type argument, %s"), arg); + return 1; + } + return 0; +} + static struct option builtin_config_options[] = { OPT_GROUP(N_("Config file location")), OPT_BOOL(0, "global", &use_global_config, N_("use global config file")), @@ -84,6 +111,7 @@ static struct option builtin_config_options[] = { OPT_BIT(0, "get-color", &actions, N_("find the color configured: slot [default]"), ACTION_GET_COLOR), OPT_BIT(0, "get-colorbool", &actions, N_("find the color setting: slot [stdout-is-tty]"), ACTION_GET_COLORBOOL), OPT_GROUP(N_("Type")), + OPT_CALLBACK('t', "type", &type, N_("type"), N_("value is given this type"), option_parse_type), OPT_SET_INT(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL), OPT_SET_INT(0, "int", &type, N_("value is decimal number"), TYPE_INT), OPT_SET_INT(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT), diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 24de37d54..5f9a83725 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -1613,6 +1613,7 @@ test_expect_success '--local requires a repo' ' cat >.git/config <<-\EOF && [core] +foo = true number = 10 EOF @@ -1622,4 +1623,21 @@ test_expect_success 'later legacy specifiers are given precedence' ' test_cmp expect actual ' +test_expect_success '--type allows valid type specifiers' ' + echo "true" >expect && + git config --type=bool core.foo >actual && + test_cmp expect actual +' + +test_expect_success '--no-type unsets type specifiers' ' + echo "10" > expect && + git config --type=bool --no-type core.number >actual && + test_cmp expect actual +' + +test_expect_success '--type rejects unknown specifiers' ' + test_must_fail git config --type=nonsense core.foo 2>error && + test_i18ngrep "unexpected --type argument" error +' + test_done -- 2.16.2.440.gc6284da4f