git-mergetool--lib.sh 4.13 KB
Newer Older
1
#!/bin/sh
2 3 4 5 6 7 8 9 10 11
# git-mergetool--lib is a library for common merge tool functions
diff_mode() {
	test "$TOOL_MODE" = diff
}

merge_mode() {
	test "$TOOL_MODE" = merge
}

translate_merge_tool_path () {
12
	echo "$1"
13 14 15
}

check_unchanged () {
16 17
	if test "$MERGED" -nt "$BACKUP"
	then
18 19
		status=0
	else
20 21
		while true
		do
22 23
			echo "$MERGED seems unchanged."
			printf "Was the merge successful? [y/n] "
24
			read answer || return 1
25 26 27 28 29 30 31 32
			case "$answer" in
			y*|Y*) status=0; break ;;
			n*|N*) status=1; break ;;
			esac
		done
	fi
}

33 34 35 36 37 38 39 40 41
valid_tool_config () {
	if test -n "$(get_merge_tool_cmd "$1")"
	then
		return 0
	else
		return 1
	fi
}

42
valid_tool () {
43 44 45 46
	setup_tool "$1" || valid_tool_config "$1"
}

setup_tool () {
47
	case "$1" in
48 49
	vim*|gvim*)
		tool=vim
50 51
		;;
	*)
52
		tool="$1"
53 54
		;;
	esac
55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
	mergetools="$(git --exec-path)/mergetools"

	# Load the default definitions
	. "$mergetools/defaults"
	if ! test -f "$mergetools/$tool"
	then
		return 1
	fi

	# Load the redefined functions
	. "$mergetools/$tool"

	if merge_mode && ! can_merge
	then
		echo "error: '$tool' can not be used to resolve merges" >&2
		exit 1
	elif diff_mode && ! can_diff
	then
		echo "error: '$tool' can only be used to resolve merges" >&2
		exit 1
	fi
	return 0
77 78 79
}

get_merge_tool_cmd () {
80
	# Prints the custom command for a merge tool
81
	merge_tool="$1"
82 83
	if diff_mode
	then
84
		echo "$(git config difftool.$merge_tool.cmd ||
85
			git config mergetool.$merge_tool.cmd)"
86 87 88
	else
		echo "$(git config mergetool.$merge_tool.cmd)"
	fi
89 90
}

91
# Entry point for running tools
92
run_merge_tool () {
93 94 95 96 97
	# If GIT_PREFIX is empty then we cannot use it in tools
	# that expect to be able to chdir() to its value.
	GIT_PREFIX=${GIT_PREFIX:-.}
	export GIT_PREFIX

98
	merge_tool_path="$(get_merge_tool_path "$1")" || exit
99 100 101
	base_present="$2"
	status=0

102 103 104 105 106 107 108 109 110
	# Bring tool-specific functions into scope
	setup_tool "$1"

	if merge_mode
	then
		merge_cmd "$1"
	else
		diff_cmd "$1"
	fi
111 112 113 114
	return $status
}

guess_merge_tool () {
115 116
	if merge_mode
	then
117 118 119 120
		tools="tortoisemerge"
	else
		tools="kompare"
	fi
121 122 123 124
	if test -n "$DISPLAY"
	then
		if test -n "$GNOME_DESKTOP_SESSION_ID"
		then
125 126 127 128
			tools="meld opendiff kdiff3 tkdiff xxdiff $tools"
		else
			tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
		fi
129
		tools="$tools gvimdiff diffuse ecmerge p4merge araxis bc3"
130
	fi
131 132
	case "${VISUAL:-$EDITOR}" in
	*vim*)
133
		tools="$tools vimdiff emerge"
134 135
		;;
	*)
136
		tools="$tools emerge vimdiff"
137 138
		;;
	esac
139 140 141 142 143 144
	echo >&2 "merge tool candidates: $tools"

	# Loop over each candidate and stop when a valid merge tool is found.
	for i in $tools
	do
		merge_tool_path="$(translate_merge_tool_path "$i")"
145 146
		if type "$merge_tool_path" >/dev/null 2>&1
		then
147 148
			echo "$i"
			return 0
149 150 151
		fi
	done

152 153
	echo >&2 "No known merge resolution program available."
	return 1
154 155 156 157 158
}

get_configured_merge_tool () {
	# Diff mode first tries diff.tool and falls back to merge.tool.
	# Merge mode only checks merge.tool
159 160
	if diff_mode
	then
161 162 163
		merge_tool=$(git config diff.tool || git config merge.tool)
	else
		merge_tool=$(git config merge.tool)
164
	fi
165 166
	if test -n "$merge_tool" && ! valid_tool "$merge_tool"
	then
167 168 169 170
		echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool"
		echo >&2 "Resetting to default..."
		return 1
	fi
171
	echo "$merge_tool"
172 173 174 175
}

get_merge_tool_path () {
	# A merge tool has been set, so verify that it's valid.
176
	merge_tool="$1"
177 178
	if ! valid_tool "$merge_tool"
	then
179 180 181
		echo >&2 "Unknown merge tool $merge_tool"
		exit 1
	fi
182 183
	if diff_mode
	then
184
		merge_tool_path=$(git config difftool."$merge_tool".path ||
185
				  git config mergetool."$merge_tool".path)
186 187
	else
		merge_tool_path=$(git config mergetool."$merge_tool".path)
188
	fi
189 190
	if test -z "$merge_tool_path"
	then
191
		merge_tool_path="$(translate_merge_tool_path "$merge_tool")"
192
	fi
193
	if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
194 195
		! type "$merge_tool_path" >/dev/null 2>&1
	then
196
		echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
197
			 "'$merge_tool_path'"
198 199 200 201 202 203 204
		exit 1
	fi
	echo "$merge_tool_path"
}

get_merge_tool () {
	# Check if a merge tool has been configured
205
	merge_tool="$(get_configured_merge_tool)"
206
	# Try to guess an appropriate merge tool if no tool has been set.
207 208
	if test -z "$merge_tool"
	then
209
		merge_tool="$(guess_merge_tool)" || exit
210 211 212
	fi
	echo "$merge_tool"
}