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

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

From
Stefan Beller <sbeller@google.com>
Date
Jun 14, 2017, 18:44 UTC
Message-ID
<CAGZ79kasPxbGLUEkvQ0sOJtjTvGO0BvAeUF_LeOiFNEhd7VBfg@mail.gmail.com>
In-Reply-To
<xmqqo9tq51yq.fsf@gitster.mtv.corp.google.com>
On Wed, Jun 14, 2017 at 2:54 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 20 quoted lines
> Stefan Beller <sbeller@google.com> writes:
>
>> The color experts agreed that (3) might be the best solution
>> as this gives most flexibility:
>>
>>     "I would be happy as I can configure the bounds highlighting
>>     to not exist, it would degenerate to a pure Zebra, which is
>>     very simple to understand. Junio seemed to like (2) a lot, so
>>     he would configure both dim colors to be 'context', but configure
>>     the highlight colors to be attention drawing. So everybody would
>>     be happy. It is also not too many colors, we are good at for loops."
>
> Another thing I found a bit confusing in the description of choices
> in the documentation was that description for some began with "Based
> on X.", and as a plain reader, I couldn't tell if that is saying
> "the implementation happens to be similar or shares code with X"
> (which is not all that interesting to the end user) or "the meaning
> this mode tries to convey is the same as X but the presentation is a
> bit different" (in which case the end user is hinted that it is
> benefitial to understand what informacion the mode X shows and how).

it is the latter, as I wanted to save typing. Maybe it was savings at the wrong place.

>
> For example, I view what I prefer (i.e. (2)) as a variant of Zebra
> (i.e. (1)).

Ok, so in a reroll I'll add Zebra as the base (It conveys all information that we have, any further modifications is just giving a better finish to the painting.) and then make commits on top of it adding the taping and water-dunking method on top.

By organizing it in multiple commits the algorithm may become clearer.
Show 14 quoted lines
> Conceptually, you paint the diff output using water
> soluble paint into a Zebra pattern, then apply thin strips of
> protective tape to places where two Zebra colors are adjacent to
> each other (i.e. do not cover the boundary between a block of a
> Zebra colored moved lines and a block of context lines), dunk the
> whole thing in water and then remove the strips of tape.  Regions
> covered by the strips of tape will retain the Zebra colors, while
> the remainder of the Zebra colored part are colored in a much subdued
> way.  Understanding how Zebra mode marks the moved lines would help
> understanding its output, but your implementation may not share much
> code with the actual implementation of Zebra-painting.
>
> Thanks.
>

Thanks, Stefan

Previous: Junio C HamanoNext: Jacob Keller
Message 8 of 14 in “What's cooking in git.git (Jun 2017, #03; Mon, 5)”
  1. Junio C HamanoJun 5, 2017
  2. Stefan BellerJun 5, 2017
  3. Junio C HamanoJun 6, 2017
  4. Jacob KellerJun 6, 2017
  5. Jacob KellerJun 8, 2017
  6. Stefan BellerJun 13, 2017
  7. Junio C HamanoJun 14, 2017
  8. Stefan BellerJun 14, 2017
  9. Jacob KellerJun 6, 2017
  10. Michael HaggertyJun 6, 2017
  11. Jacob KellerJun 6, 2017
  12. Stefan BellerJun 7, 2017
  13. Ævar Arnfjörð BjarmasonJun 7, 2017
  14. Stefan BellerJun 7, 2017

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.