Re: [PATCH v6 16/21] range-diff --dual-color: skip white-space warnings

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



"Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx>
writes:

> From: Johannes Schindelin <johannes.schindelin@xxxxxx>
>
> When displaying a diff of diffs, it is possible that there is an outer
> `+` before a context line. That happens when the context changed between
> old and new commit. When that context line starts with a tab (after the
> space that marks it as context line), our diff machinery spits out a
> white-space error (space before tab), but in this case, that is
> incorrect.

    Also it is possible that there is an outer `+`, ` `, or `-`
    before an added line (i.e. the second column is `+`), and that
    line introduces a leading whitespace error (e.g. the whole line
    begins with two plusses, SP and HT, meaning that the new
    iteration of the patch introduces a space-before-tab whitespace
    error), but feeding that to our normal diff machinery would of
    course not catch it as introducing a new whitespace error.

I think it is a good design decision to give up showing whitespace
errors correctly in this round, because the problem is not limited
to the first space on an outer context line.  The next paragraph
would want to lose the mention of the "Rather than".  We do want to
list the problems we know about for future reference, but that is
what we already did in the above paragraph, so all we need to say
after this point in the next paragraph would be "let's punt and
leave whitespace error highlighting for future enhancements" or
something like that.

With the dim/bold cues step applied, the resulting dual-color mode
shows the differences between the previous few rounds and this one
pretty nicely.  After seeing the huccup between v5 and v6, I am a
bit hesitant to merge this immediately to 'next' but hopefully we
can have it there in a few days (I definitely will merge the topic
to my previate edition that I use for my everyday work during this
integration cycle).

Thanks.



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux