From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: [PATCH v3 0/8] show negatability of options in short help
Date: Sat, 5 Aug 2023 16:33:07 +0200 [thread overview]
Message-ID: <e4d46d97-1cd4-7fea-afd1-7de5023b1b09@web.de> (raw)
In-Reply-To: <xmqq4jlxuiuu.fsf@gitster.g>
Changes since v2:
- Rebase, affects only patch 5.
- Add patch 7 for documenting negative options on their own line.
- Add preparatory patch 6.
- Add bonus patch 8.
subtree: disallow --no-{help,quiet,debug,branch,message}
t1502, docs: disallow --no-help
t1502: move optionspec help output to a file
t1502: test option negation
parse-options: show negatability of options in short help
parse-options: factor out usage_indent() and usage_padding()
parse-options: no --[no-]no-...
parse-options: simplify usage_padding()
Documentation/git-rev-parse.txt | 10 +--
contrib/subtree/git-subtree.sh | 10 +--
contrib/subtree/t/t7900-subtree.sh | 2 +-
parse-options.c | 70 ++++++++++-----
t/t0040-parse-options.sh | 44 +++++-----
t/t1502-rev-parse-parseopt.sh | 131 ++++++++++++-----------------
t/t1502/.gitattributes | 1 +
t/t1502/optionspec-neg | 8 ++
t/t1502/optionspec-neg.help | 12 +++
t/t1502/optionspec.help | 36 ++++++++
10 files changed, 199 insertions(+), 125 deletions(-)
create mode 100644 t/t1502/.gitattributes
create mode 100644 t/t1502/optionspec-neg
create mode 100644 t/t1502/optionspec-neg.help
create mode 100755 t/t1502/optionspec.help
Range-Diff gegen v2:
1: 26c03bd70c = 1: ee280b3484 subtree: disallow --no-{help,quiet,debug,branch,message}
2: ad9e7d1393 = 2: 556e79ce55 t1502, docs: disallow --no-help
3: 1bb68a4a40 = 3: 274e65ec1c t1502: move optionspec help output to a file
4: 47ab167d1c = 4: 89b0455305 t1502: test option negation
5: 961c5dfcf7 ! 5: 7cd3abcff7 parse-options: show negatability of options in short help
@@ t/t0040-parse-options.sh: usage: test-tool parse-options <options>
+ set file to <file>
String options
-- -s, --string <string>
-+ -s, --[no-]string <string>
- get a string
+- -s, --string <string> get a string
- --string2 <str> get another string
- --st <st> get another string (pervert ordering)
++ -s, --[no-]string <string>
++ get a string
+ --[no-]string2 <str> get another string
+ --[no-]st <st> get another string (pervert ordering)
-o <str> get another string
+ --longhelp help text of this entry
+ spans multiple lines
- --list <str> add str to list
+ --[no-]list <str> add str to list
@@ t/t1502/optionspec.help: usage: some-command [options] <args>...
An option group Header
-C[...] option C with an optional argument
- -d, --data[=...] short and long option with an optional argument
-+ -d, --[no-]data[=...]
-+ short and long option with an optional argument
++ -d, --[no-]data[=...] short and long option with an optional argument
Argument hints
-B <arg> short option required argument
@@ t/t1502/optionspec.help: usage: some-command [options] <args>...
+ --[no-]pair <key=value>
+ with an equals sign in the hint
+ --[no-]aswitch help te=t contains? fl*g characters!`
-+ --[no-]bswitch <hint>
-+ hint has trailing tab character
++ --[no-]bswitch <hint> hint has trailing tab character
+ --[no-]cswitch switch has trailing tab character
-+ --[no-]short-hint <a>
-+ with a one symbol hint
++ --[no-]short-hint <a> with a one symbol hint
Extras
- --extra1 line above used to cause a segfault but no longer does
-: ---------- > 6: 46dcdb902d parse-options: factor out usage_indent() and usage_padding()
-: ---------- > 7: fdeca0d6d2 parse-options: no --[no-]no-...
-: ---------- > 8: 08b2d1e861 parse-options: simplify usage_padding()
--
2.41.0
next prev parent reply other threads:[~2023-08-05 14:33 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 15:44 [PATCH] ls-tree: fix --no-full-name René Scharfe
2023-07-18 16:37 ` Junio C Hamano
2023-07-18 20:49 ` Junio C Hamano
2023-07-21 12:41 ` René Scharfe
2023-07-21 12:41 ` René Scharfe
2023-07-21 14:37 ` Junio C Hamano
2023-07-21 19:29 ` René Scharfe
2023-07-21 20:09 ` Junio C Hamano
2023-07-21 20:14 ` Junio C Hamano
2023-07-24 12:29 ` René Scharfe
2023-07-24 18:51 ` Junio C Hamano
2023-07-24 20:09 ` René Scharfe
2023-07-24 20:50 ` Junio C Hamano
2023-07-28 6:12 ` René Scharfe
2023-07-28 9:45 ` Phillip Wood
2023-07-29 20:40 ` René Scharfe
2023-07-31 15:31 ` Junio C Hamano
2023-08-04 16:40 ` Junio C Hamano
2023-08-04 19:48 ` Phillip Wood
2023-08-05 10:40 ` René Scharfe
2023-07-24 12:29 ` [PATCH v2 0/5] show negatability of options in short help René Scharfe
2023-07-24 12:34 ` [PATCH v2 1/5] subtree: disallow --no-{help,quiet,debug,branch,message} René Scharfe
2023-07-24 12:36 ` [PATCH v2 2/5] t1502, docs: disallow --no-help René Scharfe
2023-07-24 12:38 ` [PATCH v2 3/5] t1502: move optionspec help output to a file René Scharfe
2023-07-24 12:39 ` [PATCH v2 4/5] t1502: test option negation René Scharfe
2023-07-24 12:40 ` [PATCH v2 5/5] parse-options: show negatability of options in short help René Scharfe
2023-08-05 14:33 ` René Scharfe [this message]
2023-08-05 14:37 ` [PATCH v3 1/8] subtree: disallow --no-{help,quiet,debug,branch,message} René Scharfe
2023-08-05 14:37 ` [PATCH v3 2/8] t1502, docs: disallow --no-help René Scharfe
2023-08-05 14:38 ` [PATCH v3 3/8] t1502: move optionspec help output to a file René Scharfe
2023-08-05 14:39 ` [PATCH v3 4/8] t1502: test option negation René Scharfe
2023-08-05 14:40 ` [PATCH v3 5/8] parse-options: show negatability of options in short help René Scharfe
2023-08-05 14:43 ` [PATCH v3 6/8] parse-options: factor out usage_indent() and usage_padding() René Scharfe
2023-08-05 14:44 ` [PATCH v3 7/8] parse-options: no --[no-]no- René Scharfe
2023-08-05 14:52 ` [PATCH v3 8/8] parse-options: simplify usage_padding() René Scharfe
2023-08-05 23:04 ` Junio C Hamano
2023-07-21 12:41 ` [PATCH] show-branch: fix --no-sparse René Scharfe
2023-07-21 14:42 ` Junio C Hamano
2023-07-21 16:30 ` René Scharfe
2023-07-21 12:41 ` [PATCH] show-branch: disallow --no-{date,topo}-order René Scharfe
2023-07-21 12:41 ` [PATCH] reset: disallow --no-{mixed,soft,hard,merge,keep} René Scharfe
2023-07-21 12:41 ` [PATCH] pack-objects: fix --no-quiet René Scharfe
2023-07-21 12:41 ` [PATCH] pack-objects: fix --no-keep-true-parents René Scharfe
2023-07-21 17:03 ` Junio C Hamano
2023-07-21 12:42 ` [PATCH] branch: disallow --no-{all,remotes} René Scharfe
2023-07-21 12:42 ` [PATCH] am: unify definition of --keep-cr and --no-keep-cr René Scharfe
2023-07-21 13:41 ` [PATCH] describe: fix --no-exact-match René Scharfe
2023-07-21 14:10 ` Junio C Hamano
2023-07-21 17:00 ` Junio C Hamano
2023-08-08 21:27 ` Jeff King
2023-08-08 21:28 ` Jeff King
2023-08-09 1:43 ` Junio C Hamano
2023-08-09 14:09 ` Jeff King
2023-08-09 16:41 ` René Scharfe
2023-08-09 19:07 ` Junio C Hamano
2023-08-10 0:26 ` Jeff King
2023-08-10 1:00 ` Junio C Hamano
2023-08-10 19:45 ` René Scharfe
2023-08-10 0:41 ` Jeff King
2023-08-10 19:10 ` René Scharfe
2023-08-11 15:11 ` Jeff King
2023-08-11 17:59 ` René Scharfe
2023-08-11 18:24 ` Jeff King
2023-08-12 5:11 ` René Scharfe
2023-08-11 15:13 ` Jeff King
2023-08-11 17:59 ` René Scharfe
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=e4d46d97-1cd4-7fea-afd1-7de5023b1b09@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood123@gmail.com \
/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).