From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Stefan Beller <sbeller@google.com>
Cc: Junio C Hamano <gitster@pobox.com>, git <git@vger.kernel.org>
Subject: Re: [PATCH 4/4] range-diff: indent special lines as context
Date: Thu, 16 Aug 2018 10:22:51 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1808161022180.71@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CAGZ79kZhLsUZL+bfoovV+U6W-zX6npERRG86fS8+1GsTQmKoHA@mail.gmail.com>
Hi Stefan,
On Tue, 14 Aug 2018, Stefan Beller wrote:
> On Tue, Aug 14, 2018 at 11:54 AM Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
> >
> > On Mon, 13 Aug 2018, Stefan Beller wrote:
> >
> > > > > The later lines that indicate a change to the Makefile will be
> > > > > treated as context both in the outer and inner diff, such that
> > > > > those lines stay regular color.
> > > >
> > > > While I am a fan of having those lines colored correctly, I have
> > > > to admit that I am not exactly enthusiastic about that extra
> > > > indentation...
> > > >
> > > > Otherwise, this looks good to me.
> > >
> > > Can you explain what makes you less enthused about the indentation?
> > >
> > > Advantage:
> > > * allows easy coloring (easy implementation)
> > > Disadvantage:
> > > * formats change,
> >
> > This is it. It breaks my visual flow.
> >
> > > but the range diff is still in its early design phase, so we're not
> > > breaking things, yet?
> >
> > Indeed. We're not breaking things. If you feel strongly about it, we
> > can have that indentation, I *can* get used to it.
>
> I only feel strongly about it now as that is the *easiest* way to make
> the colors look like I want them to look. And I really value colors in
> the range-diff. Earlier you said that color-less range-diff is nearly
> useless for you and I thought it was hyperbole, but by now I realize how
> much truth you spoke. So getting the colors fixed to not markup files
> (+++/ --- lines of the inner diff) is a high priority for me. So high
> that I would compromise on the indentation/flow of these corner case
> areas.
Okay, let's go with your indentation, then.
Ciao,
Dscho
next prev parent reply other threads:[~2018-08-16 8:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-10 22:49 [PATCH 0/4] Better colors in range-diff! Stefan Beller
2018-08-10 22:49 ` [PATCH 1/4] diff.c: emit_line_0 to take string instead of first sign Stefan Beller
2018-08-13 11:42 ` Johannes Schindelin
2018-08-13 18:19 ` Stefan Beller
2018-08-10 22:49 ` [PATCH 2/4] diff.c: add --output-indicator-{new, old, context} Stefan Beller
2018-08-13 11:47 ` Johannes Schindelin
2018-08-13 18:23 ` Stefan Beller
2018-08-10 22:49 ` [PATCH 3/4] range-diff: make use of different output indicators Stefan Beller
2018-08-13 11:51 ` Johannes Schindelin
2018-08-13 18:24 ` Stefan Beller
2018-08-10 22:49 ` [PATCH 4/4] range-diff: indent special lines as context Stefan Beller
2018-08-13 11:54 ` Johannes Schindelin
2018-08-13 18:36 ` Stefan Beller
2018-08-14 18:54 ` Johannes Schindelin
2018-08-14 19:05 ` Stefan Beller
2018-08-16 8:22 ` Johannes Schindelin [this message]
2018-08-17 20:43 ` [PATCH 0/3] Better colors in range-diff Stefan Beller
2018-08-17 20:43 ` [PATCH 1/3] diff.c: add --output-indicator-{new, old, context} Stefan Beller
2018-08-20 19:31 ` Johannes Schindelin
2018-08-20 19:39 ` Stefan Beller
2018-08-21 16:13 ` Johannes Schindelin
2018-08-22 22:25 ` [PATCH] diff.c: pass sign_index to emit_line_ws_markup Stefan Beller
2018-08-23 14:26 ` Johannes Schindelin
2018-08-17 20:43 ` [PATCH 2/3] range-diff: make use of different output indicators Stefan Beller
2018-08-17 20:43 ` [PATCH 3/3] range-diff: indent special lines as context Stefan Beller
2018-08-17 22:04 ` [PATCH 0/3] Better colors in range-diff Junio C Hamano
2018-08-17 22:09 ` Stefan Beller
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1808161022180.71@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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 NNTP newsgroup(s).