From: Pranit Bauva <pranit.bauva@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH v13 4/6] parse-options.c: make OPTION_COUNTUP respect "unspecified" values
Date: Sat, 9 Apr 2016 12:23:20 +0000 [thread overview]
Message-ID: <01020153faf9fcca-f9fc4f38-7432-4f5c-831d-0274eb5ec992-000000@eu-west-1.amazonses.com> (raw)
In-Reply-To: <01020153faf9fc14-e6ad18fa-c892-4601-bab7-e2cc4cd9e100-000000@eu-west-1.amazonses.com>
OPT_COUNTUP() merely increments the counter upon --option, and resets it
to 0 upon --no-option, which means that there is no "unspecified" value
with which a client can initialize the counter to determine whether or
not --[no]-option was seen at all.
Make OPT_COUNTUP() treat any negative number as an "unspecified" value
to address this shortcoming. In particular, if a client initializes the
counter to -1, then if it is still -1 after parse_options(), then
neither --option nor --no-option was seen; If it is 0, then --no-option
was seen last, and if it is 1 or greater, than --option was seen last.
This change does not affect the behavior of existing clients because
they all use the initial value of 0 (or more).
Note that builtin/clean.c initializes the variable used with
OPT__FORCE (which uses OPT_COUNTUP()) to a negative value, but it is set
to either 0 or 1 by reading the configuration before the code calls
parse_options(), i.e. as far as parse_options() is concerned, the
initial value of the variable is not negative.
To test this behavior, in test-parse-options.c, "verbose" is set to
"unspecified" while quiet is set to 0 which will test the new behavior
with all sets of values.
Helped-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
---
The discussion about this patch:
[1] : http://thread.gmane.org/gmane.comp.version-control.git/289027
Previous version of the patch:
[v11] : http://thread.gmane.org/gmane.comp.version-control.git/288820
[v10] : http://thread.gmane.org/gmane.comp.version-control.git/288820
[v9] : http://thread.gmane.org/gmane.comp.version-control.git/288820
[v1] : http://thread.gmane.org/gmane.comp.version-control.git/289061
Changes wrt previous version (v12):
- Use bits of commit message provided by Eric Sunshine.
Please Note: The diff might seem improper especially the part where I
have introduced some continuous lines but this is a logical error by git
diff (nothing could be done about it) and thus the changes will be
clearly visible with the original file itself.
---
Documentation/technical/api-parse-options.txt | 8 ++++--
parse-options.c | 2 ++
t/t0040-parse-options.sh | 39 ++++++++++++++++++++-------
test-parse-options.c | 3 ++-
4 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 5f0757d..8908bf7 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -144,8 +144,12 @@ There are some macros to easily define options:
`OPT_COUNTUP(short, long, &int_var, description)`::
Introduce a count-up option.
- `int_var` is incremented on each use of `--option`, and
- reset to zero with `--no-option`.
+ Each use of `--option` increments `int_var`, starting from zero
+ (even if initially negative), and `--no-option` resets it to
+ zero. To determine if `--option` or `--no-option` was set at
+ all, set `int_var` to a negative value, and if it is still
+ negative after parse_options(), then neither `--option` nor
+ `--no-option` was seen.
`OPT_BIT(short, long, &int_var, description, mask)`::
Introduce a boolean option.
diff --git a/parse-options.c b/parse-options.c
index 47a9192..312a85d 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -110,6 +110,8 @@ static int get_value(struct parse_opt_ctx_t *p,
return 0;
case OPTION_COUNTUP:
+ if (*(int *)opt->value < 0)
+ *(int *)opt->value = 0;
*(int *)opt->value = unset ? 0 : *(int *)opt->value + 1;
return 0;
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index c913d1c..efcd844 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -63,7 +63,7 @@ magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 0
dry run: no
file: (not set)
@@ -211,7 +211,7 @@ magnitude: 0
timestamp: 0
string: 123
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 0
dry run: no
file: (not set)
@@ -234,7 +234,7 @@ magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 0
dry run: no
file: (not set)
@@ -263,7 +263,7 @@ magnitude: 0
timestamp: 0
string: 123
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 0
dry run: no
file: (not set)
@@ -302,7 +302,7 @@ magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 0
dry run: no
file: (not set)
@@ -322,7 +322,7 @@ magnitude: 0
timestamp: 1
string: (not set)
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 1
dry run: no
file: (not set)
@@ -344,7 +344,7 @@ magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 0
dry run: no
file: (not set)
@@ -373,7 +373,7 @@ magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 0
dry run: no
file: (not set)
@@ -398,7 +398,7 @@ magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 0
dry run: no
file: (not set)
@@ -429,7 +429,7 @@ magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
+verbose: -1
quiet: 0
dry run: no
file: (not set)
@@ -454,6 +454,25 @@ dry run: no
file: (not set)
EOF
+test_expect_success 'OPT_COUNTUP() resets to 0 with --no- flag' '
+ test-parse-options --no-verbose >output 2>output.err &&
+ test_must_be_empty output.err &&
+ test_cmp expect output
+'
+
+cat >expect <<EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: -1
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
test_expect_success 'negation of OPT_NONEG flags is not ambiguous' '
test-parse-options --no-ambig >output 2>output.err &&
test_must_be_empty output.err &&
diff --git a/test-parse-options.c b/test-parse-options.c
index 86afa98..f02c275 100644
--- a/test-parse-options.c
+++ b/test-parse-options.c
@@ -7,7 +7,8 @@ static int integer = 0;
static unsigned long magnitude = 0;
static unsigned long timestamp;
static int abbrev = 7;
-static int verbose = 0, dry_run = 0, quiet = 0;
+static int verbose = -1; /* unspecified */
+static int dry_run = 0, quiet = 0;
static char *string = NULL;
static char *file = NULL;
static int ambiguous;
--
https://github.com/git/git/pull/218
next prev parent reply other threads:[~2016-04-09 12:23 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-14 21:38 [PATCH v7] commit: add a commit.verbose config variable Pranit Bauva
2016-03-15 11:31 ` SZEDER Gábor
2016-03-15 19:00 ` Pranit Bauva
2016-03-15 19:24 ` Eric Sunshine
2016-03-15 20:13 ` Pranit Bauva
2016-03-15 20:24 ` Junio C Hamano
2016-03-15 21:09 ` Pranit Bauva
2016-03-15 21:16 ` Junio C Hamano
2016-03-15 21:18 ` Pranit Bauva
2016-03-18 21:19 ` [PATCH v8 1/2] parse-options.c: make OPTION__COUNTUP consider negative values Pranit Bauva
2016-03-18 21:19 ` [PATCH v8 2/2] commit: add a commit.verbose config variable Pranit Bauva
2016-03-20 3:56 ` Eric Sunshine
2016-03-20 11:05 ` Pranit Bauva
2016-03-20 17:34 ` Eric Sunshine
2016-03-20 18:02 ` Pranit Bauva
2016-03-23 19:19 ` Junio C Hamano
2016-03-23 19:23 ` Pranit Bauva
2016-03-23 20:43 ` Junio C Hamano
2016-03-24 8:25 ` [PATCH v9 1/3] parse-options.c: make OPTION__COUNTUP consider negative values Pranit Bauva
2016-03-24 8:25 ` [PATCH v9 3/3] commit: add a commit.verbose config variable Pranit Bauva
2016-03-24 10:04 ` SZEDER Gábor
2016-03-24 10:22 ` Pranit Bauva
2016-03-24 10:26 ` Pranit Bauva
2016-03-25 0:05 ` Eric Sunshine
2016-03-25 6:15 ` Pranit Bauva
2016-03-24 8:25 ` [PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script Pranit Bauva
2016-03-24 11:00 ` SZEDER Gábor
2016-03-24 23:57 ` Eric Sunshine
2016-03-25 6:06 ` Pranit Bauva
2016-03-25 6:24 ` Eric Sunshine
2016-03-25 6:55 ` Pranit Bauva
2016-03-25 14:46 ` SZEDER Gábor
2016-03-25 14:50 ` Pranit Bauva
2016-03-25 17:04 ` Eric Sunshine
2016-03-25 18:15 ` Pranit Bauva
2016-03-25 23:06 ` Eric Sunshine
2016-03-24 10:33 ` [PATCH v9 1/3] parse-options.c: make OPTION__COUNTUP consider negative values SZEDER Gábor
2016-03-24 10:38 ` Pranit Bauva
2016-03-24 23:34 ` Eric Sunshine
2016-03-28 18:42 ` Pranit Bauva
2016-03-28 19:03 ` Eric Sunshine
2016-03-26 19:48 ` [PATCH v10 1/3] parse-options.c: make OPTION__COUNTUP understand "unspecified" values Pranit Bauva
2016-03-26 19:48 ` [PATCH v10 3/3] commit: add a commit.verbose config variable Pranit Bauva
2016-03-27 3:34 ` Eric Sunshine
2016-03-27 7:00 ` Pranit Bauva
2016-03-27 8:17 ` Eric Sunshine
2016-03-27 8:40 ` Pranit Bauva
2016-03-27 11:51 ` SZEDER Gábor
2016-03-27 11:59 ` Pranit Bauva
2016-03-27 12:07 ` SZEDER Gábor
2016-03-27 12:11 ` Pranit Bauva
2016-03-27 16:48 ` Eric Sunshine
2016-03-26 19:48 ` [PATCH v10 2/3] t7507-commit-verbose: store output of grep in a file Pranit Bauva
2016-03-27 3:07 ` Eric Sunshine
2016-03-27 13:27 ` SZEDER Gábor
2016-03-27 13:43 ` Pranit Bauva
2016-03-27 17:27 ` Eric Sunshine
2016-03-27 18:31 ` Pranit Bauva
[not found] ` <CAFZEwPMaZkUi+DvohhVrc_dW_8cdfJsZX-YA_SRWDp021UvDLQ@mail.gmail.com>
2016-03-27 17:03 ` Eric Sunshine
[not found] ` <CAPig+cTFK=HPAtk7MeMQSTccmiaai++3sVn6J_pRcSi+w_4Lng@mail.gmail.com>
2016-03-27 17:05 ` Eric Sunshine
[not found] ` <CAFZEwPMJiCTKszfCAVrzsA+jNHwoHPaXySSD3HyiO=f5AikvZg@mail.gmail.com>
[not found] ` <CAPig+cS3usDDeTMzjqbxqi+k+XbmjawZ0TF20s9-vM6o=Fm=OQ@mail.gmail.com>
2016-03-27 17:08 ` Eric Sunshine
2016-03-27 2:45 ` [PATCH v10 1/3] parse-options.c: make OPTION__COUNTUP understand "unspecified" values Eric Sunshine
2016-03-27 6:10 ` Pranit Bauva
2016-03-31 14:45 ` [PATCH v11 1/4] test-parse-options: print quiet as integer Pranit Bauva
2016-03-31 14:45 ` [PATCH v11 3/4] t7507-commit-verbose: improve test coverage by testing number of diffs Pranit Bauva
2016-03-31 18:23 ` Junio C Hamano
2016-03-31 18:42 ` Pranit Bauva
2016-03-31 14:45 ` [PATCH v11 4/4] commit: add a commit.verbose config variable Pranit Bauva
2016-03-31 14:45 ` [PATCH v11 2/4] parse-options.c: make OPTION_COUNTUP respect "unspecified" values Pranit Bauva
2016-03-31 18:41 ` Junio C Hamano
2016-03-31 19:34 ` Pranit Bauva
2016-03-31 20:06 ` Junio C Hamano
2016-03-31 20:41 ` Pranit Bauva
2016-03-31 20:45 ` Junio C Hamano
2016-03-31 18:19 ` [PATCH v11 1/4] test-parse-options: print quiet as integer Junio C Hamano
2016-03-31 18:40 ` Pranit Bauva
2016-04-02 23:33 ` [PATCH v12 1/5] t0040-test-parse-options.sh: fix style issues Pranit Bauva
2016-04-02 23:33 ` [PATCH v12 2/5] test-parse-options: print quiet as integer Pranit Bauva
2016-04-03 21:30 ` Eric Sunshine
2016-04-05 15:39 ` Pranit Bauva
2016-04-06 5:56 ` Eric Sunshine
2016-04-08 11:33 ` Duy Nguyen
2016-04-08 16:52 ` Junio C Hamano
2016-04-02 23:33 ` [PATCH v12 3/5] parse-options.c: make OPTION_COUNTUP respect "unspecified" values Pranit Bauva
2016-04-03 23:10 ` Eric Sunshine
2016-04-05 15:51 ` Pranit Bauva
2016-04-02 23:33 ` [PATCH v12 4/5] t7507-commit-verbose: improve test coverage by testing number of diffs Pranit Bauva
2016-04-04 0:02 ` Eric Sunshine
2016-04-04 1:05 ` Eric Sunshine
2016-04-05 15:54 ` Pranit Bauva
2016-04-02 23:33 ` [PATCH v12 5/5] commit: add a commit.verbose config variable Pranit Bauva
2016-04-04 0:58 ` Eric Sunshine
2016-04-04 23:29 ` Eric Sunshine
2016-04-05 15:58 ` Pranit Bauva
2016-04-03 21:00 ` [PATCH v12 1/5] t0040-test-parse-options.sh: fix style issues Eric Sunshine
2016-04-04 12:45 ` Pranit Bauva
2016-04-04 17:30 ` Eric Sunshine
2016-04-05 5:08 ` Pranit Bauva
2016-04-09 12:23 ` [PATCH v13 1/6] " Pranit Bauva
2016-04-09 12:23 ` [PATCH v13 6/6] commit: add a commit.verbose config variable Pranit Bauva
2016-04-12 21:24 ` Junio C Hamano
2016-04-12 21:28 ` Pranit Bauva
2016-04-12 21:39 ` Junio C Hamano
2016-04-12 22:18 ` Junio C Hamano
2016-04-12 22:25 ` Pranit Bauva
2016-04-09 12:23 ` Pranit Bauva [this message]
2016-04-09 12:23 ` [PATCH v13 2/6] test-parse-options: print quiet as integer Pranit Bauva
2016-04-12 21:33 ` Junio C Hamano
2016-04-12 22:16 ` Pranit Bauva
2016-04-12 23:11 ` Junio C Hamano
2016-04-09 12:23 ` [PATCH v13 5/6] t7507-commit-verbose: improve test coverage by testing number of diffs Pranit Bauva
2016-04-09 12:23 ` [PATCH v13 3/6] t0040-parse-options: improve test coverage Pranit Bauva
2016-04-12 23:02 ` [PATCH v14 1/6] t0040-test-parse-options.sh: fix style issues Pranit Bauva
2016-04-12 23:02 ` [PATCH v14 6/6] commit: add a commit.verbose config variable Pranit Bauva
2016-04-13 6:14 ` Eric Sunshine
2016-04-13 9:15 ` Pranit Bauva
2016-04-13 17:44 ` Eric Sunshine
2016-04-12 23:02 ` [PATCH v14 4/6] parse-options.c: make OPTION_COUNTUP respect "unspecified" values Pranit Bauva
2016-04-13 5:56 ` Eric Sunshine
2016-04-13 8:39 ` Pranit Bauva
2016-04-13 17:33 ` Eric Sunshine
2016-04-13 17:43 ` Pranit Bauva
2016-04-13 17:50 ` Eric Sunshine
2016-04-12 23:02 ` [PATCH v14 3/6] t0040-parse-options: improve test coverage Pranit Bauva
2016-04-13 5:26 ` Eric Sunshine
2016-04-13 8:59 ` Pranit Bauva
2016-04-13 17:27 ` Eric Sunshine
2016-04-25 18:40 ` Pranit Bauva
2016-04-27 17:55 ` Eric Sunshine
2016-04-27 18:16 ` Pranit Bauva
2016-04-12 23:02 ` [PATCH v14 2/6] test-parse-options: print quiet as integer Pranit Bauva
2016-04-12 23:02 ` [PATCH v14 5/6] t7507-commit-verbose: improve test coverage by testing number of diffs Pranit Bauva
2016-04-13 6:03 ` Eric Sunshine
2016-04-13 9:00 ` Pranit Bauva
2016-03-18 22:59 ` [PATCH v8 1/2] parse-options.c: make OPTION__COUNTUP consider negative values Junio C Hamano
2016-03-19 4:55 ` Pranit Bauva
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=01020153faf9fcca-f9fc4f38-7432-4f5c-831d-0274eb5ec992-000000@eu-west-1.amazonses.com \
--to=pranit.bauva@gmail.com \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).