Re: [PATCH] Copy mergetool "bc3" as "bc4"
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 21, 2014, 18:27 UTC
- Message-ID
- <xmqqsiihz39y.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <20141021084436.GA39148@gmail.com>
David Aguilar <davvid@gmail.com> writes:
> Otherwise, this patch looks like the right way to go ~ it makes > "bc" available and keeps compatibility for "bc3".
OK, thanks. Here is what I'll queue.
-- >8 -- From: Junio C Hamano <gitster@pobox.com> Date: Mon, 20 Oct 2014 15:49:36 -0700 Subject: [PATCH] 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> --- contrib/completion/git-completion.bash | 2 +- git-mergetool--lib.sh | 2 +- mergetools/bc | 25 +++++++++++++++++++++++++ mergetools/bc3 | 26 +------------------------- 4 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 mergetools/bc
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 06bf262..8a19b3e 100644 --- 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 - tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare + tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare " _git_difftool () diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index c45a020..a40d3df 100644 --- 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="$tools p4merge araxis bc3 codecompare" + tools="$tools p4merge araxis bc codecompare" fi case "${VISUAL:-$EDITOR}" in *vim*) diff --git a/mergetools/bc b/mergetools/bc new file mode 100644 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 b6319d2..5d8dd48 100644 --- 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"
-- 2.1.2-583-g325e495