[PATCH] mergetools: add winmerge as a builtin tool

David Aguilar· May 12, 2015, 09:29 UTC · lore

Add a winmerge scriptlet with the commands described in [1] so that users can use winmerge without needing to perform any additional configuration.

[1] http://thread.gmane.org/gmane.comp.version-control.git/268631

Helped-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
---

Phil and Philip, can either of you test this patch in your environment so that we can add a Tested-by footer above?

 mergetools/winmerge | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 mergetools/winmerge

Show changes to mergetools/winmerge +37 −0

diff --git a/mergetools/winmerge b/mergetools/winmerge
new file mode 100644
index 0000000..c3d13b1
--- /dev/null
+++ b/mergetools/winmerge
@@ -0,0 +1,37 @@
+diff_cmd () {
+	"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
+	return 0
+}
+
+merge_cmd () {
+	# mergetool.winmerge.trustExitCode is implicitly false.
+	# touch $BACKUP so that we can check_unchanged.
+	touch "$BACKUP"
+	"$merge_tool_path" -u -e -dl Local -dr Remote \
+		"$LOCAL" "$REMOTE" "$MERGED"
+	check_unchanged
+}
+
+translate_merge_tool_path() {
+	# Use WinMergeU.exe if it exists in $PATH
+	if type WinMergeU.exe >/dev/null 2>&1
+	then
+		echo WinMergeU.exe
+		return
+	fi
+
+	# Look for WinMergeU.exe in the typical locations
+	winmerge_exe="WinMerge/WinMergeU.exe"
+	if test -n "$PROGRAMFILES" && test -x "$PROGRAMFILES/$winmerge_exe"
+	then
+		printf '%s' "$PROGRAMFILES/$winmerge_exe"
+	elif test -x "/c/Program Files (x86)/$winmerge_exe"
+	then
+		printf '%s' "/c/Program Files (x86)/$winmerge_exe"
+	elif test -x "/c/Program Files/$winmerge_exe"
+	then
+		printf '%s' "/c/Program Files/$winmerge_exe"
+	else
+		echo WinMergeU.exe
+	fi
+}

-- 
2.4.0.194.gc518059

Johannes Schindelin· May 12, 2015, 15:03 UTC · re: David Aguilar · lore

Re: [PATCH] mergetools: add winmerge as a builtin tool

Hi David,

On 2015-05-12 11:29, David Aguilar wrote:

Show 6 quoted lines

> +	# Look for WinMergeU.exe in the typical locations
> +	winmerge_exe="WinMerge/WinMergeU.exe"
> +	if test -n "$PROGRAMFILES" && test -x "$PROGRAMFILES/$winmerge_exe"
> +	then
> +		printf '%s' "$PROGRAMFILES/$winmerge_exe"
> +	elif test -x "/c/Program Files (x86)/$winmerge_exe"

At this stage you probably want to look for "$ProgramW6432" first.

Show 9 quoted lines

> +	then
> +		printf '%s' "/c/Program Files (x86)/$winmerge_exe"
> +	elif test -x "/c/Program Files/$winmerge_exe"
> +	then
> +		printf '%s' "/c/Program Files/$winmerge_exe"
> +	else
> +		echo WinMergeU.exe
> +	fi
> +}

Ciao, Johannes

patchmergetools: add winmerge as a builtin tool