{"thread":{"id":"17468","subject":"[PATCH] contrib/difftool: add support for Kompare","startedAt":"2009-01-30T23:19:29Z","lastAt":"2009-01-31T10:41:23Z","messageCount":3,"participants":["Markus Heidelberg","David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"102656","messageId":"200901310019.30117.markus.heidelberg@web.de","threadId":"17468","inReplyTo":null,"subject":"[PATCH] contrib/difftool: add support for Kompare","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-01-30T23:19:29Z","receivedAt":"2009-01-30T23:19:29Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"\nSigned-off-by: Markus Heidelberg \n---\n contrib/difftool/git-difftool-helper | 16 ++++++++++------\n contrib/difftool/git-difftool.txt | 3 ++-\n 2 files changed, 12 insertions(+), 7 deletions(-)\n\ndiff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper\nindex 0c48506..10632a3 100755\n--- a/contrib/difftool/git-difftool-helper\n+++ b/contrib/difftool/git-difftool-helper\n@@ -1,7 +1,7 @@\n #!/bin/sh\n # git-difftool-helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.\n-# It supports kdiff3, tkdiff, xxdiff, meld, opendiff, emerge, ecmerge,\n-# vimdiff, gvimdiff, and custom user-configurable tools.\n+# It supports kdiff3, kompare, tkdiff, xxdiff, meld, opendiff,\n+# emerge, ecmerge, vimdiff, gvimdiff, and custom user-configurable tools.\n # This script is typically launched by using the 'git difftool'\n # convenience command.\n #\n@@ -73,6 +73,10 @@ launch_merge_tool () {\n \t\t\t> /dev/null 2>&1\n \t\t;;\n \n+\tkompare)\n+\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\"\n+\t\t;;\n+\n \ttkdiff)\n \t\t\"$merge_tool_path\" -o \"$MERGED\" \"$LOCAL\" \"$REMOTE\"\n \t\t;;\n@@ -134,7 +138,7 @@ valid_custom_tool() {\n # Built-in merge tools are always valid.\n valid_tool() {\n \tcase \"$1\" in\n-\tkdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)\n+\tkdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)\n \t\t;; # happy\n \t*)\n \t\tif ! valid_custom_tool \"$1\"\n@@ -180,14 +184,14 @@ if test -z \"$merge_tool\"; then\n \n \t# We have a $DISPLAY so try some common UNIX merge tools\n \tif test -n \"$DISPLAY\"; then\n-\t\tmerge_tool_candidates=\"kdiff3 tkdiff xxdiff meld gvimdiff\"\n+\t\tmerge_tool_candidates=\"kdiff3 kompare tkdiff xxdiff meld gvimdiff\"\n \t\t# If gnome then prefer meld\n \t\tif test -n \"$GNOME_DESKTOP_SESSION_ID\"; then\n \t\t\tmerge_tool_candidates=\"meld $merge_tool_candidates\"\n \t\tfi\n-\t\t# If KDE then prefer kdiff3\n+\t\t# If KDE then prefer kdiff3 or kompare\n \t\tif test \"$KDE_FULL_SESSION\" = \"true\"; then\n-\t\t\tmerge_tool_candidates=\"kdiff3 $merge_tool_candidates\"\n+\t\t\tmerge_tool_candidates=\"kdiff3 kompare $merge_tool_candidates\"\n \t\tfi\n \tfi\n \ndiff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt\nindex ca3dbd2..6e2610c 100644\n--- a/contrib/difftool/git-difftool.txt\n+++ b/contrib/difftool/git-difftool.txt\n@@ -28,7 +28,8 @@ OPTIONS\n --tool=::\n \tUse the merge resolution program specified by .\n \tValid merge tools are:\n-\tkdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff\n+\tkdiff3, kompare, tkdiff, meld, xxdiff, emerge,\n+\tvimdiff, gvimdiff, ecmerge, and opendiff\n +\n If a merge resolution program is not specified, 'git-difftool'\n will use the configuration variable `merge.tool`. If the\n-- \n1.6.1.2.256.g62566b\n"},{"id":"102677","messageId":"20090131063714.GA29621@gmail.com","threadId":"17468","inReplyTo":"200901310019.30117.markus.heidelberg@web.de","subject":"Re: [PATCH] contrib/difftool: add support for Kompare","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-01-31T06:37:15Z","receivedAt":"2009-01-31T06:37:15Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On 0, Markus Heidelberg wrote:\n> \n> Signed-off-by: Markus Heidelberg \n> ---\n> contrib/difftool/git-difftool-helper | 16 ++++++++++------\n> contrib/difftool/git-difftool.txt | 3 ++-\n> 2 files changed, 12 insertions(+), 7 deletions(-)\n\n\nGood stuff =)\nShould we patch mergetool with the same change?\nKompare's pretty popular in KDE land.\n\n\nBTW git.git's next branch has:\n\ncommit fb700cb0679e22900f0d1435641e6cf7c652968b\nAuthor: Johannes Gilger \nDate: Sat Jan 24 00:12:45 2009 +0100\n\n mergetool: Don't repeat merge tool candidates\n \n git mergetool listed some candidates for mergetools twice, depending on\n the environment.\n \n This slightly changes the behavior when both KDE_FULL_SESSION and\n GNOME_DESKTOP_SESSION_ID are set at the same time; in such a case\n meld is used in favor of kdiff3 (the old code favored kdiff3 in such a\n case), but it should not matter in practice.\n \n Signed-off-by: Johannes Gilger \n Signed-off-by: Junio C Hamano \n\n\ndifftool probably needs a similar patch.\nI'll see if I can get to that this weekend if no one beats\nme to it.\n\n\n> \n> diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper\n> index 0c48506..10632a3 100755\n> --- a/contrib/difftool/git-difftool-helper\n> +++ b/contrib/difftool/git-difftool-helper\n> @@ -1,7 +1,7 @@\n> #!/bin/sh\n> # git-difftool-helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.\n> -# It supports kdiff3, tkdiff, xxdiff, meld, opendiff, emerge, ecmerge,\n> -# vimdiff, gvimdiff, and custom user-configurable tools.\n> +# It supports kdiff3, kompare, tkdiff, xxdiff, meld, opendiff,\n> +# emerge, ecmerge, vimdiff, gvimdiff, and custom user-configurable tools.\n> # This script is typically launched by using the 'git difftool'\n> # convenience command.\n> #\n> @@ -73,6 +73,10 @@ launch_merge_tool () {\n> \t\t\t> /dev/null 2>&1\n> \t\t;;\n> \n> +\tkompare)\n> +\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\"\n> +\t\t;;\n> +\n> \ttkdiff)\n> \t\t\"$merge_tool_path\" -o \"$MERGED\" \"$LOCAL\" \"$REMOTE\"\n> \t\t;;\n> @@ -134,7 +138,7 @@ valid_custom_tool() {\n> # Built-in merge tools are always valid.\n> valid_tool() {\n> \tcase \"$1\" in\n> -\tkdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)\n> +\tkdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)\n> \t\t;; # happy\n> \t*)\n> \t\tif ! valid_custom_tool \"$1\"\n> @@ -180,14 +184,14 @@ if test -z \"$merge_tool\"; then\n> \n> \t# We have a $DISPLAY so try some common UNIX merge tools\n> \tif test -n \"$DISPLAY\"; then\n> -\t\tmerge_tool_candidates=\"kdiff3 tkdiff xxdiff meld gvimdiff\"\n> +\t\tmerge_tool_candidates=\"kdiff3 kompare tkdiff xxdiff meld gvimdiff\"\n> \t\t# If gnome then prefer meld\n> \t\tif test -n \"$GNOME_DESKTOP_SESSION_ID\"; then\n> \t\t\tmerge_tool_candidates=\"meld $merge_tool_candidates\"\n> \t\tfi\n> -\t\t# If KDE then prefer kdiff3\n> +\t\t# If KDE then prefer kdiff3 or kompare\n> \t\tif test \"$KDE_FULL_SESSION\" = \"true\"; then\n> -\t\t\tmerge_tool_candidates=\"kdiff3 $merge_tool_candidates\"\n> +\t\t\tmerge_tool_candidates=\"kdiff3 kompare $merge_tool_candidates\"\n> \t\tfi\n> \tfi\n> \n> diff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt\n> index ca3dbd2..6e2610c 100644\n> --- a/contrib/difftool/git-difftool.txt\n> +++ b/contrib/difftool/git-difftool.txt\n> @@ -28,7 +28,8 @@ OPTIONS\n> --tool=::\n> \tUse the merge resolution program specified by .\n> \tValid merge tools are:\n> -\tkdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff\n> +\tkdiff3, kompare, tkdiff, meld, xxdiff, emerge,\n> +\tvimdiff, gvimdiff, ecmerge, and opendiff\n> +\n> If a merge resolution program is not specified, 'git-difftool'\n> will use the configuration variable `merge.tool`. If the\n> -- \n> 1.6.1.2.256.g62566b\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n\n-- \n\n\tDavid\n"},{"id":"102689","messageId":"200901311141.23986.markus.heidelberg@web.de","threadId":"17468","inReplyTo":"20090131063714.GA29621@gmail.com","subject":"Re: [PATCH] contrib/difftool: add support for Kompare","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-01-31T10:41:23Z","receivedAt":"2009-01-31T10:41:23Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"David Aguilar, 31.01.2009:\n> On 0, Markus Heidelberg wrote:\n> > \n> > Signed-off-by: Markus Heidelberg \n> > ---\n> > contrib/difftool/git-difftool-helper | 16 ++++++++++------\n> > contrib/difftool/git-difftool.txt | 3 ++-\n> > 2 files changed, 12 insertions(+), 7 deletions(-)\n> \n> \n> Good stuff =)\n> Should we patch mergetool with the same change?\n> Kompare's pretty popular in KDE land.\n\nBut Kompare cannot merge. It is kind of a diff/patch frontend, it takes\nonly one or two files (or directories) as arguments.\n\n> BTW git.git's next branch has:\n> \n> commit fb700cb0679e22900f0d1435641e6cf7c652968b\n> Author: Johannes Gilger \n> Date: Sat Jan 24 00:12:45 2009 +0100\n> \n> mergetool: Don't repeat merge tool candidates\n> \n> git mergetool listed some candidates for mergetools twice, depending on\n> the environment.\n> \n> This slightly changes the behavior when both KDE_FULL_SESSION and\n> GNOME_DESKTOP_SESSION_ID are set at the same time; in such a case\n> meld is used in favor of kdiff3 (the old code favored kdiff3 in such a\n> case), but it should not matter in practice.\n> \n> Signed-off-by: Johannes Gilger \n> Signed-off-by: Junio C Hamano \n> \n> \n> difftool probably needs a similar patch.\n> I'll see if I can get to that this weekend if no one beats\n> me to it.\n\nYes, the change would make sense here, too.\n\nMarkus\n"}]}