On 0, David Aguilar <davvid@xxxxxxxxx> wrote:
> From: Sebastian Pipping <sebastian@xxxxxxxxxxx>
>
> This adds diffuse as a built-in merge tool.
>
> Signed-off-by: Sebastian Pipping <sebastian@xxxxxxxxxxx>
> Signed-off-by: David Aguilar <davvid@xxxxxxxxx>
> ---
>
> This is Sebastian's patch rebased onto Junio's pu branch.
>
> I removed the git-gui part because I think git-gui
> patches go through Shawn / git-gui.git?
>
Hi Sebastian..
Here's the patch you sent a couple of days ago applied
onto Junio's pu branch
As I mentioned above, you had some git-gui changes in your
original that I stripped out since I was under the impression
that git-gui patches go through Shawn / git-gui.git.
git-send-email (probably gmail, too) won't let me send
one patch in a series with a different "From:" header,
so maybe you should resend this patch so that you can get the
proper authorship recognition? I've attached the original
patch file I sent in case you want to just grab it and
send-email it back out for the purposes of getting the right
authorship in there (actually, Junio, please advise...,
I'm not exactly sure what you'd prefer)
Also, all three patches should apply independently,
so even though this says 3/3 in principle they are
actually all independent patches,
I just happened to have them queued up that way.
>
> Documentation/git-difftool.txt | 4 ++--
> Documentation/git-mergetool.txt | 3 ++-
> Documentation/merge-config.txt | 7 ++++---
> contrib/completion/git-completion.bash | 3 ++-
> git-difftool-helper.sh | 6 ++----
> git-mergetool-lib.sh | 17 ++++++++++++++++-
> git-mergetool.sh | 4 ++--
> 7 files changed, 30 insertions(+), 14 deletions(-)
>
--
David
>From 34186399f67930e3e0f6a8772fbea2966c997cfa Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@xxxxxxxxxxx>
Date: Thu, 26 Mar 2009 20:42:31 +0100
Subject: [PATCH 3/3] mergetool-lib: add diffuse as merge and diff tool
This adds diffuse as a built-in merge tool.
Signed-off-by: Sebastian Pipping <sebastian@xxxxxxxxxxx>
Signed-off-by: David Aguilar <davvid@xxxxxxxxx>
---
This is Sebastian's patch rebased onto Junio's pu branch.
I removed the git-gui part because I think git-gui
patches go through Shawn / git-gui.git?
This diff is still too big, so maybe we should
refactor the $mergetool_candidate code into
mergetool-lib as well.
Documentation/git-difftool.txt | 4 ++--
Documentation/git-mergetool.txt | 3 ++-
Documentation/merge-config.txt | 7 ++++---
contrib/completion/git-completion.bash | 3 ++-
git-difftool-helper.sh | 6 ++----
git-mergetool-lib.sh | 17 ++++++++++++++++-
git-mergetool.sh | 4 ++--
7 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 73d4782..15b247b 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -30,8 +30,8 @@ OPTIONS
--tool=<tool>::
Use the diff tool specified by <tool>.
Valid merge tools are:
- kdiff3, kompare, tkdiff, meld, xxdiff, emerge,
- vimdiff, gvimdiff, ecmerge, and opendiff
+ kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
+ ecmerge, diffuse and opendiff
+
If a diff tool is not specified, 'git-difftool'
will use the configuration variable `diff.tool`. If the
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 5d3c632..c3a8092 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -26,7 +26,8 @@ OPTIONS
--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, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
+ diffuse and opendiff
+
If a merge resolution program is not specified, 'git-mergetool'
will use the configuration variable `merge.tool`. If the
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 1ff08ff..c4fc3eb 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -22,9 +22,10 @@ merge.stat::
merge.tool::
Controls which merge resolution program is used by
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
- "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
- "opendiff". Any other value is treated is custom merge tool
- and there must be a corresponding mergetool.<tool>.cmd option.
+ "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
+ "diffuse" and "opendiff". Any other value is treated as a custom
+ merge tool and there must be a corresponding mergetool.<tool>.cmd
+ option.
merge.verbosity::
Controls the amount of output shown by the recursive merge
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e72ce24..4fcd77a 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1173,7 +1173,8 @@ _git_mergetool ()
--tool=*)
__gitcomp "
kdiff3 tkdiff meld xxdiff emerge
- vimdiff gvimdiff ecmerge opendiff
+ vimdiff gvimdiff ecmerge diffuse
+ opendiff
" "" "${cur##--tool=}"
return
;;
diff --git a/git-difftool-helper.sh b/git-difftool-helper.sh
index 2dfc870..d174b34 100755
--- a/git-difftool-helper.sh
+++ b/git-difftool-helper.sh
@@ -1,7 +1,5 @@
#!/bin/sh
# git-difftool-helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
-# 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.
#
@@ -70,9 +68,9 @@ if test -z "$merge_tool"; then
if test -n "$DISPLAY"; then
# If gnome then prefer meld, otherwise, prefer kdiff3 or kompare
if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
- merge_tool_candidates="meld kdiff3 kompare tkdiff xxdiff gvimdiff"
+ merge_tool_candidates="meld kdiff3 kompare tkdiff xxdiff gvimdiff diffuse"
else
- merge_tool_candidates="kdiff3 kompare tkdiff xxdiff meld gvimdiff"
+ merge_tool_candidates="kdiff3 kompare tkdiff xxdiff meld gvimdiff diffuse"
fi
fi
if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
diff --git a/git-mergetool-lib.sh b/git-mergetool-lib.sh
index 3ba332b..197533e 100644
--- a/git-mergetool-lib.sh
+++ b/git-mergetool-lib.sh
@@ -29,7 +29,7 @@ check_unchanged () {
valid_tool () {
case "$1" in
- kdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
+ kdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge | diffuse)
if test "$1" = "kompare" && ! diff_mode; then
return 1
fi
@@ -108,6 +108,21 @@ run_mergetool () {
fi
check_unchanged
;;
+ diffuse)
+ if merge_mode; then
+ touch "$BACKUP"
+ fi
+ if $base_present; then
+ "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" "$BASE" | cat
+ else
+ if merge_mode; then
+ "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" | cat
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
+ fi
+ fi
+ check_unchanged
+ ;;
vimdiff)
if merge_mode; then
touch "$BACKUP"
diff --git a/git-mergetool.sh b/git-mergetool.sh
index fd81ad7..16562bd 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -284,9 +284,9 @@ fi
if test -z "$merge_tool" ; then
if test -n "$DISPLAY"; then
if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
- merge_tool_candidates="meld kdiff3 tkdiff xxdiff gvimdiff"
+ merge_tool_candidates="meld kdiff3 tkdiff xxdiff gvimdiff diffuse"
else
- merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"
+ merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff diffuse"
fi
fi
if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
--
1.6.2.1.303.g63699
