]>
Commit | Line | Data |
---|---|---|
c4b4a5af TT |
1 | #!/bin/sh |
2 | # | |
3 | # This program resolves merge conflicts in git | |
4 | # | |
5 | # Copyright (c) 2006 Theodore Y. Ts'o | |
6 | # | |
7 | # This file is licensed under the GPL v2, or a later version | |
2571ac67 | 8 | # at the discretion of Junio C Hamano. |
c4b4a5af TT |
9 | # |
10 | ||
682b451f | 11 | USAGE='[--tool=tool] [-y|--no-prompt|--prompt] [file to merge] ...' |
c4b4a5af | 12 | SUBDIRECTORY_OK=Yes |
8f321a39 | 13 | OPTIONS_SPEC= |
c4b4a5af TT |
14 | . git-sh-setup |
15 | require_work_tree | |
16 | ||
17 | # Returns true if the mode reflects a symlink | |
262c981e | 18 | is_symlink () { |
c4b4a5af TT |
19 | test "$1" = 120000 |
20 | } | |
21 | ||
262c981e | 22 | local_present () { |
c4b4a5af TT |
23 | test -n "$local_mode" |
24 | } | |
25 | ||
262c981e | 26 | remote_present () { |
c4b4a5af TT |
27 | test -n "$remote_mode" |
28 | } | |
29 | ||
262c981e | 30 | base_present () { |
c4b4a5af TT |
31 | test -n "$base_mode" |
32 | } | |
33 | ||
34 | cleanup_temp_files () { | |
35 | if test "$1" = --save-backup ; then | |
b3ea27e4 | 36 | mv -- "$BACKUP" "$MERGED.orig" |
c4b4a5af TT |
37 | rm -f -- "$LOCAL" "$REMOTE" "$BASE" |
38 | else | |
39 | rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP" | |
40 | fi | |
41 | } | |
42 | ||
262c981e | 43 | describe_file () { |
c4b4a5af TT |
44 | mode="$1" |
45 | branch="$2" | |
46 | file="$3" | |
47 | ||
27090aa1 | 48 | printf " {%s}: " "$branch" |
c4b4a5af | 49 | if test -z "$mode"; then |
27090aa1 | 50 | echo "deleted" |
c4b4a5af | 51 | elif is_symlink "$mode" ; then |
27090aa1 | 52 | echo "a symbolic link -> '$(cat "$file")'" |
c4b4a5af TT |
53 | else |
54 | if base_present; then | |
27090aa1 | 55 | echo "modified" |
c4b4a5af | 56 | else |
27090aa1 | 57 | echo "created" |
c4b4a5af TT |
58 | fi |
59 | fi | |
c4b4a5af TT |
60 | } |
61 | ||
62 | ||
63 | resolve_symlink_merge () { | |
d1dc6959 | 64 | while true; do |
27090aa1 | 65 | printf "Use (l)ocal or (r)emote, or (a)bort? " |
c4b4a5af TT |
66 | read ans |
67 | case "$ans" in | |
68 | [lL]*) | |
b3ea27e4 CB |
69 | git checkout-index -f --stage=2 -- "$MERGED" |
70 | git add -- "$MERGED" | |
c4b4a5af | 71 | cleanup_temp_files --save-backup |
b0169d84 | 72 | return 0 |
c4b4a5af | 73 | ;; |
5a174f1a | 74 | [rR]*) |
b3ea27e4 CB |
75 | git checkout-index -f --stage=3 -- "$MERGED" |
76 | git add -- "$MERGED" | |
c4b4a5af | 77 | cleanup_temp_files --save-backup |
b0169d84 | 78 | return 0 |
c4b4a5af | 79 | ;; |
5a174f1a | 80 | [aA]*) |
b0169d84 | 81 | return 1 |
c4b4a5af TT |
82 | ;; |
83 | esac | |
84 | done | |
85 | } | |
86 | ||
87 | resolve_deleted_merge () { | |
d1dc6959 | 88 | while true; do |
27090aa1 TT |
89 | if base_present; then |
90 | printf "Use (m)odified or (d)eleted file, or (a)bort? " | |
91 | else | |
92 | printf "Use (c)reated or (d)eleted file, or (a)bort? " | |
93 | fi | |
c4b4a5af TT |
94 | read ans |
95 | case "$ans" in | |
27090aa1 | 96 | [mMcC]*) |
b3ea27e4 | 97 | git add -- "$MERGED" |
c4b4a5af | 98 | cleanup_temp_files --save-backup |
b0169d84 | 99 | return 0 |
c4b4a5af | 100 | ;; |
5a174f1a | 101 | [dD]*) |
b3ea27e4 | 102 | git rm -- "$MERGED" > /dev/null |
c4b4a5af | 103 | cleanup_temp_files |
b0169d84 | 104 | return 0 |
c4b4a5af | 105 | ;; |
5a174f1a | 106 | [aA]*) |
b0169d84 | 107 | return 1 |
c4b4a5af TT |
108 | ;; |
109 | esac | |
110 | done | |
111 | } | |
112 | ||
ddc0c497 | 113 | check_unchanged () { |
b3ea27e4 | 114 | if test "$MERGED" -nt "$BACKUP" ; then |
ddc0c497 TT |
115 | status=0; |
116 | else | |
117 | while true; do | |
b3ea27e4 | 118 | echo "$MERGED seems unchanged." |
ddc0c497 TT |
119 | printf "Was the merge successful? [y/n] " |
120 | read answer < /dev/tty | |
121 | case "$answer" in | |
122 | y*|Y*) status=0; break ;; | |
123 | n*|N*) status=1; break ;; | |
124 | esac | |
125 | done | |
126 | fi | |
127 | } | |
128 | ||
0ec7b6c2 CB |
129 | checkout_staged_file () { |
130 | tmpfile=$(expr "$(git checkout-index --temp --stage="$1" "$2")" : '\([^ ]*\) ') | |
131 | ||
132 | if test $? -eq 0 -a -n "$tmpfile" ; then | |
ff4a1855 | 133 | mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3" |
0ec7b6c2 CB |
134 | fi |
135 | } | |
136 | ||
c4b4a5af | 137 | merge_file () { |
b3ea27e4 | 138 | MERGED="$1" |
c4b4a5af | 139 | |
b3ea27e4 | 140 | f=`git ls-files -u -- "$MERGED"` |
c4b4a5af | 141 | if test -z "$f" ; then |
b3ea27e4 CB |
142 | if test ! -f "$MERGED" ; then |
143 | echo "$MERGED: file not found" | |
ce5b6d75 | 144 | else |
b3ea27e4 | 145 | echo "$MERGED: file does not need merging" |
ce5b6d75 | 146 | fi |
b0169d84 | 147 | return 1 |
c4b4a5af TT |
148 | fi |
149 | ||
b3ea27e4 | 150 | ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')" |
641dba49 PH |
151 | BACKUP="./$MERGED.BACKUP.$ext" |
152 | LOCAL="./$MERGED.LOCAL.$ext" | |
153 | REMOTE="./$MERGED.REMOTE.$ext" | |
154 | BASE="./$MERGED.BASE.$ext" | |
c4b4a5af | 155 | |
b3ea27e4 CB |
156 | mv -- "$MERGED" "$BACKUP" |
157 | cp -- "$BACKUP" "$MERGED" | |
c4b4a5af | 158 | |
b3ea27e4 CB |
159 | base_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}'` |
160 | local_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}'` | |
161 | remote_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}'` | |
c4b4a5af | 162 | |
ff4a1855 CB |
163 | base_present && checkout_staged_file 1 "$MERGED" "$BASE" |
164 | local_present && checkout_staged_file 2 "$MERGED" "$LOCAL" | |
165 | remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE" | |
c4b4a5af TT |
166 | |
167 | if test -z "$local_mode" -o -z "$remote_mode"; then | |
b3ea27e4 | 168 | echo "Deleted merge conflict for '$MERGED':" |
c4b4a5af TT |
169 | describe_file "$local_mode" "local" "$LOCAL" |
170 | describe_file "$remote_mode" "remote" "$REMOTE" | |
171 | resolve_deleted_merge | |
172 | return | |
173 | fi | |
174 | ||
175 | if is_symlink "$local_mode" || is_symlink "$remote_mode"; then | |
b3ea27e4 | 176 | echo "Symbolic link merge conflict for '$MERGED':" |
c4b4a5af TT |
177 | describe_file "$local_mode" "local" "$LOCAL" |
178 | describe_file "$remote_mode" "remote" "$REMOTE" | |
179 | resolve_symlink_merge | |
180 | return | |
181 | fi | |
182 | ||
b3ea27e4 | 183 | echo "Normal merge conflict for '$MERGED':" |
c4b4a5af TT |
184 | describe_file "$local_mode" "local" "$LOCAL" |
185 | describe_file "$remote_mode" "remote" "$REMOTE" | |
682b451f CB |
186 | if "$prompt" = true; then |
187 | printf "Hit return to start merge resolution tool (%s): " "$merge_tool" | |
188 | read ans | |
189 | fi | |
c4b4a5af TT |
190 | |
191 | case "$merge_tool" in | |
192 | kdiff3) | |
193 | if base_present ; then | |
b3ea27e4 | 194 | ("$merge_tool_path" --auto --L1 "$MERGED (Base)" --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" \ |
641dba49 | 195 | -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1) |
c4b4a5af | 196 | else |
b3ea27e4 | 197 | ("$merge_tool_path" --auto --L1 "$MERGED (Local)" --L2 "$MERGED (Remote)" \ |
641dba49 | 198 | -o "$MERGED" "$LOCAL" "$REMOTE" > /dev/null 2>&1) |
c4b4a5af TT |
199 | fi |
200 | status=$? | |
c4b4a5af TT |
201 | ;; |
202 | tkdiff) | |
203 | if base_present ; then | |
641dba49 | 204 | "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE" |
c4b4a5af | 205 | else |
641dba49 | 206 | "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" |
c4b4a5af TT |
207 | fi |
208 | status=$? | |
c4b4a5af | 209 | ;; |
71ee483a | 210 | meld) |
c4b4a5af | 211 | touch "$BACKUP" |
641dba49 | 212 | "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" |
ddc0c497 | 213 | check_unchanged |
c4b4a5af | 214 | ;; |
71ee483a MH |
215 | vimdiff) |
216 | touch "$BACKUP" | |
bad42732 | 217 | "$merge_tool_path" -d -c "wincmd l" "$LOCAL" "$MERGED" "$REMOTE" |
71ee483a MH |
218 | check_unchanged |
219 | ;; | |
730b5b45 | 220 | gvimdiff) |
44c36d1c | 221 | touch "$BACKUP" |
bad42732 | 222 | "$merge_tool_path" -d -c "wincmd l" -f "$LOCAL" "$MERGED" "$REMOTE" |
44c36d1c CB |
223 | check_unchanged |
224 | ;; | |
c4b4a5af TT |
225 | xxdiff) |
226 | touch "$BACKUP" | |
227 | if base_present ; then | |
e3fa2c76 | 228 | "$merge_tool_path" -X --show-merged-pane \ |
c4b4a5af TT |
229 | -R 'Accel.SaveAsMerged: "Ctrl-S"' \ |
230 | -R 'Accel.Search: "Ctrl+F"' \ | |
231 | -R 'Accel.SearchForward: "Ctrl-G"' \ | |
641dba49 | 232 | --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE" |
c4b4a5af | 233 | else |
e3fa2c76 | 234 | "$merge_tool_path" -X --show-merged-pane \ |
c4b4a5af TT |
235 | -R 'Accel.SaveAsMerged: "Ctrl-S"' \ |
236 | -R 'Accel.Search: "Ctrl+F"' \ | |
237 | -R 'Accel.SearchForward: "Ctrl-G"' \ | |
641dba49 | 238 | --merged-file "$MERGED" "$LOCAL" "$REMOTE" |
c4b4a5af | 239 | fi |
ddc0c497 | 240 | check_unchanged |
c4b4a5af | 241 | ;; |
365cf979 TT |
242 | opendiff) |
243 | touch "$BACKUP" | |
244 | if base_present; then | |
b3ea27e4 | 245 | "$merge_tool_path" "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED" | cat |
365cf979 | 246 | else |
b3ea27e4 | 247 | "$merge_tool_path" "$LOCAL" "$REMOTE" -merge "$MERGED" | cat |
365cf979 TT |
248 | fi |
249 | check_unchanged | |
365cf979 | 250 | ;; |
ca8e6b7a SP |
251 | ecmerge) |
252 | touch "$BACKUP" | |
253 | if base_present; then | |
f4e9f786 | 254 | "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED" |
ca8e6b7a | 255 | else |
f4e9f786 | 256 | "$merge_tool_path" "$LOCAL" "$REMOTE" --default --mode=merge2 --to="$MERGED" |
ca8e6b7a SP |
257 | fi |
258 | check_unchanged | |
ca8e6b7a | 259 | ;; |
c4b4a5af TT |
260 | emerge) |
261 | if base_present ; then | |
b3ea27e4 | 262 | "$merge_tool_path" -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$(basename "$MERGED")" |
c4b4a5af | 263 | else |
b3ea27e4 | 264 | "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" "$(basename "$MERGED")" |
c4b4a5af TT |
265 | fi |
266 | status=$? | |
c4b4a5af | 267 | ;; |
b98c212a MH |
268 | tortoisemerge) |
269 | if base_present ; then | |
270 | touch "$BACKUP" | |
271 | "$merge_tool_path" -base:"$BASE" -mine:"$LOCAL" -theirs:"$REMOTE" -merged:"$MERGED" | |
272 | check_unchanged | |
273 | else | |
274 | echo "TortoiseMerge cannot be used without a base" 1>&2 | |
275 | status=1 | |
276 | fi | |
277 | ;; | |
964473a0 CB |
278 | *) |
279 | if test -n "$merge_tool_cmd"; then | |
280 | if test "$merge_tool_trust_exit_code" = "false"; then | |
281 | touch "$BACKUP" | |
282 | ( eval $merge_tool_cmd ) | |
283 | check_unchanged | |
284 | else | |
285 | ( eval $merge_tool_cmd ) | |
286 | status=$? | |
287 | fi | |
288 | fi | |
289 | ;; | |
c4b4a5af TT |
290 | esac |
291 | if test "$status" -ne 0; then | |
b3ea27e4 CB |
292 | echo "merge of $MERGED failed" 1>&2 |
293 | mv -- "$BACKUP" "$MERGED" | |
162eba8b CB |
294 | |
295 | if test "$merge_keep_temporaries" = "false"; then | |
296 | cleanup_temp_files | |
297 | fi | |
298 | ||
b0169d84 | 299 | return 1 |
c4b4a5af | 300 | fi |
44c36d1c CB |
301 | |
302 | if test "$merge_keep_backup" = "true"; then | |
b3ea27e4 | 303 | mv -- "$BACKUP" "$MERGED.orig" |
44c36d1c CB |
304 | else |
305 | rm -- "$BACKUP" | |
306 | fi | |
307 | ||
b3ea27e4 | 308 | git add -- "$MERGED" |
c4b4a5af | 309 | cleanup_temp_files |
b0169d84 | 310 | return 0 |
c4b4a5af TT |
311 | } |
312 | ||
682b451f CB |
313 | prompt=$(git config --bool mergetool.prompt || echo true) |
314 | ||
822f7c73 | 315 | while test $# != 0 |
c4b4a5af TT |
316 | do |
317 | case "$1" in | |
318 | -t|--tool*) | |
319 | case "$#,$1" in | |
320 | *,*=*) | |
321 | merge_tool=`expr "z$1" : 'z-[^=]*=\(.*\)'` | |
322 | ;; | |
323 | 1,*) | |
324 | usage ;; | |
325 | *) | |
326 | merge_tool="$2" | |
327 | shift ;; | |
328 | esac | |
329 | ;; | |
682b451f CB |
330 | -y|--no-prompt) |
331 | prompt=false | |
332 | ;; | |
333 | --prompt) | |
334 | prompt=true | |
335 | ;; | |
c4b4a5af | 336 | --) |
ce2c3ebb | 337 | shift |
c4b4a5af TT |
338 | break |
339 | ;; | |
340 | -*) | |
341 | usage | |
342 | ;; | |
343 | *) | |
344 | break | |
345 | ;; | |
346 | esac | |
347 | shift | |
348 | done | |
349 | ||
964473a0 CB |
350 | valid_custom_tool() |
351 | { | |
352 | merge_tool_cmd="$(git config mergetool.$1.cmd)" | |
353 | test -n "$merge_tool_cmd" | |
354 | } | |
355 | ||
e3fa2c76 SP |
356 | valid_tool() { |
357 | case "$1" in | |
b98c212a | 358 | kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge | tortoisemerge) |
e3fa2c76 SP |
359 | ;; # happy |
360 | *) | |
964473a0 CB |
361 | if ! valid_custom_tool "$1"; then |
362 | return 1 | |
363 | fi | |
e3fa2c76 SP |
364 | ;; |
365 | esac | |
366 | } | |
367 | ||
368 | init_merge_tool_path() { | |
369 | merge_tool_path=`git config mergetool.$1.path` | |
370 | if test -z "$merge_tool_path" ; then | |
371 | case "$1" in | |
bad42732 MH |
372 | vimdiff) |
373 | merge_tool_path=vim | |
374 | ;; | |
375 | gvimdiff) | |
376 | merge_tool_path=gvim | |
377 | ;; | |
e3fa2c76 SP |
378 | emerge) |
379 | merge_tool_path=emacs | |
380 | ;; | |
381 | *) | |
382 | merge_tool_path=$1 | |
383 | ;; | |
384 | esac | |
385 | fi | |
386 | } | |
387 | ||
b0169d84 CB |
388 | prompt_after_failed_merge() { |
389 | while true; do | |
390 | printf "Continue merging other unresolved paths (y/n) ? " | |
391 | read ans | |
392 | case "$ans" in | |
393 | ||
394 | [yY]*) | |
395 | return 0 | |
396 | ;; | |
397 | ||
398 | [nN]*) | |
399 | return 1 | |
400 | ;; | |
401 | esac | |
402 | done | |
403 | } | |
e3fa2c76 | 404 | |
c4b4a5af | 405 | if test -z "$merge_tool"; then |
5be60078 | 406 | merge_tool=`git config merge.tool` |
d279fc1a | 407 | if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then |
d6678c28 TT |
408 | echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" |
409 | echo >&2 "Resetting to default..." | |
410 | unset merge_tool | |
e3fa2c76 | 411 | fi |
c4b4a5af TT |
412 | fi |
413 | ||
414 | if test -z "$merge_tool" ; then | |
301ac38b | 415 | if test -n "$DISPLAY"; then |
301ac38b | 416 | if test -n "$GNOME_DESKTOP_SESSION_ID" ; then |
b98c212a | 417 | merge_tool_candidates="meld kdiff3 tkdiff xxdiff tortoisemerge gvimdiff" |
fb700cb0 | 418 | else |
b98c212a | 419 | merge_tool_candidates="kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff" |
301ac38b TT |
420 | fi |
421 | fi | |
422 | if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then | |
fb700cb0 JG |
423 | merge_tool_candidates="$merge_tool_candidates emerge opendiff vimdiff" |
424 | elif echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then | |
425 | merge_tool_candidates="$merge_tool_candidates vimdiff opendiff emerge" | |
426 | else | |
427 | merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff" | |
301ac38b | 428 | fi |
301ac38b TT |
429 | echo "merge tool candidates: $merge_tool_candidates" |
430 | for i in $merge_tool_candidates; do | |
e3fa2c76 SP |
431 | init_merge_tool_path $i |
432 | if type "$merge_tool_path" > /dev/null 2>&1; then | |
301ac38b TT |
433 | merge_tool=$i |
434 | break | |
435 | fi | |
436 | done | |
437 | if test -z "$merge_tool" ; then | |
e3fa2c76 | 438 | echo "No known merge resolution program available." |
c4b4a5af TT |
439 | exit 1 |
440 | fi | |
e3fa2c76 SP |
441 | else |
442 | if ! valid_tool "$merge_tool"; then | |
443 | echo >&2 "Unknown merge_tool $merge_tool" | |
444 | exit 1 | |
445 | fi | |
446 | ||
447 | init_merge_tool_path "$merge_tool" | |
448 | ||
44c36d1c | 449 | merge_keep_backup="$(git config --bool merge.keepBackup || echo true)" |
162eba8b | 450 | merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)" |
44c36d1c | 451 | |
964473a0 | 452 | if test -z "$merge_tool_cmd" && ! type "$merge_tool_path" > /dev/null 2>&1; then |
e3fa2c76 SP |
453 | echo "The merge tool $merge_tool is not available as '$merge_tool_path'" |
454 | exit 1 | |
455 | fi | |
964473a0 CB |
456 | |
457 | if ! test -z "$merge_tool_cmd"; then | |
458 | merge_tool_trust_exit_code="$(git config --bool mergetool.$merge_tool.trustExitCode || echo false)" | |
459 | fi | |
c4b4a5af TT |
460 | fi |
461 | ||
b0169d84 CB |
462 | last_status=0 |
463 | rollup_status=0 | |
c4b4a5af TT |
464 | |
465 | if test $# -eq 0 ; then | |
0eea3451 CB |
466 | files=`git ls-files -u | sed -e 's/^[^ ]* //' | sort -u` |
467 | if test -z "$files" ; then | |
468 | echo "No files need merging" | |
469 | exit 0 | |
470 | fi | |
471 | echo Merging the files: "$files" | |
472 | git ls-files -u | | |
473 | sed -e 's/^[^ ]* //' | | |
474 | sort -u | | |
475 | while IFS= read i | |
476 | do | |
b0169d84 CB |
477 | if test $last_status -ne 0; then |
478 | prompt_after_failed_merge < /dev/tty || exit 1 | |
c4b4a5af | 479 | fi |
0eea3451 CB |
480 | printf "\n" |
481 | merge_file "$i" < /dev/tty > /dev/tty | |
b0169d84 CB |
482 | last_status=$? |
483 | if test $last_status -ne 0; then | |
484 | rollup_status=1 | |
485 | fi | |
0eea3451 | 486 | done |
c4b4a5af | 487 | else |
0eea3451 | 488 | while test $# -gt 0; do |
b0169d84 CB |
489 | if test $last_status -ne 0; then |
490 | prompt_after_failed_merge || exit 1 | |
491 | fi | |
0eea3451 CB |
492 | printf "\n" |
493 | merge_file "$1" | |
b0169d84 CB |
494 | last_status=$? |
495 | if test $last_status -ne 0; then | |
496 | rollup_status=1 | |
497 | fi | |
0eea3451 CB |
498 | shift |
499 | done | |
c4b4a5af | 500 | fi |
b0169d84 CB |
501 | |
502 | exit $rollup_status |