From: Junio C Hamano <junkio@cox.net>
Date: Sat, 21 Oct 2006 09:41:35 GMT
Subject: Re: [RFC] Syntax highlighting for combined diff
Message-ID: <7vfydigg4w.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <200610211049.56477.jnareb@gmail.com>

Jakub Narebski <jnareb@gmail.com> writes:

> Do I understand code correctly, and the last '+' or '-'
> in the parents column means?
>
>         for (i = 0; i < ecbdata->nparents && len; i++) {
>                 if (line[i] == '-')
>                         color = DIFF_FILE_OLD;
>                 else if (line[i] == '+')
>                         color = DIFF_FILE_NEW;
>         }
>
> Anyone who wrote this code, could you answer me, please?

The "up to ecbdata->nparents" is Johannes in cd112ce.  But you
are looking at a wrong code, I am afraid, if your original
question was about the combined format (there is a comment about
the codepath dealing only with two-way diffs by Johannes, above
the part you quoted).  The output for combined diff is coming
from combine-diff.c:dump_sline().

Combined diff output logic pretty much guarantees that you never
will see plus and minus on the same line.