{"thread":{"id":"29841","subject":"[PATCH v4] mergetools: add a plug-in to support DeltaWalker","startedAt":"2012-03-05T14:28:07Z","lastAt":"2012-03-05T17:34:01Z","messageCount":2,"participants":["Tim Henigan","Junio C Hamano"],"isPatch":true,"patchVersion":4,"patchTotal":null},"messages":[{"id":"186117","messageId":"1330957687-4313-1-git-send-email-tim.henigan@gmail.com","threadId":"29841","inReplyTo":null,"subject":"[PATCH v4] mergetools: add a plug-in to support DeltaWalker","fromName":"Tim Henigan","fromEmail":"tim.henigan@gmail.com","sentAt":"2012-03-05T14:28:07Z","receivedAt":"2012-03-05T14:28:07Z","isPatch":true,"sender":{"key":"tim.henigan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42022?v=4"},"body":"DeltaWalker is a non-free tool popular among some users.  Add a\nplug-in to support it from difftool and mergetool.\n\nNote that the $(pwd)/ in front of $MERGED should not be necessary.\nHowever without it, DeltaWalker crashes with a JRE exception.\n\nSigned-off-by: Tim Henigan <tim.henigan@gmail.com>\nHelped-by: David Aguilar <davvid@gmail.com>\n---\n\nChanges in v4:\n - Changed all $PWD to $(pwd)\n - Added comment indicating why $MERGED is prefixed with $(pwd)/\n - Reworded commit message based on feedback from Junio Hamano\n - Added 'Helped-by: David Aguilar' to commit message\n\nChanges in v3:\n - Changed script file name to lowercase to match others in mergetools\n - Added 'translate_merge_tool_path' to deal with difference between\n  script file name and the actual name of the tool.\n\nChanges in v2:\n - reworded the commit message\n - moved >/dev/null redirect to after the final fi statement\n - removed the 'status=$?' line at the end of merge_cmd()\n\nTested with DeltaWalker v1.9.8 on Ubuntu 11.10 and msysgit on Win7.\n\n\n mergetools/deltawalker |   21 +++++++++++++++++++++\n 1 file changed, 21 insertions(+)\n create mode 100644 mergetools/deltawalker\n\ndiff --git a/mergetools/deltawalker b/mergetools/deltawalker\nnew file mode 100644\nindex 0000000..b3c71b6\n--- /dev/null\n+++ b/mergetools/deltawalker\n@@ -0,0 +1,21 @@\n+diff_cmd () {\n+\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" >/dev/null 2>&1\n+}\n+\n+merge_cmd () {\n+\t# Adding $(pwd)/ in front of $MERGED should not be necessary.\n+\t# However without it, DeltaWalker (at least v1.9.8 on Windows)\n+\t# crashes with a JRE exception.  The DeltaWalker user manual,\n+\t# shows $(pwd)/ whenever the '-merged' options is given.\n+\t# Adding it here seems to work around the problem.\n+\tif $base_present\n+\tthen\n+\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" -merged=\"$(pwd)/$MERGED\"\n+\telse\n+\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" -merged=\"$(pwd)/$MERGED\"\n+\tfi >/dev/null 2>&1\n+}\n+\n+translate_merge_tool_path() {\n+\techo DeltaWalker\n+}\n-- \n1.7.9.2.334.g79716\n"},{"id":"186127","messageId":"7vvcmj0x6e.fsf@alter.siamese.dyndns.org","threadId":"29841","inReplyTo":"1330957687-4313-1-git-send-email-tim.henigan@gmail.com","subject":"Re: [PATCH v4] mergetools: add a plug-in to support DeltaWalker","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-05T17:34:01Z","receivedAt":"2012-03-05T17:34:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks, will replace the version in 'pu' and advance it to 'next'.\nLet's get this in before 1.7.10-rc0.\n"}]}