Re: [PATCH v2 0/9] mergetools: vimdiff: regression fix and reorg

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Aug 7, 2022, 15:39 UTC
Message-ID: <CAMP44s2s7QV9+Pgkchfk9=X-6Vwz_QZP0Vd145-euT-SR9Xw6Q@mail.gmail.com>
In-Reply-To: <Yu9vvAKJzOpoQ5AS@zacax395.localdomain>

On Sun, Aug 7, 2022 at 2:54 AM Fernando Ramos <greenfoo@u92.eu> wrote:

Show 14 quoted lines

>
> Thanks Felipe, this new patch is much cleaner than mine.
>
> Just two comments:
>
>     1. Due to the way single windows are now detected, layouts with multiple
>        tabs but single windows on each of them do not work. Example:
>
>          layout = LOCAL + BASE + REMOTE + MERGED
>
>        (we should probably add a test case for this)
>
>        I noticed it did also not work in "master" (but it looks like it does in
>        the patch I sent yesterday)

Yeah, but as you mention that's a problem already, so it has nothing to do with this patch.

>     2. Tabs with a single window are not highlighted (this was also a problem in
>        "master", I just noticed this when testing your changes)

That's because the diff mode only highlights differences between the windows in the tab. If you do something like "BASE,MERGED" the diff won't show colors for LOCAL or REMOTE.

That's why I don't like any mode other than vimdiff3 (and occasionally vimdiff): because I want to see the diff for all the files, even if I don't see those files. If I open mergetool with vimdiff and I close the BASE window I get something better than vimdiff2.

To me if I configure "BASE,MERGED" and I close the first window, I should end up with the same view as "MERGED", but I don't, which is why I fundamentally don't like this layout approach.

This could be made to work by opening all the windows and hiding them, but at the moment it doesn't, only vimdiff (a layout with all the files in the windows) works correctly for me.

-- 
Felipe Contreras