[PATCH 7/8] mergetool: refactor git-mergetool to use run_merge_tool

From

David Aguilar <davvid@gmail.com>

Date

Mar 30, 2009, 05:03 UTC

Message-ID

<1238389428-69328-8-git-send-email-davvid@gmail.com>

In-Reply-To

<1238389428-69328-7-git-send-email-davvid@gmail.com>

This removes most of the duplicated code in git-mergetool.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 git-mergetool.sh |  106 ++----------------------------------------------------
 1 files changed, 3 insertions(+), 103 deletions(-)

diff --git a/git-mergetool.sh b/git-mergetool.sh
index ec20030..0f5033c 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -191,109 +191,9 @@ merge_file () {
 		read ans
 	fi
 
-	case "$merge_tool" in
-	kdiff3)
-		if base_present ; then
-			("$merge_tool_path" --auto \
-				--L1 "$MERGED (Base)" \
-				--L2 "$MERGED (Local)" \
-				--L3 "$MERGED (Remote)" \
-				-o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
-			 > /dev/null 2>&1)
-		else
-			("$merge_tool_path" --auto \
-				--L1 "$MERGED (Local)" \
-				--L2 "$MERGED (Remote)" \
-				-o "$MERGED" "$LOCAL" "$REMOTE" \
-			 > /dev/null 2>&1)
-		fi
-		status=$?
-		;;
-	tkdiff)
-		if base_present ; then
-			"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
-		else
-			"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
-		fi
-		status=$?
-		;;
-	meld)
-		touch "$BACKUP"
-		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
-		check_unchanged
-		;;
-	vimdiff)
-		touch "$BACKUP"
-		"$merge_tool_path" -c "wincmd l" "$LOCAL" "$MERGED" "$REMOTE"
-		check_unchanged
-		;;
-	gvimdiff)
-		touch "$BACKUP"
-		"$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$MERGED" "$REMOTE"
-		check_unchanged
-		;;
-	xxdiff)
-		touch "$BACKUP"
-		if base_present ; then
-			"$merge_tool_path" -X --show-merged-pane \
-				-R 'Accel.SaveAsMerged: "Ctrl-S"' \
-				-R 'Accel.Search: "Ctrl+F"' \
-				-R 'Accel.SearchForward: "Ctrl-G"' \
-				--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
-		else
-			"$merge_tool_path" -X --show-merged-pane \
-				-R 'Accel.SaveAsMerged: "Ctrl-S"' \
-				-R 'Accel.Search: "Ctrl+F"' \
-				-R 'Accel.SearchForward: "Ctrl-G"' \
-				--merged-file "$MERGED" "$LOCAL" "$REMOTE"
-		fi
-		check_unchanged
-		;;
-	opendiff)
-		touch "$BACKUP"
-		if base_present; then
-			"$merge_tool_path" "$LOCAL" "$REMOTE" \
-				-ancestor "$BASE" -merge "$MERGED" | cat
-		else
-			"$merge_tool_path" "$LOCAL" "$REMOTE" \
-				-merge "$MERGED" | cat
-		fi
-		check_unchanged
-		;;
-	ecmerge)
-		touch "$BACKUP"
-		if base_present; then
-			"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
-				--default --mode=merge3 --to="$MERGED"
-		else
-			"$merge_tool_path" "$LOCAL" "$REMOTE" \
-				--default --mode=merge2 --to="$MERGED"
-		fi
-		check_unchanged
-		;;
-	emerge)
-		if base_present ; then
-			"$merge_tool_path" -f emerge-files-with-ancestor-command \
-				"$LOCAL" "$REMOTE" "$BASE" "$(basename "$MERGED")"
-		else
-			"$merge_tool_path" -f emerge-files-command \
-				"$LOCAL" "$REMOTE" "$(basename "$MERGED")"
-		fi
-		status=$?
-		;;
-	*)
-		if test -n "$merge_tool_cmd"; then
-			if test "$merge_tool_trust_exit_code" = "false"; then
-				touch "$BACKUP"
-				( eval $merge_tool_cmd )
-				check_unchanged
-			else
-				( eval $merge_tool_cmd )
-				status=$?
-			fi
-		fi
-		;;
-	esac
+	run_merge_tool "$merge_tool"
+	status=$?
+
 	if test "$status" -ne 0; then
 		echo "merge of $MERGED failed" 1>&2
 		mv -- "$BACKUP" "$MERGED"

-- 
1.6.1.3