Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100755 71 lines (62 sloc) 1.67 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 #
db36713 @davvid difftool--helper: Update copyright and remove distracting comments
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 () {
a904392 @davvid difftool: add support for a difftool.prompt config variable
davvid authored
14 prompt=$(git config --bool difftool.prompt || echo true)
15 if test "$prompt" = true; then
16 test -z "$GIT_DIFFTOOL_NO_PROMPT"
17 else
18 test -n "$GIT_DIFFTOOL_PROMPT"
19 fi
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
20 }
21
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
22 # Indicates that --extcmd=... was specified
23 use_ext_cmd () {
24 test -n "$GIT_DIFFTOOL_EXTCMD"
25 }
26
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
27 launch_merge_tool () {
28 # Merged is the filename as it appears in the work tree
29 # Local is the contents of a/filename
30 # Remote is the contents of b/filename
31 # Custom merge tool commands might use $BASE so we provide it
32 MERGED="$1"
33 LOCAL="$2"
34 REMOTE="$3"
35 BASE="$1"
36
37 # $LOCAL and $REMOTE are temporary files so prompt
38 # the user with the real $MERGED name before launching $merge_tool.
39 if should_prompt; then
40 printf "\nViewing: '$MERGED'\n"
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
41 if use_ext_cmd; then
42 printf "Hit return to launch '%s': " \
43 "$GIT_DIFFTOOL_EXTCMD"
44 else
45 printf "Hit return to launch '%s': " "$merge_tool"
46 fi
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
47 read ans
48 fi
49
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
50 if use_ext_cmd; then
9f3d54d @davvid difftool: Use eval to expand '--extcmd' expressions
davvid authored
51 eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
52 else
53 run_merge_tool "$merge_tool"
54 fi
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
55 }
56
1c6f5b5 @davvid difftool: Allow specifying unconfigured commands with --extcmd
davvid authored
57 if ! use_ext_cmd; then
58 if test -n "$GIT_DIFF_TOOL"; then
59 merge_tool="$GIT_DIFF_TOOL"
60 else
61 merge_tool="$(get_merge_tool)" || exit
62 fi
47d6592 @davvid mergetool--lib: simplify API usage by removing more global variables
davvid authored
63 fi
5c38ea3 @davvid contrib: add 'git difftool' for launching common merge tools
davvid authored
64
65 # Launch the merge tool on each path provided by 'git diff'
66 while test $# -gt 6
67 do
68 launch_merge_tool "$1" "$2" "$5"
69 shift 7
70 done
Something went wrong with that request. Please try again.