From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git <git@vger.kernel.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: What's cooking in git.git (Jul 2018, #03; Wed, 25)
Date: Thu, 26 Jul 2018 09:56:34 -0700 [thread overview]
Message-ID: <xmqqtvomq6kd.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqq4lgmubi8.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Wed, 25 Jul 2018 16:43:59 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Stefan Beller <sbeller@google.com> writes:
>
>>> * js/range-diff (2018-07-25) 21 commits
>
>> I think the current coloring is good enough to ship, but it still has
>> errors around corners, for example introduction of new files,
>> having lines in the inner diff as:
>>
>> diff --git a/Makefile b/Makefile
>> --- a/Makefile
>> +++ b/Makefile
>>
>> will be colored white/red/green (in that order), but in the outer diff
>> these are all "context", but as these specific context lines happen
>> to start with +/- we color them.
>> If we want to be perfect, we rather need to parse&understand
>> the inner diff on a more detailed level, but I would argue to leave
>> that to a later stage for another volunteer to step in and cleanup.
>
> I think the primary part of coloring i.e. "white is common, green is
> added, red is removed" together with "bold is new, dimmed is old" is
> quite usable and not broken.
I just compared the output from the original tbdiff and the dual
color mode of range-diff; especially with that "new round is bold,
old round is dimmed", I find that the coloring makes it easier to
spot what kind of each line is than what tbdiff did.
Dscho, good job on that.
next prev parent reply other threads:[~2018-07-26 16:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-25 22:13 What's cooking in git.git (Jul 2018, #03; Wed, 25) Junio C Hamano
2018-07-25 22:56 ` Stefan Beller
2018-07-25 23:43 ` Junio C Hamano
2018-07-26 4:14 ` Junio C Hamano
2018-07-26 16:56 ` Junio C Hamano [this message]
2018-07-25 23:47 ` Junio C Hamano
2018-07-25 23:48 ` Junio C Hamano
2018-07-26 4:15 ` Junio C Hamano
2018-07-26 6:07 ` Оля Тележная
2018-07-26 16:57 ` Junio C Hamano
2018-08-02 12:41 ` Christian Couder
2018-08-02 18:40 ` Junio C Hamano
2018-07-26 7:24 ` Jeff King
2018-07-26 16:57 ` Junio C Hamano
2018-07-26 20:46 ` Jeff King
2018-07-27 14:28 ` Ævar Arnfjörð Bjarmason
2018-07-27 17:28 ` Junio C Hamano
2018-07-30 13:16 ` range-diff, was " Johannes Schindelin
2018-07-30 15:41 ` Junio C Hamano
2018-08-01 16:01 ` Johannes Schindelin
2018-08-01 19:11 ` Junio C Hamano
2018-08-01 20:44 ` ds/reachable (was Re: What's cooking in git.git (Jul 2018, #03; Wed, 25)) Derrick Stolee
2018-08-01 21:55 ` Junio C Hamano
2018-08-01 20:53 ` ds/multi-pack-index " Derrick Stolee
2018-08-01 22:13 ` 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=xmqqtvomq6kd.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
/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).