{"thread":{"id":"35649","subject":"git gui crashes ( v 1.8.5.2)","startedAt":"2014-01-14T00:14:24Z","lastAt":"2014-01-16T16:39:24Z","messageCount":6,"participants":["Benoît Bourbié","Jonathan Nieder","Max Kirillov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"233071","messageId":"CANJSc_uYm7f4LoZoMoVzcsmGrYnUy+2nXFL_cNWqQnwLb5J6mw@mail.gmail.com","threadId":"35649","inReplyTo":null,"subject":"git gui crashes ( v 1.8.5.2)","fromName":"Benoît Bourbié","fromEmail":"benoit.bourbie@gmail.com","sentAt":"2014-01-14T00:14:24Z","receivedAt":"2014-01-14T00:14:24Z","isPatch":false,"sender":{"key":"benoit.bourbie@gmail.com","avatar":null},"body":"Hello,\n\ngit gui crashes on my Linux machin since I updated it to 1.8.5.2.\n\nI had the message\nError in startup script: unknown option \"-stretch\"\n    while executing\n\".vpane.lower paneconfigure .vpane.lower.diff -stretch always\"\n    invoked from within\n\"if {$use_ttk} {\n.vpane.lower pane .vpane.lower.diff -weight 1\n.vpane.lower pane .vpane.lower.commarea -weight 0\n} else {\n.vpane.lower paneconfigure...\"\n    (file \"git/libexec/git-core/git-gui\" line 3233)\n\nSo, I reverted the change that has been made in git-gui/git-gui.sh\n(Diff and Commit Area)\n\nI replaced\n\n${NS}::panedwindow .vpane.lower -orient vertical\n${NS}::frame .vpane.lower.commarea\n${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500\n.vpane.lower add .vpane.lower.diff\n.vpane.lower add .vpane.lower.commarea\n.vpane add .vpane.lower\n\nby\n\n${NS}::frame .vpane.lower -height 300 -width 400\n${NS}::frame .vpane.lower.commarea\n${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1\npack .vpane.lower.diff -fill both -expand 1\npack .vpane.lower.commarea -side bottom -fill x\n.vpane add .vpane.lower\nif {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}\n\nand now, git gui works as expected.\n\nRegards,\n\nBenoit\n"},{"id":"233074","messageId":"20140114011141.GF18964@google.com","threadId":"35649","inReplyTo":"CANJSc_uYm7f4LoZoMoVzcsmGrYnUy+2nXFL_cNWqQnwLb5J6mw@mail.gmail.com","subject":"Re: git gui crashes ( v 1.8.5.2)","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2014-01-14T01:11:41Z","receivedAt":"2014-01-14T01:11:41Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"(just cc-ing some area experts)\nHi Benoît,\n\nBenoît Bourbié wrote:\n\n> git gui crashes on my Linux machin since I updated it to 1.8.5.2.\n\nI assume you mean \"master\" and not 1.8.5.2, since v1.8.5.2 doesn't\ninclude the change 918dbf58 (git-gui: right half window is paned,\n2013-08-21).\n\n> I had the message\n> Error in startup script: unknown option \"-stretch\"\n>     while executing\n> \".vpane.lower paneconfigure .vpane.lower.diff -stretch always\"\n>     invoked from within\n> \"if {$use_ttk} {\n> .vpane.lower pane .vpane.lower.diff -weight 1\n> .vpane.lower pane .vpane.lower.commarea -weight 0\n> } else {\n> .vpane.lower paneconfigure...\"\n>     (file \"git/libexec/git-core/git-gui\" line 3233)\n>\n> So, I reverted the change that has been made in git-gui/git-gui.sh\n> (Diff and Commit Area)\n>\n> I replaced\n>\n> ${NS}::panedwindow .vpane.lower -orient vertical\n> ${NS}::frame .vpane.lower.commarea\n> ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500\n> .vpane.lower add .vpane.lower.diff\n> .vpane.lower add .vpane.lower.commarea\n> .vpane add .vpane.lower\n>\n> by\n>\n> ${NS}::frame .vpane.lower -height 300 -width 400\n> ${NS}::frame .vpane.lower.commarea\n> ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1\n> pack .vpane.lower.diff -fill both -expand 1\n> pack .vpane.lower.commarea -side bottom -fill x\n> .vpane add .vpane.lower\n> if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}\n>\n> and now, git gui works as expected.\n\nThanks,\nJonathan\n"},{"id":"233081","messageId":"CANJSc_u-f-qZsbEQdEeDTGnmjsEf_82aJ3MXE+cpvzt5+-aPow@mail.gmail.com","threadId":"35649","inReplyTo":"20140114011141.GF18964@google.com","subject":"Re: git gui crashes ( v 1.8.5.2)","fromName":"Benoît Bourbié","fromEmail":"benoit.bourbie@gmail.com","sentAt":"2014-01-14T04:06:12Z","receivedAt":"2014-01-14T04:06:12Z","isPatch":false,"sender":{"key":"benoit.bourbie@gmail.com","avatar":null},"body":"Hello Jonathan,\n\nYes, after checking, you are absolutely right, I was on master.\n\n:)\n\n\n\nOn Mon, Jan 13, 2014 at 7:11 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:\n> (just cc-ing some area experts)\n> Hi Benoît,\n>\n> Benoît Bourbié wrote:\n>\n>> git gui crashes on my Linux machin since I updated it to 1.8.5.2.\n>\n> I assume you mean \"master\" and not 1.8.5.2, since v1.8.5.2 doesn't\n> include the change 918dbf58 (git-gui: right half window is paned,\n> 2013-08-21).\n>\n>> I had the message\n>> Error in startup script: unknown option \"-stretch\"\n>>     while executing\n>> \".vpane.lower paneconfigure .vpane.lower.diff -stretch always\"\n>>     invoked from within\n>> \"if {$use_ttk} {\n>> .vpane.lower pane .vpane.lower.diff -weight 1\n>> .vpane.lower pane .vpane.lower.commarea -weight 0\n>> } else {\n>> .vpane.lower paneconfigure...\"\n>>     (file \"git/libexec/git-core/git-gui\" line 3233)\n>>\n>> So, I reverted the change that has been made in git-gui/git-gui.sh\n>> (Diff and Commit Area)\n>>\n>> I replaced\n>>\n>> ${NS}::panedwindow .vpane.lower -orient vertical\n>> ${NS}::frame .vpane.lower.commarea\n>> ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500\n>> .vpane.lower add .vpane.lower.diff\n>> .vpane.lower add .vpane.lower.commarea\n>> .vpane add .vpane.lower\n>>\n>> by\n>>\n>> ${NS}::frame .vpane.lower -height 300 -width 400\n>> ${NS}::frame .vpane.lower.commarea\n>> ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1\n>> pack .vpane.lower.diff -fill both -expand 1\n>> pack .vpane.lower.commarea -side bottom -fill x\n>> .vpane add .vpane.lower\n>> if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}\n>>\n>> and now, git gui works as expected.\n>\n> Thanks,\n> Jonathan\n"},{"id":"233082","messageId":"20140114065014.GA29816@wheezy.local","threadId":"35649","inReplyTo":"20140114011141.GF18964@google.com","subject":"Re: git gui crashes ( v 1.8.5.2)","fromName":"Max Kirillov","fromEmail":"max@max630.net","sentAt":"2014-01-14T06:50:14Z","receivedAt":"2014-01-14T06:50:14Z","isPatch":false,"sender":{"key":"max@max630.net","avatar":"https://avatars.githubusercontent.com/u/381560?v=4"},"body":"Hi.\n\nOn Mon, Jan 13, 2014 at 05:11:41PM -0800, Jonathan Nieder wrote:\n> (just cc-ing some area experts)\n> Benoît Bourbié wrote:\n>> git gui crashes on my Linux machin since I updated it to 1.8.5.2.\n\nI believe this happens at tk8.4 or earlier. I have not\ntested it there, and according to the manpages in Internet\nthe older versions do not have the -stretch option.\n\nBefore I can find a system to test it, I think the panned\nright half should really be reverted for the older versions of\ntk. I remember it did not behave correctly without the\nstretch option.\n\nMaybe, to avoid cluttering the code, panedwindow should nit\nbe used at all without the ttk.\n\nI'll try to submit a fix today.\n\n-- \nMax\n"},{"id":"233116","messageId":"20140114235809.GA15510@wheezy.local","threadId":"35649","inReplyTo":"20140114065014.GA29816@wheezy.local","subject":"[PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4","fromName":"Max Kirillov","fromEmail":"max@max630.net","sentAt":"2014-01-14T23:58:09Z","receivedAt":"2014-01-14T23:58:09Z","isPatch":true,"sender":{"key":"max@max630.net","avatar":"https://avatars.githubusercontent.com/u/381560?v=4"},"body":"Since 918dbf58, git-gui crashes if started with Tk 8.4. The reason is that\ntk < 8.5 does not support -stretch option for panedwindow.\n\nWithout the option it's not possible to properly expand the right half -\nthe commit area is expanded, while desired behavior is to expand the diff\narea. So the whole feature should be disabled with Tk\nversion less than 8.5.\n\nSigned-off-by: Max Kirillov <max@max630.net>\n---\n git-gui/git-gui.sh | 32 +++++++++++++++++++++-----------\n 1 file changed, 21 insertions(+), 11 deletions(-)\n\ndiff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh\nindex e2e710e..147be8c 100755\n--- a/git-gui/git-gui.sh\n+++ b/git-gui/git-gui.sh\n@@ -3196,18 +3196,28 @@ unset i\n \n # -- Diff and Commit Area\n #\n-${NS}::panedwindow .vpane.lower -orient vertical\n-${NS}::frame .vpane.lower.commarea\n-${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500\n-.vpane.lower add .vpane.lower.diff\n-.vpane.lower add .vpane.lower.commarea\n-.vpane add .vpane.lower\n-if {$use_ttk} {\n-\t.vpane.lower pane .vpane.lower.diff -weight 1\n-\t.vpane.lower pane .vpane.lower.commarea -weight 0\n+if {$have_tk85} {\n+\t${NS}::panedwindow .vpane.lower -orient vertical\n+\t${NS}::frame .vpane.lower.commarea\n+\t${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500\n+\t.vpane.lower add .vpane.lower.diff\n+\t.vpane.lower add .vpane.lower.commarea\n+\t.vpane add .vpane.lower\n+\tif {$use_ttk} {\n+\t\t.vpane.lower pane .vpane.lower.diff -weight 1\n+\t\t.vpane.lower pane .vpane.lower.commarea -weight 0\n+\t} else {\n+\t\t.vpane.lower paneconfigure .vpane.lower.diff -stretch always\n+\t\t.vpane.lower paneconfigure .vpane.lower.commarea -stretch never\n+\t}\n } else {\n-\t.vpane.lower paneconfigure .vpane.lower.diff -stretch always\n-\t.vpane.lower paneconfigure .vpane.lower.commarea -stretch never\n+\tframe .vpane.lower -height 300 -width 400\n+\tframe .vpane.lower.commarea\n+\tframe .vpane.lower.diff -relief sunken -borderwidth 1\n+\tpack .vpane.lower.diff -fill both -expand 1\n+\tpack .vpane.lower.commarea -side bottom -fill x\n+\t.vpane add .vpane.lower\n+\t.vpane paneconfigure .vpane.lower -sticky nsew\n }\n \n # -- Commit Area Buttons\n-- \n1.8.4.2.1566.g3c1a064\n"},{"id":"233207","messageId":"CANJSc_uhYU7EPZ89dbEQhc8QM4e-yLj2qhQOJMQyzU-2RdZn8A@mail.gmail.com","threadId":"35649","inReplyTo":"20140114235809.GA15510@wheezy.local","subject":"Re: [PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4","fromName":"Benoît Bourbié","fromEmail":"benoit.bourbie@gmail.com","sentAt":"2014-01-16T16:39:24Z","receivedAt":"2014-01-16T16:39:24Z","isPatch":true,"sender":{"key":"benoit.bourbie@gmail.com","avatar":null},"body":"Hi All,\n\nMax, you are right, my TK version is 8.4.\nI applied the patch and it now works perfectly.\n\nThanks!!\n\nBenoît\n\nOn Tue, Jan 14, 2014 at 5:58 PM, Max Kirillov <max@max630.net> wrote:\n> Since 918dbf58, git-gui crashes if started with Tk 8.4. The reason is that\n> tk < 8.5 does not support -stretch option for panedwindow.\n>\n> Without the option it's not possible to properly expand the right half -\n> the commit area is expanded, while desired behavior is to expand the diff\n> area. So the whole feature should be disabled with Tk\n> version less than 8.5.\n>\n> Signed-off-by: Max Kirillov <max@max630.net>\n> ---\n>  git-gui/git-gui.sh | 32 +++++++++++++++++++++-----------\n>  1 file changed, 21 insertions(+), 11 deletions(-)\n>\n> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh\n> index e2e710e..147be8c 100755\n> --- a/git-gui/git-gui.sh\n> +++ b/git-gui/git-gui.sh\n> @@ -3196,18 +3196,28 @@ unset i\n>\n>  # -- Diff and Commit Area\n>  #\n> -${NS}::panedwindow .vpane.lower -orient vertical\n> -${NS}::frame .vpane.lower.commarea\n> -${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500\n> -.vpane.lower add .vpane.lower.diff\n> -.vpane.lower add .vpane.lower.commarea\n> -.vpane add .vpane.lower\n> -if {$use_ttk} {\n> -       .vpane.lower pane .vpane.lower.diff -weight 1\n> -       .vpane.lower pane .vpane.lower.commarea -weight 0\n> +if {$have_tk85} {\n> +       ${NS}::panedwindow .vpane.lower -orient vertical\n> +       ${NS}::frame .vpane.lower.commarea\n> +       ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500\n> +       .vpane.lower add .vpane.lower.diff\n> +       .vpane.lower add .vpane.lower.commarea\n> +       .vpane add .vpane.lower\n> +       if {$use_ttk} {\n> +               .vpane.lower pane .vpane.lower.diff -weight 1\n> +               .vpane.lower pane .vpane.lower.commarea -weight 0\n> +       } else {\n> +               .vpane.lower paneconfigure .vpane.lower.diff -stretch always\n> +               .vpane.lower paneconfigure .vpane.lower.commarea -stretch never\n> +       }\n>  } else {\n> -       .vpane.lower paneconfigure .vpane.lower.diff -stretch always\n> -       .vpane.lower paneconfigure .vpane.lower.commarea -stretch never\n> +       frame .vpane.lower -height 300 -width 400\n> +       frame .vpane.lower.commarea\n> +       frame .vpane.lower.diff -relief sunken -borderwidth 1\n> +       pack .vpane.lower.diff -fill both -expand 1\n> +       pack .vpane.lower.commarea -side bottom -fill x\n> +       .vpane add .vpane.lower\n> +       .vpane paneconfigure .vpane.lower -sticky nsew\n>  }\n>\n>  # -- Commit Area Buttons\n> --\n> 1.8.4.2.1566.g3c1a064\n"}]}