mergetool: rename bc3 to bc

Beyond Compare version 4 works the same way as version 3, so rename
the existing "bc3" adaptor to just "bc", while keeping "bc3" as a
backward compatible wrapper.

Noticed-by: Olivier Croquette <ocroquette@free.fr>
Helped-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 06bf262087768d98450cb589eb8f8fcc51ed2f74..8a19b3e3fddcd917c57369a2fbe3408ff7d88a82 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1207,7 +1207,7 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
 }
 
 __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff

-                       tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
+                       tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare

 "
 
 _git_difftool ()
 "
 
 _git_difftool ()

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index c45a020301c16614057912b9a26d1466a94654a9..a40d3dfea6799e5a257dc70c82b88cacc62bdcc0 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -250,7 +250,7 @@ list_merge_tool_candidates () {
                        tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
                fi
                tools="$tools gvimdiff diffuse diffmerge ecmerge"
                        tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
                fi
                tools="$tools gvimdiff diffuse diffmerge ecmerge"

-               tools="$tools p4merge araxis bc3 codecompare"
+               tools="$tools p4merge araxis bc codecompare"

        fi
        case "${VISUAL:-$EDITOR}" in
        *vim*)
        fi
        case "${VISUAL:-$EDITOR}" in
        *vim*)

diff --git a/mergetools/bc b/mergetools/bc
new file mode 100644 (file)
index 0000000..b6319d2
--- /dev/null
+++ b/mergetools/bc
@@ -0,0 +1,25 @@
+diff_cmd () {
+       "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+       touch "$BACKUP"
+       if $base_present
+       then
+               "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
+                       -mergeoutput="$MERGED"
+       else
+               "$merge_tool_path" "$LOCAL" "$REMOTE" \
+                       -mergeoutput="$MERGED"
+       fi
+       check_unchanged
+}
+
+translate_merge_tool_path() {
+       if type bcomp >/dev/null 2>/dev/null
+       then
+               echo bcomp
+       else
+               echo bcompare
+       fi
+}

diff --git a/mergetools/bc3 b/mergetools/bc3
index b6319d206e2333e42469486604d4635e846e5faa..5d8dd4818488c1aa62750946d5490a99850e63b2 100644 (file)
--- a/mergetools/bc3
+++ b/mergetools/bc3
@@ -1,25 +1 @@
-diff_cmd () {
-       "$merge_tool_path" "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-       touch "$BACKUP"
-       if $base_present
-       then
-               "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
-                       -mergeoutput="$MERGED"
-       else
-               "$merge_tool_path" "$LOCAL" "$REMOTE" \
-                       -mergeoutput="$MERGED"
-       fi
-       check_unchanged
-}
-
-translate_merge_tool_path() {
-       if type bcomp >/dev/null 2>/dev/null
-       then
-               echo bcomp
-       else
-               echo bcompare
-       fi
-}
+. "$MERGE_TOOLS_DIR/bc"