Win32: fix detection of empty directories in is_dir_empty
[git/dscho.git] / git-mergetool.sh
blobc50e18a8998c1f4ca1449e1733f76cb769f501b9
1 #!/bin/sh
3 # This program resolves merge conflicts in git
5 # Copyright (c) 2006 Theodore Y. Ts'o
7 # This file is licensed under the GPL v2, or a later version
8 # at the discretion of Junio C Hamano.
11 USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
12 SUBDIRECTORY_OK=Yes
13 OPTIONS_SPEC=
14 TOOL_MODE=merge
15 . git-sh-setup
16 . git-mergetool--lib
17 require_work_tree
19 # Returns true if the mode reflects a symlink
20 is_symlink () {
21 test "$1" = 120000
24 is_submodule () {
25 test "$1" = 160000
28 local_present () {
29 test -n "$local_mode"
32 remote_present () {
33 test -n "$remote_mode"
36 base_present () {
37 test -n "$base_mode"
40 cleanup_temp_files () {
41 if test "$1" = --save-backup
42 then
43 rm -rf -- "$MERGED.orig"
44 test -e "$BACKUP" && mv -- "$BACKUP" "$MERGED.orig"
45 rm -f -- "$LOCAL" "$REMOTE" "$BASE"
46 else
47 rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
51 describe_file () {
52 mode="$1"
53 branch="$2"
54 file="$3"
56 printf " {%s}: " "$branch"
57 if test -z "$mode"
58 then
59 echo "deleted"
60 elif is_symlink "$mode"
61 then
62 echo "a symbolic link -> '$(cat "$file")'"
63 elif is_submodule "$mode"
64 then
65 echo "submodule commit $file"
66 elif base_present
67 then
68 echo "modified file"
69 else
70 echo "created file"
74 resolve_symlink_merge () {
75 while true
77 printf "Use (l)ocal or (r)emote, or (a)bort? "
78 read ans || return 1
79 case "$ans" in
80 [lL]*)
81 git checkout-index -f --stage=2 -- "$MERGED"
82 git add -- "$MERGED"
83 cleanup_temp_files --save-backup
84 return 0
86 [rR]*)
87 git checkout-index -f --stage=3 -- "$MERGED"
88 git add -- "$MERGED"
89 cleanup_temp_files --save-backup
90 return 0
92 [aA]*)
93 return 1
95 esac
96 done
99 resolve_deleted_merge () {
100 while true
102 if base_present
103 then
104 printf "Use (m)odified or (d)eleted file, or (a)bort? "
105 else
106 printf "Use (c)reated or (d)eleted file, or (a)bort? "
108 read ans || return 1
109 case "$ans" in
110 [mMcC]*)
111 git add -- "$MERGED"
112 cleanup_temp_files --save-backup
113 return 0
115 [dD]*)
116 git rm -- "$MERGED" > /dev/null
117 cleanup_temp_files
118 return 0
120 [aA]*)
121 return 1
123 esac
124 done
127 resolve_submodule_merge () {
128 while true
130 printf "Use (l)ocal or (r)emote, or (a)bort? "
131 read ans || return 1
132 case "$ans" in
133 [lL]*)
134 if ! local_present
135 then
136 if test -n "$(git ls-tree HEAD -- "$MERGED")"
137 then
138 # Local isn't present, but it's a subdirectory
139 git ls-tree --full-name -r HEAD -- "$MERGED" |
140 git update-index --index-info || exit $?
141 else
142 test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
143 git update-index --force-remove "$MERGED"
144 cleanup_temp_files --save-backup
146 elif is_submodule "$local_mode"
147 then
148 stage_submodule "$MERGED" "$local_sha1"
149 else
150 git checkout-index -f --stage=2 -- "$MERGED"
151 git add -- "$MERGED"
153 return 0
155 [rR]*)
156 if ! remote_present
157 then
158 if test -n "$(git ls-tree MERGE_HEAD -- "$MERGED")"
159 then
160 # Remote isn't present, but it's a subdirectory
161 git ls-tree --full-name -r MERGE_HEAD -- "$MERGED" |
162 git update-index --index-info || exit $?
163 else
164 test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
165 git update-index --force-remove "$MERGED"
167 elif is_submodule "$remote_mode"
168 then
169 ! is_submodule "$local_mode" &&
170 test -e "$MERGED" &&
171 mv -- "$MERGED" "$BACKUP"
172 stage_submodule "$MERGED" "$remote_sha1"
173 else
174 test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
175 git checkout-index -f --stage=3 -- "$MERGED"
176 git add -- "$MERGED"
178 cleanup_temp_files --save-backup
179 return 0
181 [aA]*)
182 return 1
184 esac
185 done
188 stage_submodule () {
189 path="$1"
190 submodule_sha1="$2"
191 mkdir -p "$path" ||
192 die "fatal: unable to create directory for module at $path"
193 # Find $path relative to work tree
194 work_tree_root=$(cd_to_toplevel && pwd)
195 work_rel_path=$(cd "$path" &&
196 GIT_WORK_TREE="${work_tree_root}" git rev-parse --show-prefix
198 test -n "$work_rel_path" ||
199 die "fatal: unable to get path of module $path relative to work tree"
200 git update-index --add --replace --cacheinfo 160000 "$submodule_sha1" "${work_rel_path%/}" || die
203 checkout_staged_file () {
204 tmpfile=$(expr \
205 "$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" \
206 : '\([^ ]*\) ')
208 if test $? -eq 0 -a -n "$tmpfile"
209 then
210 mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
211 else
212 >"$3"
216 merge_file () {
217 MERGED="$1"
219 f=$(git ls-files -u -- "$MERGED")
220 if test -z "$f"
221 then
222 if test ! -f "$MERGED"
223 then
224 echo "$MERGED: file not found"
225 else
226 echo "$MERGED: file does not need merging"
228 return 1
231 ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')"
232 BACKUP="./$MERGED.BACKUP.$ext"
233 LOCAL="./$MERGED.LOCAL.$ext"
234 REMOTE="./$MERGED.REMOTE.$ext"
235 BASE="./$MERGED.BASE.$ext"
237 base_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}')
238 local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}')
239 remote_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}')
241 if is_submodule "$local_mode" || is_submodule "$remote_mode"
242 then
243 echo "Submodule merge conflict for '$MERGED':"
244 local_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $2;}')
245 remote_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $2;}')
246 describe_file "$local_mode" "local" "$local_sha1"
247 describe_file "$remote_mode" "remote" "$remote_sha1"
248 resolve_submodule_merge
249 return
252 mv -- "$MERGED" "$BACKUP"
253 cp -- "$BACKUP" "$MERGED"
255 checkout_staged_file 1 "$MERGED" "$BASE"
256 checkout_staged_file 2 "$MERGED" "$LOCAL"
257 checkout_staged_file 3 "$MERGED" "$REMOTE"
259 if test -z "$local_mode" -o -z "$remote_mode"
260 then
261 echo "Deleted merge conflict for '$MERGED':"
262 describe_file "$local_mode" "local" "$LOCAL"
263 describe_file "$remote_mode" "remote" "$REMOTE"
264 resolve_deleted_merge
265 return
268 if is_symlink "$local_mode" || is_symlink "$remote_mode"
269 then
270 echo "Symbolic link merge conflict for '$MERGED':"
271 describe_file "$local_mode" "local" "$LOCAL"
272 describe_file "$remote_mode" "remote" "$REMOTE"
273 resolve_symlink_merge
274 return
277 echo "Normal merge conflict for '$MERGED':"
278 describe_file "$local_mode" "local" "$LOCAL"
279 describe_file "$remote_mode" "remote" "$REMOTE"
280 if "$prompt" = true
281 then
282 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
283 read ans || return 1
286 if base_present
287 then
288 present=true
289 else
290 present=false
293 if ! run_merge_tool "$merge_tool" "$present"
294 then
295 echo "merge of $MERGED failed" 1>&2
296 mv -- "$BACKUP" "$MERGED"
298 if test "$merge_keep_temporaries" = "false"
299 then
300 cleanup_temp_files
303 return 1
306 if test "$merge_keep_backup" = "true"
307 then
308 mv -- "$BACKUP" "$MERGED.orig"
309 else
310 rm -- "$BACKUP"
313 git add -- "$MERGED"
314 cleanup_temp_files
315 return 0
318 show_tool_help () {
319 TOOL_MODE=merge
320 list_merge_tool_candidates
321 unavailable= available= LF='
323 for i in $tools
325 merge_tool_path=$(translate_merge_tool_path "$i")
326 if type "$merge_tool_path" >/dev/null 2>&1
327 then
328 available="$available$i$LF"
329 else
330 unavailable="$unavailable$i$LF"
332 done
333 if test -n "$available"
334 then
335 echo "'git mergetool --tool=<tool>' may be set to one of the following:"
336 echo "$available" | sort | sed -e 's/^/ /'
337 else
338 echo "No suitable tool for 'git mergetool --tool=<tool>' found."
340 if test -n "$unavailable"
341 then
342 echo
343 echo 'The following tools are valid, but not currently available:'
344 echo "$unavailable" | sort | sed -e 's/^/ /'
346 if test -n "$unavailable$available"
347 then
348 echo
349 echo "Some of the tools listed above only work in a windowed"
350 echo "environment. If run in a terminal-only session, they will fail."
352 exit 0
355 prompt=$(git config --bool mergetool.prompt || echo true)
357 while test $# != 0
359 case "$1" in
360 --tool-help)
361 show_tool_help
363 -t|--tool*)
364 case "$#,$1" in
365 *,*=*)
366 merge_tool=$(expr "z$1" : 'z-[^=]*=\(.*\)')
368 1,*)
369 usage ;;
371 merge_tool="$2"
372 shift ;;
373 esac
375 -y|--no-prompt)
376 prompt=false
378 --prompt)
379 prompt=true
382 shift
383 break
386 usage
389 break
391 esac
392 shift
393 done
395 prompt_after_failed_merge () {
396 while true
398 printf "Continue merging other unresolved paths (y/n) ? "
399 read ans || return 1
400 case "$ans" in
401 [yY]*)
402 return 0
404 [nN]*)
405 return 1
407 esac
408 done
411 if test -z "$merge_tool"
412 then
413 merge_tool=$(get_merge_tool "$merge_tool") || exit
415 merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
416 merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
418 last_status=0
419 rollup_status=0
420 files=
422 if test $# -eq 0
423 then
424 cd_to_toplevel
426 if test -e "$GIT_DIR/MERGE_RR"
427 then
428 files=$(git rerere remaining)
429 else
430 files=$(git ls-files -u | sed -e 's/^[^ ]* //' | sort -u)
432 else
433 files=$(git ls-files -u -- "$@" | sed -e 's/^[^ ]* //' | sort -u)
436 if test -z "$files"
437 then
438 echo "No files need merging"
439 exit 0
442 printf "Merging:\n"
443 printf "$files\n"
445 IFS='
447 for i in $files
449 if test $last_status -ne 0
450 then
451 prompt_after_failed_merge || exit 1
453 printf "\n"
454 merge_file "$i"
455 last_status=$?
456 if test $last_status -ne 0
457 then
458 rollup_status=1
460 done
462 exit $rollup_status