[PATCH] mergetools: don't let meld open all changed files on startup

[Mathias De Mare]

# HG changeset patch
# User Mathias De Mare <mathias...@nokia.com>
# Date 1664956264 -7200
# Wed Oct 05 09:51:04 2022 +0200
# Node ID 6db07f191e2f88b73cc5cf4ccca36c910e7db283
# Parent 81a6f0507e07620bf17ebdc150907dab213d098e
mergetools: don't let meld open all changed files on startup

In meld 3.16, a multi-file change with option '-a' results in
an overview list being opened.
In meld 3.20, a multi-file change with option '-a' results in
an overview list AND every changed file being opened.

Simply removing '-a' seems to work fine for both cases
and also behaves the same as before for single-file changes.

As per the release notes, this is due to the following change
in meld 3.19.0:
"Make the --auto-compare command line flag work again (Kai Willadsen)"

See also https://gitlab.gnome.org/GNOME/meld/-/issues/516

Note: change done in the same way as for mergetools.rc in Mercurial.

diff --git a/contrib/mergetools.rc b/contrib/mergetools.rc
--- a/contrib/mergetools.rc
+++ b/contrib/mergetools.rc
@@ -201,8 +201,8 @@ kdiff3.regkeyalt=Software\Wow6432Node\KD
; copy of meld below, dropping --auto-merge
meld-noauto.args=--label='local' $local --label='merged' $base --label='other' $other -o $output
meld-noauto.checkchanged=True
-meld-noauto.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2
-meld-noauto.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
+meld-noauto.diff3args=--label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2
+meld-noauto.diffargs=--label='$plabel1' $parent --label='$clabel' $child
meld-noauto.dirdiff=True
meld-noauto.gui=True
meld-noauto.priority=-3
@@ -212,8 +212,8 @@ meld-noauto.regname=Executable

meld.args=--label='local' $local --label='merged' $base --label='other' $other --auto-merge -o $output
meld.checkchanged=True
-meld.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2
-meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
+meld.diff3args=--label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2
+meld.diffargs=--label='$plabel1' $parent --label='$clabel' $child
meld.dirdiff=True
meld.gui=True
meld.priority=-2

[Yuya Nishihara]

On Wed, 05 Oct 2022 09:51:14 +0200, Mathias De Mare wrote:
> # HG changeset patch
> # User Mathias De Mare <mathias...@nokia.com>
> # Date 1664956264 -7200
> # Wed Oct 05 09:51:04 2022 +0200
> # Node ID 6db07f191e2f88b73cc5cf4ccca36c910e7db283
> # Parent 81a6f0507e07620bf17ebdc150907dab213d098e
> mergetools: don't let meld open all changed files on startup

Queued for stable, thanks.