Re: git gui crashes ( v 1.8.5.2)

2014-01-13 Thread Jonathan Nieder 
(just cc-ing some area experts)
Hi Benoît,

Benoît Bourbié wrote:

 git gui crashes on my Linux machin since I updated it to 1.8.5.2.

I assume you mean master and not 1.8.5.2, since v1.8.5.2 doesn't
include the change 918dbf58 (git-gui: right half window is paned,
2013-08-21).

 I had the message
 Error in startup script: unknown option -stretch
 while executing
 .vpane.lower paneconfigure .vpane.lower.diff -stretch always
 invoked from within
 if {$use_ttk} {
 .vpane.lower pane .vpane.lower.diff -weight 1
 .vpane.lower pane .vpane.lower.commarea -weight 0
 } else {
 .vpane.lower paneconfigure...
 (file git/libexec/git-core/git-gui line 3233)

 So, I reverted the change that has been made in git-gui/git-gui.sh
 (Diff and Commit Area)

 I replaced

 ${NS}::panedwindow .vpane.lower -orient vertical
 ${NS}::frame .vpane.lower.commarea
 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
 .vpane.lower add .vpane.lower.diff
 .vpane.lower add .vpane.lower.commarea
 .vpane add .vpane.lower

 by

 ${NS}::frame .vpane.lower -height 300 -width 400
 ${NS}::frame .vpane.lower.commarea
 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
 pack .vpane.lower.diff -fill both -expand 1
 pack .vpane.lower.commarea -side bottom -fill x
 .vpane add .vpane.lower
 if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}

 and now, git gui works as expected.

Thanks,
Jonathan
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git gui crashes ( v 1.8.5.2)

2014-01-13 Thread Benoît Bourbié 
Hello Jonathan,

Yes, after checking, you are absolutely right, I was on master.

:)



On Mon, Jan 13, 2014 at 7:11 PM, Jonathan Nieder jrnie...@gmail.com wrote:
 (just cc-ing some area experts)
 Hi Benoît,

 Benoît Bourbié wrote:

 git gui crashes on my Linux machin since I updated it to 1.8.5.2.

 I assume you mean master and not 1.8.5.2, since v1.8.5.2 doesn't
 include the change 918dbf58 (git-gui: right half window is paned,
 2013-08-21).

 I had the message
 Error in startup script: unknown option -stretch
 while executing
 .vpane.lower paneconfigure .vpane.lower.diff -stretch always
 invoked from within
 if {$use_ttk} {
 .vpane.lower pane .vpane.lower.diff -weight 1
 .vpane.lower pane .vpane.lower.commarea -weight 0
 } else {
 .vpane.lower paneconfigure...
 (file git/libexec/git-core/git-gui line 3233)

 So, I reverted the change that has been made in git-gui/git-gui.sh
 (Diff and Commit Area)

 I replaced

 ${NS}::panedwindow .vpane.lower -orient vertical
 ${NS}::frame .vpane.lower.commarea
 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
 .vpane.lower add .vpane.lower.diff
 .vpane.lower add .vpane.lower.commarea
 .vpane add .vpane.lower

 by

 ${NS}::frame .vpane.lower -height 300 -width 400
 ${NS}::frame .vpane.lower.commarea
 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
 pack .vpane.lower.diff -fill both -expand 1
 pack .vpane.lower.commarea -side bottom -fill x
 .vpane add .vpane.lower
 if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}

 and now, git gui works as expected.

 Thanks,
 Jonathan
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git gui crashes ( v 1.8.5.2)

2014-01-13 Thread Max Kirillov 
Hi.

On Mon, Jan 13, 2014 at 05:11:41PM -0800, Jonathan Nieder wrote:
 (just cc-ing some area experts)
 Benoît Bourbié wrote:
 git gui crashes on my Linux machin since I updated it to 1.8.5.2.

I believe this happens at tk8.4 or earlier. I have not
tested it there, and according to the manpages in Internet
the older versions do not have the -stretch option.

Before I can find a system to test it, I think the panned
right half should really be reverted for the older versions of
tk. I remember it did not behave correctly without the
stretch option.

Maybe, to avoid cluttering the code, panedwindow should nit
be used at all without the ttk.

I'll try to submit a fix today.

-- 
Max
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html