mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-07 09:11:20 +02:00
Code

Merge with gitk.

Browse Source 
This merges commit
    d6e8149bc53de57cab7cc0d9aff6c2341f3a7efa
from gitk into our head commit
    200e7fbbac82b6665f8175af0e375fbef3568c30

Sincerely,
    jit-merge command.
This commit is contained in:
Junio C Hamano 2005-08-07 14:11:08 -07:00
commit 6b7242aa1a
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gitk
View File

@ -48,13 +48,13 @@ proc getcommits {rargs} {
exit 1 exit 1
} }
set leftover {} set leftover {}
fconfigure $commfd -blocking 0 -translation binary fconfigure $commfd -blocking 0 -translation lf
fileevent $commfd readable "getcommitlines $commfd" fileevent $commfd readable "getcommitlines $commfd"
$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 . config -cursor watch
$ctext config -cursor watch settextcursor watch
} }
proc getcommitlines {commfd} { proc getcommitlines {commfd} {
@ -277,7 +277,7 @@ proc makewindow {} {
global canv canv2 canv3 linespc charspc ctext cflist textfont global canv canv2 canv3 linespc charspc ctext cflist textfont
global findtype findtypemenu findloc findstring fstring geometry global findtype findtypemenu findloc findstring fstring geometry
global entries sha1entry sha1string sha1but global entries sha1entry sha1string sha1but
global maincursor textcursor global maincursor textcursor curtextcursor
global rowctxmenu gaudydiff mergemax global rowctxmenu gaudydiff mergemax
menu .bar menu .bar
@ -465,6 +465,7 @@ proc makewindow {} {
set maincursor [. cget -cursor] set maincursor [. cget -cursor]
set textcursor [$ctext cget -cursor] set textcursor [$ctext cget -cursor]
set curtextcursor $textcursor
set rowctxmenu .rowctxmenu set rowctxmenu .rowctxmenu
menu $rowctxmenu -tearoff 0 menu $rowctxmenu -tearoff 0
@ -1142,7 +1143,18 @@ proc finishcommits {} {
drawrest $level [llength $startcommits] drawrest $level [llength $startcommits]
} }
. config -cursor $maincursor . config -cursor $maincursor
$ctext config -cursor $textcursor settextcursor $textcursor
}
# Don't change the text pane cursor if it is currently the hand cursor,
# showing that we are over a sha1 ID link.
proc settextcursor {c} {
global ctext curtextcursor
if {[$ctext cget -cursor] == $curtextcursor} {
$ctext config -cursor $c
}
set curtextcursor $c
} }
proc drawgraph {} { proc drawgraph {} {
@ -1377,7 +1389,7 @@ proc stopfindproc {{done 0}} {
unset findinprogress unset findinprogress
if {$phase != "incrdraw"} { if {$phase != "incrdraw"} {
. config -cursor $maincursor . config -cursor $maincursor
$ctext config -cursor $textcursor settextcursor $textcursor
} }
} }
} }
@ -1420,7 +1432,7 @@ proc findpatches {} {
fileevent $f readable readfindproc fileevent $f readable readfindproc
set finddidsel 0 set finddidsel 0
. config -cursor watch . config -cursor watch
$ctext config -cursor watch settextcursor watch
set findinprogress 1 set findinprogress 1
} }
@ -1525,7 +1537,7 @@ proc findfiles {} {
set id $lineid($l) set id $lineid($l)
set p [lindex $parents($id) 0] set p [lindex $parents($id) 0]
. config -cursor watch . config -cursor watch
$ctext config -cursor watch settextcursor watch
set findinprogress 1 set findinprogress 1
findcont [list $id $p] findcont [list $id $p]
update update
@ -1802,10 +1814,14 @@ proc selectline {l isnew} {
set linkid [string range $comment $s $e] set linkid [string range $comment $s $e]
if {![info exists idline($linkid)]} continue if {![info exists idline($linkid)]} continue
incr e incr e
$ctext tag conf link$i -foreground blue -underline 1 $ctext tag add link "$commentstart + $s c" "$commentstart + $e c"
$ctext tag add link$i "$commentstart + $s c" "$commentstart + $e c" $ctext tag add link$i "$commentstart + $s c" "$commentstart + $e c"
$ctext tag bind link$i <1> [list selectline $idline($linkid) 1] $ctext tag bind link$i <1> [list selectline $idline($linkid) 1]
incr i
} }
$ctext tag conf link -foreground blue -underline 1
$ctext tag bind link <Enter> { %W configure -cursor hand2 }
$ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
$ctext tag delete Comments $ctext tag delete Comments
$ctext tag remove found 1.0 end $ctext tag remove found 1.0 end