From: Eli Schwartz <eschwartz@archlinux.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v4 0/3] Add some more options to the pretty-formats
Date: Sun, 31 Oct 2021 13:15:07 -0400 [thread overview]
Message-ID: <20211031171510.1646396-1-eschwartz@archlinux.org> (raw)
In-Reply-To: <20211029184512.1568017-1-eschwartz@archlinux.org>
Renamed enum values. OPT_ -> DESCRIBE_ARG_
Doc fixups.
Eli Schwartz (3):
pretty.c: rework describe options parsing for better extensibility
pretty: add tag option to %(describe)
pretty: add abbrev option to %(describe)
Documentation/pretty-formats.txt | 16 ++++++---
pretty.c | 58 ++++++++++++++++++++++++++------
t/t4205-log-pretty-formats.sh | 16 +++++++++
3 files changed, 75 insertions(+), 15 deletions(-)
Range-diff against v3:
1: 55a20468d3 ! 1: be35fee252 pretty.c: rework describe options parsing for better extensibility
@@ pretty.c: int format_set_trailers_options(struct process_trailer_options *opts,
- const char *options[] = { "match", "exclude" };
+ struct {
+ char *name;
-+ enum { OPT_STRING } type;
++ enum {
++ DESCRIBE_ARG_STRING,
++ } type;
+ } option[] = {
-+ { "exclude", OPT_STRING },
-+ { "match", OPT_STRING },
++ { "exclude", DESCRIBE_ARG_STRING },
++ { "match", DESCRIBE_ARG_STRING },
+ };
const char *arg = start;
@@ pretty.c: int format_set_trailers_options(struct process_trailer_options *opts,
- matched = options[i];
+ for (i = 0; !found && i < ARRAY_SIZE(option); i++) {
+ switch (option[i].type) {
-+ case OPT_STRING:
++ case DESCRIBE_ARG_STRING:
+ if (match_placeholder_arg_value(arg, option[i].name, &arg,
+ &argval, &arglen)) {
+ if (!arglen)
2: c34c8a4f7f ! 2: 5830c69d4d pretty: add tag option to %(describe)
@@ Documentation/pretty-formats.txt: The placeholders are:
inconsistent when tags are added or removed at
the same time.
+
-+** 'tags[=<BOOL>]': Instead of only considering annotated tags,
++** 'tags[=<bool>]': Instead of only considering annotated tags,
+ consider lightweight tags as well.
** 'match=<pattern>': Only consider tags matching the given
`glob(7)` pattern, excluding the "refs/tags/" prefix.
@@ Documentation/pretty-formats.txt: insert an empty string unless we are traversin
decoration format if `--decorate` was not already provided on the command
line.
-+The boolean options accept an optional value `[=<BOOL>]`. The values
++The boolean options accept an optional value `[=<bool>]`. The values
+`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
+sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
+option is given with no value, it's enabled.
@@ Documentation/pretty-formats.txt: insert an empty string unless we are traversin
## pretty.c ##
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *args)
- {
struct {
char *name;
-- enum { OPT_STRING } type;
-+ enum { OPT_BOOL, OPT_STRING, } type;
+ enum {
++ DESCRIBE_ARG_BOOL,
+ DESCRIBE_ARG_STRING,
+ } type;
} option[] = {
-+ { "tags", OPT_BOOL},
- { "exclude", OPT_STRING },
- { "match", OPT_STRING },
++ { "tags", DESCRIBE_ARG_BOOL},
+ { "exclude", DESCRIBE_ARG_STRING },
+ { "match", DESCRIBE_ARG_STRING },
};
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *args)
int found = 0;
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *ar
for (i = 0; !found && i < ARRAY_SIZE(option); i++) {
switch (option[i].type) {
-+ case OPT_BOOL:
++ case DESCRIBE_ARG_BOOL:
+ if (match_placeholder_bool_arg(arg, option[i].name, &arg, &optval)) {
+ if (optval)
+ strvec_pushf(args, "--%s", option[i].name);
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *ar
+ found = 1;
+ }
+ break;
- case OPT_STRING:
+ case DESCRIBE_ARG_STRING:
if (match_placeholder_arg_value(arg, option[i].name, &arg,
&argval, &arglen)) {
3: b751aaf3c6 ! 3: 032513150d pretty: add abbrev option to %(describe)
@@ Commit message
## Documentation/pretty-formats.txt ##
@@ Documentation/pretty-formats.txt: The placeholders are:
+
- ** 'tags[=<BOOL>]': Instead of only considering annotated tags,
+ ** 'tags[=<bool>]': Instead of only considering annotated tags,
consider lightweight tags as well.
-+** 'abbrev=<N>': Instead of using the default number of hexadecimal digits
++** 'abbrev=<number>': Instead of using the default number of hexadecimal digits
+ (which will vary according to the number of objects in the repository with a
-+ default of 7) of the abbreviated object name, use <n> digits, or as many digits
-+ as needed to form a unique object name.
++ default of 7) of the abbreviated object name, use <number> digits, or as many
++ digits as needed to form a unique object name.
** 'match=<pattern>': Only consider tags matching the given
`glob(7)` pattern, excluding the "refs/tags/" prefix.
** 'exclude=<pattern>': Do not consider tags matching the given
## pretty.c ##
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *args)
- {
- struct {
char *name;
-- enum { OPT_BOOL, OPT_STRING, } type;
-+ enum { OPT_BOOL, OPT_INTEGER, OPT_STRING, } type;
+ enum {
+ DESCRIBE_ARG_BOOL,
++ DESCRIBE_ARG_INTEGER,
+ DESCRIBE_ARG_STRING,
+ } type;
} option[] = {
- { "tags", OPT_BOOL},
-+ { "abbrev", OPT_INTEGER },
- { "exclude", OPT_STRING },
- { "match", OPT_STRING },
+ { "tags", DESCRIBE_ARG_BOOL},
++ { "abbrev", DESCRIBE_ARG_INTEGER },
+ { "exclude", DESCRIBE_ARG_STRING },
+ { "match", DESCRIBE_ARG_STRING },
};
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *args)
found = 1;
}
break;
-+ case OPT_INTEGER:
++ case DESCRIBE_ARG_INTEGER:
+ if (match_placeholder_arg_value(arg, option[i].name, &arg,
+ &argval, &arglen)) {
+ char *endptr;
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *ar
+ found = 1;
+ }
+ break;
- case OPT_STRING:
+ case DESCRIBE_ARG_STRING:
if (match_placeholder_arg_value(arg, option[i].name, &arg,
&argval, &arglen)) {
--
2.33.1
next prev parent reply other threads:[~2021-10-31 17:15 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-24 1:42 [PATCH 0/3] Add some more options to the pretty-formats Eli Schwartz
2021-10-24 1:42 ` [PATCH 1/3] pretty.c: rename describe options variable to more descriptive name Eli Schwartz
2021-10-24 4:31 ` Junio C Hamano
2021-10-24 15:37 ` Eli Schwartz
2021-10-24 1:42 ` [PATCH 2/3] pretty: add tag option to %(describe) Eli Schwartz
2021-10-24 4:57 ` Junio C Hamano
2021-10-24 15:38 ` Eli Schwartz
2021-10-24 1:42 ` [PATCH 3/3] pretty: add abbrev " Eli Schwartz
2021-10-24 5:15 ` Junio C Hamano
2021-10-24 15:43 ` Eli Schwartz
2021-10-26 1:34 ` [PATCH v2 0/3] Add some more options to the pretty-formats Eli Schwartz
2021-10-26 1:34 ` [PATCH v2 1/3] pretty.c: rework describe options parsing for better extensibility Eli Schwartz
2021-10-26 5:18 ` Eric Sunshine
2021-10-26 20:05 ` Eli Schwartz
2021-10-26 1:34 ` [PATCH v2 2/3] pretty: add tag option to %(describe) Eli Schwartz
2021-10-26 5:25 ` Eric Sunshine
2021-10-26 20:06 ` Eli Schwartz
2021-10-26 1:34 ` [PATCH v2 3/3] pretty: add abbrev " Eli Schwartz
2021-10-26 5:36 ` Eric Sunshine
2021-10-26 12:06 ` Đoàn Trần Công Danh
2021-10-26 17:28 ` Eric Sunshine
2021-10-26 19:12 ` Eli Schwartz
2021-10-27 8:05 ` Carlo Arenas
2021-11-03 23:20 ` Johannes Schindelin
2021-11-04 9:29 ` Johannes Schindelin
2021-11-07 12:39 ` Eli Schwartz
2021-10-29 18:45 ` [PATCH v3 0/3] Add some more options to the pretty-formats Eli Schwartz
2021-10-29 18:45 ` [PATCH v3 1/3] pretty.c: rework describe options parsing for better extensibility Eli Schwartz
2021-10-29 20:11 ` Junio C Hamano
2021-10-29 21:06 ` Eli Schwartz
2021-10-29 21:34 ` Junio C Hamano
2021-10-29 18:45 ` [PATCH v3 2/3] pretty: add tag option to %(describe) Eli Schwartz
2021-10-29 20:18 ` Junio C Hamano
2021-10-29 21:14 ` Eli Schwartz
2021-10-29 21:46 ` Junio C Hamano
2021-10-29 21:28 ` Junio C Hamano
2021-10-29 21:44 ` Eli Schwartz
2021-10-29 18:45 ` [PATCH v3 3/3] pretty: add abbrev " Eli Schwartz
2021-10-29 18:51 ` Eric Sunshine
2021-10-29 19:04 ` Eli Schwartz
2021-10-31 17:15 ` Eli Schwartz [this message]
2021-10-31 17:15 ` [PATCH v4 1/3] pretty.c: rework describe options parsing for better extensibility Eli Schwartz
2021-10-31 17:15 ` [PATCH v4 2/3] pretty: add tag option to %(describe) Eli Schwartz
2021-10-31 18:07 ` Junio C Hamano
2021-10-31 18:58 ` Eli Schwartz
2021-10-31 17:15 ` [PATCH v4 3/3] pretty: add abbrev " Eli Schwartz
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=20211031171510.1646396-1-eschwartz@archlinux.org \
--to=eschwartz@archlinux.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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.
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).