mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Paul Mackerras
2007-08-13 16:17:33 +10:00
parent 3c409a06f1 a69b2d1a8b
commit 0373273d06
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
gitk
View File

@ -329,7 +329,7 @@ proc readcommit {id} {
proc updatecommits {} { proc updatecommits {} {
global viewdata curview phase displayorder global viewdata curview phase displayorder
global children commitrow selectedline thickerline global children commitrow selectedline thickerline showneartags
if {$phase ne {}} { if {$phase ne {}} {
stop_rev_list stop_rev_list
@ -346,7 +346,9 @@ proc updatecommits {} {
catch {unset viewdata($n)} catch {unset viewdata($n)}
readrefs readrefs
changedrefs changedrefs
regetallcommits if {$showneartags} {
getallcommits
}
showview $n showview $n
} }
@ -2901,20 +2903,7 @@ proc layoutrows {row endrow last} {
set idlist [lindex $rowidlist $row] set idlist [lindex $rowidlist $row]
while {$row < $endrow} { while {$row < $endrow} {
set id [lindex $displayorder $row] set id [lindex $displayorder $row]
set oldolds {} if {1} {
set newolds {}
set olds [lindex $parentlist $row]
foreach p $olds {
if {![info exists idinlist($p)]} {
lappend newolds $p
} elseif {!$idinlist($p)} {
lappend oldolds $p
}
set idinlist($p) 1
}
set nev [expr {[llength $idlist] + [llength $newolds]
+ [llength $oldolds] - $maxwidth + 1}]
if {1 || $nev > 0} {
if {!$last && if {!$last &&
$row + $uparrowlen + $mingaplen >= $commitidx($curview)} break $row + $uparrowlen + $mingaplen >= $commitidx($curview)} break
for {set x [llength $idlist]} {[incr x -1] >= 0} {} { for {set x [llength $idlist]} {[incr x -1] >= 0} {} {
@ -2927,14 +2916,23 @@ proc layoutrows {row endrow last} {
set idinlist($i) 0 set idinlist($i) 0
set rm1 [expr {$row - 1}] set rm1 [expr {$row - 1}]
lappend idrowranges($i) [lindex $displayorder $rm1] lappend idrowranges($i) [lindex $displayorder $rm1]
#if {[incr nev -1] <= 0} break
continue continue
} }
set rowchk($id) [expr {$row + $r}] set rowchk($i) [expr {$row + $r}]
} }
} }
lset rowidlist $row $idlist lset rowidlist $row $idlist
} }
set oldolds {}
set newolds {}
foreach p [lindex $parentlist $row] {
if {![info exists idinlist($p)]} {
lappend newolds $p
} elseif {!$idinlist($p)} {
lappend oldolds $p
}
set idinlist($p) 1
}
set col [lsearch -exact $idlist $id] set col [lsearch -exact $idlist $id]
if {$col < 0} { if {$col < 0} {
set col [idcol $idlist $id] set col [idcol $idlist $id]
@ -6145,17 +6143,13 @@ proc rmbranch {} {
proc getallcommits {} { proc getallcommits {} {
global allcommits allids nbmp nextarc seeds global allcommits allids nbmp nextarc seeds
set allids {} if {![info exists allcommits]} {
set nbmp 0 set allids {}
set nextarc 0 set nbmp 0
set allcommits 0 set nextarc 0
set seeds {} set allcommits 0
regetallcommits set seeds {}
} }
# Called when the graph might have changed
proc regetallcommits {} {
global allcommits seeds
set cmd [concat | git rev-list --all --parents] set cmd [concat | git rev-list --all --parents]
foreach id $seeds { foreach id $seeds {