From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 May 2008 19:17:26 GMT
Subject: Re: [PATCH v2 4/5] Make boundary characters for --color-words configurable
Message-ID: <7vve1jxrg9.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <m34p934afu.fsf@localhost.localdomain>

Jakub Narebski <jnareb@gmail.com> writes:

>> To achieve the best, we have to find the pairs of lines (one minus and
>> one plus for each pair) which most match each other, and then do the
>> word diff for each pair.
>
> Wouldn't be enough to treat run of plus/minus lines as a single block,
> tokenize, do token-based (as opposed to line-based) diff, then show it
> using linebreaks of the destination file (pluses line)?

I tried the "using linebreaks" but I discarded it because I did not think
it would work.  If we rewrite the last three lines above with this single
line:

> Wouldn't be enough to use magic?

and apply that algorithm between the two, then we would get a long single
line that has words painted in red, two lines worth, followed by green "to
use magic?"  and finally an end-of-line.