From e15b484f6af581270f2ee03149e4e0d6af053ddf Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 27 Mar 2007 11:38:59 -0400 Subject: Fix minor formatting issue in man page for git-mergetool Signed-off-by: "Theodore Ts'o" --- Documentation/git-mergetool.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 5baaaca0b..34288fe08 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -26,11 +26,11 @@ OPTIONS Use the merge resolution program specified by . Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. - - If a merge resolution program is not specified, 'git mergetool' - will use the configuration variable merge.tool. If the - configuration variable merge.tool is not set, 'git mergetool' - will pick a suitable default. ++ +If a merge resolution program is not specified, 'git mergetool' +will use the configuration variable merge.tool. If the +configuration variable merge.tool is not set, 'git mergetool' +will pick a suitable default. Author ------ -- cgit v1.2.1 From 20fa04ea6bad985d74bd2c0180701f1c69272801 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 27 Mar 2007 12:12:22 -0400 Subject: mergetool: Replace use of "echo -n" with printf(1) to be more portable Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 7942fd0b6..340182335 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -44,18 +44,16 @@ function describe_file () { branch="$2" file="$3" - echo -n " " + printf " " if test -z "$mode"; then - echo -n "'$path' was deleted" + printf "'%s' was deleted" "$path" elif is_symlink "$mode" ; then - echo -n "'$path' is a symlink containing '" - cat "$file" - echo -n "'" + printf "'%s' is a symlink containing '%s'" "$path" "$file" else if base_present; then - echo -n "'$path' was created" + printf "'%s' was created" "$path" else - echo -n "'$path' was modified" + printf "'%s' was modified" "$path" fi fi echo " in the $branch branch" @@ -64,7 +62,7 @@ function describe_file () { resolve_symlink_merge () { while /bin/true; do - echo -n "Use (r)emote or (l)ocal, or (a)bort? " + printf "Use (r)emote or (l)ocal, or (a)bort? " read ans case "$ans" in [lL]*) @@ -88,7 +86,7 @@ resolve_symlink_merge () { resolve_deleted_merge () { while /bin/true; do - echo -n "Use (m)odified or (d)eleted file, or (a)bort? " + printf "Use (m)odified or (d)eleted file, or (a)bort? " read ans case "$ans" in [mM]*) @@ -157,7 +155,7 @@ merge_file () { echo "Normal merge conflict for $path:" describe_file "$local_mode" "local" "$LOCAL" describe_file "$remote_mode" "remote" "$REMOTE" - echo -n "Hit return to start merge resolution tool ($merge_tool): " + printf "Hit return to start merge resolution tool (%s): " "$merge_tool" read ans case "$merge_tool" in @@ -193,7 +191,7 @@ merge_file () { else while true; do echo "$path seems unchanged." - echo -n "Was the merge successful? [y/n] " + printf "Was the merge successful? [y/n] " read answer < /dev/tty case "$answer" in y*|Y*) status=0; break ;; @@ -225,7 +223,7 @@ merge_file () { else while true; do echo "$path seems unchanged." - echo -n "Was the merge successful? [y/n] " + printf "Was the merge successful? [y/n] " read answer < /dev/tty case "$answer" in y*|Y*) status=0; break ;; @@ -346,12 +344,12 @@ if test $# -eq 0 ; then echo Merging the files: $files git ls-files -u | sed -e 's/^[^ ]* //' | sort -u | while read i do - echo "" + printf "\n" merge_file "$i" < /dev/tty > /dev/tty done else while test $# -gt 0; do - echo "" + printf "\n" merge_file "$1" shift done -- cgit v1.2.1 From ce5b6d752bf4fdc72697ef85b3589983f52d7007 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 27 Mar 2007 18:00:03 -0400 Subject: mergetool: Don't error out in the merge case where the local file is deleted If the file we are trying to merge resolve is in git-ls-files -u, then skip the file existence test. If the file isn't reported in git-ls-files, then check to see if the file exists or not to give an appropriate error message. Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 340182335..fa301add3 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -109,14 +109,13 @@ resolve_deleted_merge () { merge_file () { path="$1" - if test ! -f "$path" ; then - echo "$path: file not found" - exit 1 - fi - f=`git-ls-files -u -- "$path"` if test -z "$f" ; then - echo "$path: file does not need merging" + if test ! -f "$path" ; then + echo "$path: file not found" + else + echo "$path: file does not need merging" + fi exit 1 fi -- cgit v1.2.1 From d1dc6959bbff89496e3ae5d845d73e98ae213e09 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 06:46:59 -0400 Subject: mergetool: portability fix: don't assume true is in /bin Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index fa301add3..600aef0a1 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -61,7 +61,7 @@ function describe_file () { resolve_symlink_merge () { - while /bin/true; do + while true; do printf "Use (r)emote or (l)ocal, or (a)bort? " read ans case "$ans" in @@ -85,7 +85,7 @@ resolve_symlink_merge () { } resolve_deleted_merge () { - while /bin/true; do + while true; do printf "Use (m)odified or (d)eleted file, or (a)bort? " read ans case "$ans" in -- cgit v1.2.1 From 262c981ea720c3c67d01d9a556069f79a6170786 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 06:55:11 -0400 Subject: mergetool: portability fix: don't use reserved word function Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 600aef0a1..0b843a54d 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -14,19 +14,19 @@ SUBDIRECTORY_OK=Yes require_work_tree # Returns true if the mode reflects a symlink -function is_symlink () { +is_symlink () { test "$1" = 120000 } -function local_present () { +local_present () { test -n "$local_mode" } -function remote_present () { +remote_present () { test -n "$remote_mode" } -function base_present () { +base_present () { test -n "$base_mode" } @@ -39,7 +39,7 @@ cleanup_temp_files () { fi } -function describe_file () { +describe_file () { mode="$1" branch="$2" file="$3" -- cgit v1.2.1 From ddc0c49753001d2b5da4df7df2d42378c8c3a295 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 09:39:59 -0400 Subject: mergetool: factor out common code Create common function check_unchanged(), save_backup() and remove_backup(). Also fix some minor whitespace issues while we're at it. Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 78 ++++++++++++++++++++++++++------------------------------ 1 file changed, 36 insertions(+), 42 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 0b843a54d..1355fcb19 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -106,12 +106,40 @@ resolve_deleted_merge () { done } +check_unchanged () { + if test "$path" -nt "$BACKUP" ; then + status=0; + else + while true; do + echo "$path seems unchanged." + printf "Was the merge successful? [y/n] " + read answer < /dev/tty + case "$answer" in + y*|Y*) status=0; break ;; + n*|N*) status=1; break ;; + esac + done + fi +} + +save_backup () { + if test "$status" -eq 0; then + mv -- "$BACKUP" "$path.orig" + fi +} + +remove_backup () { + if test "$status" -eq 0; then + rm "$BACKUP" + fi +} + merge_file () { path="$1" f=`git-ls-files -u -- "$path"` if test -z "$f" ; then - if test ! -f "$path" ; then + if test ! -f "$path" ; then echo "$path: file not found" else echo "$path: file does not need merging" @@ -167,9 +195,7 @@ merge_file () { -o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1) fi status=$? - if test "$status" -eq 0; then - rm "$BACKUP" - fi + remove_backup ;; tkdiff) if base_present ; then @@ -178,29 +204,13 @@ merge_file () { tkdiff -o "$path" -- "$LOCAL" "$REMOTE" fi status=$? - if test "$status" -eq 0; then - mv -- "$BACKUP" "$path.orig" - fi + save_backup ;; meld|vimdiff) touch "$BACKUP" $merge_tool -- "$LOCAL" "$path" "$REMOTE" - if test "$path" -nt "$BACKUP" ; then - status=0; - else - while true; do - echo "$path seems unchanged." - printf "Was the merge successful? [y/n] " - read answer < /dev/tty - case "$answer" in - y*|Y*) status=0; break ;; - n*|N*) status=1; break ;; - esac - done - fi - if test "$status" -eq 0; then - mv -- "$BACKUP" "$path.orig" - fi + check_unchanged + save_backup ;; xxdiff) touch "$BACKUP" @@ -217,22 +227,8 @@ merge_file () { -R 'Accel.SearchForward: "Ctrl-G"' \ --merged-file "$path" -- "$LOCAL" "$REMOTE" fi - if test "$path" -nt "$BACKUP" ; then - status=0; - else - while true; do - echo "$path seems unchanged." - printf "Was the merge successful? [y/n] " - read answer < /dev/tty - case "$answer" in - y*|Y*) status=0; break ;; - n*|N*) status=1; break ;; - esac - done - fi - if test "$status" -eq 0; then - mv -- "$BACKUP" "$path.orig" - fi + check_unchanged + save_backup ;; emerge) if base_present ; then @@ -241,9 +237,7 @@ merge_file () { emacs -f emerge-files-command "$LOCAL" "$REMOTE" "$path" fi status=$? - if test "$status" -eq 0; then - mv -- "$BACKUP" "$path.orig" - fi + save_backup ;; esac if test "$status" -ne 0; then -- cgit v1.2.1 From b7b36f92fd096d1ff0d4cccd8980c93c3bff4fa8 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 09:46:31 -0400 Subject: mergetool: Remove spurious error message if merge.tool config option not set Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 1355fcb19..c1fde41a0 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -280,7 +280,7 @@ done if test -z "$merge_tool"; then merge_tool=`git-config merge.tool` case "$merge_tool" in - kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff) + kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff | "") ;; # happy *) echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" -- cgit v1.2.1 From 5a174f1a2ee338172d1ca1dab4e30f5968535f2d Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 09:48:31 -0400 Subject: mergetool: Fix abort command when resolving symlinks and deleted files Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index c1fde41a0..9b736507b 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -71,13 +71,13 @@ resolve_symlink_merge () { cleanup_temp_files --save-backup return ;; - [rR]*) + [rR]*) git-checkout-index -f --stage=3 -- "$path" git-add -- "$path" cleanup_temp_files --save-backup return ;; - [qQ]*) + [aA]*) exit 1 ;; esac @@ -94,12 +94,12 @@ resolve_deleted_merge () { cleanup_temp_files --save-backup return ;; - [dD]*) + [dD]*) git-rm -- "$path" cleanup_temp_files return ;; - [qQ]*) + [aA]*) exit 1 ;; esac -- cgit v1.2.1 From 365cf979c48a52eec65f29a02a973753418396f4 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 10:03:17 -0400 Subject: mergetool: Add support for Apple Mac OS X's opendiff command Signed-off-by: Arjen Laarhoven Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 9b736507b..58794cad4 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -230,6 +230,16 @@ merge_file () { check_unchanged save_backup ;; + opendiff) + touch "$BACKUP" + if base_present; then + opendiff "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$path" | cat + else + opendiff "$LOCAL" "$REMOTE" -merge "$path" | cat + fi + check_unchanged + save_backup + ;; emerge) if base_present ; then emacs -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$path" @@ -280,7 +290,7 @@ done if test -z "$merge_tool"; then merge_tool=`git-config merge.tool` case "$merge_tool" in - kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff | "") + kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | "") ;; # happy *) echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" @@ -299,6 +309,8 @@ if test -z "$merge_tool" ; then merge_tool=xxdiff elif type meld >/dev/null 2>&1 && test -n "$DISPLAY"; then merge_tool=meld + elif type opendiff >/dev/null 2>&1; then + merge_tool=opendiff elif type emacs >/dev/null 2>&1; then merge_tool=emerge elif type vimdiff >/dev/null 2>&1; then @@ -310,7 +322,7 @@ if test -z "$merge_tool" ; then fi case "$merge_tool" in - kdiff3|tkdiff|meld|xxdiff|vimdiff) + kdiff3|tkdiff|meld|xxdiff|vimdiff|opendiff) if ! type "$merge_tool" > /dev/null 2>&1; then echo "The merge tool $merge_tool is not available" exit 1 -- cgit v1.2.1 From 1346c9996350e96c7b38a57ede5d503821d84fe3 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 10:05:02 -0400 Subject: mergetool: Make git-rm quiet when resolving a deleted file conflict Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 58794cad4..7a2b9b9f0 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -95,7 +95,7 @@ resolve_deleted_merge () { return ;; [dD]*) - git-rm -- "$path" + git-rm -- "$path" > /dev/null cleanup_temp_files return ;; -- cgit v1.2.1 From 27090aa1eabdc44553a0d8a51ff4ab9543c64c65 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 11:39:46 -0400 Subject: 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" --- git-mergetool.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 7a2b9b9f0..e62351bcb 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -44,25 +44,24 @@ describe_file () { branch="$2" file="$3" - printf " " + printf " {%s}: " "$branch" if test -z "$mode"; then - printf "'%s' was deleted" "$path" + echo "deleted" elif is_symlink "$mode" ; then - printf "'%s' is a symlink containing '%s'" "$path" "$file" + echo "a symbolic link -> '$(cat "$file")'" else if base_present; then - printf "'%s' was created" "$path" + echo "modified" else - printf "'%s' was modified" "$path" + echo "created" fi fi - echo " in the $branch branch" } resolve_symlink_merge () { while true; do - printf "Use (r)emote or (l)ocal, or (a)bort? " + printf "Use (l)ocal or (r)emote, or (a)bort? " read ans case "$ans" in [lL]*) @@ -86,10 +85,14 @@ resolve_symlink_merge () { resolve_deleted_merge () { while true; do - printf "Use (m)odified or (d)eleted file, or (a)bort? " + if base_present; then + printf "Use (m)odified or (d)eleted file, or (a)bort? " + else + printf "Use (c)reated or (d)eleted file, or (a)bort? " + fi read ans case "$ans" in - [mM]*) + [mMcC]*) git-add -- "$path" cleanup_temp_files --save-backup return @@ -164,7 +167,7 @@ merge_file () { remote_present && git cat-file blob ":3:$path" > "$REMOTE" 2>/dev/null if test -z "$local_mode" -o -z "$remote_mode"; then - echo "Deleted merge conflict for $path:" + echo "Deleted merge conflict for '$path':" describe_file "$local_mode" "local" "$LOCAL" describe_file "$remote_mode" "remote" "$REMOTE" resolve_deleted_merge @@ -172,14 +175,14 @@ merge_file () { fi if is_symlink "$local_mode" || is_symlink "$remote_mode"; then - echo "Symlink merge conflict for $path:" + echo "Symbolic link merge conflict for '$path':" describe_file "$local_mode" "local" "$LOCAL" describe_file "$remote_mode" "remote" "$REMOTE" resolve_symlink_merge return fi - echo "Normal merge conflict for $path:" + echo "Normal merge conflict for '$path':" describe_file "$local_mode" "local" "$LOCAL" describe_file "$remote_mode" "remote" "$REMOTE" printf "Hit return to start merge resolution tool (%s): " "$merge_tool" -- cgit v1.2.1