{"thread":{"id":"29823","subject":"[PATCH v3] mergetools: add support for DeltaWalker","startedAt":"2012-03-03T16:56:34Z","lastAt":"2012-03-03T16:56:34Z","messageCount":1,"participants":["Tim Henigan"],"isPatch":true,"patchVersion":3,"patchTotal":null},"messages":[{"id":"185995","messageId":"1330793794-5376-1-git-send-email-tim.henigan@gmail.com","threadId":"29823","inReplyTo":null,"subject":"[PATCH v3] mergetools: add support for DeltaWalker","fromName":"Tim Henigan","fromEmail":"tim.henigan@gmail.com","sentAt":"2012-03-03T16:56:34Z","receivedAt":"2012-03-03T16:56:34Z","isPatch":true,"sender":{"key":"tim.henigan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42022?v=4"},"body":"Thanks to bc7a96a8965d, it is possible to integrate new external\ndiff/merge tools by adding a simple shell script at mergetools/$tool.\n\nThis commit adds DeltaWalker support.\n\nSigned-off-by: Tim Henigan <tim.henigan@gmail.com>\n---\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 |   16 ++++++++++++++++\n 1 file changed, 16 insertions(+)\n create mode 100644 mergetools/deltawalker\n\ndiff --git a/mergetools/deltawalker b/mergetools/deltawalker\nnew file mode 100644\nindex 0000000..aba2130\n--- /dev/null\n+++ b/mergetools/deltawalker\n@@ -0,0 +1,16 @@\n+diff_cmd () {\n+\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" >/dev/null 2>&1\n+}\n+\n+merge_cmd () {\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.GIT\n"}]}