* git gui crashes ( v 1.8.5.2)
@ 2014-01-14 0:14 Benoît Bourbié
2014-01-14 1:11 ` Jonathan Nieder
0 siblings, 1 reply; 6+ messages in thread
From: Benoît Bourbié @ 2014-01-14 0:14 UTC (permalink / raw)
To: git
Hello,
git gui crashes on my Linux machin since I updated it to 1.8.5.2.
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.
Regards,
Benoit
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: git gui crashes ( v 1.8.5.2)
2014-01-14 0:14 git gui crashes ( v 1.8.5.2) Benoît Bourbié
@ 2014-01-14 1:11 ` Jonathan Nieder
2014-01-14 4:06 ` Benoît Bourbié
2014-01-14 6:50 ` Max Kirillov
0 siblings, 2 replies; 6+ messages in thread
From: Jonathan Nieder @ 2014-01-14 1:11 UTC (permalink / raw)
To: Benoît Bourbié; +Cc: git, Max Kirillov, Pat Thoyts
(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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: git gui crashes ( v 1.8.5.2)
2014-01-14 1:11 ` Jonathan Nieder
@ 2014-01-14 4:06 ` Benoît Bourbié
2014-01-14 6:50 ` Max Kirillov
1 sibling, 0 replies; 6+ messages in thread
From: Benoît Bourbié @ 2014-01-14 4:06 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: git, Max Kirillov, Pat Thoyts
Hello Jonathan,
Yes, after checking, you are absolutely right, I was on master.
:)
On Mon, Jan 13, 2014 at 7:11 PM, Jonathan Nieder <jrnieder@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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: git gui crashes ( v 1.8.5.2)
2014-01-14 1:11 ` Jonathan Nieder
2014-01-14 4:06 ` Benoît Bourbié
@ 2014-01-14 6:50 ` Max Kirillov
2014-01-14 23:58 ` [PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4 Max Kirillov
1 sibling, 1 reply; 6+ messages in thread
From: Max Kirillov @ 2014-01-14 6:50 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: Benoît Bourbié, git, Max Kirillov, Pat Thoyts
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4
2014-01-14 6:50 ` Max Kirillov
@ 2014-01-14 23:58 ` Max Kirillov
2014-01-16 16:39 ` Benoît Bourbié
0 siblings, 1 reply; 6+ messages in thread
From: Max Kirillov @ 2014-01-14 23:58 UTC (permalink / raw)
To: Pat Thoyts; +Cc: Jonathan Nieder, Benoît Bourbié, git
Since 918dbf58, git-gui crashes if started with Tk 8.4. The reason is that
tk < 8.5 does not support -stretch option for panedwindow.
Without the option it's not possible to properly expand the right half -
the commit area is expanded, while desired behavior is to expand the diff
area. So the whole feature should be disabled with Tk
version less than 8.5.
Signed-off-by: Max Kirillov <max@max630.net>
---
git-gui/git-gui.sh | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index e2e710e..147be8c 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -3196,18 +3196,28 @@ unset i
# -- Diff and Commit Area
#
-${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
-if {$use_ttk} {
- .vpane.lower pane .vpane.lower.diff -weight 1
- .vpane.lower pane .vpane.lower.commarea -weight 0
+if {$have_tk85} {
+ ${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
+ if {$use_ttk} {
+ .vpane.lower pane .vpane.lower.diff -weight 1
+ .vpane.lower pane .vpane.lower.commarea -weight 0
+ } else {
+ .vpane.lower paneconfigure .vpane.lower.diff -stretch always
+ .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
+ }
} else {
- .vpane.lower paneconfigure .vpane.lower.diff -stretch always
- .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
+ frame .vpane.lower -height 300 -width 400
+ frame .vpane.lower.commarea
+ 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
+ .vpane paneconfigure .vpane.lower -sticky nsew
}
# -- Commit Area Buttons
--
1.8.4.2.1566.g3c1a064
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4
2014-01-14 23:58 ` [PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4 Max Kirillov
@ 2014-01-16 16:39 ` Benoît Bourbié
0 siblings, 0 replies; 6+ messages in thread
From: Benoît Bourbié @ 2014-01-16 16:39 UTC (permalink / raw)
To: Max Kirillov; +Cc: Pat Thoyts, Jonathan Nieder, git
Hi All,
Max, you are right, my TK version is 8.4.
I applied the patch and it now works perfectly.
Thanks!!
Benoît
On Tue, Jan 14, 2014 at 5:58 PM, Max Kirillov <max@max630.net> wrote:
> Since 918dbf58, git-gui crashes if started with Tk 8.4. The reason is that
> tk < 8.5 does not support -stretch option for panedwindow.
>
> Without the option it's not possible to properly expand the right half -
> the commit area is expanded, while desired behavior is to expand the diff
> area. So the whole feature should be disabled with Tk
> version less than 8.5.
>
> Signed-off-by: Max Kirillov <max@max630.net>
> ---
> git-gui/git-gui.sh | 32 +++++++++++++++++++++-----------
> 1 file changed, 21 insertions(+), 11 deletions(-)
>
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index e2e710e..147be8c 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
> @@ -3196,18 +3196,28 @@ unset i
>
> # -- Diff and Commit Area
> #
> -${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
> -if {$use_ttk} {
> - .vpane.lower pane .vpane.lower.diff -weight 1
> - .vpane.lower pane .vpane.lower.commarea -weight 0
> +if {$have_tk85} {
> + ${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
> + if {$use_ttk} {
> + .vpane.lower pane .vpane.lower.diff -weight 1
> + .vpane.lower pane .vpane.lower.commarea -weight 0
> + } else {
> + .vpane.lower paneconfigure .vpane.lower.diff -stretch always
> + .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
> + }
> } else {
> - .vpane.lower paneconfigure .vpane.lower.diff -stretch always
> - .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
> + frame .vpane.lower -height 300 -width 400
> + frame .vpane.lower.commarea
> + 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
> + .vpane paneconfigure .vpane.lower -sticky nsew
> }
>
> # -- Commit Area Buttons
> --
> 1.8.4.2.1566.g3c1a064
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-16 16:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-14 0:14 git gui crashes ( v 1.8.5.2) Benoît Bourbié
2014-01-14 1:11 ` Jonathan Nieder
2014-01-14 4:06 ` Benoît Bourbié
2014-01-14 6:50 ` Max Kirillov
2014-01-14 23:58 ` [PATCH] git-gui: fallback right pane to packed widgets with Tk 8.4 Max Kirillov
2014-01-16 16:39 ` Benoît Bourbié
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 NNTP newsgroup(s).