From: Paul Mackerras <paulus@samba.org>
Date: Mon, 13 Aug 2007 00:09:02 +0000 (+1000)
Subject: Merge branch 'master' into dev
X-Git-Tag: v1.5.4-rc0~318^2~1^2~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c409a06f1fb10390458b34a533d71ed017ed4a7;p=git.git

Merge branch 'master' into dev
---

3c409a06f1fb10390458b34a533d71ed017ed4a7
diff --cc gitk
index 7b62e98ec,769c79ab0..c0cdd625f
--- a/gitk
+++ b/gitk
@@@ -2931,21 -2957,36 +2955,19 @@@ proc layoutrows {row endrow last} 
  	}
  	lappend rowrangelist $ranges
  	incr row
 -	set offs [ntimes [llength $idlist] 0]
 -	set l [llength $newolds]
 -	set idlist [eval lreplace \$idlist $col $col $newolds]
 -	set o 0
 -	if {$l != 1} {
 -	    set offs [lrange $offs 0 [expr {$col - 1}]]
 -	    foreach x $newolds {
 -		lappend offs {}
 -		incr o -1
 -	    }
 -	    incr o
 -	    set tmp [expr {[llength $idlist] - [llength $offs]}]
 -	    if {$tmp > 0} {
 -		set offs [concat $offs [ntimes $tmp $o]]
 -	    }
 -	} else {
 -	    lset offs $col {}
 -	}
 +	set idlist [lreplace $idlist $col $col]
 +	set x $col
  	foreach i $newolds {
 +	    set x [idcol $idlist $i $x]
 +	    set idlist [linsert $idlist $x $i]
- 	    set idinlist($i) 1
  	    set idrowranges($i) $id
  	}
 -	incr col $l
  	foreach oid $oldolds {
- 	    set idinlist($oid) 1
 -	    set idlist [linsert $idlist $col $oid]
 -	    set offs [linsert $offs $col $o]
 -	    makeuparrow $oid $col $row $o
 -	    incr col
 +	    set x [idcol $idlist $oid $x]
 +	    set idlist [linsert $idlist $x $oid]
 +	    makeuparrow $oid $row $x
  	}
  	lappend rowidlist $idlist
 -	lappend rowoffsets $offs
      }
      return $row
  }