undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool: break setup_tool out into separate initialization function

Browse Source 
This is preparation for the following commit where we need to source the
mergetool shell script to look for overrides before `run_merge_tool` is
called. Previously `run_merge_tool` both sourced that script and invoked
the mergetool.

In the case of the following commit, we need the result of the
`hide_resolved` override, if present, before we actually run
`run_merge_tool`.

The new `initialize_merge_tool` wrapper is exposed and documented as
a public interface for consistency with the existing `run_merge_tool`
which is also public. Although `setup_tool` could instead be exposed
directly, the related `setup_user_tool` would probably also want to be
elevated to match and this felt the cleanest to me.

Signed-off-by: Seth House <seth@eseth.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Seth House 2021-02-09 13:07:11 -07:00 committed by Junio C Hamano
parent 98ea309b3f
commit de8dafbada
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-mergetool--lib.txt
View File

@ -38,6 +38,10 @@ get_merge_tool_cmd::
get_merge_tool_path:: get_merge_tool_path::
returns the custom path for a merge tool. returns the custom path for a merge tool.
initialize_merge_tool::
bring merge tool specific functions into scope so they can be used or
overridden.
run_merge_tool:: run_merge_tool::
launches a merge tool given the tool name and a true/false launches a merge tool given the tool name and a true/false
flag to indicate whether a merge base is present. flag to indicate whether a merge base is present.

6
git-difftool--helper.sh
View File

@ -61,6 +61,9 @@ launch_merge_tool () {
export BASE export BASE
eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"' eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
else else
initialize_merge_tool "$merge_tool"
# ignore the error from the above --- run_merge_tool
# will diagnose unusable tool by itself
run_merge_tool "$merge_tool" run_merge_tool "$merge_tool"
fi fi
} }
@ -79,6 +82,9 @@ if test -n "$GIT_DIFFTOOL_DIRDIFF"
then then
LOCAL="$1" LOCAL="$1"
REMOTE="$2" REMOTE="$2"
initialize_merge_tool "$merge_tool"
# ignore the error from the above --- run_merge_tool
# will diagnose unusable tool by itself
run_merge_tool "$merge_tool" false run_merge_tool "$merge_tool" false
else else
# Launch the merge tool on each path provided by 'git diff' # Launch the merge tool on each path provided by 'git diff'

7
git-mergetool--lib.sh
View File

@ -248,6 +248,10 @@ trust_exit_code () {
fi fi
} }
initialize_merge_tool () {
# Bring tool-specific functions into scope
setup_tool "$1" || return 1
}
# Entry point for running tools # Entry point for running tools
run_merge_tool () { run_merge_tool () {
@ -259,9 +263,6 @@ run_merge_tool () {
merge_tool_path=$(get_merge_tool_path "$1") || exit merge_tool_path=$(get_merge_tool_path "$1") || exit
base_present="$2" base_present="$2"
# Bring tool-specific functions into scope
setup_tool "$1" || return 1
if merge_mode if merge_mode
then then
run_merge_cmd "$1" run_merge_cmd "$1"

2
git-mergetool.sh
View File

@ -272,6 +272,8 @@ merge_file () {
ext= ext=
esac esac
initialize_merge_tool "$merge_tool" || return
mergetool_tmpdir_init mergetool_tmpdir_init
if test "$MERGETOOL_TMPDIR" != "." if test "$MERGETOOL_TMPDIR" != "."