Re: [PATCH 3/3] mergetool-lib: give kdiff3 prioirty in KDE environments

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Aug 5, 2020, 21:15 UTC
Message-ID: <CAPig+cSn7pGzr+PYBMAgbp9V0z+OVUGgW=SDWV33HbqjMiiKhA@mail.gmail.com>
In-Reply-To: <37090d232221415b227c165bd44f6711d21f376b.1596634463.git.gitgitgadget@gmail.com>

On Wed, Aug 5, 2020 at 4:02 PM Marco Trevisan (Treviño) via GitGitGadget <gitgitgadget@gmail.com> wrote:

> mergetool-lib: give kdiff3 prioirty in KDE environments

s/prioirty/priority/

Show 17 quoted lines

> Signed-off-by: Marco Trevisan (Treviño) <mail@3v1n0.net>
> ---
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> @@ -288,12 +288,15 @@ list_merge_tool_candidates () {
> -               cross_desktop_tools="opendiff kdiff3 tkdiff xxdiff"
> +               cross_desktop_tools="opendiff tkdiff xxdiff"
>                 if is_desktop "GNOME"
>                 then
> -                       tools="meld $cross_desktop_tools $tools"
> +                       tools="meld $cross_desktop_tools kdiff3 $tools"
> +               elif is_desktop "KDE"
> +               then
> +                       tools="kdiff3 $cross_desktop_tools meld $tools"
>                 else
> -                       tools="$cross_desktop_tools meld $tools"
> +                       tools="$cross_desktop_tools kdiff3 meld $tools"
>                 fi

Wouldn't this change the behavior for people running old KDE which doesn't have XDG_CURRENT_DESKTOP, giving "kdiff3" much lower priority than it had before?

This change also illustrates why I wasn't convinced that patch 2/3 was necessarily a good idea. When you touch 'cross_desktop_tools' here, you end up having to touch all the other 'tools=' lines anyhow, so the introduction of 'cross_desktop_tools' didn't buy much in terms of reduced maintenance cost.