mergetools: add a plug-in to support DeltaWalker
DeltaWalker is a non-free tool popular among some users. Add a plug-in to support it from difftool and mergetool. Note that the $(pwd)/ in front of $MERGED should not be necessary. However without it, DeltaWalker crashes with a JRE exception. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Helped-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tim Henigan committed
Mar 5, 2012 at 09:28 UTC
284a126c3ef3dfedede9bc64df4cf3a24600dea5
1 file changed
+21
mergetools/deltawalker
new
+21
@@ -0,0 +1,21 @@
1
+diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
3
+}
4
+
5
+merge_cmd () {
6
+ # Adding $(pwd)/ in front of $MERGED should not be necessary.
7
+ # However without it, DeltaWalker (at least v1.9.8 on Windows)
8
+ # crashes with a JRE exception. The DeltaWalker user manual,
9
+ # shows $(pwd)/ whenever the '-merged' options is given.
10
+ # Adding it here seems to work around the problem.
11
+ if $base_present
12
+ then
13
+ "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
14
+ else
15
+ "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
16
+ fi >/dev/null 2>&1
17
+}
18
+
19
+translate_merge_tool_path() {
20
+ echo DeltaWalker
21
+}