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 merge_tool_path
="$(get_merge_tool_path "$1")" ||
exit
97 if $base_present; then
98 "$merge_tool_path" -wait -merge -3 -a1 \
99 "$BASE" "$LOCAL" "$REMOTE" "$MERGED" \
102 "$merge_tool_path" -wait -2 \
103 "$LOCAL" "$REMOTE" "$MERGED" \
108 "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" \
115 if $base_present; then
116 "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
117 -mergeoutput="$MERGED"
119 "$merge_tool_path" "$LOCAL" "$REMOTE" \
120 -mergeoutput="$MERGED"
124 "$merge_tool_path" "$LOCAL" "$REMOTE"
130 if $base_present; then
132 "$LOCAL" "$MERGED" "$REMOTE" \
136 "$LOCAL" "$MERGED" "$REMOTE" |
cat
140 "$merge_tool_path" "$LOCAL" "$REMOTE" |
cat
146 if $base_present; then
147 "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
148 --default --mode=merge3
--to="$MERGED"
150 "$merge_tool_path" "$LOCAL" "$REMOTE" \
151 --default --mode=merge2
--to="$MERGED"
155 "$merge_tool_path" --default --mode=diff2 \
161 if $base_present; then
163 -f emerge-files-with-ancestor-command \
164 "$LOCAL" "$REMOTE" "$BASE" \
165 "$(basename "$MERGED")"
168 -f emerge-files-command \
170 "$(basename "$MERGED")"
174 "$merge_tool_path" -f emerge-files-command \
181 if $base_present; then
182 "$merge_tool_path" -f -d -c "wincmd J" \
183 "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
185 "$merge_tool_path" -f -d -c "wincmd l" \
186 "$LOCAL" "$MERGED" "$REMOTE"
190 "$merge_tool_path" -R -f -d -c "wincmd l" \
197 "$merge_tool_path" -f -d -c "wincmd l" \
198 "$LOCAL" "$MERGED" "$REMOTE"
201 "$merge_tool_path" -R -f -d -c "wincmd l" \
207 if $base_present; then
208 ("$merge_tool_path" --auto \
209 --L1 "$MERGED (Base)" \
210 --L2 "$MERGED (Local)" \
211 --L3 "$MERGED (Remote)" \
213 "$BASE" "$LOCAL" "$REMOTE" \
216 ("$merge_tool_path" --auto \
217 --L1 "$MERGED (Local)" \
218 --L2 "$MERGED (Remote)" \
225 ("$merge_tool_path" --auto \
227 --L2 "$MERGED (B)" "$LOCAL" "$REMOTE" \
232 "$merge_tool_path" "$LOCAL" "$REMOTE"
237 "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
240 "$merge_tool_path" "$LOCAL" "$REMOTE"
246 if $base_present; then
247 "$merge_tool_path" "$LOCAL" "$REMOTE" \
249 -merge "$MERGED" |
cat
251 "$merge_tool_path" "$LOCAL" "$REMOTE" \
252 -merge "$MERGED" |
cat
256 "$merge_tool_path" "$LOCAL" "$REMOTE" |
cat
262 if $base_present; then
263 "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
265 "$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
269 "$merge_tool_path" "$LOCAL" "$REMOTE"
274 if $base_present; then
275 "$merge_tool_path" -a "$BASE" \
276 -o "$MERGED" "$LOCAL" "$REMOTE"
279 -o "$MERGED" "$LOCAL" "$REMOTE"
283 "$merge_tool_path" "$LOCAL" "$REMOTE"
287 if $base_present; then
290 -base:"$BASE" -mine:"$LOCAL" \
291 -theirs:"$REMOTE" -merged:"$MERGED"
294 echo "TortoiseMerge cannot be used without a base" 1>&2
301 if $base_present; then
302 "$merge_tool_path" -X --show-merged-pane \
303 -R 'Accel.SaveAsMerged: "Ctrl-S"' \
304 -R 'Accel.Search: "Ctrl+F"' \
305 -R 'Accel.SearchForward: "Ctrl-G"' \
306 --merged-file "$MERGED" \
307 "$LOCAL" "$BASE" "$REMOTE"
309 "$merge_tool_path" -X $extra \
310 -R 'Accel.SaveAsMerged: "Ctrl-S"' \
311 -R 'Accel.Search: "Ctrl+F"' \
312 -R 'Accel.SearchForward: "Ctrl-G"' \
313 --merged-file "$MERGED" \
319 -R 'Accel.Search: "Ctrl+F"' \
320 -R 'Accel.SearchForward: "Ctrl-G"' \
325 merge_tool_cmd
="$(get_merge_tool_cmd "$1")"
326 if test -z "$merge_tool_cmd"; then
333 trust_exit_code
="$(git config --bool \
334 mergetool."$1".trustExitCode || echo false)"
335 if test "$trust_exit_code" = "false"; then
337 ( eval $merge_tool_cmd )
340 ( eval $merge_tool_cmd )
344 ( eval $merge_tool_cmd )
351 guess_merge_tool
() {
353 tools
="tortoisemerge"
357 if test -n "$DISPLAY"; then
358 if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
359 tools
="meld opendiff kdiff3 tkdiff xxdiff $tools"
361 tools
="opendiff kdiff3 tkdiff xxdiff meld $tools"
363 tools
="$tools gvimdiff diffuse ecmerge p4merge araxis bc3"
365 case "${VISUAL:-$EDITOR}" in
367 tools
="$tools vimdiff emerge"
370 tools
="$tools emerge vimdiff"
373 echo >&2 "merge tool candidates: $tools"
375 # Loop over each candidate and stop when a valid merge tool is found.
378 merge_tool_path
="$(translate_merge_tool_path "$i")"
379 if type "$merge_tool_path" > /dev
/null
2>&1; then
385 echo >&2 "No known merge resolution program available."
389 get_configured_merge_tool
() {
390 # Diff mode first tries diff.tool and falls back to merge.tool.
391 # Merge mode only checks merge.tool
393 merge_tool
=$
(git config
diff.tool || git config merge.tool
)
395 merge_tool
=$
(git config merge.tool
)
397 if test -n "$merge_tool" && ! valid_tool
"$merge_tool"; then
398 echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool"
399 echo >&2 "Resetting to default..."
405 get_merge_tool_path
() {
406 # A merge tool has been set, so verify that it's valid.
407 if test -n "$1"; then
410 merge_tool
="$(get_merge_tool)"
412 if ! valid_tool
"$merge_tool"; then
413 echo >&2 "Unknown merge tool $merge_tool"
417 merge_tool_path
=$
(git config difftool.
"$merge_tool".path ||
418 git config mergetool.
"$merge_tool".path
)
420 merge_tool_path
=$
(git config mergetool.
"$merge_tool".path
)
422 if test -z "$merge_tool_path"; then
423 merge_tool_path
="$(translate_merge_tool_path "$merge_tool")"
425 if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
426 ! type "$merge_tool_path" > /dev
/null
2>&1; then
427 echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
431 echo "$merge_tool_path"
435 # Check if a merge tool has been configured
436 merge_tool
=$
(get_configured_merge_tool
)
437 # Try to guess an appropriate merge tool if no tool has been set.
438 if test -z "$merge_tool"; then
439 merge_tool
="$(guess_merge_tool)" ||
exit