git-difftool--helper.sh 2.1 KB
Newer Older
1
#!/bin/sh
2
# git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
3 4 5
# This script is typically launched by using the 'git difftool'
# convenience command.
#
6
# Copyright (c) 2009, 2010 David Aguilar
7

8 9 10
TOOL_MODE=diff
. git-mergetool--lib

11 12
# difftool.prompt controls the default prompt/no-prompt behavior
# and is overridden with $GIT_DIFFTOOL*_PROMPT.
13
should_prompt () {
14 15
	prompt_merge=$(git config --bool mergetool.prompt || echo true)
	prompt=$(git config --bool difftool.prompt || echo $prompt_merge)
16 17
	if test "$prompt" = true
	then
18 19 20 21
		test -z "$GIT_DIFFTOOL_NO_PROMPT"
	else
		test -n "$GIT_DIFFTOOL_PROMPT"
	fi
22 23
}

24 25 26 27 28
# Indicates that --extcmd=... was specified
use_ext_cmd () {
	test -n "$GIT_DIFFTOOL_EXTCMD"
}

29 30 31 32 33 34 35 36 37 38 39 40
launch_merge_tool () {
	# Merged is the filename as it appears in the work tree
	# Local is the contents of a/filename
	# Remote is the contents of b/filename
	# Custom merge tool commands might use $BASE so we provide it
	MERGED="$1"
	LOCAL="$2"
	REMOTE="$3"
	BASE="$1"

	# $LOCAL and $REMOTE are temporary files so prompt
	# the user with the real $MERGED name before launching $merge_tool.
41 42
	if should_prompt
	then
43 44
		printf "\nViewing (%s/%s): '%s'\n" "$GIT_DIFF_PATH_COUNTER" \
			"$GIT_DIFF_PATH_TOTAL" "$MERGED"
45 46
		if use_ext_cmd
		then
47
			printf "Launch '%s' [Y/n]? " \
48 49
				"$GIT_DIFFTOOL_EXTCMD"
		else
50
			printf "Launch '%s' [Y/n]? " "$merge_tool"
51
		fi
52 53
		read ans || return
		if test "$ans" = n
54 55
		then
			return
56
		fi
57 58
	fi

59 60
	if use_ext_cmd
	then
61
		export BASE
62
		eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
63 64 65
	else
		run_merge_tool "$merge_tool"
	fi
66 67
}

68 69 70 71
if ! use_ext_cmd
then
	if test -n "$GIT_DIFF_TOOL"
	then
72 73 74 75
		merge_tool="$GIT_DIFF_TOOL"
	else
		merge_tool="$(get_merge_tool)" || exit
	fi
76
fi
77

78 79 80 81 82 83 84 85 86 87
if test -n "$GIT_DIFFTOOL_DIRDIFF"
then
	LOCAL="$1"
	REMOTE="$2"
	run_merge_tool "$merge_tool" false
else
	# Launch the merge tool on each path provided by 'git diff'
	while test $# -gt 6
	do
		launch_merge_tool "$1" "$2" "$5"
88 89 90 91 92 93
		status=$?
		if test "$status" != 0 &&
			test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
		then
			exit $status
		fi
94 95 96
		shift 7
	done
fi
97 98

exit 0