Re: [RFC/PATCH] builtin/blame: darken redundant line information
- From
Stefan Beller <sbeller@google.com>
- Date
- Jun 13, 2017, 17:13 UTC
- Message-ID
- <CAGZ79kYV8Ngis=ux50Zs1r5XOBUJ=hw2=8BEkNqk7PiGamX0AA@mail.gmail.com>
- In-Reply-To
- <xmqqa85b9626.fsf@gitster.mtv.corp.google.com>
On Tue, Jun 13, 2017 at 10:00 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 40 quoted lines
> Stefan Beller <sbeller@google.com> writes:
>
>> * As you have an individual color setup, maybe you can fix this
>> for you by setting the appropriate slots to your perception of
>> dimmed?
>
> I do not think it is possible with only {new,old}{,alternative} 4
> colors.
>
> Consider this diff:
>
> context
> -B
> -B
> -B
> -A
> -A
> -A
> context
> +A
> +A
> +A
> +B
> +B
> +B
> context
>
> Two blocks (A and B) that are adjacent are moved but swapped to form
> a pair of new adjacent blocks.
>
> We would like the boundary between the last "-B" and the first "-A"
> to be highlighted differently; all other "-A" and "-B" lines do not
> disappear but go elsewhere, so they want to be dimmed.
>
> The newly added 6 lines are actually moved from elsewhere, and we
> would like the boundary between the last "+A" and the first "+B" to
> be highlighted differently, and others are dimmed.
>
> So I'd think you would need at least two kinds of highlight colors
> plus a dimmed color.Here is what currently happens:
Show 17 quoted lines
> > context > -B dim oldMoved > -B dim oldMoved > -B highlight oldMovedAlternative > -A highlight oldMovedAlternative > -A dim oldMoved > -A dim oldMoved > context > +A dim newMoved > +A dim newMoved > +A highlight newMovedAlternative > +B highlight newMovedAlternative > +B dim newMoved > +B dim newMoved > context >
So the there is only one "highlight" color in each block. There is no separate hightligh-for-ending-block and highlight-for-new-block respectively.
Show 5 quoted lines
> If old_moved and old_moved_alternative are meant for highlighting > "-B" and "-A" above differently, while new_moved and > new_moved_alternative are for highlighting "+A" and "+B" > differently, you'd need a way to specify "dim" for old and new moved > lines, which seems to be impossible with only 4 new colors.
The standard non alternative was dim in my mind for the adjacentbounds mode.
If you prefer to have the alternate mode, you rather want no dim, no highlight, but just 2 alternating colors of equal attention-drawing.