X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=gitk;h=8d25c32d653f9ffd30cb8c6543c33212de1d89c9;hb=39ad85705cb2e9665a71d55e2d84b6ab8bc40d6d;hp=fbc6497a141142c724c598cebd5a9a64cc11493c;hpb=276819b35bb457648d91ee431c29ad5af3c20bef;p=git.git

diff --git a/gitk b/gitk
index fbc6497a..8d25c32d 100755
--- a/gitk
+++ b/gitk
@@ -7,7 +7,7 @@ exec wish "$0" -- "${1+$@}"
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
 
-# CVS $Revision: 1.10 $
+# CVS $Revision: 1.17 $
 
 proc getcommits {rargs} {
     global commits commfd phase canv mainfont
@@ -17,7 +17,7 @@ proc getcommits {rargs} {
     set commits {}
     set phase getcommits
     if [catch {set commfd [open "|git-rev-tree $rargs" r]} err] {
-	puts stder "Error executing git-rev-tree: $err"
+	puts stderr "Error executing git-rev-tree: $err"
 	exit 1
     }
     fconfigure $commfd -blocking 0
@@ -32,17 +32,21 @@ proc getcommitline {commfd}  {
     set n [gets $commfd line]
     if {$n < 0} {
 	if {![eof $commfd]} return
+	# this works around what is apparently a bug in Tcl...
+	fconfigure $commfd -blocking 1
 	if {![catch {close $commfd} err]} {
 	    after idle drawgraph
 	    return
 	}
 	if {[string range $err 0 4] == "usage"} {
-	    puts stderr "Error reading commits: bad arguments to git-rev-tree"
-	    puts stderr "Note: arguments to gitk are passed to git-rev-tree"
-	    puts stderr "      to allow selection of commits to be displayed"
+	    set err "\
+Gitk: error reading commits: bad arguments to git-rev-tree.\n\
+(Note: arguments to gitk are passed to git-rev-tree\
+to allow selection of commits to be displayed.)"
 	} else {
-	    puts stderr "Error reading commits: $err"
+	    set err "Error reading commits: $err"
 	}
+	error_popup $err
 	exit 1
     }
 
@@ -83,7 +87,8 @@ proc readcommit {id} {
     set audate {}
     set comname {}
     set comdate {}
-    foreach line [split [exec git-cat-file commit $id] "\n"] {
+    if [catch {set contents [exec git-cat-file commit $id]}] return
+    foreach line [split $contents "\n"] {
 	if {$inhdr} {
 	    if {$line == {}} {
 		set inhdr 0
@@ -118,9 +123,21 @@ proc readcommit {id} {
 			     $comname $comdate $comment]
 }
 
+proc error_popup msg {
+    set w .error
+    toplevel $w
+    wm transient $w .
+    message $w.m -text $msg -justify center -aspect 400
+    pack $w.m -side top -fill x -padx 20 -pady 20
+    button $w.ok -text OK -command "destroy $w"
+    pack $w.ok -side bottom -fill x
+    bind $w <Visibility> "grab $w; focus $w"
+    tkwait window $w
+}
+
 proc makewindow {} {
     global canv canv2 canv3 linespc charspc ctext cflist textfont
-    global sha1entry findtype findloc findstring
+    global sha1entry findtype findloc findstring fstring geometry
 
     menu .bar
     .bar add cascade -label "File" -menu .bar.file
@@ -131,7 +148,22 @@ proc makewindow {} {
     .bar.help add command -label "About gitk" -command about
     . configure -menu .bar
 
+    if {![info exists geometry(canv1)]} {
+	set geometry(canv1) [expr 45 * $charspc]
+	set geometry(canv2) [expr 30 * $charspc]
+	set geometry(canv3) [expr 15 * $charspc]
+	set geometry(canvh) [expr 25 * $linespc + 4]
+	set geometry(ctextw) 80
+	set geometry(ctexth) 30
+	set geometry(cflistw) 30
+    }
     panedwindow .ctop -orient vertical
+    if {[info exists geometry(width)]} {
+	.ctop conf -width $geometry(width) -height $geometry(height)
+	set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
+	set geometry(ctexth) [expr {($texth - 8) /
+				    [font metrics $textfont -linespace]}]
+    }
     frame .ctop.top
     frame .ctop.top.bar
     pack .ctop.top.bar -side bottom -fill x
@@ -142,19 +174,19 @@ proc makewindow {} {
     pack .ctop.top.clist -side top -fill both -expand 1
     .ctop add .ctop.top
     set canv .ctop.top.clist.canv
-    set height [expr 25 * $linespc + 4]
-    canvas $canv -height $height -width [expr 45 * $charspc] \
+    canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
 	-bg white -bd 0 \
 	-yscrollincr $linespc -yscrollcommand "$cscroll set"
     .ctop.top.clist add $canv
     set canv2 .ctop.top.clist.canv2
-    canvas $canv2 -height $height -width [expr 30 * $charspc] \
+    canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
 	-bg white -bd 0 -yscrollincr $linespc
     .ctop.top.clist add $canv2
     set canv3 .ctop.top.clist.canv3
-    canvas $canv3 -height $height -width [expr 15 * $charspc] \
+    canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
 	-bg white -bd 0 -yscrollincr $linespc
     .ctop.top.clist add $canv3
+    bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
 
     set sha1entry .ctop.top.bar.sha1
     label .ctop.top.bar.sha1label -text "SHA1 ID: "
@@ -164,9 +196,9 @@ proc makewindow {} {
     button .ctop.top.bar.findbut -text "Find" -command dofind
     pack .ctop.top.bar.findbut -side left
     set findstring {}
-    entry .ctop.top.bar.findstring -width 30 -font $textfont \
-	-textvariable findstring
-    pack .ctop.top.bar.findstring -side left -expand 1 -fill x
+    set fstring .ctop.top.bar.findstring
+    entry $fstring -width 30 -font $textfont -textvariable findstring
+    pack $fstring -side left -expand 1 -fill x
     set findtype Exact
     tk_optionMenu .ctop.top.bar.findtype findtype Exact IgnCase Regexp
     set findloc "All fields"
@@ -179,7 +211,8 @@ proc makewindow {} {
     .ctop add .ctop.cdet
     frame .ctop.cdet.left
     set ctext .ctop.cdet.left.ctext
-    text $ctext -bg white -state disabled -font $textfont -height 32 \
+    text $ctext -bg white -state disabled -font $textfont \
+	-width $geometry(ctextw) -height $geometry(ctexth) \
 	-yscrollcommand ".ctop.cdet.left.sb set"
     scrollbar .ctop.cdet.left.sb -command "$ctext yview"
     pack .ctop.cdet.left.sb -side right -fill y
@@ -190,15 +223,17 @@ proc makewindow {} {
     $ctext tag conf hunksep -back blue -fore white
     $ctext tag conf d0 -back "#ff8080"
     $ctext tag conf d1 -back green
+    $ctext tag conf found -back yellow
 
     frame .ctop.cdet.right
     set cflist .ctop.cdet.right.cfiles
-    listbox $cflist -width 30 -bg white -selectmode extended \
+    listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
 	-yscrollcommand ".ctop.cdet.right.sb set"
     scrollbar .ctop.cdet.right.sb -command "$cflist yview"
     pack .ctop.cdet.right.sb -side right -fill y
     pack $cflist -side left -fill both -expand 1
     .ctop.cdet add .ctop.cdet.right
+    bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
 
     pack .ctop -side top -fill both -expand 1
 
@@ -210,17 +245,19 @@ proc makewindow {} {
     bindall <B2-Motion> "allcanvs scan dragto 0 %y"
     bind . <Key-Up> "selnextline -1"
     bind . <Key-Down> "selnextline 1"
-    bind . p "selnextline -1"
-    bind . n "selnextline 1"
     bind . <Key-Prior> "allcanvs yview scroll -1 p"
     bind . <Key-Next> "allcanvs yview scroll 1 p"
-    bind . <Key-Delete> "$ctext yview scroll -1 p"
-    bind . <Key-BackSpace> "$ctext yview scroll -1 p"
-    bind . <Key-space> "$ctext yview scroll 1 p"
-    bind . b "$ctext yview scroll -1 p"
-    bind . d "$ctext yview scroll 18 u"
-    bind . u "$ctext yview scroll -18 u"
-    bind . Q doquit
+    bindkey <Key-Delete> "$ctext yview scroll -1 p"
+    bindkey <Key-BackSpace> "$ctext yview scroll -1 p"
+    bindkey <Key-space> "$ctext yview scroll 1 p"
+    bindkey p "selnextline -1"
+    bindkey n "selnextline 1"
+    bindkey b "$ctext yview scroll -1 p"
+    bindkey d "$ctext yview scroll 18 u"
+    bindkey u "$ctext yview scroll -18 u"
+    bindkey / findnext
+    bindkey ? findprev
+    bindkey f nextfile
     bind . <Control-q> doquit
     bind . <Control-f> dofind
     bind . <Control-g> findnext
@@ -230,6 +267,110 @@ proc makewindow {} {
     bind . <Control-minus> {incrfont -1}
     bind . <Control-KP_Subtract> {incrfont -1}
     bind $cflist <<ListboxSelect>> listboxsel
+    bind . <Destroy> {savestuff %W}
+    bind . <Button-1> "click %W"
+    bind $fstring <Key-Return> dofind
+}
+
+# when we make a key binding for the toplevel, make sure
+# it doesn't get triggered when that key is pressed in the
+# find string entry widget.
+proc bindkey {ev script} {
+    global fstring
+    bind . $ev $script
+    set escript [bind Entry $ev]
+    if {$escript == {}} {
+	set escript [bind Entry <Key>]
+    }
+    bind $fstring $ev "$escript; break"
+}
+
+# set the focus back to the toplevel for any click outside
+# the find string entry widget
+proc click {w} {
+    global fstring
+    if {$w != $fstring} {
+	focus .
+    }
+}
+
+proc savestuff {w} {
+    global canv canv2 canv3 ctext cflist mainfont textfont
+    global stuffsaved
+    if {$stuffsaved} return
+    if {![winfo viewable .]} return
+    catch {
+	set f [open "~/.gitk-new" w]
+	puts $f "set mainfont {$mainfont}"
+	puts $f "set textfont {$textfont}"
+	puts $f "set geometry(width) [winfo width .ctop]"
+	puts $f "set geometry(height) [winfo height .ctop]"
+	puts $f "set geometry(canv1) [expr [winfo width $canv]-2]"
+	puts $f "set geometry(canv2) [expr [winfo width $canv2]-2]"
+	puts $f "set geometry(canv3) [expr [winfo width $canv3]-2]"
+	puts $f "set geometry(canvh) [expr [winfo height $canv]-2]"
+	set wid [expr {([winfo width $ctext] - 8) \
+			   / [font measure $textfont "0"]}]
+	puts $f "set geometry(ctextw) $wid"
+	set wid [expr {([winfo width $cflist] - 11) \
+			   / [font measure [$cflist cget -font] "0"]}]
+	puts $f "set geometry(cflistw) $wid"
+	close $f
+	file rename -force "~/.gitk-new" "~/.gitk"
+    }
+    set stuffsaved 1
+}
+
+proc resizeclistpanes {win w} {
+    global oldwidth
+    if [info exists oldwidth($win)] {
+	set s0 [$win sash coord 0]
+	set s1 [$win sash coord 1]
+	if {$w < 60} {
+	    set sash0 [expr {int($w/2 - 2)}]
+	    set sash1 [expr {int($w*5/6 - 2)}]
+	} else {
+	    set factor [expr {1.0 * $w / $oldwidth($win)}]
+	    set sash0 [expr {int($factor * [lindex $s0 0])}]
+	    set sash1 [expr {int($factor * [lindex $s1 0])}]
+	    if {$sash0 < 30} {
+		set sash0 30
+	    }
+	    if {$sash1 < $sash0 + 20} {
+		set sash1 [expr $sash0 + 20]
+	    }
+	    if {$sash1 > $w - 10} {
+		set sash1 [expr $w - 10]
+		if {$sash0 > $sash1 - 20} {
+		    set sash0 [expr $sash1 - 20]
+		}
+	    }
+	}
+	$win sash place 0 $sash0 [lindex $s0 1]
+	$win sash place 1 $sash1 [lindex $s1 1]
+    }
+    set oldwidth($win) $w
+}
+
+proc resizecdetpanes {win w} {
+    global oldwidth
+    if [info exists oldwidth($win)] {
+	set s0 [$win sash coord 0]
+	if {$w < 60} {
+	    set sash0 [expr {int($w*3/4 - 2)}]
+	} else {
+	    set factor [expr {1.0 * $w / $oldwidth($win)}]
+	    set sash0 [expr {int($factor * [lindex $s0 0])}]
+	    if {$sash0 < 45} {
+		set sash0 45
+	    }
+	    if {$sash0 > $w - 15} {
+		set sash0 [expr $w - 15]
+	    }
+	}
+	$win sash place 0 $sash0 [lindex $s0 1]
+    }
+    set oldwidth($win) $w
 }
 
 proc allcanvs args {
@@ -255,13 +396,13 @@ proc about {} {
     toplevel $w
     wm title $w "About gitk"
     message $w.m -text {
-Gitk version 0.91
+Gitk version 1.0
 
 Copyright © 2005 Paul Mackerras
 
 Use and redistribute under the terms of the GNU General Public License
 
-(CVS $Revision: 1.10 $)} \
+(CVS $Revision: 1.17 $)} \
 	    -justify center -aspect 400
     pack $w.m -side top -fill x -padx 20 -pady 20
     button $w.ok -text Close -command "destroy $w"
@@ -353,17 +494,18 @@ proc drawgraph {} {
 
     allcanvs delete all
     set start {}
-    foreach id $commits {
+    foreach id [array names nchildren] {
 	if {$nchildren($id) == 0} {
 	    lappend start $id
 	}
 	set ncleft($id) $nchildren($id)
+	if {![info exists nparents($id)]} {
+	    set nparents($id) 0
+	}
     }
     if {$start == {}} {
-	$canv create text 3 3 -anchor nw -font $mainfont \
-	    -text "ERROR: No starting commits found"
-	set phase {}
-	return
+	error_popup "Gitk: ERROR: No starting commits found"
+	exit 1
     }
 
     set nextcolor 0
@@ -377,9 +519,11 @@ proc drawgraph {} {
     set lineno -1
     set numcommits 0
     set phase drawgraph
+    set lthickness [expr {($linespc / 9) + 1}]
     while 1 {
 	set canvy $y2
-	allcanvs conf -scrollregion [list 0 0 0 $canvy]
+	allcanvs conf -scrollregion \
+	    [list 0 0 0 [expr $canvy + 0.5 * $linespc + 2]]
 	update
 	if {$stopped} break
 	incr numcommits
@@ -388,26 +532,35 @@ proc drawgraph {} {
 	set id [lindex $todo $level]
 	set lineid($lineno) $id
 	set actualparents {}
-	foreach p $parents($id) {
-	    if {[info exists ncleft($p)]} {
+	if {[info exists parents($id)]} {
+	    foreach p $parents($id) {
 		incr ncleft($p) -1
+		if {![info exists commitinfo($p)]} {
+		    readcommit $p
+		    if {![info exists commitinfo($p)]} continue
+		}
 		lappend actualparents $p
 	    }
 	}
 	if {![info exists commitinfo($id)]} {
 	    readcommit $id
+	    if {![info exists commitinfo($id)]} {
+		set commitinfo($id) {"No commit information available"}
+	    }
 	}
 	set x [expr $canvx0 + $level * $linespc]
 	set y2 [expr $canvy + $linespc]
 	if {[info exists linestarty($level)] && $linestarty($level) < $canvy} {
 	    set t [$canv create line $x $linestarty($level) $x $canvy \
-		       -width 2 -fill $colormap($id)]
+		       -width $lthickness -fill $colormap($id)]
 	    $canv lower $t
 	}
 	set linestarty($level) $canvy
-	set t [$canv create oval [expr $x - 4] [expr $canvy - 4] \
-		   [expr $x + 3] [expr $canvy + 3] \
-		   -fill blue -outline black -width 1]
+	set ofill [expr {[info exists parents($id)]? "blue": "white"}]
+	set orad [expr {$linespc / 3}]
+	set t [$canv create oval [expr $x - $orad] [expr $canvy - $orad] \
+		   [expr $x + $orad - 1] [expr $canvy + $orad - 1] \
+		   -fill $ofill -outline black -width 1]
 	$canv raise $t
 	set xt [expr $canvx0 + $nlines * $linespc]
 	set headline [lindex $commitinfo($id) 0]
@@ -544,7 +697,8 @@ proc drawgraph {} {
 		lappend coords [expr $xj - $linespc] $canvy
 	    }
 	    lappend coords $xj $y2
-	    set t [$canv create line $coords -width 2 -fill $colormap($dst)]
+	    set t [$canv create line $coords -width $lthickness \
+		       -fill $colormap($dst)]
 	    $canv lower $t
 	    if {![info exists linestarty($j)]} {
 		set linestarty($j) $y2
@@ -565,21 +719,42 @@ proc drawgraph {} {
     }
 }
 
+proc findmatches {f} {
+    global findtype foundstring foundstrlen
+    if {$findtype == "Regexp"} {
+	set matches [regexp -indices -all -inline $foundstring $f]
+    } else {
+	if {$findtype == "IgnCase"} {
+	    set str [string tolower $f]
+	} else {
+	    set str $f
+	}
+	set matches {}
+	set i 0
+	while {[set j [string first $foundstring $str $i]] >= 0} {
+	    lappend matches [list $j [expr $j+$foundstrlen-1]]
+	    set i [expr $j + $foundstrlen]
+	}
+    }
+    return $matches
+}
+
 proc dofind {} {
     global findtype findloc findstring markedmatches commitinfo
     global numcommits lineid linehtag linentag linedtag
     global mainfont namefont canv canv2 canv3 selectedline
-    global matchinglines
+    global matchinglines foundstring foundstrlen
     unmarkmatches
+    focus .
     set matchinglines {}
     set fldtypes {Headline Author Date Committer CDate Comment}
     if {$findtype == "IgnCase"} {
-	set fstr [string tolower $findstring]
+	set foundstring [string tolower $findstring]
     } else {
-	set fstr $findstring
+	set foundstring $findstring
     }
-    set mlen [string length $findstring]
-    if {$mlen == 0} return
+    set foundstrlen [string length $findstring]
+    if {$foundstrlen == 0} return
     if {![info exists selectedline]} {
 	set oldsel -1
     } else {
@@ -594,21 +769,7 @@ proc dofind {} {
 	    if {$findloc != "All fields" && $findloc != $ty} {
 		continue
 	    }
-	    if {$findtype == "Regexp"} {
-		set matches [regexp -indices -all -inline $fstr $f]
-	    } else {
-		if {$findtype == "IgnCase"} {
-		    set str [string tolower $f]
-		} else {
-		    set str $f
-		}
-		set matches {}
-		set i 0
-		while {[set j [string first $fstr $str $i]] >= 0} {
-		    lappend matches [list $j [expr $j+$mlen-1]]
-		    set i [expr $j + $mlen]
-		}
-	    }
+	    set matches [findmatches $f]
 	    if {$matches == {}} continue
 	    set doesmatch 1
 	    if {$ty == "Headline"} {
@@ -622,7 +783,7 @@ proc dofind {} {
 	if {$doesmatch} {
 	    lappend matchinglines $l
 	    if {!$didsel && $l > $oldsel} {
-		selectline $l
+		findselectline $l
 		set didsel 1
 	    }
 	}
@@ -630,7 +791,22 @@ proc dofind {} {
     if {$matchinglines == {}} {
 	bell
     } elseif {!$didsel} {
-	selectline [lindex $matchinglines 0]
+	findselectline [lindex $matchinglines 0]
+    }
+}
+
+proc findselectline {l} {
+    global findloc commentend ctext
+    selectline $l
+    if {$findloc == "All fields" || $findloc == "Comments"} {
+	# highlight the matches in the comments
+	set f [$ctext get 1.0 $commentend]
+	set matches [findmatches $f]
+	foreach match $matches {
+	    set start [lindex $match 0]
+	    set end [expr [lindex $match 1] + 1]
+	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
+	}
     }
 }
 
@@ -643,7 +819,7 @@ proc findnext {} {
     if {![info exists selectedline]} return
     foreach l $matchinglines {
 	if {$l > $selectedline} {
-	    selectline $l
+	    findselectline $l
 	    return
 	}
     }
@@ -663,7 +839,7 @@ proc findprev {} {
 	set prev $l
     }
     if {$prev != {}} {
-	selectline $prev
+	findselectline $prev
     } else {
 	bell
     }
@@ -710,8 +886,9 @@ proc selcanvline {x y} {
 proc selectline {l} {
     global canv canv2 canv3 ctext commitinfo selectedline
     global lineid linehtag linentag linedtag
-    global canvy canvy0 linespc nparents treepending
+    global canvy0 linespc nparents treepending
     global cflist treediffs currentid sha1entry
+    global commentend seenfile numcommits
     if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
     $canv delete secsel
     set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
@@ -726,14 +903,38 @@ proc selectline {l} {
 	       -tags secsel -fill [$canv3 cget -selectbackground]]
     $canv3 lower $t
     set y [expr {$canvy0 + $l * $linespc}]
-    set ytop [expr {($y - $linespc / 2.0) / $canvy}]
-    set ybot [expr {($y + $linespc / 2.0) / $canvy}]
+    set ymax [lindex [$canv cget -scrollregion] 3]
+    set ytop [expr {$y - $linespc - 1}]
+    set ybot [expr {$y + $linespc + 1}]
     set wnow [$canv yview]
-    if {$ytop < [lindex $wnow 0]} {
-	allcanvs yview moveto $ytop
-    } elseif {$ybot > [lindex $wnow 1]} {
-	set wh [expr {[lindex $wnow 1] - [lindex $wnow 0]}]
-	allcanvs yview moveto [expr {$ybot - $wh}]
+    set wtop [expr [lindex $wnow 0] * $ymax]
+    set wbot [expr [lindex $wnow 1] * $ymax]
+    set wh [expr {$wbot - $wtop}]
+    set newtop $wtop
+    if {$ytop < $wtop} {
+	if {$ybot < $wtop} {
+	    set newtop [expr {$y - $wh / 2.0}]
+	} else {
+	    set newtop $ytop
+	    if {$newtop > $wtop - $linespc} {
+		set newtop [expr {$wtop - $linespc}]
+	    }
+	}
+    } elseif {$ybot > $wbot} {
+	if {$ytop > $wbot} {
+	    set newtop [expr {$y - $wh / 2.0}]
+	} else {
+	    set newtop [expr {$ybot - $wh}]
+	    if {$newtop < $wtop + $linespc} {
+		set newtop [expr {$wtop + $linespc}]
+	    }
+	}
+    }
+    if {$newtop != $wtop} {
+	if {$newtop < 0} {
+	    set newtop 0
+	}
+	allcanvs yview moveto [expr $newtop * 1.0 / $ymax]
     }
     set selectedline $l
 
@@ -754,7 +955,9 @@ proc selectline {l} {
     $ctext insert end [lindex $info 5]
     $ctext insert end "\n"
     $ctext tag delete Comments
+    $ctext tag remove found 1.0 end
     $ctext conf -state disabled
+    set commentend [$ctext index "end - 1c"]
 
     $cflist delete 0 end
     set currentid $id
@@ -767,6 +970,7 @@ proc selectline {l} {
 	    addtocflist $id
 	}
     }
+    catch {unset seenfile}
 }
 
 proc selnextline {dir} {
@@ -819,6 +1023,7 @@ proc gettreediffline {gdtf id} {
 
 proc getblobdiffs {id} {
     global parents diffopts blobdifffd env curdifftag curtagstart
+    global diffindex difffilestart
     set p [lindex $parents($id) 0]
     set env(GIT_DIFF_OPTS) $diffopts
     if [catch {set bdf [open "|git-diff-tree -r -p $p $id" r]} err] {
@@ -829,17 +1034,21 @@ proc getblobdiffs {id} {
     set blobdifffd($id) $bdf
     set curdifftag Comments
     set curtagstart 0.0
+    set diffindex 0
+    catch {unset difffilestart}
     fileevent $bdf readable "getblobdiffline $bdf $id"
 }
 
 proc getblobdiffline {bdf id} {
-    global currentid blobdifffd ctext curdifftag curtagstart
+    global currentid blobdifffd ctext curdifftag curtagstart seenfile
+    global diffnexthead diffnextnote diffindex difffilestart
     set n [gets $bdf line]
     if {$n < 0} {
 	if {[eof $bdf]} {
 	    close $bdf
 	    if {$id == $currentid && $bdf == $blobdifffd($id)} {
 		$ctext tag add $curdifftag $curtagstart end
+		set seenfile($curdifftag) 1
 	    }
 	}
 	return
@@ -848,18 +1057,41 @@ proc getblobdiffline {bdf id} {
 	return
     }
     $ctext conf -state normal
-    if {[regexp {^---[ \t]+([^/])+/(.*)} $line match s1 fname]} {
+    if {[regexp {^---[ \t]+([^/])*/(.*)} $line match s1 fname]} {
 	# start of a new file
 	$ctext insert end "\n"
 	$ctext tag add $curdifftag $curtagstart end
+	set seenfile($curdifftag) 1
 	set curtagstart [$ctext index "end - 1c"]
+	set header $fname
+	if {[info exists diffnexthead]} {
+	    set fname $diffnexthead
+	    set header "$diffnexthead ($diffnextnote)"
+	    unset diffnexthead
+	}
+	set difffilestart($diffindex) [$ctext index "end - 1c"]
+	incr diffindex
 	set curdifftag "f:$fname"
 	$ctext tag delete $curdifftag
-	set l [expr {(78 - [string length $fname]) / 2}]
+	set l [expr {(78 - [string length $header]) / 2}]
 	set pad [string range "----------------------------------------" 1 $l]
-	$ctext insert end "$pad $fname $pad\n" filesep
+	$ctext insert end "$pad $header $pad\n" filesep
     } elseif {[string range $line 0 2] == "+++"} {
 	# no need to do anything with this
+    } elseif {[regexp {^Created: (.*) \((mode: *[0-7]*)\)} $line match fn m]} {
+	set diffnexthead $fn
+	set diffnextnote "created, mode $m"
+    } elseif {[string range $line 0 8] == "Deleted: "} {
+	set diffnexthead [string range $line 9 end]
+	set diffnextnote "deleted"
+    } elseif {[regexp {^diff --git a/(.*) b/} $line match fn]} {
+	# save the filename in case the next thing is "new file mode ..."
+	set diffnexthead $fn
+	set diffnextnote "modified"
+    } elseif {[regexp {^new file mode ([0-7]+)} $line match m]} {
+	set diffnextnote "new file, mode $m"
+    } elseif {[string range $line 0 11] == "deleted file"} {
+	set diffnextnote "deleted"
     } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
 		   $line match f1l f1c f2l f2c rest]} {
 	$ctext insert end "\t" hunksep
@@ -874,11 +1106,15 @@ proc getblobdiffline {bdf id} {
 	} elseif {$x == " "} {
 	    set line [string range $line 1 end]
 	    $ctext insert end "$line\n"
+	} elseif {$x == "\\"} {
+	    # e.g. "\ No newline at end of file"
+	    $ctext insert end "$line\n" filesep
 	} else {
 	    # Something else we don't recognize
 	    if {$curdifftag != "Comments"} {
 		$ctext insert end "\n"
 		$ctext tag add $curdifftag $curtagstart end
+		set seenfile($curdifftag) 1
 		set curtagstart [$ctext index "end - 1c"]
 		set curdifftag Comments
 	    }
@@ -888,15 +1124,28 @@ proc getblobdiffline {bdf id} {
     $ctext conf -state disabled
 }
 
+proc nextfile {} {
+    global difffilestart ctext
+    set here [$ctext index @0,0]
+    for {set i 0} {[info exists difffilestart($i)]} {incr i} {
+	if {[$ctext compare $difffilestart($i) > $here]} {
+	    $ctext yview $difffilestart($i)
+	    break
+	}
+    }
+}
+
 proc listboxsel {} {
-    global ctext cflist currentid treediffs
+    global ctext cflist currentid treediffs seenfile
     if {![info exists currentid]} return
     set sel [$cflist curselection]
     if {$sel == {} || [lsearch -exact $sel 0] >= 0} {
 	# show everything
 	$ctext tag conf Comments -elide 0
 	foreach f $treediffs($currentid) {
-	    $ctext tag conf "f:$f" -elide 0
+	    if [info exists seenfile(f:$f)] {
+		$ctext tag conf "f:$f" -elide 0
+	    }
 	}
     } else {
 	# just show selected files
@@ -904,7 +1153,9 @@ proc listboxsel {} {
 	set i 1
 	foreach f $treediffs($currentid) {
 	    set elide [expr {[lsearch -exact $sel $i] < 0}]
-	    $ctext tag conf "f:$f" -elide $elide
+	    if [info exists seenfile(f:$f)] {
+		$ctext tag conf "f:$f" -elide $elide
+	    }
 	    incr i
 	}
     }
@@ -958,17 +1209,18 @@ set boldnames 0
 set diffopts "-U 5 -p"
 
 set mainfont {Helvetica 9}
-set namefont $mainfont
 set textfont {Courier 9}
-if {$boldnames} {
-    lappend namefont bold
-}
 
 set colors {green red blue magenta darkgrey brown orange}
 set colorbycommitter false
 
 catch {source ~/.gitk}
 
+set namefont $mainfont
+if {$boldnames} {
+    lappend namefont bold
+}
+
 set revtreeargs {}
 foreach arg $argv {
     switch -regexp -- $arg {
@@ -988,6 +1240,7 @@ foreach arg $argv {
 
 set stopped 0
 set redisplaying 0
+set stuffsaved 0
 setcoords
 makewindow
 getcommits $revtreeargs