summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-08-13 06:17:33 (GMT)
committerPaul Mackerras <paulus@samba.org>2007-08-13 06:17:33 (GMT)
commit0373273d06f97239d379653d38f97590aa3dca2f (patch)
treef255e7bdbee89e71286d2d915819fce586a5bb5e /gitk
parent3c409a06f1fb10390458b34a533d71ed017ed4a7 (diff)
parenta69b2d1a8bf335ddbf0929c609b2daa523c7ede0 (diff)
downloadgit-0373273d06f97239d379653d38f97590aa3dca2f.zip
git-0373273d06f97239d379653d38f97590aa3dca2f.tar.gz
git-0373273d06f97239d379653d38f97590aa3dca2f.tar.bz2
Merge branch 'master' into dev
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk52
1 files changed, 23 insertions, 29 deletions
diff --git a/gitk b/gitk
index c0cdd62..f5b2da3 100755
--- a/gitk
+++ b/gitk
@@ -329,7 +329,7 @@ proc readcommit {id} {
proc updatecommits {} {
global viewdata curview phase displayorder
- global children commitrow selectedline thickerline
+ global children commitrow selectedline thickerline showneartags
if {$phase ne {}} {
stop_rev_list
@@ -346,7 +346,9 @@ proc updatecommits {} {
catch {unset viewdata($n)}
readrefs
changedrefs
- regetallcommits
+ if {$showneartags} {
+ getallcommits
+ }
showview $n
}
@@ -2901,20 +2903,7 @@ proc layoutrows {row endrow last} {
set idlist [lindex $rowidlist $row]
while {$row < $endrow} {
set id [lindex $displayorder $row]
- set oldolds {}
- 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 {1} {
if {!$last &&
$row + $uparrowlen + $mingaplen >= $commitidx($curview)} break
for {set x [llength $idlist]} {[incr x -1] >= 0} {} {
@@ -2927,14 +2916,23 @@ proc layoutrows {row endrow last} {
set idinlist($i) 0
set rm1 [expr {$row - 1}]
lappend idrowranges($i) [lindex $displayorder $rm1]
- #if {[incr nev -1] <= 0} break
continue
}
- set rowchk($id) [expr {$row + $r}]
+ set rowchk($i) [expr {$row + $r}]
}
}
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]
if {$col < 0} {
set col [idcol $idlist $id]
@@ -6145,17 +6143,13 @@ proc rmbranch {} {
proc getallcommits {} {
global allcommits allids nbmp nextarc seeds
- set allids {}
- set nbmp 0
- set nextarc 0
- set allcommits 0
- set seeds {}
- regetallcommits
-}
-
-# Called when the graph might have changed
-proc regetallcommits {} {
- global allcommits seeds
+ if {![info exists allcommits]} {
+ set allids {}
+ set nbmp 0
+ set nextarc 0
+ set allcommits 0
+ set seeds {}
+ }
set cmd [concat | git rev-list --all --parents]
foreach id $seeds {