From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Simon Courtois <scourtois@cubyx.fr>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 5/7] color: allow "no-" for negating attributes
Date: Thu, 23 Jun 2016 13:38:44 -0400 [thread overview]
Message-ID: <20160623173844.GE15774@sigill.intra.peff.net> (raw)
In-Reply-To: <20160623173048.GA19923@sigill.intra.peff.net>
Using "no-bold" rather than "nobold" is easier to read and
more natural to type (to me, anyway, even though I was the
person who introduced "nobold" in the first place). It's
easy to allow both.
Signed-off-by: Jeff King <peff@peff.net>
---
Documentation/config.txt | 2 +-
color.c | 4 +++-
t/t4026-color.sh | 4 ++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f8460d4..4b13c90 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -166,7 +166,7 @@ hex, like `#ff0ab3`.
The accepted attributes are `bold`, `dim`, `ul`, `blink`, and `reverse`.
The position of any attributes with respect to the colors (before, after,
or in between), doesn't matter. Specific attributes may be turned off
-by prefixing them with `no` (e.g., `noreverse`, `noul`, etc).
+by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc).
+
For git's pre-defined color slots, the attributes are meant to be reset
at the beginning of each item in the colored output. So setting
diff --git a/color.c b/color.c
index d787dec..a02a935 100644
--- a/color.c
+++ b/color.c
@@ -141,8 +141,10 @@ static int parse_attr(const char *name, size_t len)
int negate = 0;
int i;
- if (skip_prefix_mem(name, len, "no", &name, &len))
+ if (skip_prefix_mem(name, len, "no", &name, &len)) {
+ skip_prefix_mem(name, len, "-", &name, &len);
negate = 1;
+ }
for (i = 0; i < ARRAY_SIZE(attrs); i++) {
if (attrs[i].len == len && !memcmp(attrs[i].name, name, len))
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index 2b32c4f..2065752 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -50,6 +50,10 @@ test_expect_success 'attr negation' '
color "nobold nodim noul noblink noreverse" "[22;24;25;27m"
'
+test_expect_success '"no-" variant of negation' '
+ color "no-bold no-blink" "[22;25m"
+'
+
test_expect_success 'long color specification' '
color "254 255 bold dim ul blink reverse" "[1;2;4;5;7;38;5;254;48;5;255m"
'
--
2.9.0.209.g845fbc1
next prev parent reply other threads:[~2016-06-23 17:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 11:54 Italics formatting Simon Courtois
2016-06-23 13:08 ` [PATCH 0/2] more ANSI attributes Jeff King
2016-06-23 13:09 ` [PATCH 1/2] color: fix max-size comment Jeff King
2016-06-23 13:10 ` [PATCH 2/2] color: support "italic" attribute Jeff King
2016-06-23 13:57 ` Simon Courtois
2016-06-23 16:46 ` Junio C Hamano
2016-06-23 16:47 ` Jeff King
2016-06-23 17:30 ` [PATCH v2 0/7] more ANSI attributes Jeff King
2016-06-23 17:31 ` [PATCH v2 1/7] color: fix max-size comment Jeff King
2016-06-23 17:32 ` [PATCH v2 2/7] doc: refactor description of color format Jeff King
2016-06-23 17:33 ` [PATCH v2 3/7] add skip_prefix_mem helper Jeff King
2016-06-23 17:38 ` [PATCH v2 4/7] color: refactor parse_attr Jeff King
2016-06-23 17:38 ` Jeff King [this message]
2016-06-23 17:39 ` [PATCH v2 6/7] color: support "italic" attribute Jeff King
2016-06-23 18:34 ` Junio C Hamano
2016-06-23 18:36 ` Jeff King
2016-06-23 17:40 ` [PATCH v2 7/7] color: support strike-through attribute Jeff King
2016-06-23 18:36 ` Junio C Hamano
2016-06-23 18:39 ` Jeff King
2016-06-23 18:52 ` Junio C Hamano
2016-06-23 19:03 ` Junio C Hamano
2016-06-23 19:04 ` Jeff King
2016-06-23 19:11 ` Junio C Hamano
2016-06-23 19:56 ` Junio C Hamano
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=20160623173844.GE15774@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=scourtois@cubyx.fr \
/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).