{"thread":{"id":"46201","subject":"[PATCH] mergetools/meld: improve backwards-compatibiilty when using \"--output\"","startedAt":"2017-06-17T10:25:04Z","lastAt":"2017-06-19T01:02:32Z","messageCount":6,"participants":["David Aguilar","Samuel Lijin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"322499","messageId":"20170617102454.2040-1-davvid@gmail.com","threadId":"46201","inReplyTo":null,"subject":"[PATCH] mergetools/meld: improve backwards-compatibiilty when using \"--output\"","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2017-06-17T10:24:54Z","receivedAt":"2017-06-17T10:25:04Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Meld 3.16.0 requires a \"=\" in the --output argument, as it uses\na simple hand-rolled command-line parser.\n\nNewer versions of Meld (3.16.4, and possibly earlier) use\noptpaarse, which accepts either \"--output \" or\n\"--output=\".\n\nUse \"--output=\" for better compatibility.\n\nSigned-off-by: David Aguilar \n---\n mergetools/meld | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/mergetools/meld b/mergetools/meld\nindex bc178e8882..7a08470f88 100644\n--- a/mergetools/meld\n+++ b/mergetools/meld\n@@ -10,7 +10,7 @@ merge_cmd () {\n \n \tif test \"$meld_has_output_option\" = true\n \tthen\n-\t\t\"$merge_tool_path\" --output \"$MERGED\" \\\n+\t\t\"$merge_tool_path\" --output=\"$MERGED\" \\\n \t\t\t\"$LOCAL\" \"$BASE\" \"$REMOTE\"\n \telse\n \t\t\"$merge_tool_path\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n-- \n2.13.1.453.gc0395165f3\n\n"},{"id":"322505","messageId":"CAJZjrdX=8DbRTsdJ+bH5BABJG0m=y2QpT8C4kFviUsxVqVLVLg@mail.gmail.com","threadId":"46201","inReplyTo":"20170617102454.2040-1-davvid@gmail.com","subject":"Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using \"--output\"","fromName":"Samuel Lijin","fromEmail":"sxlijin@gmail.com","sentAt":"2017-06-17T14:11:36Z","receivedAt":"2017-06-17T14:12:22Z","isPatch":true,"sender":{"key":"sxlijin@gmail.com","avatar":"https://gravatar.com/avatar/01777bf1eae64e2b4dca97dcac182a6abbcf6fd8cb4d5b8fa33edf9f8cc21746?d=mp&s=160"},"body":"On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote:\n> Meld 3.16.0 requires a \"=\" in the --output argument, as it uses\n> a simple hand-rolled command-line parser.\n>\n> Newer versions of Meld (3.16.4, and possibly earlier) use\n> optpaarse, which accepts either \"--output \" or\n> \"--output=\".\n\nDo older versions also support both?\n\n> Use \"--output=\" for better compatibility.\n>\n> Signed-off-by: David Aguilar \n> ---\n> mergetools/meld | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/mergetools/meld b/mergetools/meld\n> index bc178e8882..7a08470f88 100644\n> --- a/mergetools/meld\n> +++ b/mergetools/meld\n> @@ -10,7 +10,7 @@ merge_cmd () {\n>\n> if test \"$meld_has_output_option\" = true\n> then\n> - \"$merge_tool_path\" --output \"$MERGED\" \\\n> + \"$merge_tool_path\" --output=\"$MERGED\" \\\n> \"$LOCAL\" \"$BASE\" \"$REMOTE\"\n> else\n> \"$merge_tool_path\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n> --\n> 2.13.1.453.gc0395165f3\n>\n"},{"id":"322516","messageId":"20170618074603.epf3vhsi4pevg6jn@gmail.com","threadId":"46201","inReplyTo":"CAJZjrdX=8DbRTsdJ+bH5BABJG0m=y2QpT8C4kFviUsxVqVLVLg@mail.gmail.com","subject":"Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using \"--output\"","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2017-06-18T07:46:03Z","receivedAt":"2017-06-18T07:46:13Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote:\n> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote:\n> > Meld 3.16.0 requires a \"=\" in the --output argument, as it uses\n> > a simple hand-rolled command-line parser.\n> >\n> > Newer versions of Meld (3.16.4, and possibly earlier) use\n> > optpaarse, which accepts either \"--output \" or\n> > \"--output=\".\n\nJunio, there's an optpaarse -> optparse typo in the commit message\nhere in case you want to fix that up.\n\n> \n> Do older versions also support both?\n\nNo. When the \"--output\" option was first added (3.16.0, or possibly\nearlier) it used the simpler parser that does not undertand the\n\"--output \" form.\n\nMuch older versions didn't support \"--output\" at all, so we don't have\nto worry about them since we already use the \"--output\" flag\nselectively based on whether or not it's supported.\n-- \nDavid\n"},{"id":"322519","messageId":"CAJZjrdVU7h6RCd7K2hwFbZfo-6ifiKeh3dYdz7bdNzaPzCRXCg@mail.gmail.com","threadId":"46201","inReplyTo":"20170618074603.epf3vhsi4pevg6jn@gmail.com","subject":"Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using \"--output\"","fromName":"Samuel Lijin","fromEmail":"sxlijin@gmail.com","sentAt":"2017-06-18T09:11:48Z","receivedAt":"2017-06-18T09:12:35Z","isPatch":true,"sender":{"key":"sxlijin@gmail.com","avatar":"https://gravatar.com/avatar/01777bf1eae64e2b4dca97dcac182a6abbcf6fd8cb4d5b8fa33edf9f8cc21746?d=mp&s=160"},"body":"On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar wrote:\n> On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote:\n>> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote:\n>> > Meld 3.16.0 requires a \"=\" in the --output argument, as it uses\n>> > a simple hand-rolled command-line parser.\n>> >\n>> > Newer versions of Meld (3.16.4, and possibly earlier) use\n>> > optpaarse, which accepts either \"--output \" or\n>> > \"--output=\".\n>\n> Junio, there's an optpaarse -> optparse typo in the commit message\n> here in case you want to fix that up.\n>\n>>\n>> Do older versions also support both?\n>\n> No. When the \"--output\" option was first added (3.16.0, or possibly\n> earlier) it used the simpler parser that does not undertand the\n> \"--output \" form.\n>\n> Much older versions didn't support \"--output\" at all, so we don't have\n> to worry about them since we already use the \"--output\" flag\n> selectively based on whether or not it's supported.\n\nIt sounds like this patch would break versions of Meld that use the\nhand-rolled parser, then.\n"},{"id":"322534","messageId":"20170619001701.gvyjdrohsv7scshc@gmail.com","threadId":"46201","inReplyTo":"CAJZjrdVU7h6RCd7K2hwFbZfo-6ifiKeh3dYdz7bdNzaPzCRXCg@mail.gmail.com","subject":"Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using \"--output\"","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2017-06-19T00:17:01Z","receivedAt":"2017-06-19T00:17:12Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote:\n> On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar wrote:\n> > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote:\n> >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote:\n> >> > Meld 3.16.0 requires a \"=\" in the --output argument, as it uses\n> >> > a simple hand-rolled command-line parser.\n> >> >\n> >> > Newer versions of Meld (3.16.4, and possibly earlier) use\n> >> > optpaarse, which accepts either \"--output \" or\n> >> > \"--output=\".\n> >\n> > Junio, there's an optpaarse -> optparse typo in the commit message\n> > here in case you want to fix that up.\n> >\n> >>\n> >> Do older versions also support both?\n> >\n> > No. When the \"--output\" option was first added (3.16.0, or possibly\n> > earlier) it used the simpler parser that does not undertand the\n> > \"--output \" form.\n> >\n> > Much older versions didn't support \"--output\" at all, so we don't have\n> > to worry about them since we already use the \"--output\" flag\n> > selectively based on whether or not it's supported.\n> \n> It sounds like this patch would break versions of Meld that use the\n> hand-rolled parser, then.\n\nI don't think so.\n\nThe whole point of this patch is to make it compatible with the\nhand-rolled parser.\n\nBefore the patch:\n\n\t--output \n\nAfter the patch:\n\n\t--output=\n\n\nThe form with \"=\" (the latter one) is the one that's maximally\ncompatible.\n\nPlease re-read the commit message and patch to verify that this is\nindeed true.\n-- \nDavid\n"},{"id":"322536","messageId":"CAJZjrdWYUV88Ob1pB+yNLKKG22Xr+qCH3Ft06p8ne7x0hkwR5g@mail.gmail.com","threadId":"46201","inReplyTo":"20170619001701.gvyjdrohsv7scshc@gmail.com","subject":"Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using \"--output\"","fromName":"Samuel Lijin","fromEmail":"sxlijin@gmail.com","sentAt":"2017-06-19T01:01:45Z","receivedAt":"2017-06-19T01:02:32Z","isPatch":true,"sender":{"key":"sxlijin@gmail.com","avatar":"https://gravatar.com/avatar/01777bf1eae64e2b4dca97dcac182a6abbcf6fd8cb4d5b8fa33edf9f8cc21746?d=mp&s=160"},"body":"On Sun, Jun 18, 2017 at 8:17 PM, David Aguilar wrote:\n> On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote:\n>> On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar wrote:\n>> > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote:\n>> >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote:\n>> >> > Meld 3.16.0 requires a \"=\" in the --output argument, as it uses\n>> >> > a simple hand-rolled command-line parser.\n>> >> >\n>> >> > Newer versions of Meld (3.16.4, and possibly earlier) use\n>> >> > optpaarse, which accepts either \"--output \" or\n>> >> > \"--output=\".\n>> >\n>> > Junio, there's an optpaarse -> optparse typo in the commit message\n>> > here in case you want to fix that up.\n>> >\n>> >>\n>> >> Do older versions also support both?\n>> >\n>> > No. When the \"--output\" option was first added (3.16.0, or possibly\n>> > earlier) it used the simpler parser that does not undertand the\n>> > \"--output \" form.\n>> >\n>> > Much older versions didn't support \"--output\" at all, so we don't have\n>> > to worry about them since we already use the \"--output\" flag\n>> > selectively based on whether or not it's supported.\n>>\n>> It sounds like this patch would break versions of Meld that use the\n>> hand-rolled parser, then.\n>\n> I don't think so.\n>\n> The whole point of this patch is to make it compatible with the\n> hand-rolled parser.\n>\n> Before the patch:\n>\n> --output \n>\n> After the patch:\n>\n> --output=\n>\n>\n> The form with \"=\" (the latter one) is the one that's maximally\n> compatible.\n>\n> Please re-read the commit message and patch to verify that this is\n> indeed true.\n\nWhoops, sorry, yes, you're right. It does still sound like there are\nsome versions of Meld in the middle that rely on \"--output \"\nthough, that this does break.\n"}]}