[RFC PATCH v2 2/3] difftool-helper: conciliate difftool.tabbed and difftool.prompt settings
The commit combines paths of compared files into a separate temporary
file and prints them before launch the tool on last invocation of the
helper. All temporary files will be removed before exiting after that.
At least, we try. But it may happen the files remain in case of a bug
or a random SIGKILL.
---
git-difftool--helper.sh | 39 ++++++++++++++++++++++++++-------------
git-mergetool--lib.sh | 34 +++++++++++++++++++++++++++-------
2 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 46af3e60b7..529d55c96d 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -11,8 +11,8 @@ TOOL_MODE=diff
# difftool.prompt controls the default prompt/no-prompt behavior
# and is overridden with $GIT_DIFFTOOL*_PROMPT.
should_prompt () {
- prompt_merge=$(git config --bool mergetool.prompt || echo true)
- prompt=$(git config --bool difftool.prompt || echo $prompt_merge)
+ prompt=$(git config --bool mergetool.prompt || echo true)
+ prompt=$(git config --bool difftool.prompt || echo $prompt)
if test "$prompt" = true
then
test -z "$GIT_DIFFTOOL_NO_PROMPT"
@@ -26,6 +26,18 @@ use_ext_cmd () {
test -n "$GIT_DIFFTOOL_EXTCMD"
}
+prompt_before_launch () {
+ while true
+ do
+ printf "Launch '%s' [Y/n]? " "${GIT_DIFFTOOL_EXTCMD:-$merge_tool}"
+ read ans 2>/dev/null || return 1
+ case "${ans-y}" in
+ [yY]*) return 0 ;;
+ [nN]*) return 1 ;;
+ esac
+ done
+}
+
launch_merge_tool () {
# Merged is the filename as it appears in the work tree
# Local is the contents of a/filename
@@ -40,19 +52,20 @@ launch_merge_tool () {
# the user with the real $MERGED name before launching $merge_tool.
if should_prompt
then
- printf "\nViewing (%s/%s): '%s'\n" "$GIT_DIFF_PATH_COUNTER" \
- "$GIT_DIFF_PATH_TOTAL" "$MERGED"
- if use_ext_cmd
+ append_templist merged-paths "$MERGED"
+ # Do preinit before test whether the tool supports tabbed run.
+ use_ext_cmd || setup_tool "$merge_tool"
+
+ if ! is_difftool_tabbed
then
- printf "Launch '%s' [Y/n]? " \
- "$GIT_DIFFTOOL_EXTCMD"
- else
- printf "Launch '%s' [Y/n]? " "$merge_tool"
- fi
- read ans || return
- if test "$ans" = n
+ printf "\nViewing (%d/%d): '%s'\n" "$GIT_DIFF_PATH_COUNTER" \
+ "$GIT_DIFF_PATH_TOTAL" "$MERGED"
+ prompt_before_launch || return
+ elif on_last_file
then
- return
+ printf "Viewing %d files:\n" "$GIT_DIFF_PATH_TOTAL"
+ printf " '%s'\n" `cat "$LAST_TEMPFILE"`
+ prompt_before_launch || return
fi
fi
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 2a1edbb9b9..4bb0e31dac 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -22,6 +22,10 @@ is_available () {
type "$merge_tool_path" >/dev/null 2>&1
}
+on_last_file () {
+ test "$GIT_DIFF_PATH_COUNTER" -eq "$GIT_DIFF_PATH_TOTAL" 2>/dev/null
+}
+
list_config_tools () {
section=$1
line_prefix=${2:-}
@@ -277,6 +281,26 @@ is_difftool_tabbed () {
type diff_combo_cmd >/dev/null 2>&1
}
+# Save lines to the chosen temporary file for usage from subsequent invocations.
+# Path to the file will be placed to the LAST_TEMPFILE variable for later links.
+append_templist () {
+ LAST_TEMPFILE="${TMPDIR:-/tmp}/git-${PPID}_$1"
+ shift
+
+ if test "$GIT_DIFF_PATH_COUNTER" -eq 1
+ then
+ printf '%s\n' "$@" >"$LAST_TEMPFILE"
+ else
+ printf '%s\n' "$@" >>"$LAST_TEMPFILE"
+ fi
+}
+
+# Clean any temporary files that may create this script.
+clean_templists () {
+ rm -f -- "${TMPDIR:-/tmp}/git-${PPID}"_*
+}
+trap 'on_last_file && clean_templists' EXIT INT TERM
+
# Entry point for running tools
run_merge_tool () {
@@ -303,14 +327,10 @@ run_merge_tool () {
run_diff_cmd () {
if is_difftool_tabbed
then
- temp_file="${TMPDIR:-/tmp}/git-${PPID}_tabbed-queue"
- test "$GIT_DIFF_PATH_COUNTER" -eq 1 && >"$temp_file"
- printf '%s\n' "$LOCAL" "$REMOTE" >>"$temp_file"
-
- if test "$GIT_DIFF_PATH_COUNTER" -eq "$GIT_DIFF_PATH_TOTAL"
+ append_templist tabbed-queue "$LOCAL" "$REMOTE"
+ if on_last_file
then
- diff_combo_cmd 3<"$temp_file"
- rm -f -- "$temp_file"
+ diff_combo_cmd 3<"$LAST_TEMPFILE"
fi
else
diff_cmd "$1"
--
2.27.0