[thirdparty/git.git] / git-mergetool.sh

#!/bin/sh
#
# This program resolves merge conflicts in git
#
# Copyright (c) 2006 Theodore Y. Ts'o
#
# This file is licensed under the GPL v2, or a later version
# at the discretion of Junio C Hamano.
#

USAGE='[--tool=tool] [-y|--no-prompt|--prompt] [file to merge] ...'
SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
. git-sh-setup
require_work_tree
prefix=$(git rev-parse --show-prefix)

# Returns true if the mode reflects a symlink
is_symlink () {
    test "$1" = 120000
}

local_present () {
    test -n "$local_mode"
}

remote_present () {
    test -n "$remote_mode"
}

base_present () {
    test -n "$base_mode"
}

cleanup_temp_files () {
    if test "$1" = --save-backup ; then
	mv -- "$BACKUP" "$MERGED.orig"
	rm -f -- "$LOCAL" "$REMOTE" "$BASE"
    else
	rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
    fi
}

describe_file () {
    mode="$1"
    branch="$2"
    file="$3"

    printf "  {%s}: " "$branch"
    if test -z "$mode"; then
	echo "deleted"
    elif is_symlink "$mode" ; then
	echo "a symbolic link -> '$(cat "$file")'"
    else
	if base_present; then
	    echo "modified"
	else
	    echo "created"
	fi
    fi
}


resolve_symlink_merge () {
    while true; do
	printf "Use (l)ocal or (r)emote, or (a)bort? "
	read ans
	case "$ans" in
	    [lL]*)
		git checkout-index -f --stage=2 -- "$MERGED"
		git add -- "$MERGED"
		cleanup_temp_files --save-backup
		return
		;;
	    [rR]*)
		git checkout-index -f --stage=3 -- "$MERGED"
		git add -- "$MERGED"
		cleanup_temp_files --save-backup
		return
		;;
	    [aA]*)
		exit 1
		;;
	    esac
	done
}

resolve_deleted_merge () {
    while true; do
	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
	    [mMcC]*)
		git add -- "$MERGED"
		cleanup_temp_files --save-backup
		return
		;;
	    [dD]*)
		git rm -- "$MERGED" > /dev/null
		cleanup_temp_files
		return
		;;
	    [aA]*)
		exit 1
		;;
	    esac
	done
}

check_unchanged () {
    if test "$MERGED" -nt "$BACKUP" ; then
	status=0;
    else
	while true; do
	    echo "$MERGED 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
}

merge_file () {
    MERGED="$1"

    f=`git ls-files -u -- "$MERGED"`
    if test -z "$f" ; then
	if test ! -f "$MERGED" ; then
	    echo "$MERGED: file not found"
	else
	    echo "$MERGED: file does not need merging"
	fi
	exit 1
    fi

    ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')"
    BACKUP="./$MERGED.BACKUP.$ext"
    LOCAL="./$MERGED.LOCAL.$ext"
    REMOTE="./$MERGED.REMOTE.$ext"
    BASE="./$MERGED.BASE.$ext"

    mv -- "$MERGED" "$BACKUP"
    cp -- "$BACKUP" "$MERGED"

    base_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}'`
    local_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}'`
    remote_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}'`

    base_present   && git cat-file blob ":1:$prefix$MERGED" >"$BASE" 2>/dev/null
    local_present  && git cat-file blob ":2:$prefix$MERGED" >"$LOCAL" 2>/dev/null
    remote_present && git cat-file blob ":3:$prefix$MERGED" >"$REMOTE" 2>/dev/null

    if test -z "$local_mode" -o -z "$remote_mode"; then
	echo "Deleted merge conflict for '$MERGED':"
	describe_file "$local_mode" "local" "$LOCAL"
	describe_file "$remote_mode" "remote" "$REMOTE"
	resolve_deleted_merge
	return
    fi

    if is_symlink "$local_mode" || is_symlink "$remote_mode"; then
	echo "Symbolic link merge conflict for '$MERGED':"
	describe_file "$local_mode" "local" "$LOCAL"
	describe_file "$remote_mode" "remote" "$REMOTE"
	resolve_symlink_merge
	return
    fi

    echo "Normal merge conflict for '$MERGED':"
    describe_file "$local_mode" "local" "$LOCAL"
    describe_file "$remote_mode" "remote" "$REMOTE"
    if "$prompt" = true; then
	printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
	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|vimdiff)
	    touch "$BACKUP"
	    "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
	    check_unchanged
	    ;;
	gvimdiff)
	    touch "$BACKUP"
	    "$merge_tool_path" -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
    if test "$status" -ne 0; then
	echo "merge of $MERGED failed" 1>&2
	mv -- "$BACKUP" "$MERGED"
	exit 1
    fi

    if test "$merge_keep_backup" = "true"; then
	mv -- "$BACKUP" "$MERGED.orig"
    else
	rm -- "$BACKUP"
    fi

    git add -- "$MERGED"
    cleanup_temp_files
}

prompt=$(git config --bool mergetool.prompt || echo true)

while test $# != 0
do
    case "$1" in
	-t|--tool*)
	    case "$#,$1" in
		*,*=*)
		    merge_tool=`expr "z$1" : 'z-[^=]*=\(.*\)'`
		    ;;
		1,*)
		    usage ;;
		*)
		    merge_tool="$2"
		    shift ;;
	    esac
	    ;;
	-y|--no-prompt)
	    prompt=false
	    ;;
	--prompt)
	    prompt=true
	    ;;
	--)
	    break
	    ;;
	-*)
	    usage
	    ;;
	*)
	    break
	    ;;
    esac
    shift
done

valid_custom_tool()
{
    merge_tool_cmd="$(git config mergetool.$1.cmd)"
    test -n "$merge_tool_cmd"
}

valid_tool() {
	case "$1" in
		kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
			;; # happy
		*)
			if ! valid_custom_tool "$1"; then
				return 1
			fi
			;;
	esac
}

init_merge_tool_path() {
	merge_tool_path=`git config mergetool.$1.path`
	if test -z "$merge_tool_path" ; then
		case "$1" in
			emerge)
				merge_tool_path=emacs
				;;
			*)
				merge_tool_path=$1
				;;
		esac
	fi
}


if test -z "$merge_tool"; then
    merge_tool=`git config merge.tool`
    if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then
	    echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
	    echo >&2 "Resetting to default..."
	    unset merge_tool
    fi
fi

if test -z "$merge_tool" ; then
    if test -n "$DISPLAY"; then
        merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"
        if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
            merge_tool_candidates="meld $merge_tool_candidates"
        fi
        if test "$KDE_FULL_SESSION" = "true"; then
            merge_tool_candidates="kdiff3 $merge_tool_candidates"
        fi
    fi
    if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
        merge_tool_candidates="$merge_tool_candidates emerge"
    fi
    if echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then
        merge_tool_candidates="$merge_tool_candidates vimdiff"
    fi
    merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff"
    echo "merge tool candidates: $merge_tool_candidates"
    for i in $merge_tool_candidates; do
        init_merge_tool_path $i
        if type "$merge_tool_path" > /dev/null 2>&1; then
            merge_tool=$i
            break
        fi
    done
    if test -z "$merge_tool" ; then
	echo "No known merge resolution program available."
	exit 1
    fi
else
    if ! valid_tool "$merge_tool"; then
        echo >&2 "Unknown merge_tool $merge_tool"
        exit 1
    fi

    init_merge_tool_path "$merge_tool"

    merge_keep_backup="$(git config --bool merge.keepBackup || echo true)"

    if test -z "$merge_tool_cmd" && ! type "$merge_tool_path" > /dev/null 2>&1; then
        echo "The merge tool $merge_tool is not available as '$merge_tool_path'"
        exit 1
    fi

    if ! test -z "$merge_tool_cmd"; then
        merge_tool_trust_exit_code="$(git config --bool mergetool.$merge_tool.trustExitCode || echo false)"
    fi
fi


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