Re: [RFD] Strange patch formats (aka tricks with unified diffs)..

From: Junio C Hamano <junkio@cox.net>
Date: Apr 14, 2007, 09:55 UTC
Message-ID: <7vbqhrb7r2.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0704141051350.18846@racer.site>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 9 quoted lines

> On Thu, 12 Apr 2007, Junio C Hamano wrote:
>
>> [...] the --color-words (whose implementation I happen to hate) [...]
>
> I know that we talked about it previously. And strictly, I think it is not 
> the implementation that you hate, but the rules that were implemented.
>
> I'll have a look at what you wrote back then, and try to come up with some 
> sensible alternatives, so you don't have to hate the code so much.

One sensible behaviour would be to show exactly the same output lines as the regular output, but color-code only the words that changed. E.g (the words are capitalized to illustrate instead of colored here):

        diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
        index 6a5fcfd..535214c 100644
        --- a/Documentation/git-cvsserver.txt
        +++ b/Documentation/git-cvsserver.txt
        @@ -125,7 +131,7 @@ By default it uses SQLite databases in the git directory, named
         temporary files in the same directory as the database file on
         write so it might not be enough to grant the users using
         git-cvsserver write access to the database file without granting
        -them ALSO write access to the directory.
        +them write access to the directory, TOO.

         You can configure the database backend with the following
         configuration variables: