2 # git-mergetool--lib is a library for common merge tool functions
4 test "$TOOL_MODE" = diff
8 test "$TOOL_MODE" = merge
11 translate_merge_tool_path
() {
35 if test "$MERGED" -nt "$BACKUP"; then
39 echo "$MERGED seems unchanged."
40 printf "Was the merge successful? [y/n] "
43 y
*|Y
*) status
=0; break ;;
44 n
*|N
*) status
=1; break ;;
52 araxis | bc3 | diffuse | ecmerge | emerge | gvimdiff | gvimdiff2 | \
53 kdiff3 | meld | opendiff | p4merge | tkdiff | vimdiff | vimdiff2 | xxdiff
)
66 if test -z "$(get_merge_tool_cmd "$1")"; then
73 get_merge_tool_cmd
() {
74 # Prints the custom command for a merge tool
78 merge_tool
="$(get_merge_tool)"
81 echo "$(git config difftool.$merge_tool.cmd ||
82 git config mergetool.$merge_tool.cmd)"
84 echo "$(git config mergetool.$merge_tool.cmd)"
89 # If GIT_PREFIX is empty then we cannot use it in tools
90 # that expect to be able to chdir() to its value.
91 GIT_PREFIX
=${GIT_PREFIX:-.}
94 merge_tool_path
="$(get_merge_tool_path "$1")" ||
exit
102 if $base_present; then
103 "$merge_tool_path" -wait -merge -3 -a1 \
104 "$BASE" "$LOCAL" "$REMOTE" "$MERGED" \
107 "$merge_tool_path" -wait -2 \
108 "$LOCAL" "$REMOTE" "$MERGED" \
113 "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" \
120 if $base_present; then
121 "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
122 -mergeoutput="$MERGED"
124 "$merge_tool_path" "$LOCAL" "$REMOTE" \
125 -mergeoutput="$MERGED"
129 "$merge_tool_path" "$LOCAL" "$REMOTE"
135 if $base_present; then
137 "$LOCAL" "$MERGED" "$REMOTE" \
141 "$LOCAL" "$MERGED" "$REMOTE" |
cat
145 "$merge_tool_path" "$LOCAL" "$REMOTE" |
cat
151 if $base_present; then
152 "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
153 --default --mode=merge3
--to="$MERGED"
155 "$merge_tool_path" "$LOCAL" "$REMOTE" \
156 --default --mode=merge2
--to="$MERGED"
160 "$merge_tool_path" --default --mode=diff2 \
166 if $base_present; then
168 -f emerge-files-with-ancestor-command \
169 "$LOCAL" "$REMOTE" "$BASE" \
170 "$(basename "$MERGED")"
173 -f emerge-files-command \
175 "$(basename "$MERGED")"
179 "$merge_tool_path" -f emerge-files-command \
186 if $base_present; then
187 "$merge_tool_path" -f -d -c "wincmd J" \
188 "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
190 "$merge_tool_path" -f -d -c "wincmd l" \
191 "$LOCAL" "$MERGED" "$REMOTE"
195 "$merge_tool_path" -R -f -d -c "wincmd l" \
196 -c 'cd $GIT_PREFIX' \
203 "$merge_tool_path" -f -d -c "wincmd l" \
204 "$LOCAL" "$MERGED" "$REMOTE"
207 "$merge_tool_path" -R -f -d -c "wincmd l" \
208 -c 'cd $GIT_PREFIX' \
214 if $base_present; then
215 ("$merge_tool_path" --auto \
216 --L1 "$MERGED (Base)" \
217 --L2 "$MERGED (Local)" \
218 --L3 "$MERGED (Remote)" \
220 "$BASE" "$LOCAL" "$REMOTE" \
223 ("$merge_tool_path" --auto \
224 --L1 "$MERGED (Local)" \
225 --L2 "$MERGED (Remote)" \
232 ("$merge_tool_path" --auto \
234 --L2 "$MERGED (B)" "$LOCAL" "$REMOTE" \
239 "$merge_tool_path" "$LOCAL" "$REMOTE"
244 "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
247 "$merge_tool_path" "$LOCAL" "$REMOTE"
253 if $base_present; then
254 "$merge_tool_path" "$LOCAL" "$REMOTE" \
256 -merge "$MERGED" |
cat
258 "$merge_tool_path" "$LOCAL" "$REMOTE" \
259 -merge "$MERGED" |
cat
263 "$merge_tool_path" "$LOCAL" "$REMOTE" |
cat
269 if $base_present; then
270 "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
272 "$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
276 "$merge_tool_path" "$LOCAL" "$REMOTE"
281 if $base_present; then
282 "$merge_tool_path" -a "$BASE" \
283 -o "$MERGED" "$LOCAL" "$REMOTE"
286 -o "$MERGED" "$LOCAL" "$REMOTE"
290 "$merge_tool_path" "$LOCAL" "$REMOTE"
294 if $base_present; then
297 -base:"$BASE" -mine:"$LOCAL" \
298 -theirs:"$REMOTE" -merged:"$MERGED"
301 echo "TortoiseMerge cannot be used without a base" 1>&2
308 if $base_present; then
309 "$merge_tool_path" -X --show-merged-pane \
310 -R 'Accel.SaveAsMerged: "Ctrl-S"' \
311 -R 'Accel.Search: "Ctrl+F"' \
312 -R 'Accel.SearchForward: "Ctrl-G"' \
313 --merged-file "$MERGED" \
314 "$LOCAL" "$BASE" "$REMOTE"
316 "$merge_tool_path" -X $extra \
317 -R 'Accel.SaveAsMerged: "Ctrl-S"' \
318 -R 'Accel.Search: "Ctrl+F"' \
319 -R 'Accel.SearchForward: "Ctrl-G"' \
320 --merged-file "$MERGED" \
326 -R 'Accel.Search: "Ctrl+F"' \
327 -R 'Accel.SearchForward: "Ctrl-G"' \
332 merge_tool_cmd
="$(get_merge_tool_cmd "$1")"
333 if test -z "$merge_tool_cmd"; then
340 trust_exit_code
="$(git config --bool \
341 mergetool."$1".trustExitCode || echo false)"
342 if test "$trust_exit_code" = "false"; then
344 ( eval $merge_tool_cmd )
347 ( eval $merge_tool_cmd )
351 ( eval $merge_tool_cmd )
358 guess_merge_tool
() {
360 tools
="tortoisemerge"
364 if test -n "$DISPLAY"; then
365 if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
366 tools
="meld opendiff kdiff3 tkdiff xxdiff $tools"
368 tools
="opendiff kdiff3 tkdiff xxdiff meld $tools"
370 tools
="$tools gvimdiff diffuse ecmerge p4merge araxis bc3"
372 case "${VISUAL:-$EDITOR}" in
374 tools
="$tools vimdiff emerge"
377 tools
="$tools emerge vimdiff"
380 echo >&2 "merge tool candidates: $tools"
382 # Loop over each candidate and stop when a valid merge tool is found.
385 merge_tool_path
="$(translate_merge_tool_path "$i")"
386 if type "$merge_tool_path" > /dev
/null
2>&1; then
392 echo >&2 "No known merge resolution program available."
396 get_configured_merge_tool
() {
397 # Diff mode first tries diff.tool and falls back to merge.tool.
398 # Merge mode only checks merge.tool
400 merge_tool
=$
(git config
diff.tool || git config merge.tool
)
402 merge_tool
=$
(git config merge.tool
)
404 if test -n "$merge_tool" && ! valid_tool
"$merge_tool"; then
405 echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool"
406 echo >&2 "Resetting to default..."
412 get_merge_tool_path
() {
413 # A merge tool has been set, so verify that it's valid.
414 if test -n "$1"; then
417 merge_tool
="$(get_merge_tool)"
419 if ! valid_tool
"$merge_tool"; then
420 echo >&2 "Unknown merge tool $merge_tool"
424 merge_tool_path
=$
(git config difftool.
"$merge_tool".path ||
425 git config mergetool.
"$merge_tool".path
)
427 merge_tool_path
=$
(git config mergetool.
"$merge_tool".path
)
429 if test -z "$merge_tool_path"; then
430 merge_tool_path
="$(translate_merge_tool_path "$merge_tool")"
432 if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
433 ! type "$merge_tool_path" > /dev
/null
2>&1; then
434 echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
438 echo "$merge_tool_path"
442 # Check if a merge tool has been configured
443 merge_tool
=$
(get_configured_merge_tool
)
444 # Try to guess an appropriate merge tool if no tool has been set.
445 if test -z "$merge_tool"; then
446 merge_tool
="$(guess_merge_tool)" ||
exit