Re: [PATCH] xdiff/xpatience: support anchoring line(s)

From: Jonathan Tan <jonathantanmy@google.com>
Date: Nov 27, 2017, 18:30 UTC
Message-ID: <20171127103055.a10ccec6b4e2adc2c2c26c22@google.com>
In-Reply-To: <xmqqh8tlr9sp.fsf@gitster.mtv.corp.google.com>

On Thu, 23 Nov 2017 11:47:02 +0900 Junio C Hamano <gitster@pobox.com> wrote:

Show 18 quoted lines

> Thinking about this a bit more, I do like the basic idea of the UI
> even better.  What we could do is to sell this to the end users as a
> new kind of diff algorithm choice (i.e. myers, patience, ... will
> gain a new friend) that internally happens to be implemented by
> piggybacking on patience (just like minimal is piggybacking on
> myers) and call it "anchor".  Then just like this command line
> 
>     git diff --histogram --patience
> 
> makes the last one win without complaint, it is sane that these
> command lines
> 
>     git diff --histogram --anchored=<pattern>
>     git diff --anchored=<pattern> --histogram
> 
> make the last one win without complaint, either.
> 
> Hmm?

This sounds good. There will be a bit of inconsistency in that in "git diff --anchored=<pattern1> --anchored=<pattern2>", it is not the last one that wins, but both of them will in fact be used. But I think that in practice, this will be fine.

I'll send out another version with this UI (and with Stefan's test suggestion).