From: Taylor Blau <me@ttaylorr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 5/5] builtin/config: introduce `color` type specifier
Date: Wed, 25 Apr 2018 23:01:15 -0700 [thread overview]
Message-ID: <20180426060115.GA40265@syl.local> (raw)
In-Reply-To: <xmqq36zi352x.fsf@gitster-ct.c.googlers.com>
On Thu, Apr 26, 2018 at 02:32:54PM +0900, Junio C Hamano wrote:
> Taylor Blau <me@ttaylorr.com> writes:
>
> > diff --git a/builtin/config.c b/builtin/config.c
> > index d7acf912cd..ec5c11293b 100644
> > --- a/builtin/config.c
> > +++ b/builtin/config.c
> > @@ -61,6 +61,7 @@ static int show_origin;
> > #define TYPE_BOOL_OR_INT 3
> > #define TYPE_PATH 4
> > #define TYPE_EXPIRY_DATE 5
> > +#define TYPE_COLOR 6
> >
> > #define OPT_CALLBACK_VALUE(s, l, v, h, i) \
> > { OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \
> > @@ -231,6 +232,11 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value
> > if (git_config_expiry_date(&t, key_, value_) < 0)
> > return -1;
> > strbuf_addf(buf, "%"PRItime, t);
> > + } else if (type == TYPE_COLOR) {
> > + char v[COLOR_MAXLEN];
> > + if (git_config_color(v, key_, value_) < 0)
> > + return -1;
> > + strbuf_addstr(buf, v);
> > } else if (value_) {
> > strbuf_addstr(buf, value_);
> > } else {
> > @@ -376,6 +382,20 @@ static char *normalize_value(const char *key, const char *value)
> > else
> > return xstrdup(v ? "true" : "false");
> > }
> > + if (type == TYPE_COLOR) {
> > + char v[COLOR_MAXLEN];
> > + if (git_config_color(v, key, value))
> > + die("cannot parse color '%s'", value);
> > +
> > + /*
> > + * The contents of `v` now contain an ANSI escape
> > + * sequence, not suitable for including within a
> > + * configuration file. Treat the above as a
> > + * "sanity-check", and return the given value, which we
> > + * know is representable as valid color code.
> > + */
> > + return xstrdup(value);
> > + }
> >
> > die("BUG: cannot normalize type %d", type);
> > }
>
> Hmmm, option_parse_type() introduced in [PATCH 2/5] used to learn
> to parse "color" in this step, but it no longer does.
Oof, again. I dropped this hunk on the floor when integrating. I put it
back in v2.
Thanks,
Taylor
next prev parent reply other threads:[~2018-04-26 6:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 4:25 [PATCH 0/5] builtin/config.c: combined series '--type', '--default' Taylor Blau
2018-04-26 4:25 ` [PATCH 1/5] builtin/config.c: treat type specifiers singularly Taylor Blau
2018-04-26 4:25 ` [PATCH 2/5] builtin/config.c: support `--type=<type>` as preferred alias for `--type` Taylor Blau
2018-04-26 5:25 ` Junio C Hamano
2018-04-26 6:00 ` Taylor Blau
2018-04-27 6:06 ` Eric Sunshine
2018-04-26 4:25 ` [PATCH 3/5] builtin/config: introduce `--default` Taylor Blau
2018-04-26 4:25 ` [PATCH 4/5] config.c: introduce 'git_config_color' to parse ANSI colors Taylor Blau
2018-04-26 4:25 ` [PATCH 5/5] builtin/config: introduce `color` type specifier Taylor Blau
2018-04-26 5:32 ` Junio C Hamano
2018-04-26 6:01 ` Taylor Blau [this message]
2018-04-26 5:58 ` [PATCH v2 0/5] builtin/config.c: combined series '--type', '--default' Taylor Blau
2018-04-26 5:58 ` [PATCH v2 1/5] builtin/config.c: treat type specifiers singularly Taylor Blau
2018-04-26 5:58 ` [PATCH v2 2/5] builtin/config.c: support `--type=<type>` as preferred alias for `--<type>` Taylor Blau
2018-04-26 9:49 ` Junio C Hamano
2018-04-27 5:57 ` Eric Sunshine
2018-04-26 5:58 ` [PATCH v2 3/5] builtin/config: introduce `--default` Taylor Blau
2018-04-26 5:58 ` [PATCH v2 4/5] config.c: introduce 'git_config_color' to parse ANSI colors Taylor Blau
2018-04-26 5:58 ` [PATCH v2 5/5] builtin/config: introduce `color` type specifier Taylor Blau
2018-04-27 6:22 ` Eric Sunshine
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=20180426060115.GA40265@syl.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).