@matheusbsbs / matheus-bagliano / commits / 27090aa1ea
Fork 0

mergetool: Clean up description of files and prompts for merge resolutions

This fixes complaints from Junio for how messages and prompts are printed when resolving symlink and deleted file merges. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Theodore Ts'o committed Mar 29, 2007 at 11:39 UTC 27090aa1eabdc44553a0d8a51ff4ab9543c64c65
1 file changed +15 -12
git-mergetool.sh
+15 -12
@@ -44,25 +44,24 @@ describe_file () {
44 branch="$2"
45 file="$3"
46
47 - printf " "
47 + printf " {%s}: " "$branch"
48 if test -z "$mode"; then
49 - printf "'%s' was deleted" "$path"
49 + echo "deleted"
50 elif is_symlink "$mode" ; then
51 - printf "'%s' is a symlink containing '%s'" "$path" "$file"
51 + echo "a symbolic link -> '$(cat "$file")'"
52 else
53 if base_present; then
54 - printf "'%s' was created" "$path"
54 + echo "modified"
55 else
56 - printf "'%s' was modified" "$path"
56 + echo "created"
57 fi
58 fi
59 - echo " in the $branch branch"
59 }
60
61
62 resolve_symlink_merge () {
63 while true; do
65 - printf "Use (r)emote or (l)ocal, or (a)bort? "
64 + printf "Use (l)ocal or (r)emote, or (a)bort? "
65 read ans
66 case "$ans" in
67 [lL]*)
@@ -86,10 +85,14 @@ resolve_symlink_merge () {
85
86 resolve_deleted_merge () {
87 while true; do
89 - printf "Use (m)odified or (d)eleted file, or (a)bort? "
88 + if base_present; then
89 + printf "Use (m)odified or (d)eleted file, or (a)bort? "
90 + else
91 + printf "Use (c)reated or (d)eleted file, or (a)bort? "
92 + fi
93 read ans
94 case "$ans" in
92 - [mM]*)
95 + [mMcC]*)
96 git-add -- "$path"
97 cleanup_temp_files --save-backup
98 return
@@ -164,7 +167,7 @@ merge_file () {
167 remote_present && git cat-file blob ":3:$path" > "$REMOTE" 2>/dev/null
168
169 if test -z "$local_mode" -o -z "$remote_mode"; then
167 - echo "Deleted merge conflict for $path:"
170 + echo "Deleted merge conflict for '$path':"
171 describe_file "$local_mode" "local" "$LOCAL"
172 describe_file "$remote_mode" "remote" "$REMOTE"
173 resolve_deleted_merge
@@ -172,14 +175,14 @@ merge_file () {
175 fi
176
177 if is_symlink "$local_mode" || is_symlink "$remote_mode"; then
175 - echo "Symlink merge conflict for $path:"
178 + echo "Symbolic link merge conflict for '$path':"
179 describe_file "$local_mode" "local" "$LOCAL"
180 describe_file "$remote_mode" "remote" "$REMOTE"
181 resolve_symlink_merge
182 return
183 fi
184
182 - echo "Normal merge conflict for $path:"
185 + echo "Normal merge conflict for '$path':"
186 describe_file "$local_mode" "local" "$LOCAL"
187 describe_file "$remote_mode" "remote" "$REMOTE"
188 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"