git-mergetool: check return value from read
[git/git.git] / git-mergetool--lib.sh
CommitLineData
02e51243 1#!/bin/sh
21d0ba7e
DA
2# git-mergetool--lib is a library for common merge tool functions
3diff_mode() {
4 test "$TOOL_MODE" = diff
5}
6
7merge_mode() {
8 test "$TOOL_MODE" = merge
9}
10
11translate_merge_tool_path () {
47d65924 12 case "$1" in
aa03f604
SS
13 araxis)
14 echo compare
47d65924 15 ;;
ffe6dc08
SS
16 bc3)
17 echo bcompare
47d65924
DA
18 ;;
19 emerge)
20 echo emacs
21 ;;
aa03f604
SS
22 gvimdiff|gvimdiff2)
23 echo gvim
24 ;;
25 vimdiff|vimdiff2)
26 echo vim
b6f0621a 27 ;;
47d65924
DA
28 *)
29 echo "$1"
30 ;;
31 esac
21d0ba7e
DA
32}
33
34check_unchanged () {
35 if test "$MERGED" -nt "$BACKUP"; then
36 status=0
37 else
38 while true; do
39 echo "$MERGED seems unchanged."
40 printf "Was the merge successful? [y/n] "
e622f41d 41 read answer || return 1
21d0ba7e
DA
42 case "$answer" in
43 y*|Y*) status=0; break ;;
44 n*|N*) status=1; break ;;
45 esac
46 done
47 fi
48}
49
50valid_tool () {
51 case "$1" in
ffe6dc08 52 araxis | bc3 | diffuse | ecmerge | emerge | gvimdiff | gvimdiff2 | \
aa03f604 53 kdiff3 | meld | opendiff | p4merge | tkdiff | vimdiff | vimdiff2 | xxdiff)
21d0ba7e 54 ;; # happy
aa03f604
SS
55 kompare)
56 if ! diff_mode; then
21d0ba7e
DA
57 return 1
58 fi
59 ;;
aa03f604
SS
60 tortoisemerge)
61 if ! merge_mode; then
21d0ba7e
DA
62 return 1
63 fi
64 ;;
65 *)
66 if test -z "$(get_merge_tool_cmd "$1")"; then
67 return 1
68 fi
69 ;;
70 esac
71}
72
73get_merge_tool_cmd () {
47d65924
DA
74 # Prints the custom command for a merge tool
75 if test -n "$1"; then
76 merge_tool="$1"
77 else
78 merge_tool="$(get_merge_tool)"
79 fi
80 if diff_mode; then
81 echo "$(git config difftool.$merge_tool.cmd ||
82 git config mergetool.$merge_tool.cmd)"
83 else
84 echo "$(git config mergetool.$merge_tool.cmd)"
85 fi
21d0ba7e
DA
86}
87
88run_merge_tool () {
47d65924 89 merge_tool_path="$(get_merge_tool_path "$1")" || exit
21d0ba7e
DA
90 base_present="$2"
91 status=0
92
93 case "$1" in
aa03f604 94 araxis)
21d0ba7e 95 if merge_mode; then
aa03f604 96 touch "$BACKUP"
21d0ba7e 97 if $base_present; then
aa03f604
SS
98 "$merge_tool_path" -wait -merge -3 -a1 \
99 "$BASE" "$LOCAL" "$REMOTE" "$MERGED" \
100 >/dev/null 2>&1
21d0ba7e 101 else
aa03f604
SS
102 "$merge_tool_path" -wait -2 \
103 "$LOCAL" "$REMOTE" "$MERGED" \
104 >/dev/null 2>&1
21d0ba7e 105 fi
aa03f604 106 check_unchanged
21d0ba7e 107 else
aa03f604
SS
108 "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" \
109 >/dev/null 2>&1
21d0ba7e
DA
110 fi
111 ;;
ffe6dc08 112 bc3)
21d0ba7e 113 if merge_mode; then
ffe6dc08 114 touch "$BACKUP"
21d0ba7e 115 if $base_present; then
ffe6dc08
SS
116 "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
117 -mergeoutput="$MERGED"
21d0ba7e 118 else
ffe6dc08
SS
119 "$merge_tool_path" "$LOCAL" "$REMOTE" \
120 -mergeoutput="$MERGED"
21d0ba7e 121 fi
ffe6dc08 122 check_unchanged
21d0ba7e
DA
123 else
124 "$merge_tool_path" "$LOCAL" "$REMOTE"
125 fi
126 ;;
aa03f604 127 diffuse)
c8998b48 128 if merge_mode; then
aa03f604 129 touch "$BACKUP"
c8998b48 130 if $base_present; then
aa03f604
SS
131 "$merge_tool_path" \
132 "$LOCAL" "$MERGED" "$REMOTE" \
133 "$BASE" | cat
c8998b48 134 else
21d0ba7e 135 "$merge_tool_path" \
aa03f604 136 "$LOCAL" "$MERGED" "$REMOTE" | cat
c8998b48
SC
137 fi
138 check_unchanged
139 else
aa03f604 140 "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
c8998b48
SC
141 fi
142 ;;
aa03f604 143 ecmerge)
21d0ba7e
DA
144 if merge_mode; then
145 touch "$BACKUP"
c8998b48 146 if $base_present; then
aa03f604
SS
147 "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
148 --default --mode=merge3 --to="$MERGED"
c8998b48 149 else
aa03f604
SS
150 "$merge_tool_path" "$LOCAL" "$REMOTE" \
151 --default --mode=merge2 --to="$MERGED"
c8998b48 152 fi
21d0ba7e
DA
153 check_unchanged
154 else
aa03f604
SS
155 "$merge_tool_path" --default --mode=diff2 \
156 "$LOCAL" "$REMOTE"
21d0ba7e
DA
157 fi
158 ;;
aa03f604 159 emerge)
21d0ba7e 160 if merge_mode; then
21d0ba7e
DA
161 if $base_present; then
162 "$merge_tool_path" \
aa03f604
SS
163 -f emerge-files-with-ancestor-command \
164 "$LOCAL" "$REMOTE" "$BASE" \
165 "$(basename "$MERGED")"
21d0ba7e
DA
166 else
167 "$merge_tool_path" \
aa03f604
SS
168 -f emerge-files-command \
169 "$LOCAL" "$REMOTE" \
170 "$(basename "$MERGED")"
21d0ba7e 171 fi
aa03f604 172 status=$?
21d0ba7e 173 else
aa03f604
SS
174 "$merge_tool_path" -f emerge-files-command \
175 "$LOCAL" "$REMOTE"
21d0ba7e
DA
176 fi
177 ;;
aa03f604 178 gvimdiff|vimdiff)
21d0ba7e
DA
179 if merge_mode; then
180 touch "$BACKUP"
829ef383
DM
181 if $base_present; then
182 "$merge_tool_path" -f -d -c "wincmd J" \
183 "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
184 else
185 "$merge_tool_path" -f -d -c "wincmd l" \
186 "$LOCAL" "$MERGED" "$REMOTE"
187 fi
21d0ba7e
DA
188 check_unchanged
189 else
853c0ffe 190 "$merge_tool_path" -R -f -d -c "wincmd l" \
21d0ba7e
DA
191 "$LOCAL" "$REMOTE"
192 fi
193 ;;
aa03f604 194 gvimdiff2|vimdiff2)
00086690
DM
195 if merge_mode; then
196 touch "$BACKUP"
197 "$merge_tool_path" -f -d -c "wincmd l" \
198 "$LOCAL" "$MERGED" "$REMOTE"
199 check_unchanged
200 else
853c0ffe 201 "$merge_tool_path" -R -f -d -c "wincmd l" \
00086690
DM
202 "$LOCAL" "$REMOTE"
203 fi
204 ;;
aa03f604 205 kdiff3)
21d0ba7e 206 if merge_mode; then
21d0ba7e 207 if $base_present; then
aa03f604
SS
208 ("$merge_tool_path" --auto \
209 --L1 "$MERGED (Base)" \
210 --L2 "$MERGED (Local)" \
211 --L3 "$MERGED (Remote)" \
212 -o "$MERGED" \
213 "$BASE" "$LOCAL" "$REMOTE" \
214 > /dev/null 2>&1)
21d0ba7e 215 else
aa03f604
SS
216 ("$merge_tool_path" --auto \
217 --L1 "$MERGED (Local)" \
218 --L2 "$MERGED (Remote)" \
219 -o "$MERGED" \
220 "$LOCAL" "$REMOTE" \
221 > /dev/null 2>&1)
21d0ba7e 222 fi
aa03f604
SS
223 status=$?
224 else
225 ("$merge_tool_path" --auto \
226 --L1 "$MERGED (A)" \
227 --L2 "$MERGED (B)" "$LOCAL" "$REMOTE" \
228 > /dev/null 2>&1)
229 fi
230 ;;
231 kompare)
232 "$merge_tool_path" "$LOCAL" "$REMOTE"
233 ;;
234 meld)
235 if merge_mode; then
236 touch "$BACKUP"
237 "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
21d0ba7e
DA
238 check_unchanged
239 else
aa03f604 240 "$merge_tool_path" "$LOCAL" "$REMOTE"
21d0ba7e
DA
241 fi
242 ;;
243 opendiff)
244 if merge_mode; then
245 touch "$BACKUP"
246 if $base_present; then
247 "$merge_tool_path" "$LOCAL" "$REMOTE" \
248 -ancestor "$BASE" \
249 -merge "$MERGED" | cat
250 else
251 "$merge_tool_path" "$LOCAL" "$REMOTE" \
252 -merge "$MERGED" | cat
253 fi
254 check_unchanged
255 else
256 "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
257 fi
258 ;;
aa03f604 259 p4merge)
21d0ba7e 260 if merge_mode; then
0a0ec7bd
CJ
261 touch "$BACKUP"
262 $base_present || >"$BASE"
263 "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
21d0ba7e
DA
264 check_unchanged
265 else
aa03f604 266 "$merge_tool_path" "$LOCAL" "$REMOTE"
21d0ba7e
DA
267 fi
268 ;;
aa03f604 269 tkdiff)
21d0ba7e
DA
270 if merge_mode; then
271 if $base_present; then
aa03f604
SS
272 "$merge_tool_path" -a "$BASE" \
273 -o "$MERGED" "$LOCAL" "$REMOTE"
21d0ba7e
DA
274 else
275 "$merge_tool_path" \
aa03f604 276 -o "$MERGED" "$LOCAL" "$REMOTE"
21d0ba7e
DA
277 fi
278 status=$?
279 else
aa03f604 280 "$merge_tool_path" "$LOCAL" "$REMOTE"
21d0ba7e
DA
281 fi
282 ;;
283 tortoisemerge)
284 if $base_present; then
285 touch "$BACKUP"
286 "$merge_tool_path" \
287 -base:"$BASE" -mine:"$LOCAL" \
288 -theirs:"$REMOTE" -merged:"$MERGED"
289 check_unchanged
290 else
291 echo "TortoiseMerge cannot be used without a base" 1>&2
292 status=1
293 fi
294 ;;
aa03f604 295 xxdiff)
b6f0621a
DA
296 if merge_mode; then
297 touch "$BACKUP"
298 if $base_present; then
aa03f604
SS
299 "$merge_tool_path" -X --show-merged-pane \
300 -R 'Accel.SaveAsMerged: "Ctrl-S"' \
301 -R 'Accel.Search: "Ctrl+F"' \
302 -R 'Accel.SearchForward: "Ctrl-G"' \
303 --merged-file "$MERGED" \
304 "$LOCAL" "$BASE" "$REMOTE"
b6f0621a 305 else
aa03f604
SS
306 "$merge_tool_path" -X $extra \
307 -R 'Accel.SaveAsMerged: "Ctrl-S"' \
308 -R 'Accel.Search: "Ctrl+F"' \
309 -R 'Accel.SearchForward: "Ctrl-G"' \
310 --merged-file "$MERGED" \
311 "$LOCAL" "$REMOTE"
b6f0621a
DA
312 fi
313 check_unchanged
314 else
aa03f604
SS
315 "$merge_tool_path" \
316 -R 'Accel.Search: "Ctrl+F"' \
317 -R 'Accel.SearchForward: "Ctrl-G"' \
318 "$LOCAL" "$REMOTE"
b6f0621a
DA
319 fi
320 ;;
21d0ba7e 321 *)
47d65924 322 merge_tool_cmd="$(get_merge_tool_cmd "$1")"
21d0ba7e
DA
323 if test -z "$merge_tool_cmd"; then
324 if merge_mode; then
325 status=1
326 fi
327 break
328 fi
329 if merge_mode; then
47d65924
DA
330 trust_exit_code="$(git config --bool \
331 mergetool."$1".trustExitCode || echo false)"
332 if test "$trust_exit_code" = "false"; then
21d0ba7e
DA
333 touch "$BACKUP"
334 ( eval $merge_tool_cmd )
335 check_unchanged
336 else
337 ( eval $merge_tool_cmd )
338 status=$?
339 fi
340 else
341 ( eval $merge_tool_cmd )
342 fi
343 ;;
344 esac
345 return $status
346}
347
348guess_merge_tool () {
349 if merge_mode; then
350 tools="tortoisemerge"
351 else
352 tools="kompare"
353 fi
354 if test -n "$DISPLAY"; then
355 if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
356 tools="meld opendiff kdiff3 tkdiff xxdiff $tools"
357 else
358 tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
359 fi
ffe6dc08 360 tools="$tools gvimdiff diffuse ecmerge p4merge araxis bc3"
21d0ba7e 361 fi
7b104229
RS
362 case "${VISUAL:-$EDITOR}" in
363 *vim*)
21d0ba7e 364 tools="$tools vimdiff emerge"
7b104229
RS
365 ;;
366 *)
21d0ba7e 367 tools="$tools emerge vimdiff"
7b104229
RS
368 ;;
369 esac
21d0ba7e
DA
370 echo >&2 "merge tool candidates: $tools"
371
372 # Loop over each candidate and stop when a valid merge tool is found.
373 for i in $tools
374 do
375 merge_tool_path="$(translate_merge_tool_path "$i")"
376 if type "$merge_tool_path" > /dev/null 2>&1; then
47d65924
DA
377 echo "$i"
378 return 0
21d0ba7e
DA
379 fi
380 done
381
47d65924
DA
382 echo >&2 "No known merge resolution program available."
383 return 1
21d0ba7e
DA
384}
385
386get_configured_merge_tool () {
387 # Diff mode first tries diff.tool and falls back to merge.tool.
388 # Merge mode only checks merge.tool
389 if diff_mode; then
47d65924
DA
390 merge_tool=$(git config diff.tool || git config merge.tool)
391 else
392 merge_tool=$(git config merge.tool)
21d0ba7e
DA
393 fi
394 if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then
395 echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool"
396 echo >&2 "Resetting to default..."
397 return 1
398 fi
47d65924 399 echo "$merge_tool"
21d0ba7e
DA
400}
401
402get_merge_tool_path () {
403 # A merge tool has been set, so verify that it's valid.
47d65924
DA
404 if test -n "$1"; then
405 merge_tool="$1"
406 else
407 merge_tool="$(get_merge_tool)"
408 fi
21d0ba7e
DA
409 if ! valid_tool "$merge_tool"; then
410 echo >&2 "Unknown merge tool $merge_tool"
411 exit 1
412 fi
413 if diff_mode; then
47d65924
DA
414 merge_tool_path=$(git config difftool."$merge_tool".path ||
415 git config mergetool."$merge_tool".path)
416 else
417 merge_tool_path=$(git config mergetool."$merge_tool".path)
21d0ba7e
DA
418 fi
419 if test -z "$merge_tool_path"; then
47d65924 420 merge_tool_path="$(translate_merge_tool_path "$merge_tool")"
21d0ba7e 421 fi
47d65924
DA
422 if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
423 ! type "$merge_tool_path" > /dev/null 2>&1; then
424 echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
425 "'$merge_tool_path'"
21d0ba7e
DA
426 exit 1
427 fi
428 echo "$merge_tool_path"
429}
430
431get_merge_tool () {
21d0ba7e 432 # Check if a merge tool has been configured
47d65924 433 merge_tool=$(get_configured_merge_tool)
21d0ba7e
DA
434 # Try to guess an appropriate merge tool if no tool has been set.
435 if test -z "$merge_tool"; then
47d65924 436 merge_tool="$(guess_merge_tool)" || exit
21d0ba7e
DA
437 fi
438 echo "$merge_tool"
439}