From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.2 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 07BFF20989 for ; Mon, 10 Oct 2016 19:06:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751979AbcJJTGZ (ORCPT ); Mon, 10 Oct 2016 15:06:25 -0400 Received: from cloud.peff.net ([104.130.231.41]:55254 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751917AbcJJTGY (ORCPT ); Mon, 10 Oct 2016 15:06:24 -0400 Received: (qmail 9636 invoked by uid 109); 10 Oct 2016 18:59:38 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.84) with SMTP; Mon, 10 Oct 2016 18:59:38 +0000 Received: (qmail 846 invoked by uid 111); 10 Oct 2016 18:59:57 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.84) with SMTP; Mon, 10 Oct 2016 14:59:57 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Mon, 10 Oct 2016 14:59:36 -0400 Date: Mon, 10 Oct 2016 14:59:36 -0400 From: Jeff King To: Junio C Hamano Cc: Duy Nguyen , =?utf-8?B?UmVuw6k=?= Scharfe , Tom Hale , git Subject: Re: [PATCH] pretty: respect color settings for %C placeholders Message-ID: <20161010185935.r3wnfglpi7hjjpdk@sigill.intra.peff.net> References: <65d8def3-df62-6c45-7d8f-79b6a8769bf5@hale.ee> <25c17e16-2456-7da3-ae22-2dc812a3aa0d@web.de> <20161009234617.y6xfjyv6xjkf2afi@sigill.intra.peff.net> <20161010142818.lglwrxpks6l6aqrm@sigill.intra.peff.net> <20161010151517.6wszhuyp57yfncaj@sigill.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Mon, Oct 10, 2016 at 11:52:14AM -0700, Junio C Hamano wrote: > > + By default, colors are shown only when enabled for log output (by > > + `color.diff`, `color.ui`, or `--color`, and respecting the `auto` > > + settings of the former if we are going to a terminal). `%C(auto,...)` > > + is accepted as a historical synonym for the default. Specifying > > + `%C(always,...) will show the colors always, even when colors are not > > + otherwise enabled (to enable this behavior for the whole format, use > > + `--color=always`). > > It is not just "for the whole format", but also affects other parts > of the output, no? I am thinking about "git log -p --format=...". True. I consider that a feature and more likely to be pointing the user in the right direction, but it should probably be s/format/output/ in the last sentence. > > diff --git a/pretty.c b/pretty.c > > index 25efbca..73e58b5 100644 > > --- a/pretty.c > > +++ b/pretty.c > > @@ -965,22 +965,31 @@ static size_t parse_color(struct strbuf *sb, /* in UTF-8 */ > > > > if (!end) > > return 0; > > - if (skip_prefix(begin, "auto,", &begin)) { > > + > > + if (!skip_prefix(begin, "always,", &begin)) { > > if (!want_color(c->pretty_ctx->color)) > > return end - placeholder + 1; > > } > > As a way to say "when color is not enabled, ignore everything unless > it begins with 'always,'", this was a bit hard to read. Perhaps an > in-code comment is in order? I'll see what I can do. The most readable one is probably: if (skip_prefix(begin, "auto,", &begin)) { if (!want_color(c->pretty_ctx->color)) return end - placeholder + 1; } else if (skip_prefix(begin, "always,", &begin)) { /* nothing to do; we do not respect want_color at all */ } else { /* the default is now the same as "auto" */ if (!want_color(c->pretty_ctx->color)) return end - placeholder + 1; } I avoided that because of the repetition, but it probably is not too bad. > > - if (skip_prefix(placeholder + 1, "red", &rest)) > > + if (skip_prefix(placeholder + 1, "red", &rest) && > > + want_color(c->pretty_ctx->color)) > > strbuf_addstr(sb, GIT_COLOR_RED); > > Hmm. If we are in "no I do not want color" mode and "always,red" > was given, we countermanded !want_color() check up above and come > here. Then we check want_color() again and refuse to paint it red? > > I must be reading the patch incorrectly, but I cannot quite tell > where I want astray... No, we don't come here from %C() at all. This is for bare "%Cred", which cannot have "always" (or "auto"), as there is no syntactic spot for it. It is mostly historical (it _only_ supports red, green, and blue). We could actually leave this as-is to show the colors unconditionally. I changed it to keep the new behavior consistent, but I doubt anybody cares much either way. -Peff