blob: 0594bf7ca54c6b91d5f96dd86d8962e93459d004 [file] [log] [blame]
David Aguilar5c38ea32009-01-16 00:00:02 -08001#!/bin/sh
David Aguilarafcbc8e2009-04-07 01:21:20 -07002# git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
David Aguilar5c38ea32009-01-16 00:00:02 -08003# This script is typically launched by using the 'git difftool'
4# convenience command.
5#
David Aguilarc8a56722010-01-15 19:10:03 -08006# Copyright (c) 2009, 2010 David Aguilar
David Aguilar5c38ea32009-01-16 00:00:02 -08007
David Aguilar21d0ba72009-04-08 00:17:20 -07008TOOL_MODE=diff
9. git-mergetool--lib
10
David Aguilara9043922009-04-07 01:21:22 -070011# difftool.prompt controls the default prompt/no-prompt behavior
12# and is overridden with $GIT_DIFFTOOL*_PROMPT.
David Aguilar5c38ea32009-01-16 00:00:02 -080013should_prompt () {
Sebastian Schuberth4cacc622010-01-22 17:36:36 +010014 prompt_merge=$(git config --bool mergetool.prompt || echo true)
15 prompt=$(git config --bool difftool.prompt || echo $prompt_merge)
David Aguilara9043922009-04-07 01:21:22 -070016 if test "$prompt" = true; then
17 test -z "$GIT_DIFFTOOL_NO_PROMPT"
18 else
19 test -n "$GIT_DIFFTOOL_PROMPT"
20 fi
David Aguilar5c38ea32009-01-16 00:00:02 -080021}
22
David Aguilar1c6f5b52010-01-09 20:02:42 -080023# Indicates that --extcmd=... was specified
24use_ext_cmd () {
25 test -n "$GIT_DIFFTOOL_EXTCMD"
26}
27
David Aguilar5c38ea32009-01-16 00:00:02 -080028launch_merge_tool () {
29 # Merged is the filename as it appears in the work tree
30 # Local is the contents of a/filename
31 # Remote is the contents of b/filename
32 # Custom merge tool commands might use $BASE so we provide it
33 MERGED="$1"
34 LOCAL="$2"
35 REMOTE="$3"
36 BASE="$1"
David Aguilar5c38ea32009-01-16 00:00:02 -080037
38 # $LOCAL and $REMOTE are temporary files so prompt
39 # the user with the real $MERGED name before launching $merge_tool.
40 if should_prompt; then
41 printf "\nViewing: '$MERGED'\n"
David Aguilar1c6f5b52010-01-09 20:02:42 -080042 if use_ext_cmd; then
43 printf "Hit return to launch '%s': " \
44 "$GIT_DIFFTOOL_EXTCMD"
45 else
46 printf "Hit return to launch '%s': " "$merge_tool"
47 fi
David Aguilar5c38ea32009-01-16 00:00:02 -080048 read ans
49 fi
50
David Aguilar1c6f5b52010-01-09 20:02:42 -080051 if use_ext_cmd; then
Michael J Gruber4a689af2010-12-14 10:18:35 +010052 export BASE
David Aguilar9f3d54d2010-01-15 14:03:44 -080053 eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
David Aguilar1c6f5b52010-01-09 20:02:42 -080054 else
55 run_merge_tool "$merge_tool"
56 fi
David Aguilar5c38ea32009-01-16 00:00:02 -080057}
58
David Aguilar1c6f5b52010-01-09 20:02:42 -080059if ! use_ext_cmd; then
60 if test -n "$GIT_DIFF_TOOL"; then
61 merge_tool="$GIT_DIFF_TOOL"
62 else
63 merge_tool="$(get_merge_tool)" || exit
64 fi
David Aguilar47d65922009-04-11 20:41:56 -070065fi
David Aguilar5c38ea32009-01-16 00:00:02 -080066
67# Launch the merge tool on each path provided by 'git diff'
68while test $# -gt 6
69do
70 launch_merge_tool "$1" "$2" "$5"
71 shift 7
72done