]>
Commit | Line | Data |
---|---|---|
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 |
8 | TOOL_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 | 13 | should_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 |
25 | use_ext_cmd () { | |
26 | test -n "$GIT_DIFFTOOL_EXTCMD" | |
27 | } | |
28 | ||
5c38ea31 DA |
29 | launch_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 | 63 | else |
de8dafba SH |
64 | initialize_merge_tool "$merge_tool" |
65 | # ignore the error from the above --- run_merge_tool | |
66 | # will diagnose unusable tool by itself | |
1c6f5b52 DA |
67 | run_merge_tool "$merge_tool" |
68 | fi | |
5c38ea31 DA |
69 | } |
70 | ||
fdd7aa17 DA |
71 | if ! use_ext_cmd |
72 | then | |
73 | if test -n "$GIT_DIFF_TOOL" | |
74 | then | |
1c6f5b52 DA |
75 | merge_tool="$GIT_DIFF_TOOL" |
76 | else | |
05fb8726 | 77 | merge_tool="$(get_merge_tool)" |
42943b95 TK |
78 | subshell_exit_status=$? |
79 | if test $subshell_exit_status -gt 1 | |
80 | then | |
81 | exit $subshell_exit_status | |
82 | fi | |
1c6f5b52 | 83 | fi |
47d65924 | 84 | fi |
5c38ea31 | 85 | |
7e0abcec TH |
86 | if test -n "$GIT_DIFFTOOL_DIRDIFF" |
87 | then | |
88 | LOCAL="$1" | |
89 | REMOTE="$2" | |
de8dafba SH |
90 | initialize_merge_tool "$merge_tool" |
91 | # ignore the error from the above --- run_merge_tool | |
92 | # will diagnose unusable tool by itself | |
7e0abcec TH |
93 | run_merge_tool "$merge_tool" false |
94 | else | |
95 | # Launch the merge tool on each path provided by 'git diff' | |
96 | while test $# -gt 6 | |
97 | do | |
98 | launch_merge_tool "$1" "$2" "$5" | |
2b52123f | 99 | status=$? |
45a4f5d9 JK |
100 | if test $status -ge 126 |
101 | then | |
102 | # Command not found (127), not executable (126) or | |
103 | # exited via a signal (>= 128). | |
104 | exit $status | |
105 | fi | |
106 | ||
2b52123f DA |
107 | if test "$status" != 0 && |
108 | test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true | |
109 | then | |
110 | exit $status | |
111 | fi | |
7e0abcec TH |
112 | shift 7 |
113 | done | |
114 | fi | |
c41d3fed DA |
115 | |
116 | exit 0 |