contrib/difftool: add support for Kompare

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper
index 0c48506eebdaab3b04e5c018bcc5233582404432..10632a391731a490ac2db803dc885bcfe742ece9 100755 (executable)
--- a/contrib/difftool/git-difftool-helper
+++ b/contrib/difftool/git-difftool-helper
@@ -1,7 +1,7 @@
 #!/bin/sh
 # git-difftool-helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
 #!/bin/sh
 # git-difftool-helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.

-# It supports kdiff3, tkdiff, xxdiff, meld, opendiff, emerge, ecmerge,
-# vimdiff, gvimdiff, and custom user-configurable tools.
+# It supports kdiff3, kompare, tkdiff, xxdiff, meld, opendiff,
+# emerge, ecmerge, vimdiff, gvimdiff, and custom user-configurable tools.

 # This script is typically launched by using the 'git difftool'
 # convenience command.
 #
 # This script is typically launched by using the 'git difftool'
 # convenience command.
 #


@@ -73,6 +73,10 @@ launch_merge_tool () {
                        > /dev/null 2>&1
                ;;
 
                        > /dev/null 2>&1
                ;;
 

+       kompare)
+               "$merge_tool_path" "$LOCAL" "$REMOTE"
+               ;;
+

        tkdiff)
                "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
                ;;
        tkdiff)
                "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
                ;;


@@ -134,7 +138,7 @@ valid_custom_tool() {
 # Built-in merge tools are always valid.
 valid_tool() {
        case "$1" in
 # Built-in merge tools are always valid.
 valid_tool() {
        case "$1" in

-       kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
+       kdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)

                ;; # happy
        *)
                if ! valid_custom_tool "$1"
                ;; # happy
        *)
                if ! valid_custom_tool "$1"


@@ -180,14 +184,14 @@ if test -z "$merge_tool"; then
 
        # We have a $DISPLAY so try some common UNIX merge tools
        if test -n "$DISPLAY"; then
 
        # We have a $DISPLAY so try some common UNIX merge tools
        if test -n "$DISPLAY"; then

-               merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"
+               merge_tool_candidates="kdiff3 kompare tkdiff xxdiff meld gvimdiff"

                # If gnome then prefer meld
                if test -n "$GNOME_DESKTOP_SESSION_ID"; then
                        merge_tool_candidates="meld $merge_tool_candidates"
                fi
                # If gnome then prefer meld
                if test -n "$GNOME_DESKTOP_SESSION_ID"; then
                        merge_tool_candidates="meld $merge_tool_candidates"
                fi

-               # If KDE then prefer kdiff3
+               # If KDE then prefer kdiff3 or kompare

                if test "$KDE_FULL_SESSION" = "true"; then
                if test "$KDE_FULL_SESSION" = "true"; then

-                       merge_tool_candidates="kdiff3 $merge_tool_candidates"
+                       merge_tool_candidates="kdiff3 kompare $merge_tool_candidates"

                fi
        fi
 
                fi
        fi
 

diff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt
index ca3dbd2465f9c33f450f9d7bfb9d60206ef509ae..6e2610cda6d2721eb4fb9ac063bb47ef80bfbae3 100644 (file)
--- a/contrib/difftool/git-difftool.txt
+++ b/contrib/difftool/git-difftool.txt
@@ -28,7 +28,8 @@ OPTIONS
 --tool=<tool>::
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:
 --tool=<tool>::
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:

-       kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
+       kdiff3, kompare, tkdiff, meld, xxdiff, emerge,
+       vimdiff, gvimdiff, ecmerge, and opendiff

 +
 If a merge resolution program is not specified, 'git-difftool'
 will use the configuration variable `merge.tool`.  If the
 +
 If a merge resolution program is not specified, 'git-difftool'
 will use the configuration variable `merge.tool`.  If the