[PATCH v3] mergetools: add support for DeltaWalker

Tim Henigan· Mar 3, 2012, 16:56 UTC · lore

Thanks to bc7a96a8965d, it is possible to integrate new external diff/merge tools by adding a simple shell script at mergetools/$tool.

This commit adds DeltaWalker support.

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---

Changes in v3:
  - Changed script file name to lowercase to match others in mergetools
  - Added 'translate_merge_tool_path' to deal with difference between
    script file name and the actual name of the tool.

Changes in v2:
  - reworded the commit message
  - moved >/dev/null redirect to after the final fi statement
  - removed the 'status=$?' line at the end of merge_cmd()

Tested with DeltaWalker v1.9.8 on Ubuntu 11.10 and msysgit on Win7.

 mergetools/deltawalker |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 mergetools/deltawalker

Show changes to mergetools/deltawalker +16 −0

diff --git a/mergetools/deltawalker b/mergetools/deltawalker
new file mode 100644
index 0000000..aba2130
--- /dev/null
+++ b/mergetools/deltawalker
@@ -0,0 +1,16 @@
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$PWD/$MERGED"
+	else
+		"$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$PWD/$MERGED"
+	fi >/dev/null 2>&1
+}
+
+translate_merge_tool_path() {
+	echo DeltaWalker
+}

-- 
1.7.9.GIT

v3mergetools: add support for DeltaWalker