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: https://git.lorimer.id.au/gitweb.git/diff_plain/3c409a06f1fb10390458b34a533d71ed017ed4a7?ds=inline;hp=-c

Merge branch 'master' into dev
---

3c409a06f1fb10390458b34a533d71ed017ed4a7
diff --combined gitk
index 7b62e98ec1,769c79ab07..c0cdd625f2
--- a/gitk
+++ b/gitk
@@@ -82,12 -82,11 +82,12 @@@ proc dorunq {} 
  proc start_rev_list {view} {
      global startmsecs
      global commfd leftover tclencoding datemode
 -    global viewargs viewfiles commitidx
 +    global viewargs viewfiles commitidx vnextroot
      global lookingforhead showlocalchanges
  
      set startmsecs [clock clicks -milliseconds]
      set commitidx($view) 0
 +    set vnextroot($view) 0
      set order "--topo-order"
      if {$datemode} {
  	set order "--date-order"
@@@ -132,26 -131,12 +132,26 @@@ proc getcommits {} 
      show_status "Reading commits..."
  }
  
 +# This makes a string representation of a positive integer which
 +# sorts as a string in numerical order
 +proc strrep {n} {
 +    if {$n < 16} {
 +	return [format "%x" $n]
 +    } elseif {$n < 256} {
 +	return [format "x%.2x" $n]
 +    } elseif {$n < 65536} {
 +	return [format "y%.4x" $n]
 +    }
 +    return [format "z%.8x" $n]
 +}
 +
  proc getcommitlines {fd view}  {
      global commitlisted
      global leftover commfd
      global displayorder commitidx commitrow commitdata
      global parentlist children curview hlview
      global vparentlist vdisporder vcmitlisted
 +    global ordertok vnextroot
  
      set stuff [read $fd 500000]
      # git log doesn't terminate the last commit with a null...
@@@ -236,32 -221,14 +236,32 @@@
  	    exit 1
  	}
  	set id [lindex $ids 0]
 +	if {![info exists ordertok($view,$id)]} {
 +	    set otok "o[strrep $vnextroot($view)]"
 +	    incr vnextroot($view)
 +	    set ordertok($view,$id) $otok
 +	} else {
 +	    set otok $ordertok($view,$id)
 +	}
  	if {$listed} {
  	    set olds [lrange $ids 1 end]
 -	    set i 0
 -	    foreach p $olds {
 -		if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
 -		    lappend children($view,$p) $id
 +	    if {[llength $olds] == 1} {
 +		set p [lindex $olds 0]
 +		lappend children($view,$p) $id
 +		if {![info exists ordertok($view,$p)]} {
 +		    set ordertok($view,$p) $ordertok($view,$id)
 +		}
 +	    } else {
 +		set i 0
 +		foreach p $olds {
 +		    if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
 +			lappend children($view,$p) $id
 +		    }
 +		    if {![info exists ordertok($view,$p)]} {
 +			set ordertok($view,$p) "$otok[strrep $i]]"
 +		    }
 +		    incr i
  		}
 -		incr i
  	    }
  	} else {
  	    set olds {}
@@@ -460,7 -427,7 +460,7 @@@ proc readrefs {} 
  	    lappend idotherrefs($id) $name
  	}
      }
-     close $refd
+     catch {close $refd}
      set mainhead {}
      set mainheadid {}
      catch {
@@@ -856,8 -823,13 +856,13 @@@ proc makewindow {} 
      pack .ctop -fill both -expand 1
      bindall <1> {selcanvline %W %x %y}
      #bindall <B1-Motion> {selcanvline %W %x %y}
-     bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
-     bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
+     if {[tk windowingsystem] == "win32"} {
+ 	bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D }
+ 	bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break }
+     } else {
+ 	bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
+ 	bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
+     }
      bindall <2> "canvscan mark %W %x %y"
      bindall <B2-Motion> "canvscan dragto %W %x %y"
      bindkey <Home> selfirstline
@@@ -960,6 -932,24 +965,24 @@@
  	-command {flist_hl 1}
  }
  
+ # Windows sends all mouse wheel events to the current focused window, not
+ # the one where the mouse hovers, so bind those events here and redirect
+ # to the correct window
+ proc windows_mousewheel_redirector {W X Y D} {
+     global canv canv2 canv3
+     set w [winfo containing -displayof $W $X $Y]
+     if {$w ne ""} {
+ 	set u [expr {$D < 0 ? 5 : -5}]
+ 	if {$w == $canv || $w == $canv2 || $w == $canv3} {
+ 	    allcanvs yview scroll $u units
+ 	} else {
+ 	    catch {
+ 		$w yview scroll $u units
+ 	    }
+ 	}
+     }
+ }
+ 
  # mouse-2 makes all windows scan vertically, but only the one
  # the cursor is in scans horizontally
  proc canvscan {op w x y} {
@@@ -997,8 -987,8 +1020,8 @@@ proc bindkey {ev script} 
  # set the focus back to the toplevel for any click outside
  # the entry widgets
  proc click {w} {
-     global entries
-     foreach e $entries {
+     global ctext entries
+     foreach e [concat $entries $ctext] {
  	if {$w == $e} return
      }
      focus .
@@@ -1854,7 -1844,7 +1877,7 @@@ proc unflatten {var l} 
  
  proc showview {n} {
      global curview viewdata viewfiles
 -    global displayorder parentlist rowidlist rowoffsets
 +    global displayorder parentlist rowidlist
      global colormap rowtextx commitrow nextcolor canvxmax
      global numcommits rowrangelist commitlisted idrowranges rowchk
      global selectedline currentid canv canvy0
@@@ -1892,13 -1882,13 +1915,13 @@@
  	set vcmitlisted($curview) $commitlisted
  	if {$phase ne {}} {
  	    set viewdata($curview) \
 -		[list $phase $rowidlist $rowoffsets $rowrangelist \
 +		[list $phase $rowidlist {} $rowrangelist \
  		     [flatten idrowranges] [flatten idinlist] \
  		     $rowlaidout $rowoptim $numcommits]
  	} elseif {![info exists viewdata($curview)]
  		  || [lindex $viewdata($curview) 0] ne {}} {
  	    set viewdata($curview) \
 -		[list {} $rowidlist $rowoffsets $rowrangelist]
 +		[list {} $rowidlist {} $rowrangelist]
  	}
      }
      catch {unset treediffs}
@@@ -1927,6 -1917,7 +1950,6 @@@
      set parentlist $vparentlist($n)
      set commitlisted $vcmitlisted($n)
      set rowidlist [lindex $v 1]
 -    set rowoffsets [lindex $v 2]
      set rowrangelist [lindex $v 3]
      if {$phase eq {}} {
  	set numcommits [llength $displayorder]
@@@ -2574,43 -2565,67 +2597,43 @@@ proc usedinrange {id l1 l2} 
      return 0
  }
  
 -proc sanity {row {full 0}} {
 -    global rowidlist rowoffsets
 +# Work out where id should go in idlist so that order-token
 +# values increase from left to right
 +proc idcol {idlist id {i 0}} {
 +    global ordertok curview
  
 -    set col -1
 -    set ids [lindex $rowidlist $row]
 -    foreach id $ids {
 -	incr col
 -	if {$id eq {}} continue
 -	if {$col < [llength $ids] - 1 &&
 -	    [lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
 -	    puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
 -	}
 -	set o [lindex $rowoffsets $row $col]
 -	set y $row
 -	set x $col
 -	while {$o ne {}} {
 -	    incr y -1
 -	    incr x $o
 -	    if {[lindex $rowidlist $y $x] != $id} {
 -		puts "oops: rowoffsets wrong at row [expr {$y+1}] col [expr {$x-$o}]"
 -		puts "  id=[shortids $id] check started at row $row"
 -		for {set i $row} {$i >= $y} {incr i -1} {
 -		    puts "  row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
 -		}
 -		break
 -	    }
 -	    if {!$full} break
 -	    set o [lindex $rowoffsets $y $x]
 +    set t $ordertok($curview,$id)
 +    if {$i >= [llength $idlist] ||
 +	$t < $ordertok($curview,[lindex $idlist $i])} {
 +	if {$i > [llength $idlist]} {
 +	    set i [llength $idlist]
 +	}
 +	while {[incr i -1] >= 0 &&
 +	       $t < $ordertok($curview,[lindex $idlist $i])} {}
 +	incr i
 +    } else {
 +	if {$t > $ordertok($curview,[lindex $idlist $i])} {
 +	    while {[incr i] < [llength $idlist] &&
 +		   $t >= $ordertok($curview,[lindex $idlist $i])} {}
  	}
      }
 +    return $i
  }
  
 -proc makeuparrow {oid x y z} {
 -    global rowidlist rowoffsets uparrowlen idrowranges displayorder
 +proc makeuparrow {oid y x} {
 +    global rowidlist uparrowlen idrowranges displayorder
  
 -    for {set i 1} {$i < $uparrowlen && $y > 1} {incr i} {
 +    for {set i 0} {$i < $uparrowlen && $y > 1} {incr i} {
  	incr y -1
 -	incr x $z
 -	set off0 [lindex $rowoffsets $y]
 -	for {set x0 $x} {1} {incr x0} {
 -	    if {$x0 >= [llength $off0]} {
 -		set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
 -		break
 -	    }
 -	    set z [lindex $off0 $x0]
 -	    if {$z ne {}} {
 -		incr x0 $z
 -		break
 -	    }
 -	}
 -	set z [expr {$x0 - $x}]
 -	lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
 -	lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
 +	set idl [lindex $rowidlist $y]
 +	set x [idcol $idl $oid $x]
 +	lset rowidlist $y [linsert $idl $x $oid]
      }
 -    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
 -    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
      lappend idrowranges($oid) [lindex $displayorder $y]
  }
  
  proc initlayout {} {
 -    global rowidlist rowoffsets displayorder commitlisted
 +    global rowidlist displayorder commitlisted
      global rowlaidout rowoptim
      global idinlist rowchk rowrangelist idrowranges
      global numcommits canvxmax canv
@@@ -2626,6 -2641,7 +2649,6 @@@
      set rowrangelist {}
      set nextcolor 0
      set rowidlist {{}}
 -    set rowoffsets {{}}
      catch {unset idinlist}
      catch {unset rowchk}
      set rowlaidout 0
@@@ -2686,8 -2702,8 +2709,8 @@@ proc layoutmore {tmax allread} 
  	    set nr [expr {$commitidx($curview) - $rowlaidout}]
  	    # may need to increase this threshold if uparrowlen or
  	    # mingaplen are increased...
 -	    if {$nr > 150} {
 -		set nr 150
 +	    if {$nr > 200} {
 +		set nr 200
  	    }
  	    set row $rowlaidout
  	    set rowlaidout [layoutrows $row [expr {$row + $nr}] $allread]
@@@ -2868,7 -2884,7 +2891,7 @@@ proc readdifffiles {fd serial} 
  }
  
  proc layoutrows {row endrow last} {
 -    global rowidlist rowoffsets displayorder
 +    global rowidlist displayorder
      global uparrowlen downarrowlen maxwidth mingaplen
      global children parentlist
      global idrowranges
@@@ -2876,21 -2892,22 +2899,22 @@@
      global idinlist rowchk rowrangelist
  
      set idlist [lindex $rowidlist $row]
 -    set offs [lindex $rowoffsets $row]
      while {$row < $endrow} {
  	set id [lindex $displayorder $row]
  	set oldolds {}
  	set newolds {}
 -	foreach p [lindex $parentlist $row] {
 +	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 {$nev > 0} {
 +	if {1 || $nev > 0} {
  	    if {!$last &&
  		$row + $uparrowlen + $mingaplen >= $commitidx($curview)} break
  	    for {set x [llength $idlist]} {[incr x -1] >= 0} {} {
@@@ -2900,25 -2917,34 +2924,25 @@@
  			       [expr {$row + $uparrowlen + $mingaplen}]]
  		    if {$r == 0} {
  			set idlist [lreplace $idlist $x $x]
 -			set offs [lreplace $offs $x $x]
 -			set offs [incrange $offs $x 1]
  			set idinlist($i) 0
  			set rm1 [expr {$row - 1}]
  			lappend idrowranges($i) [lindex $displayorder $rm1]
 -			if {[incr nev -1] <= 0} break
 +			#if {[incr nev -1] <= 0} break
  			continue
  		    }
  		    set rowchk($id) [expr {$row + $r}]
  		}
  	    }
  	    lset rowidlist $row $idlist
 -	    lset rowoffsets $row $offs
  	}
  	set col [lsearch -exact $idlist $id]
  	if {$col < 0} {
 -	    set col [llength $idlist]
 -	    lappend idlist $id
 +	    set col [idcol $idlist $id]
 +	    set idlist [linsert $idlist $col $id]
  	    lset rowidlist $row $idlist
 -	    set z {}
  	    if {$children($curview,$id) ne {}} {
 -		set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
  		unset idinlist($id)
 -	    }
 -	    lappend offs $z
 -	    lset rowoffsets $row $offs
 -	    if {$z ne {}} {
 -		makeuparrow $id $col $row $z
 +		makeuparrow $id $row $col
  	    }
  	} else {
  	    unset idinlist($id)
@@@ -2931,21 -2957,36 +2955,19 @@@
  	}
  	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
  }
@@@ -2970,7 -3011,7 +2992,7 @@@ proc addextraid {id row} 
  }
  
  proc layouttail {} {
 -    global rowidlist rowoffsets idinlist commitidx curview
 +    global rowidlist idinlist commitidx curview
      global idrowranges rowrangelist
  
      set row $commitidx($curview)
@@@ -2979,91 -3020,66 +3001,91 @@@
  	set col [expr {[llength $idlist] - 1}]
  	set id [lindex $idlist $col]
  	addextraid $id $row
- 	unset idinlist($id)
+ 	catch {unset idinlist($id)}
  	lappend idrowranges($id) $id
  	lappend rowrangelist $idrowranges($id)
  	unset idrowranges($id)
  	incr row
 -	set offs [ntimes $col 0]
  	set idlist [lreplace $idlist $col $col]
  	lappend rowidlist $idlist
 -	lappend rowoffsets $offs
      }
  
      foreach id [array names idinlist] {
  	unset idinlist($id)
  	addextraid $id $row
  	lset rowidlist $row [list $id]
 -	lset rowoffsets $row 0
 -	makeuparrow $id 0 $row 0
 +	makeuparrow $id $row 0
  	lappend idrowranges($id) $id
  	lappend rowrangelist $idrowranges($id)
  	unset idrowranges($id)
  	incr row
  	lappend rowidlist {}
 -	lappend rowoffsets {}
      }
  }
  
  proc insert_pad {row col npad} {
 -    global rowidlist rowoffsets
 +    global rowidlist
  
      set pad [ntimes $npad {}]
 -    lset rowidlist $row [eval linsert [list [lindex $rowidlist $row]] $col $pad]
 -    set tmp [eval linsert [list [lindex $rowoffsets $row]] $col $pad]
 -    lset rowoffsets $row [incrange $tmp [expr {$col + $npad}] [expr {-$npad}]]
 +    set idlist [lindex $rowidlist $row]
 +    set bef [lrange $idlist 0 [expr {$col - 1}]]
 +    set aft [lrange $idlist $col end]
 +    set i [lsearch -exact $aft {}]
 +    if {$i > 0} {
 +	set aft [lreplace $aft $i $i]
 +    }
 +    lset rowidlist $row [concat $bef $pad $aft]
  }
  
  proc optimize_rows {row col endrow} {
 -    global rowidlist rowoffsets displayorder
 +    global rowidlist displayorder
  
 +    if {$row < 1} {
 +	set row 1
 +    }
 +    set idlist [lindex $rowidlist [expr {$row - 1}]]
 +    if {$row >= 2} {
 +	set previdlist [lindex $rowidlist [expr {$row - 2}]]
 +    } else {
 +	set previdlist {}
 +    }
      for {} {$row < $endrow} {incr row} {
 +	set pprevidlist $previdlist
 +	set previdlist $idlist
  	set idlist [lindex $rowidlist $row]
 -	set offs [lindex $rowoffsets $row]
  	set haspad 0
 -	for {} {$col < [llength $offs]} {incr col} {
 -	    if {[lindex $idlist $col] eq {}} {
 +	set y0 [expr {$row - 1}]
 +	set ym [expr {$row - 2}]
 +	set x0 -1
 +	set xm -1
 +	for {} {$col < [llength $idlist]} {incr col} {
 +	    set id [lindex $idlist $col]
 +	    if {[lindex $previdlist $col] eq $id} continue
 +	    if {$id eq {}} {
  		set haspad 1
  		continue
  	    }
 -	    set z [lindex $offs $col]
 -	    if {$z eq {}} continue
 +	    set x0 [lsearch -exact $previdlist $id]
 +	    if {$x0 < 0} continue
 +	    set z [expr {$x0 - $col}]
  	    set isarrow 0
 -	    set x0 [expr {$col + $z}]
 -	    set y0 [expr {$row - 1}]
 -	    set z0 [lindex $rowoffsets $y0 $x0]
 +	    set z0 {}
 +	    if {$ym >= 0} {
 +		set xm [lsearch -exact $pprevidlist $id]
 +		if {$xm >= 0} {
 +		    set z0 [expr {$xm - $x0}]
 +		}
 +	    }
  	    if {$z0 eq {}} {
 -		set id [lindex $idlist $col]
  		set ranges [rowranges $id]
  		if {$ranges ne {} && $y0 > [lindex $ranges 0]} {
  		    set isarrow 1
  		}
  	    }
 +	    if {!$isarrow && $id ne [lindex $displayorder $row] &&
 +		[lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
 +		set isarrow 1
 +	    }
  	    # Looking at lines from this row to the previous row,
  	    # make them go straight up if they end in an arrow on
  	    # the previous row; otherwise make them go straight up
@@@ -3072,32 -3088,43 +3094,32 @@@
  		# Line currently goes left too much;
  		# insert pads in the previous row, then optimize it
  		set npad [expr {-1 - $z + $isarrow}]
 -		set offs [incrange $offs $col $npad]
  		insert_pad $y0 $x0 $npad
  		if {$y0 > 0} {
  		    optimize_rows $y0 $x0 $row
  		}
 -		set z [lindex $offs $col]
 -		set x0 [expr {$col + $z}]
 -		set z0 [lindex $rowoffsets $y0 $x0]
 +		set previdlist [lindex $rowidlist $y0]
 +		set x0 [lsearch -exact $previdlist $id]
 +		set z [expr {$x0 - $col}]
 +		if {$z0 ne {}} {
 +		    set pprevidlist [lindex $rowidlist $ym]
 +		    set xm [lsearch -exact $pprevidlist $id]
 +		    set z0 [expr {$xm - $x0}]
 +		}
  	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
  		# Line currently goes right too much;
 -		# insert pads in this line and adjust the next's rowoffsets
 +		# insert pads in this line
  		set npad [expr {$z - 1 + $isarrow}]
 -		set y1 [expr {$row + 1}]
 -		set offs2 [lindex $rowoffsets $y1]
 -		set x1 -1
 -		foreach z $offs2 {
 -		    incr x1
 -		    if {$z eq {} || $x1 + $z < $col} continue
 -		    if {$x1 + $z > $col} {
 -			incr npad
 -		    }
 -		    lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
 -		    break
 -		}
 -		set pad [ntimes $npad {}]
 -		set idlist [eval linsert \$idlist $col $pad]
 -		set tmp [eval linsert \$offs $col $pad]
 +		insert_pad $row $col $npad
 +		set idlist [lindex $rowidlist $row]
  		incr col $npad
 -		set offs [incrange $tmp $col [expr {-$npad}]]
 -		set z [lindex $offs $col]
 +		set z [expr {$x0 - $col}]
  		set haspad 1
  	    }
 -	    if {$z0 eq {} && !$isarrow} {
 +	    if {$z0 eq {} && !$isarrow && $ym >= 0} {
  		# this line links to its first child on row $row-2
 -		set rm2 [expr {$row - 2}]
 -		set id [lindex $displayorder $rm2]
 -		set xc [lsearch -exact [lindex $rowidlist $rm2] $id]
 +		set id [lindex $displayorder $ym]
 +		set xc [lsearch -exact $pprevidlist $id]
  		if {$xc >= 0} {
  		    set z0 [expr {$xc - $x0}]
  		}
@@@ -3105,36 -3132,51 +3127,36 @@@
  	    # avoid lines jigging left then immediately right
  	    if {$z0 ne {} && $z < 0 && $z0 > 0} {
  		insert_pad $y0 $x0 1
 -		set offs [incrange $offs $col 1]
 -		optimize_rows $y0 [expr {$x0 + 1}] $row
 +		incr x0
 +		optimize_rows $y0 $x0 $row
 +		set previdlist [lindex $rowidlist $y0]
 +		set pprevidlist [lindex $rowidlist $ym]
  	    }
  	}
  	if {!$haspad} {
 -	    set o {}
  	    # Find the first column that doesn't have a line going right
  	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
 -		set o [lindex $offs $col]
 -		if {$o eq {}} {
 +		set id [lindex $idlist $col]
 +		if {$id eq {}} break
 +		set x0 [lsearch -exact $previdlist $id]
 +		if {$x0 < 0} {
  		    # check if this is the link to the first child
 -		    set id [lindex $idlist $col]
  		    set ranges [rowranges $id]
  		    if {$ranges ne {} && $row == [lindex $ranges 0]} {
  			# it is, work out offset to child
 -			set y0 [expr {$row - 1}]
  			set id [lindex $displayorder $y0]
 -			set x0 [lsearch -exact [lindex $rowidlist $y0] $id]
 -			if {$x0 >= 0} {
 -			    set o [expr {$x0 - $col}]
 -			}
 +			set x0 [lsearch -exact $previdlist $id]
  		    }
  		}
 -		if {$o eq {} || $o <= 0} break
 +		if {$x0 <= $col} break
  	    }
  	    # Insert a pad at that column as long as it has a line and
 -	    # isn't the last column, and adjust the next row' offsets
 -	    if {$o ne {} && [incr col] < [llength $idlist]} {
 -		set y1 [expr {$row + 1}]
 -		set offs2 [lindex $rowoffsets $y1]
 -		set x1 -1
 -		foreach z $offs2 {
 -		    incr x1
 -		    if {$z eq {} || $x1 + $z < $col} continue
 -		    lset rowoffsets $y1 [incrange $offs2 $x1 1]
 -		    break
 -		}
 +	    # isn't the last column
 +	    if {$x0 >= 0 && [incr col] < [llength $idlist]} {
  		set idlist [linsert $idlist $col {}]
 -		set tmp [linsert $offs $col {}]
 -		incr col
 -		set offs [incrange $tmp $col -1]
  	    }
  	}
  	lset rowidlist $row $idlist
 -	lset rowoffsets $row $offs
  	set col 0
      }
  }
@@@ -3180,9 -3222,31 +3202,9 @@@ proc rowranges {id} 
      return $linenos
  }
  
 -# work around tk8.4 refusal to draw arrows on diagonal segments
 -proc adjarrowhigh {coords} {
 -    global linespc
 -
 -    set x0 [lindex $coords 0]
 -    set x1 [lindex $coords 2]
 -    if {$x0 != $x1} {
 -	set y0 [lindex $coords 1]
 -	set y1 [lindex $coords 3]
 -	if {$y0 - $y1 <= 2 * $linespc && $x1 == [lindex $coords 4]} {
 -	    # we have a nearby vertical segment, just trim off the diag bit
 -	    set coords [lrange $coords 2 end]
 -	} else {
 -	    set slope [expr {($x0 - $x1) / ($y0 - $y1)}]
 -	    set xi [expr {$x0 - $slope * $linespc / 2}]
 -	    set yi [expr {$y0 - $linespc / 2}]
 -	    set coords [lreplace $coords 0 1 $xi $y0 $xi $yi]
 -	}
 -    }
 -    return $coords
 -}
 -
  proc drawlineseg {id row endrow arrowlow} {
      global rowidlist displayorder iddrawn linesegs
 -    global canv colormap linespc curview maxlinelen
 +    global canv colormap linespc curview maxlinelen parentlist
  
      set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
      set le [expr {$row + 1}]
@@@ -3257,11 -3321,9 +3279,11 @@@
  	set itl [lindex $lines [expr {$i-1}] 2]
  	set al [$canv itemcget $itl -arrow]
  	set arrowlow [expr {$al eq "last" || $al eq "both"}]
 -    } elseif {$arrowlow &&
 -	      [lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0} {
 -	set arrowlow 0
 +    } elseif {$arrowlow} {
 +	if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
 +	    [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
 +	    set arrowlow 0
 +	}
      }
      set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]]
      for {set y $le} {[incr y -1] > $row} {} {
@@@ -3280,19 -3342,8 +3302,19 @@@
  	    set xc [lsearch -exact [lindex $rowidlist $row] $ch]
  	    if {$xc < 0} {
  		puts "oops: drawlineseg: child $ch not on row $row"
 -	    } else {
 -		if {$xc < $x - 1} {
 +	    } elseif {$xc != $x} {
 +		if {($arrowhigh && $le == $row + 1) || $dir == 0} {
 +		    set d [expr {int(0.5 * $linespc)}]
 +		    set x1 [xc $row $x]
 +		    if {$xc < $x} {
 +			set x2 [expr {$x1 - $d}]
 +		    } else {
 +			set x2 [expr {$x1 + $d}]
 +		    }
 +		    set y2 [yc $row]
 +		    set y1 [expr {$y2 + $d}]
 +		    lappend coords $x1 $y1 $x2 $y2
 +		} elseif {$xc < $x - 1} {
  		    lappend coords [xc $row [expr {$x-1}]] [yc $row]
  		} elseif {$xc > $x + 1} {
  		    lappend coords [xc $row [expr {$x+1}]] [yc $row]
@@@ -3303,9 -3354,23 +3325,9 @@@
  	} else {
  	    set xn [xc $row $xp]
  	    set yn [yc $row]
 -	    # work around tk8.4 refusal to draw arrows on diagonal segments
 -	    if {$arrowlow && $xn != [lindex $coords end-1]} {
 -		if {[llength $coords] < 4 ||
 -		    [lindex $coords end-3] != [lindex $coords end-1] ||
 -		    [lindex $coords end] - $yn > 2 * $linespc} {
 -		    set xn [xc $row [expr {$xp - 0.5 * $dir}]]
 -		    set yo [yc [expr {$row + 0.5}]]
 -		    lappend coords $xn $yo $xn $yn
 -		}
 -	    } else {
 -		lappend coords $xn $yn
 -	    }
 +	    lappend coords $xn $yn
  	}
  	if {!$joinhigh} {
 -	    if {$arrowhigh} {
 -		set coords [adjarrowhigh $coords]
 -	    }
  	    assigncolor $id
  	    set t [$canv create line $coords -width [linewidth $id] \
  		       -fill $colormap($id) -tags lines.$id -arrow $arrow]
@@@ -3329,6 -3394,9 +3351,6 @@@
  	set coords [concat $coords $clow]
  	if {!$joinhigh} {
  	    lset lines [expr {$i-1}] 1 $le
 -	    if {$arrowhigh} {
 -		set coords [adjarrowhigh $coords]
 -	    }
  	} else {
  	    # coalesce two pieces
  	    $canv delete $ith
@@@ -3348,7 -3416,7 +3370,7 @@@
  
  proc drawparentlinks {id row} {
      global rowidlist canv colormap curview parentlist
 -    global idpos
 +    global idpos linespc
  
      set rowids [lindex $rowidlist $row]
      set col [lsearch -exact $rowids $id]
@@@ -3358,8 -3426,6 +3380,8 @@@
      set x [xc $row $col]
      set y [yc $row]
      set y2 [yc $row2]
 +    set d [expr {int(0.5 * $linespc)}]
 +    set ymid [expr {$y + $d}]
      set ids [lindex $rowidlist $row2]
      # rmx = right-most X coord used
      set rmx 0
@@@ -3373,37 -3439,19 +3395,37 @@@
  	if {$x2 > $rmx} {
  	    set rmx $x2
  	}
 -	if {[lsearch -exact $rowids $p] < 0} {
 +	set j [lsearch -exact $rowids $p]
 +	if {$j < 0} {
  	    # drawlineseg will do this one for us
  	    continue
  	}
  	assigncolor $p
  	# should handle duplicated parents here...
  	set coords [list $x $y]
 -	if {$i < $col - 1} {
 -	    lappend coords [xc $row [expr {$i + 1}]] $y
 -	} elseif {$i > $col + 1} {
 -	    lappend coords [xc $row [expr {$i - 1}]] $y
 +	if {$i != $col} {
 +	    # if attaching to a vertical segment, draw a smaller
 +	    # slant for visual distinctness
 +	    if {$i == $j} {
 +		if {$i < $col} {
 +		    lappend coords [expr {$x2 + $d}] $y $x2 $ymid
 +		} else {
 +		    lappend coords [expr {$x2 - $d}] $y $x2 $ymid
 +		}
 +	    } elseif {$i < $col && $i < $j} {
 +		# segment slants towards us already
 +		lappend coords [xc $row $j] $y
 +	    } else {
 +		if {$i < $col - 1} {
 +		    lappend coords [expr {$x2 + $linespc}] $y
 +		} elseif {$i > $col + 1} {
 +		    lappend coords [expr {$x2 - $linespc}] $y
 +		}
 +		lappend coords $x2 $y2
 +	    }
 +	} else {
 +	    lappend coords $x2 $y2
  	}
 -	lappend coords $x2 $y2
  	set t [$canv create line $coords -width [linewidth $p] \
  		   -fill $colormap($p) -tags lines.$p]
  	$canv lower $t
@@@ -3643,7 -3691,7 +3665,7 @@@ proc clear_display {} 
  }
  
  proc findcrossings {id} {
 -    global rowidlist parentlist numcommits rowoffsets displayorder
 +    global rowidlist parentlist numcommits displayorder
  
      set cross {}
      set ccross {}
@@@ -3652,9 -3700,12 +3674,9 @@@
  	    set e [expr {$numcommits - 1}]
  	}
  	if {$e <= $s} continue
 -	set x [lsearch -exact [lindex $rowidlist $e] $id]
 -	if {$x < 0} {
 -	    puts "findcrossings: oops, no [shortids $id] in row $e"
 -	    continue
 -	}
  	for {set row $e} {[incr row -1] >= $s} {} {
 +	    set x [lsearch -exact [lindex $rowidlist $row] $id]
 +	    if {$x < 0} break
  	    set olds [lindex $parentlist $row]
  	    set kid [lindex $displayorder $row]
  	    set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
@@@ -3672,6 -3723,9 +3694,6 @@@
  		    }
  		}
  	    }
 -	    set inc [lindex $rowoffsets $row $x]
 -	    if {$inc eq {}} break
 -	    incr x $inc
  	}
      }
      return [concat $ccross {{}} $cross]
@@@ -3861,7 -3915,7 +3883,7 @@@ proc show_status {msg} 
  # on that row and below will move down one row.
  proc insertrow {row newcmit} {
      global displayorder parentlist commitlisted children
 -    global commitrow curview rowidlist rowoffsets numcommits
 +    global commitrow curview rowidlist numcommits
      global rowrangelist rowlaidout rowoptim numcommits
      global selectedline rowchk commitidx
  
@@@ -3885,14 -3939,26 +3907,14 @@@
      incr commitidx($curview)
  
      set idlist [lindex $rowidlist $row]
 -    set offs [lindex $rowoffsets $row]
 -    set newoffs {}
 -    foreach x $idlist {
 -	if {$x eq {} || ($x eq $p && [llength $kids] == 1)} {
 -	    lappend newoffs {}
 -	} else {
 -	    lappend newoffs 0
 -	}
 -    }
      if {[llength $kids] == 1} {
  	set col [lsearch -exact $idlist $p]
  	lset idlist $col $newcmit
      } else {
  	set col [llength $idlist]
  	lappend idlist $newcmit
 -	lappend offs {}
 -	lset rowoffsets $row $offs
      }
      set rowidlist [linsert $rowidlist $row $idlist]
 -    set rowoffsets [linsert $rowoffsets [expr {$row+1}] $newoffs]
  
      set rowrangelist [linsert $rowrangelist $row {}]
      if {[llength $kids] > 1} {
@@@ -3921,7 -3987,7 +3943,7 @@@
  # Remove a commit that was inserted with insertrow on row $row.
  proc removerow {row} {
      global displayorder parentlist commitlisted children
 -    global commitrow curview rowidlist rowoffsets numcommits
 +    global commitrow curview rowidlist numcommits
      global rowrangelist idrowranges rowlaidout rowoptim numcommits
      global linesegends selectedline rowchk commitidx
  
@@@ -3949,6 -4015,12 +3971,6 @@@
      incr commitidx($curview) -1
  
      set rowidlist [lreplace $rowidlist $row $row]
 -    set rowoffsets [lreplace $rowoffsets $rp1 $rp1]
 -    if {$kids ne {}} {
 -	set offs [lindex $rowoffsets $row]
 -	set offs [lreplace $offs end end]
 -	lset rowoffsets $row $offs
 -    }
  
      set rowrangelist [lreplace $rowrangelist $row $row]
      if {[llength $kids] > 0} {
@@@ -4551,6 -4623,7 +4573,7 @@@ proc sellastline {} 
  
  proc selnextline {dir} {
      global selectedline
+     focus .
      if {![info exists selectedline]} return
      set l [expr {$selectedline + $dir}]
      unmarkmatches
@@@ -4631,6 -4704,7 +4654,7 @@@ proc godo {elt} 
  
  proc goback {} {
      global history historyindex
+     focus .
  
      if {$historyindex > 1} {
  	incr historyindex -1
@@@ -4644,6 -4718,7 +4668,7 @@@
  
  proc goforw {} {
      global history historyindex
+     focus .
  
      if {$historyindex < [llength $history]} {
  	set cmd [lindex $history $historyindex]
@@@ -7540,9 -7615,9 +7565,9 @@@ set maxgraphpct 5
  set maxwidth 16
  set revlistorder 0
  set fastdate 0
 -set uparrowlen 7
 -set downarrowlen 7
 -set mingaplen 30
 +set uparrowlen 5
 +set downarrowlen 5
 +set mingaplen 100
  set cmitmode "patch"
  set wrapcomment "none"
  set showneartags 1
@@@ -7561,7 -7636,10 +7586,10 @@@ catch {source ~/.gitk
  font create optionfont -family sans-serif -size -12
  
  # check that we can find a .git directory somewhere...
- set gitdir [gitdir]
+ if {[catch {set gitdir [gitdir]}]} {
+     show_error {} . "Cannot find a git repository here."
+     exit 1
+ }
  if {![file isdirectory $gitdir]} {
      show_error {} . "Cannot find the git directory \"$gitdir\"."
      exit 1