kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Fix operation without libreadobj.so.0.0 

Display a watch cursor when reading the commits initially
maint
Paul Mackerras 2005-06-16 10:54:04 +00:00
parent 9ccbdfbfbc
commit ea13cba175
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gitk
View File

@ -7,11 +7,12 @@ exec wish "$0" -- "${1+$@}"
# and distributed under the terms of the GNU General Public Licence, # and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version. # either version 2, or (at your option) any later version.


# CVS $Revision: 1.22 $ # CVS $Revision: 1.23 $


proc getcommits {rargs} { proc getcommits {rargs} {
global commits commfd phase canv mainfont global commits commfd phase canv mainfont
global startmsecs nextupdate global startmsecs nextupdate
global ctext maincursor textcursor


if {$rargs == {}} { if {$rargs == {}} {
set rargs HEAD set rargs HEAD
@ -29,6 +30,8 @@ proc getcommits {rargs} {
$canv delete all $canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \ $canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems -font $mainfont -tags textitems
. config -cursor watch
$ctext config -cursor watch
} }


proc getcommitline {commfd} { proc getcommitline {commfd} {
@ -238,6 +241,7 @@ proc makewindow {} {
global canv canv2 canv3 linespc charspc ctext cflist textfont global canv canv2 canv3 linespc charspc ctext cflist textfont
global findtype findloc findstring fstring geometry global findtype findloc findstring fstring geometry
global entries sha1entry sha1string sha1but global entries sha1entry sha1string sha1but
global maincursor textcursor


menu .bar menu .bar
.bar add cascade -label "File" -menu .bar.file .bar add cascade -label "File" -menu .bar.file
@ -377,6 +381,9 @@ proc makewindow {} {
bind . <Button-1> "click %W" bind . <Button-1> "click %W"
bind $fstring <Key-Return> dofind bind $fstring <Key-Return> dofind
bind $sha1entry <Key-Return> gotocommit bind $sha1entry <Key-Return> gotocommit

set maincursor [. cget -cursor]
set textcursor [$ctext cget -cursor]
} }


# when we make a key binding for the toplevel, make sure # when we make a key binding for the toplevel, make sure
@ -512,7 +519,7 @@ Copyright


Use and redistribute under the terms of the GNU General Public License Use and redistribute under the terms of the GNU General Public License


(CVS $Revision: 1.22 $)} \ (CVS $Revision: 1.23 $)} \
-justify center -aspect 400 -justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20 pack $w.m -side top -fill x -padx 20 -pady 20
button $w.ok -text Close -command "destroy $w" button $w.ok -text Close -command "destroy $w"
@ -874,6 +881,7 @@ proc drawcommit {id} {
proc finishcommits {} { proc finishcommits {} {
global phase global phase
global startcommits global startcommits
global ctext maincursor textcursor


if {$phase != "incrdraw"} { if {$phase != "incrdraw"} {
$canv delete all $canv delete all
@ -885,6 +893,8 @@ proc finishcommits {} {
drawslants drawslants
set level [decidenext] set level [decidenext]
drawrest $level [llength $startcommits] drawrest $level [llength $startcommits]
. config -cursor $maincursor
$ctext config -cursor $textcursor
} }


proc drawgraph {} { proc drawgraph {} {
@ -1506,8 +1516,7 @@ foreach arg $argv {
} }
} }


set noreadobj [load libreadobj.so.0.0] set noreadobj [catch {load libreadobj.so.0.0}]
set noreadobj 0
set stopped 0 set stopped 0
set redisplaying 0 set redisplaying 0
set stuffsaved 0 set stuffsaved 0