git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv3 4/4] builtin/blame: highlight recently changed lines

From
Stefan Beller <sbeller@google.com>
Date
Jan 8, 2018, 20:09 UTC
Message-ID
<CAGZ79kays4c89quf+8g7vCzydoWxUCnZ0GmC-SP7tgE1vd=fzg@mail.gmail.com>
In-Reply-To
<xmqqfu7g86qs.fsf@gitster.mtv.corp.google.com>
On Mon, Jan 8, 2018 at 11:56 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 63 quoted lines
> Stefan Beller <sbeller@google.com> writes:
>
>> +static struct color_field {
>> +     timestamp_t hop;
>> +     char col[COLOR_MAXLEN];
>> +} *colorfield;
>> +static int colorfield_nr, colorfield_alloc;
>> +
>> +static void parse_color_fields(const char *s)
>> +{
>> +     struct string_list l = STRING_LIST_INIT_DUP;
>> +     struct string_list_item *item;
>> +     enum { EXPECT_DATE, EXPECT_COLOR } next = EXPECT_COLOR;
>> +
>> +     /* Ideally this would be stripped and split at the same time? */
>> +     string_list_split(&l, s, ',', -1);
>> +     ALLOC_GROW(colorfield, colorfield_nr + 1, colorfield_alloc);
>> +
>> +     for_each_string_list_item(item, &l) {
>> +             switch (next) {
>> +             case EXPECT_DATE:
>> +                     colorfield[colorfield_nr].hop = approxidate(item->string);
>> +                     next = EXPECT_COLOR;
>> +                     colorfield_nr++;
>> +                     ALLOC_GROW(colorfield, colorfield_nr + 1, colorfield_alloc);
>> +                     break;
>
> This should make sure cf[i].hop is monotonically increasing to avoid
> end-user mistakes, I would think (what's 'hop' by the way?).
>
>> +             case EXPECT_COLOR:
>> +                     if (color_parse(item->string, colorfield[colorfield_nr].col))
>> +                             die(_("expecting a color: %s"), item->string);
>
> When you have a typo in one of your configuration files, say "[color
> "blame"] highlightrecent = 1,week,blue,...", you'd want to see a bit
> more than just "expecting a color: week" to help you diagnose and
> resolve the issue.  Giving the name of the variable and the file the
> wrong definition was found in would be needed, givin that this is
> called from the config callback git_blame_config() below.
>
>> +                     next = EXPECT_DATE;
>> +                     break;
>> +             }
>> +     }
>> +
>> +     if (next == EXPECT_COLOR)
>> +             die (_("must end with a color"));
>
> Same here.
>
>>               OPT_BIT(0, "color-lines", &output_option, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE),
>>               OPT_BIT(0, "color-fields", &output_option, N_("color redundant metadata fields from previous line differently"), OUTPUT_COLOR_FIELDS),
>> +             OPT_BIT(0, "heated-lines", &output_option, N_("color lines by age"), OUTPUT_HEATED_LINES),
>
> These options may be useful while having fun experimenting, but my
> gut feeling is that these are too fine-grained for end-users to
> tweak per invocation basis (which is what command line options are
> for).
>
> But perhaps I am biased (as anybody else), as personally I find
> anything beyond step 2/4 uninteresting, and not adding too many of
> these options is consistent with that viewpoint ;-)

See, I find 2 and 3 uninteresting and just did it 'because someone else hinted at that is what they want'. Maybe I was a bad listener.

4 (maybe with 2 in combination) would be all I need as that allows me to quickly judge the trustworthiness of code (old code is better, just like most liquors? ;)

> In any case, thanks for a fun read.

Thanks, I'll reread the comments and see if I can remove some options to make it useful for upstream consumption.

Thanks, Stefan

Previous: Junio C HamanoNext: Stefan Beller
Message 14 of 17 in “blame: (dim rep. metadata lines or fields, decay date coloring)”
  1. 0/4 blame: (dim rep. metadata lines or fields, decay date coloring)Stefan Beller, Nov 10, 2017
  2. 1/4 color.h: modernize headerStefan Beller, Nov 10, 2017
  3. 2/4 builtin/blame: dim uninteresting metadataStefan Beller, Nov 10, 2017
  4. 3/4 builtin/blame: add option to color metadata fields separatelyStefan Beller, Nov 10, 2017
  5. 4/4 builtin/blame: highlight recently changed linesStefan Beller, Nov 10, 2017
  6. 0/4 blame: (dim rep. metadata lines or fields, decay date coloring)Stefan Beller, Jan 4, 2018
  7. 1/4 color.h: document and modernize headerStefan Beller, Jan 4, 2018
  8. Junio C HamanoJan 8, 2018
  9. 2/4 builtin/blame: dim uninteresting metadataStefan Beller, Jan 4, 2018
  10. Junio C HamanoJan 8, 2018
  11. Stefan BellerFeb 8, 2018
  12. 4/4 builtin/blame: highlight recently changed linesStefan Beller, Jan 4, 2018
  13. Junio C HamanoJan 8, 2018
  14. Stefan BellerJan 8, 2018
  15. 3/4 builtin/blame: add option to color metadata fields separatelyStefan Beller, Jan 4, 2018
  16. Ævar Arnfjörð BjarmasonFeb 1, 2018
  17. Stefan BellerFeb 1, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.