Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100755 73 lines (64 sloc) 1.759 kB
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
1 #!/bin/sh
afcbc8e @davvid difftool: move 'git-difftool' out of contrib
davvid authored
2 # git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
3 # This script is typically launched by using the 'git difftool'
4 # convenience command.
5 #
c8a5672 @davvid difftool: Update copyright notices to list each year separately
davvid authored
6 # Copyright (c) 2009, 2010 David Aguilar
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
7
21d0ba7 @davvid difftool/mergetool: refactor commands to use git-mergetool--lib
davvid authored
8 TOOL_MODE=diff
9 . git-mergetool--lib
10
a904392 @davvid difftool: add support for a difftool.prompt config variable
davvid authored
11 # difftool.prompt controls the default prompt/no-prompt behavior
12 # and is overridden with $GIT_DIFFTOOL*_PROMPT.
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
13 should_prompt () {
4cacc62 @sschuberth Make difftool.prompt fall back to mergetool.prompt
sschuberth authored
14 prompt_merge=$(git config --bool mergetool.prompt || echo true)
15 prompt=$(git config --bool difftool.prompt || echo $prompt_merge)
a904392 @davvid difftool: add support for a difftool.prompt config variable
davvid authored
16 if test "$prompt" = true; then
17 test -z "$GIT_DIFFTOOL_NO_PROMPT"
18 else
19 test -n "$GIT_DIFFTOOL_PROMPT"
20 fi
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
21 }
22
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
23 # Indicates that --extcmd=... was specified
24 use_ext_cmd () {
25 test -n "$GIT_DIFFTOOL_EXTCMD"
26 }
27
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
28 launch_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"
37
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"
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
42 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
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
48 read ans
49 fi
50
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
51 if use_ext_cmd; then
4a689af @mjg difftool: provide basename to external tools
mjg authored
52 export BASE
9f3d54d @davvid difftool: Use eval to expand '--extcmd' expressions
davvid authored
53 eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
54 else
55 run_merge_tool "$merge_tool"
56 fi
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
57 }
58
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
59 if ! 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
47d6592 @davvid mergetool--lib: simplify API usage by removing more global variables
davvid authored
65 fi
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
66
67 # Launch the merge tool on each path provided by 'git diff'
68 while test $# -gt 6
69 do
70 launch_merge_tool "$1" "$2" "$5"
71 shift 7
72 done
Something went wrong with that request. Please try again.