Re: [PATCH v2] mergetools: add support for DeltaWalker
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 5, 2012, 02:38 UTC
- Message-ID
- <7v399n7ox8.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <CAJDDKr6toChs8KpnAbjxeemBZT1AT1Uk9Ajk7DWBREuM6yFMzg@mail.gmail.com>
David Aguilar <davvid@gmail.com> writes:
> Can you mention this in a comment so that someone doesn't copy/paste > it into another tool in the future?
Ok, I think the result should look like this, but could you fill in the details in the below?
-- >8 -- From: Tim Henigan <tim.henigan@gmail.com> Date: Sat, 3 Mar 2012 11:56:34 -0500 Subject: [PATCH] mergetools: add a plug-in to support DeltaWalker
DeltaWalker is a non-free tool that is popular among xxxxxxx users. Add a plug-in to support it from difftool and mergetool.
Note that $(pwd)/ in front of $MERGED shouldn't be necessary, but without it, DeltaWalker crashes with an JRE exception.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Helped-by: David Aguilar Signed-off-by: Junio C Hamano <gitster@pobox.com> --- mergetools/deltawalker | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 mergetools/deltawalker
diff --git a/mergetools/deltawalker b/mergetools/deltawalker new file mode 100644 index 0000000..f8631f2 --- /dev/null +++ b/mergetools/deltawalker @@ -0,0 +1,19 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 +} + +merge_cmd () { + # The $(pwd)/ in front of $MERGED should not be necessary but + # DeltaWalker (at least ver XXX) crashes with a JRE exception + # and the $(pwd)/ seems to work around it. + 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.2.390.g8f827