git/mergetools/vimdiff, branch v2.45.2

mergetools: vimdiff: use correct tool's name when reading mergetool config

2024-02-19T16:45:14Z

The /mergetools/vimdiff script, which handles both vimdiff, nvimdiff and gvimdiff mergetools (the latter 2 simply source the vimdiff script), has a function merge_cmd() which read the layout variable from git config, and it would always read the value of mergetool.**vimdiff**.layout, instead of the mergetool being currently used (vimdiff or nvimdiff or gvimdiff). It looks like in 7b5cf8be18 (vimdiff: add tool documentation, 2022-03-30), we explained the current behavior in Documentation/config/mergetool.txt: ``` mergetool.vimdiff.layout:: The vimdiff backend uses this variable to control how its split windows look like. Applies even if you are using Neovim (`nvim`) or gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section ``` which makes sense why it's explained this way - the vimdiff backend is used by gvim and nvim. But the mergetool's configuration should be separate for each tool, and indeed that's confirmed in same commit at Documentation/mergetools/vimdiff.txt: ``` Variants Instead of `--tool=vimdiff`, you can also use one of these other variants: * `--tool=gvimdiff`, to open gVim instead of Vim. * `--tool=nvimdiff`, to open Neovim instead of Vim. When using these variants, in order to specify a custom layout you will have to set configuration variables `mergetool.gvimdiff.layout` and `mergetool.nvimdiff.layout` instead of `mergetool.vimdiff.layout` ``` So it looks like we just forgot to update the 1 part of the vimdiff script that read the config variable. Cheers. Though, for backward compatibility, I've kept the mergetool.vimdiff fallback, so that people who unknowingly relied on it, won't have their setup broken now. Signed-off-by: Kipras Melnikovas Signed-off-by: Junio C Hamano

mergetools: vimdiff: simplify tabfirst

2022-08-10T19:39:39Z

If we wrap the tabdo command there's no need for a separate command call. Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: fix single window layouts

2022-08-10T19:39:35Z

Layouts with a single window other than "MERGED" do not work (e.g. "LOCAL" or "MERGED+LOCAL"). This is because as the documentation of bufdo says: The last buffer (or where an error occurred) becomes the current buffer. And we do always do bufdo the end. Additionally, we do it only once, when it should be per tab. Fix this by doing it once per tab right after it's created and before any buffer is switched. Cc: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: rework tab logic

2022-08-10T19:39:32Z

If we treat tabs especially, the logic becomes much simpler. Cc: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: fix for diffopt

2022-08-10T19:39:28Z

When diffopt has hiddenoff set and there's only one window (as is the case in the single window mode) the diff mode is turned off. We don't want that, so turn that option off. Cc: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: silence annoying messages

2022-08-10T19:39:24Z

When using the single window mode we are greeted with the following warning: "./content_LOCAL_8975" 6L, 28B "./content_BASE_8975" 6 lines, 29 bytes "./content_REMOTE_8975" 6 lines, 29 bytes "content" 16 lines, 115 bytes Press ENTER or type command to continue every time. Silence that. Suggested-by: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: make vimdiff3 actually work

2022-08-10T19:39:17Z

When vimdiff3 was added in 7c147b77d3 (mergetools: add vimdiff3 mode, 2014-04-20), the description made clear the intention: It's similar to the default, except that the other windows are hidden. This ensures that removed/added colors are still visible on the main merge window, but the other windows not visible. However, in 0041797449 (vimdiff: new implementation with layout support, 2022-03-30) this was broken by generating a command that never creates windows, and therefore vim never shows the diff. The layout support implementation broke the whole purpose of vimdiff3, and simply shows MERGED, which is no different from simply opening the file with vim. In order to show the diff, the windows need to be created first, and then when they are hidden the diff remains (if hidenoff isn't set), but by setting the `hidden` option the initial buffers are marked as hidden thus making the feature work. Suggested-by: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: fix comment

2022-08-10T19:39:07Z

The name of the variable is wrong, and it can be set to anything, like 1. Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

Merge branch 'fr/vimdiff-layout-fix' into maint

2022-07-27T20:00:28Z

Recent update to vimdiff layout code has been made more robust against different end-user vim settings. source: <20220708181024.45839-1-greenfoo@u92.eu> * fr/vimdiff-layout-fix: vimdiff: make layout engine more robust against user vim settings

Merge branch 'js/vimdiff-quotepath-fix' into maint

2022-07-27T20:00:26Z

Variable quoting fix in the vimdiff driver of "git mergetool" source: * js/vimdiff-quotepath-fix: mergetool(vimdiff): allow paths to contain spaces again