* [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output" @ 2017-06-17 10:24 David Aguilar 2017-06-17 14:11 ` Samuel Lijin 0 siblings, 1 reply; 6+ messages in thread From: David Aguilar @ 2017-06-17 10:24 UTC (permalink / raw) To: Junio C Hamano; +Cc: Git Mailing List, Matthew Groth, Samuel Lijin Meld 3.16.0 requires a "=" in the --output argument, as it uses a simple hand-rolled command-line parser. Newer versions of Meld (3.16.4, and possibly earlier) use optpaarse, which accepts either "--output <file>" or "--output=<file>". Use "--output=<file>" for better compatibility. Signed-off-by: David Aguilar <davvid@gmail.com> --- mergetools/meld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mergetools/meld b/mergetools/meld index bc178e8882..7a08470f88 100644 --- a/mergetools/meld +++ b/mergetools/meld @@ -10,7 +10,7 @@ merge_cmd () { if test "$meld_has_output_option" = true then - "$merge_tool_path" --output "$MERGED" \ + "$merge_tool_path" --output="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" -- 2.13.1.453.gc0395165f3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output" 2017-06-17 10:24 [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output" David Aguilar @ 2017-06-17 14:11 ` Samuel Lijin 2017-06-18 7:46 ` David Aguilar 0 siblings, 1 reply; 6+ messages in thread From: Samuel Lijin @ 2017-06-17 14:11 UTC (permalink / raw) To: David Aguilar; +Cc: Junio C Hamano, Git Mailing List, Matthew Groth On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <davvid@gmail.com> wrote: > Meld 3.16.0 requires a "=" in the --output argument, as it uses > a simple hand-rolled command-line parser. > > Newer versions of Meld (3.16.4, and possibly earlier) use > optpaarse, which accepts either "--output <file>" or > "--output=<file>". Do older versions also support both? > Use "--output=<file>" for better compatibility. > > Signed-off-by: David Aguilar <davvid@gmail.com> > --- > mergetools/meld | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mergetools/meld b/mergetools/meld > index bc178e8882..7a08470f88 100644 > --- a/mergetools/meld > +++ b/mergetools/meld > @@ -10,7 +10,7 @@ merge_cmd () { > > if test "$meld_has_output_option" = true > then > - "$merge_tool_path" --output "$MERGED" \ > + "$merge_tool_path" --output="$MERGED" \ > "$LOCAL" "$BASE" "$REMOTE" > else > "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" > -- > 2.13.1.453.gc0395165f3 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output" 2017-06-17 14:11 ` Samuel Lijin @ 2017-06-18 7:46 ` David Aguilar 2017-06-18 9:11 ` Samuel Lijin 0 siblings, 1 reply; 6+ messages in thread From: David Aguilar @ 2017-06-18 7:46 UTC (permalink / raw) To: Samuel Lijin; +Cc: Junio C Hamano, Git Mailing List, Matthew Groth On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: > On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <davvid@gmail.com> wrote: > > Meld 3.16.0 requires a "=" in the --output argument, as it uses > > a simple hand-rolled command-line parser. > > > > Newer versions of Meld (3.16.4, and possibly earlier) use > > optpaarse, which accepts either "--output <file>" or > > "--output=<file>". Junio, there's an optpaarse -> optparse typo in the commit message here in case you want to fix that up. > > Do older versions also support both? No. When the "--output" option was first added (3.16.0, or possibly earlier) it used the simpler parser that does not undertand the "--output <filename>" form. Much older versions didn't support "--output" at all, so we don't have to worry about them since we already use the "--output" flag selectively based on whether or not it's supported. -- David ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output" 2017-06-18 7:46 ` David Aguilar @ 2017-06-18 9:11 ` Samuel Lijin 2017-06-19 0:17 ` David Aguilar 0 siblings, 1 reply; 6+ messages in thread From: Samuel Lijin @ 2017-06-18 9:11 UTC (permalink / raw) To: David Aguilar; +Cc: Junio C Hamano, Git Mailing List, Matthew Groth On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar <davvid@gmail.com> wrote: > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <davvid@gmail.com> wrote: >> > Meld 3.16.0 requires a "=" in the --output argument, as it uses >> > a simple hand-rolled command-line parser. >> > >> > Newer versions of Meld (3.16.4, and possibly earlier) use >> > optpaarse, which accepts either "--output <file>" or >> > "--output=<file>". > > Junio, there's an optpaarse -> optparse typo in the commit message > here in case you want to fix that up. > >> >> Do older versions also support both? > > No. When the "--output" option was first added (3.16.0, or possibly > earlier) it used the simpler parser that does not undertand the > "--output <filename>" form. > > Much older versions didn't support "--output" at all, so we don't have > to worry about them since we already use the "--output" flag > selectively based on whether or not it's supported. It sounds like this patch would break versions of Meld that use the hand-rolled parser, then. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output" 2017-06-18 9:11 ` Samuel Lijin @ 2017-06-19 0:17 ` David Aguilar 2017-06-19 1:01 ` Samuel Lijin 0 siblings, 1 reply; 6+ messages in thread From: David Aguilar @ 2017-06-19 0:17 UTC (permalink / raw) To: Samuel Lijin; +Cc: Junio C Hamano, Git Mailing List, Matthew Groth On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote: > On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar <davvid@gmail.com> wrote: > > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: > >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <davvid@gmail.com> wrote: > >> > Meld 3.16.0 requires a "=" in the --output argument, as it uses > >> > a simple hand-rolled command-line parser. > >> > > >> > Newer versions of Meld (3.16.4, and possibly earlier) use > >> > optpaarse, which accepts either "--output <file>" or > >> > "--output=<file>". > > > > Junio, there's an optpaarse -> optparse typo in the commit message > > here in case you want to fix that up. > > > >> > >> Do older versions also support both? > > > > No. When the "--output" option was first added (3.16.0, or possibly > > earlier) it used the simpler parser that does not undertand the > > "--output <filename>" form. > > > > Much older versions didn't support "--output" at all, so we don't have > > to worry about them since we already use the "--output" flag > > selectively based on whether or not it's supported. > > It sounds like this patch would break versions of Meld that use the > hand-rolled parser, then. I don't think so. The whole point of this patch is to make it compatible with the hand-rolled parser. Before the patch: --output <filename> After the patch: --output=<filename> The form with "=" (the latter one) is the one that's maximally compatible. Please re-read the commit message and patch to verify that this is indeed true. -- David ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output" 2017-06-19 0:17 ` David Aguilar @ 2017-06-19 1:01 ` Samuel Lijin 0 siblings, 0 replies; 6+ messages in thread From: Samuel Lijin @ 2017-06-19 1:01 UTC (permalink / raw) To: David Aguilar; +Cc: Junio C Hamano, Git Mailing List, Matthew Groth On Sun, Jun 18, 2017 at 8:17 PM, David Aguilar <davvid@gmail.com> wrote: > On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote: >> On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar <davvid@gmail.com> wrote: >> > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: >> >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <davvid@gmail.com> wrote: >> >> > Meld 3.16.0 requires a "=" in the --output argument, as it uses >> >> > a simple hand-rolled command-line parser. >> >> > >> >> > Newer versions of Meld (3.16.4, and possibly earlier) use >> >> > optpaarse, which accepts either "--output <file>" or >> >> > "--output=<file>". >> > >> > Junio, there's an optpaarse -> optparse typo in the commit message >> > here in case you want to fix that up. >> > >> >> >> >> Do older versions also support both? >> > >> > No. When the "--output" option was first added (3.16.0, or possibly >> > earlier) it used the simpler parser that does not undertand the >> > "--output <filename>" form. >> > >> > Much older versions didn't support "--output" at all, so we don't have >> > to worry about them since we already use the "--output" flag >> > selectively based on whether or not it's supported. >> >> It sounds like this patch would break versions of Meld that use the >> hand-rolled parser, then. > > I don't think so. > > The whole point of this patch is to make it compatible with the > hand-rolled parser. > > Before the patch: > > --output <filename> > > After the patch: > > --output=<filename> > > > The form with "=" (the latter one) is the one that's maximally > compatible. > > Please re-read the commit message and patch to verify that this is > indeed true. Whoops, sorry, yes, you're right. It does still sound like there are some versions of Meld in the middle that rely on "--output <filename>" though, that this does break. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-06-19 1:02 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-06-17 10:24 [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output" David Aguilar 2017-06-17 14:11 ` Samuel Lijin 2017-06-18 7:46 ` David Aguilar 2017-06-18 9:11 ` Samuel Lijin 2017-06-19 0:17 ` David Aguilar 2017-06-19 1:01 ` Samuel Lijin
Code repositories for project(s) associated with this public inbox https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).