Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

From: Stefan Beller <sbeller@google.com>
Date: Apr 18, 2016, 19:33 UTC
Message-ID: <CAGZ79kZDg9a=xr1gYa=kooYvk-ufyGAVubqbRoRpOnC38FzLSg@mail.gmail.com>
In-Reply-To: <xmqq60ve67sc.fsf@gitster.mtv.corp.google.com>

On Mon, Apr 18, 2016 at 12:22 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 7 quoted lines

> Jacob Keller <jacob.keller@gmail.com> writes:
>
>> I think we're going to make use of xdl_blankline instead of this or
>> our own "is_emptyline"
>
> OK, so perhaps either of you two can do a final version people can
> start having fun with?

Junios proposal seems to be on top of my latest series sent out, I'll squash it in and send it out as a final version if you don't mind (though I'll do it later today; currently diving into Gerrits Java)

>
> By the way, I really do not want to see something this low-level to
> be end-user tweakable with "one bit enable/disable"; the end users
> shouldn't have to bother [1].

Ok. Thanks for fixing that mistake.

> I left it in but renamed after "what"
> it enables/disables, not "how" the enabled thing works, to clarify
> that we have this only as a developers' aid.

>
> *1* I am fine with --compaction-heuristic=(shortest|blank|...) that
> allows a choice among many as a developers' aid, but I do not think
> this topic is there yet.

This doesn't bode well with
    > +--compaction-heuristic::
    > +--no-compaction-heuristic::

in the future? I'd rather have
    +--compaction-heuristic=none
    +--compaction-heuristic=lastEmptyLine
such that we don't have to worry about further experiments (or matured
heuristics) later?