Merge branch 'cc/svn-fe-py-shebang'
[git/git.git] / git-difftool--helper.sh
CommitLineData
5c38ea31 1#!/bin/sh
afcbc8e7 2# git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
5c38ea31
DA
3# This script is typically launched by using the 'git difftool'
4# convenience command.
5#
c8a5672e 6# Copyright (c) 2009, 2010 David Aguilar
5c38ea31 7
21d0ba7e
DA
8TOOL_MODE=diff
9. git-mergetool--lib
10
a904392e
DA
11# difftool.prompt controls the default prompt/no-prompt behavior
12# and is overridden with $GIT_DIFFTOOL*_PROMPT.
5c38ea31 13should_prompt () {
4cacc621
SS
14 prompt_merge=$(git config --bool mergetool.prompt || echo true)
15 prompt=$(git config --bool difftool.prompt || echo $prompt_merge)
fdd7aa17
DA
16 if test "$prompt" = true
17 then
a904392e
DA
18 test -z "$GIT_DIFFTOOL_NO_PROMPT"
19 else
20 test -n "$GIT_DIFFTOOL_PROMPT"
21 fi
5c38ea31
DA
22}
23
1c6f5b52
DA
24# Indicates that --extcmd=... was specified
25use_ext_cmd () {
26 test -n "$GIT_DIFFTOOL_EXTCMD"
27}
28
5c38ea31
DA
29launch_merge_tool () {
30 # Merged is the filename as it appears in the work tree
31 # Local is the contents of a/filename
32 # Remote is the contents of b/filename
33 # Custom merge tool commands might use $BASE so we provide it
34 MERGED="$1"
35 LOCAL="$2"
36 REMOTE="$3"
37 BASE="$1"
5c38ea31
DA
38
39 # $LOCAL and $REMOTE are temporary files so prompt
40 # the user with the real $MERGED name before launching $merge_tool.
fdd7aa17
DA
41 if should_prompt
42 then
ee7fb0b1
ZK
43 printf "\nViewing (%s/%s): '%s'\n" "$GIT_DIFF_PATH_COUNTER" \
44 "$GIT_DIFF_PATH_TOTAL" "$MERGED"
fdd7aa17
DA
45 if use_ext_cmd
46 then
cce076e3 47 printf "Launch '%s' [Y/n]? " \
1c6f5b52
DA
48 "$GIT_DIFFTOOL_EXTCMD"
49 else
cce076e3 50 printf "Launch '%s' [Y/n]? " "$merge_tool"
ba959de1 51 fi
25098690
JS
52 read ans || return
53 if test "$ans" = n
ba959de1
SC
54 then
55 return
1c6f5b52 56 fi
5c38ea31
DA
57 fi
58
fdd7aa17
DA
59 if use_ext_cmd
60 then
4a689afb 61 export BASE
9f3d54d1 62 eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
1c6f5b52
DA
63 else
64 run_merge_tool "$merge_tool"
65 fi
5c38ea31
DA
66}
67
fdd7aa17
DA
68if ! use_ext_cmd
69then
70 if test -n "$GIT_DIFF_TOOL"
71 then
1c6f5b52
DA
72 merge_tool="$GIT_DIFF_TOOL"
73 else
05fb8726 74 merge_tool="$(get_merge_tool)"
1c6f5b52 75 fi
47d65924 76fi
5c38ea31 77
7e0abcec
TH
78if test -n "$GIT_DIFFTOOL_DIRDIFF"
79then
80 LOCAL="$1"
81 REMOTE="$2"
82 run_merge_tool "$merge_tool" false
83else
84 # Launch the merge tool on each path provided by 'git diff'
85 while test $# -gt 6
86 do
87 launch_merge_tool "$1" "$2" "$5"
2b52123f 88 status=$?
45a4f5d9
JK
89 if test $status -ge 126
90 then
91 # Command not found (127), not executable (126) or
92 # exited via a signal (>= 128).
93 exit $status
94 fi
95
2b52123f
DA
96 if test "$status" != 0 &&
97 test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
98 then
99 exit $status
100 fi
7e0abcec
TH
101 shift 7
102 done
103fi
c41d3fed
DA
104
105exit 0