Merge branches 'jc/clone' and 'jc/name'

[git.git] / gitk

diff --git a/gitk b/gitk
index cca9d35..03cd475 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -72,11 +72,9 @@ proc getcommits {rargs} {
 }
 
 proc getcommitlines {commfd}  {
 }
 
 proc getcommitlines {commfd}  {

-    global parents cdate children nchildren
-    global commitlisted commitinfo phase nextupdate
-    global stopped leftover
-    global canv
-    global displayorder commitidx commitrow
+    global commitlisted nextupdate
+    global leftover
+    global displayorder commitidx commitrow commitdata

 
     set stuff [read $commfd]
     if {$stuff == {}} {
 
     set stuff [read $commfd]
     if {$stuff == {}} {


@@ -136,12 +134,9 @@ proc getcommitlines {commfd}  {
        }
        set id [lindex $ids 0]
        set olds [lrange $ids 1 end]
        }
        set id [lindex $ids 0]
        set olds [lrange $ids 1 end]

-       set cmit [string range $cmit [expr {$j + 1}] end]

        set commitlisted($id) 1
        set commitlisted($id) 1

-       updatechildren $id [lrange $ids 1 end]
-       if {![info exists commitinfo($id)]} {
-           parsecommit $id $cmit 1
-       }
+       updatechildren $id $olds
+       set commitdata($id) [string range $cmit [expr {$j + 1}] end]

        set commitrow($id) $commitidx
        incr commitidx
        lappend displayorder $id
        set commitrow($id) $commitidx
        incr commitidx
        lappend displayorder $id


@@ -269,6 +264,21 @@ proc parsecommit {id contents listed} {
                             $comname $comdate $comment]
 }
 
                             $comname $comdate $comment]
 }
 

+proc getcommit {id} {
+    global commitdata commitinfo nparents
+
+    if {[info exists commitdata($id)]} {
+       parsecommit $id $commitdata($id) 1
+    } else {
+       readcommit $id
+       if {![info exists commitinfo($id)]} {
+           set commitinfo($id) {"No commit information available"}
+           set nparents($id) 0
+       }
+    }
+    return 1
+}
+

 proc readrefs {} {
     global tagids idtags headids idheads tagcontents
     global otherrefids idotherrefs
 proc readrefs {} {
     global tagids idtags headids idheads tagcontents
     global otherrefids idotherrefs


@@ -322,6 +332,7 @@ proc error_popup msg {
     button $w.ok -text OK -command "destroy $w"
     pack $w.ok -side bottom -fill x
     bind $w <Visibility> "grab $w; focus $w"
     button $w.ok -text OK -command "destroy $w"
     pack $w.ok -side bottom -fill x
     bind $w <Visibility> "grab $w; focus $w"

+    bind $w <Key-Return> "destroy $w"

     tkwait window $w
 }
 
     tkwait window $w
 }
 


@@ -890,7 +901,7 @@ proc showstuff {canshow} {
                    incr i
                    if {$e ne {} && $e < $numcommits && $s <= $r1 && $e >= $r0
                        && ![info exists idrangedrawn($id,$i)]} {
                    incr i
                    if {$e ne {} && $e < $numcommits && $s <= $r1 && $e >= $r0
                        && ![info exists idrangedrawn($id,$i)]} {

-                       drawlineseg $id $i 1
+                       drawlineseg $id $i

                        set idrangedrawn($id,$i) 1
                    }
                }
                        set idrangedrawn($id,$i) 1
                    }
                }


@@ -941,8 +952,9 @@ proc layoutrows {row endrow last} {
                        set offs [lreplace $offs $x $x]
                        set offs [incrange $offs $x 1]
                        set idinlist($i) 0
                        set offs [lreplace $offs $x $x]
                        set offs [incrange $offs $x 1]
                        set idinlist($i) 0

-                       lappend linesegends($row) $i
-                       lappend idrowranges($i) [expr {$row-1}]
+                       set rm1 [expr {$row - 1}]
+                       lappend linesegends($rm1) $i
+                       lappend idrowranges($i) $rm1

                        if {[incr nev -1] <= 0} break
                        continue
                    }
                        if {[incr nev -1] <= 0} break
                        continue
                    }


@@ -971,7 +983,6 @@ proc layoutrows {row endrow last} {
            unset idinlist($id)
        }
        if {[info exists idrowranges($id)]} {
            unset idinlist($id)
        }
        if {[info exists idrowranges($id)]} {

-           lappend linesegends($row) $id

            lappend idrowranges($id) $row
        }
        incr row
            lappend idrowranges($id) $row
        }
        incr row


@@ -1027,7 +1038,7 @@ proc addextraid {id row} {
 
 proc layouttail {} {
     global rowidlist rowoffsets idinlist commitidx
 
 proc layouttail {} {
     global rowidlist rowoffsets idinlist commitidx

-    global idrowranges linesegends
+    global idrowranges

 
     set row $commitidx
     set idlist [lindex $rowidlist $row]
 
     set row $commitidx
     set idlist [lindex $rowidlist $row]


@@ -1036,7 +1047,6 @@ proc layouttail {} {
        set id [lindex $idlist $col]
        addextraid $id $row
        unset idinlist($id)
        set id [lindex $idlist $col]
        addextraid $id $row
        unset idinlist($id)

-       lappend linesegends($row) $id

        lappend idrowranges($id) $row
        incr row
        set offs [ntimes $col 0]
        lappend idrowranges($id) $row
        incr row
        set offs [ntimes $col 0]


@@ -1050,7 +1060,6 @@ proc layouttail {} {
        lset rowidlist $row [list $id]
        lset rowoffsets $row 0
        makeuparrow $id 0 $row 0
        lset rowidlist $row [list $id]
        lset rowoffsets $row 0
        makeuparrow $id 0 $row 0

-       lappend linesegends($row) $id

        lappend idrowranges($id) $row
        incr row
        lappend rowidlist {}
        lappend idrowranges($id) $row
        incr row
        lappend rowidlist {}


@@ -1068,12 +1077,23 @@ proc insert_pad {row col npad} {
 }
 
 proc optimize_rows {row col endrow} {
 }
 
 proc optimize_rows {row col endrow} {

-    global rowidlist rowoffsets idrowranges
+    global rowidlist rowoffsets idrowranges linesegends displayorder

 
     for {} {$row < $endrow} {incr row} {
        set idlist [lindex $rowidlist $row]
        set offs [lindex $rowoffsets $row]
        set haspad 0
 
     for {} {$row < $endrow} {incr row} {
        set idlist [lindex $rowidlist $row]
        set offs [lindex $rowoffsets $row]
        set haspad 0

+       set downarrowcols {}
+       if {[info exists linesegends($row)]} {
+           set downarrowcols $linesegends($row)
+           if {$col > 0} {
+               while {$downarrowcols ne {}} {
+                   set i [lsearch -exact $idlist [lindex $downarrowcols 0]]
+                   if {$i < 0 || $i >= $col} break
+                   set downarrowcols [lrange $downarrowcols 1 end]
+               }
+           }
+       }

        for {} {$col < [llength $offs]} {incr col} {
            if {[lindex $idlist $col] eq {}} {
                set haspad 1
        for {} {$col < [llength $offs]} {incr col} {
            if {[lindex $idlist $col] eq {}} {
                set haspad 1


@@ -1091,6 +1111,10 @@ proc optimize_rows {row col endrow} {
                    $y0 > [lindex $idrowranges($id) 0]} {
                    set isarrow 1
                }
                    $y0 > [lindex $idrowranges($id) 0]} {
                    set isarrow 1
                }

+           } elseif {$downarrowcols ne {} &&
+                     [lindex $idlist $col] eq [lindex $downarrowcols 0]} {
+               set downarrowcols [lrange $downarrowcols 1 end]
+               set isarrow 1

            }
            if {$z < -1 || ($z < 0 && $isarrow)} {
                set npad [expr {-1 - $z + $isarrow}]
            }
            if {$z < -1 || ($z < 0 && $isarrow)} {
                set npad [expr {-1 - $z + $isarrow}]


@@ -1124,6 +1148,15 @@ proc optimize_rows {row col endrow} {
                set z [lindex $offs $col]
                set haspad 1
            }
                set z [lindex $offs $col]
                set haspad 1
            }

+           if {$z0 eq {} && !$isarrow} {
+               # 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]
+               if {$xc >= 0} {
+                   set z0 [expr {$xc - $x0}]
+               }
+           }

            if {$z0 ne {} && $z < 0 && $z0 > 0} {
                insert_pad $y0 $x0 1
                set offs [incrange $offs $col 1]
            if {$z0 ne {} && $z < 0 && $z0 > 0} {
                insert_pad $y0 $x0 1
                set offs [incrange $offs $col 1]


@@ -1131,11 +1164,26 @@ proc optimize_rows {row col endrow} {
            }
        }
        if {!$haspad} {
            }
        }
        if {!$haspad} {

+           set o {}

            for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
                set o [lindex $offs $col]
            for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
                set o [lindex $offs $col]

+               if {$o eq {}} {
+                   # check if this is the link to the first child
+                   set id [lindex $idlist $col]
+                   if {[info exists idrowranges($id)] &&
+                       $row == [lindex $idrowranges($id) 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}]
+                       }
+                   }
+               }

                if {$o eq {} || $o <= 0} break
            }
                if {$o eq {} || $o <= 0} break
            }

-           if {[incr col] < [llength $idlist]} {
+           if {$o ne {} && [incr col] < [llength $idlist]} {

                set y1 [expr {$row + 1}]
                set offs2 [lindex $rowoffsets $y1]
                set x1 -1
                set y1 [expr {$row + 1}]
                set offs2 [lindex $rowoffsets $y1]
                set x1 -1


@@ -1167,9 +1215,20 @@ proc yc {row} {
     return [expr {$canvy0 + $row * $linespc}]
 }
 
     return [expr {$canvy0 + $row * $linespc}]
 }
 

-proc drawlineseg {id i wid} {
+proc linewidth {id} {
+    global thickerline lthickness
+
+    set wid $lthickness
+    if {[info exists thickerline] && $id eq $thickerline} {
+       set wid [expr {2 * $lthickness}]
+    }
+    return $wid
+}
+
+proc drawlineseg {id i} {

     global rowoffsets rowidlist idrowranges
     global rowoffsets rowidlist idrowranges

-    global canv colormap lthickness
+    global displayorder
+    global canv colormap

 
     set startrow [lindex $idrowranges($id) [expr {2 * $i}]]
     set row [lindex $idrowranges($id) [expr {2 * $i + 1}]]
 
     set startrow [lindex $idrowranges($id) [expr {2 * $i}]]
     set row [lindex $idrowranges($id) [expr {2 * $i + 1}]]


@@ -1196,22 +1255,37 @@ proc drawlineseg {id i wid} {
        incr col $o
        incr row -1
     }
        incr col $o
        incr row -1
     }

-    if {$coords eq {}} return
-    set last [expr {[llength $idrowranges($id)] / 2 - 1}]
-    set arrow [expr {2 * ($i > 0) + ($i < $last)}]
-    set arrow [lindex {none first last both} $arrow]
-    set wid [expr {$wid * $lthickness}]

     set x [xc $row $col]
     set y [yc $row]
     lappend coords $x $y
     set x [xc $row $col]
     set y [yc $row]
     lappend coords $x $y

-    set t [$canv create line $coords -width $wid \
+    if {$i == 0} {
+       # draw the link to the first child as part of this line
+       incr row -1
+       set child [lindex $displayorder $row]
+       set ccol [lsearch -exact [lindex $rowidlist $row] $child]
+       if {$ccol >= 0} {
+           set x [xc $row $ccol]
+           set y [yc $row]
+           if {$ccol < $col - 1} {
+               lappend coords [xc $row [expr {$col - 1}]] [yc $row]
+           } elseif {$ccol > $col + 1} {
+               lappend coords [xc $row [expr {$col + 1}]] [yc $row]
+           }
+           lappend coords $x $y
+       }
+    }
+    if {[llength $coords] < 4} return
+    set last [expr {[llength $idrowranges($id)] / 2 - 1}]
+    set arrow [expr {2 * ($i > 0) + ($i < $last)}]
+    set arrow [lindex {none first last both} $arrow]
+    set t [$canv create line $coords -width [linewidth $id] \

               -fill $colormap($id) -tags lines.$id -arrow $arrow]
     $canv lower $t
     bindline $t $id
 }
 
               -fill $colormap($id) -tags lines.$id -arrow $arrow]
     $canv lower $t
     bindline $t $id
 }
 

-proc drawparentlinks {id row col olds wid} {
-    global rowidlist canv colormap lthickness
+proc drawparentlinks {id row col olds} {
+    global rowidlist canv colormap idrowranges

 
     set row2 [expr {$row + 1}]
     set x [xc $row $col]
 
     set row2 [expr {$row + 1}]
     set x [xc $row $col]


@@ -1220,8 +1294,13 @@ proc drawparentlinks {id row col olds wid} {
     set ids [lindex $rowidlist $row2]
     # rmx = right-most X coord used
     set rmx 0
     set ids [lindex $rowidlist $row2]
     # rmx = right-most X coord used
     set rmx 0

-    set wid [expr {$wid * $lthickness}]

     foreach p $olds {
     foreach p $olds {

+       if {[info exists idrowranges($p)] &&
+           $row2 == [lindex $idrowranges($p) 0] &&
+           $row2 < [lindex $idrowranges($p) 1]} {
+           # drawlineseg will do this one for us
+           continue
+       }

        set i [lsearch -exact $ids $p]
        if {$i < 0} {
            puts "oops, parent $p of $id not in list"
        set i [lsearch -exact $ids $p]
        if {$i < 0} {
            puts "oops, parent $p of $id not in list"


@@ -1240,7 +1319,7 @@ proc drawparentlinks {id row col olds wid} {
            set rmx $x2
        }
        lappend coords $x2 $y2
            set rmx $x2
        }
        lappend coords $x2 $y2

-       set t [$canv create line $coords -width $wid \
+       set t [$canv create line $coords -width [linewidth $p] \

                   -fill $colormap($p) -tags lines.$p]
        $canv lower $t
        bindline $t $p
                   -fill $colormap($p) -tags lines.$p]
        $canv lower $t
        bindline $t $p


@@ -1248,17 +1327,16 @@ proc drawparentlinks {id row col olds wid} {
     return $rmx
 }
 
     return $rmx
 }
 

-proc drawlines {id xtra} {
+proc drawlines {id} {

     global colormap canv
     global idrowranges idrangedrawn
     global children iddrawn commitrow rowidlist
 
     $canv delete lines.$id
     global colormap canv
     global idrowranges idrangedrawn
     global children iddrawn commitrow rowidlist
 
     $canv delete lines.$id

-    set wid [expr {$xtra + 1}]

     set nr [expr {[llength $idrowranges($id)] / 2}]
     for {set i 0} {$i < $nr} {incr i} {
        if {[info exists idrangedrawn($id,$i)]} {
     set nr [expr {[llength $idrowranges($id)] / 2}]
     for {set i 0} {$i < $nr} {incr i} {
        if {[info exists idrangedrawn($id,$i)]} {

-           drawlineseg $id $i $wid
+           drawlineseg $id $i

        }
     }
     if {[info exists children($id)]} {
        }
     }
     if {[info exists children($id)]} {


@@ -1267,7 +1345,7 @@ proc drawlines {id xtra} {
                set row $commitrow($child)
                set col [lsearch -exact [lindex $rowidlist $row] $child]
                if {$col >= 0} {
                set row $commitrow($child)
                set col [lsearch -exact [lindex $rowidlist $row] $child]
                if {$col >= 0} {

-                   drawparentlinks $child $row $col [list $id] $wid
+                   drawparentlinks $child $row $col [list $id]

                }
            }
        }
                }
            }
        }


@@ -1328,7 +1406,7 @@ proc drawcmitrow {row} {
            if {$e eq {}} break
            if {$row <= $e} {
                if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
            if {$e eq {}} break
            if {$row <= $e} {
                if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {

-                   drawlineseg $id $i 1
+                   drawlineseg $id $i

                    set idrangedrawn($id,$i) 1
                }
                break
                    set idrangedrawn($id,$i) 1
                }
                break


@@ -1344,16 +1422,12 @@ proc drawcmitrow {row} {
        return
     }
     if {![info exists commitinfo($id)]} {
        return
     }
     if {![info exists commitinfo($id)]} {

-       readcommit $id
-       if {![info exists commitinfo($id)]} {
-           set commitinfo($id) {"No commit information available"}
-           set nparents($id) 0
-       }
+       getcommit $id

     }
     assigncolor $id
     if {[info exists commitlisted($id)] && [info exists parents($id)]
        && $parents($id) ne {}} {
     }
     assigncolor $id
     if {[info exists commitlisted($id)] && [info exists parents($id)]
        && $parents($id) ne {}} {

-       set rmx [drawparentlinks $id $row $col $parents($id) 1]
+       set rmx [drawparentlinks $id $row $col $parents($id)]

     } else {
        set rmx 0
     }
     } else {
        set rmx 0
     }


@@ -1604,19 +1678,22 @@ proc xcoord {i level ln} {
 }
 
 proc finishcommits {} {
 }
 
 proc finishcommits {} {

-    global phase
+    global commitidx phase

     global canv mainfont ctext maincursor textcursor
     global canv mainfont ctext maincursor textcursor

+    global findinprogress

 
 

-    if {$phase == "incrdraw"} {
+    if {$commitidx > 0} {

        drawrest
     } else {
        $canv delete all
        $canv create text 3 3 -anchor nw -text "No commits selected" \
            -font $mainfont -tags textitems
        drawrest
     } else {
        $canv delete all
        $canv create text 3 3 -anchor nw -text "No commits selected" \
            -font $mainfont -tags textitems

-       set phase {}

     }
     }

-    . config -cursor $maincursor
-    settextcursor $textcursor
+    if {![info exists findinprogress]} {
+       . config -cursor $maincursor
+       settextcursor $textcursor
+    }
+    set phase {}

 }
 
 # Don't change the text pane cursor if it is currently the hand cursor,
 }
 
 # Don't change the text pane cursor if it is currently the hand cursor,


@@ -1631,7 +1708,6 @@ proc settextcursor {c} {
 }
 
 proc drawrest {} {
 }
 
 proc drawrest {} {

-    global phase

     global numcommits
     global startmsecs
     global canvy0 numcommits linespc
     global numcommits
     global startmsecs
     global canvy0 numcommits linespc


@@ -1643,7 +1719,6 @@ proc drawrest {} {
     optimize_rows $row 0 $commitidx
     showstuff $commitidx
 
     optimize_rows $row 0 $commitidx
     showstuff $commitidx
 

-    set phase {}

     set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
     #puts "overall $drawmsecs ms for $numcommits commits"
 }
     set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
     #puts "overall $drawmsecs ms for $numcommits commits"
 }


@@ -1672,7 +1747,8 @@ proc dofind {} {
     global findtype findloc findstring markedmatches commitinfo
     global numcommits displayorder linehtag linentag linedtag
     global mainfont namefont canv canv2 canv3 selectedline
     global findtype findloc findstring markedmatches commitinfo
     global numcommits displayorder linehtag linentag linedtag
     global mainfont namefont canv canv2 canv3 selectedline

-    global matchinglines foundstring foundstrlen
+    global matchinglines foundstring foundstrlen matchstring
+    global commitdata

 
     stopfindproc
     unmarkmatches
 
     stopfindproc
     unmarkmatches


@@ -1689,6 +1765,8 @@ proc dofind {} {
     }
     set foundstrlen [string length $findstring]
     if {$foundstrlen == 0} return
     }
     set foundstrlen [string length $findstring]
     if {$foundstrlen == 0} return

+    regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
+    set matchstring "*$matchstring*"

     if {$findloc == "Files"} {
        findfiles
        return
     if {$findloc == "Files"} {
        findfiles
        return


@@ -1700,8 +1778,21 @@ proc dofind {} {
     }
     set didsel 0
     set fldtypes {Headline Author Date Committer CDate Comment}
     }
     set didsel 0
     set fldtypes {Headline Author Date Committer CDate Comment}

-    for {set l 0} {$l < $numcommits} {incr l} {
-       set id [lindex $displayorder $l]
+    set l -1
+    foreach id $displayorder {
+       set d $commitdata($id)
+       incr l
+       if {$findtype == "Regexp"} {
+           set doesmatch [regexp $foundstring $d]
+       } elseif {$findtype == "IgnCase"} {
+           set doesmatch [string match -nocase $matchstring $d]
+       } else {
+           set doesmatch [string match $matchstring $d]
+       }
+       if {!$doesmatch} continue
+       if {![info exists commitinfo($id)]} {
+           getcommit $id
+       }

        set info $commitinfo($id)
        set doesmatch 0
        foreach f $info ty $fldtypes {
        set info $commitinfo($id)
        set doesmatch 0
        foreach f $info ty $fldtypes {


@@ -2069,7 +2160,7 @@ proc findcont {id} {
 # mark a commit as matching by putting a yellow background
 # behind the headline
 proc markheadline {l id} {
 # mark a commit as matching by putting a yellow background
 # behind the headline
 proc markheadline {l id} {

-    global canv mainfont linehtag commitinfo
+    global canv mainfont linehtag

 
     drawcmitrow $l
     set bbox [$canv bbox $linehtag($l)]
 
     drawcmitrow $l
     set bbox [$canv bbox $linehtag($l)]


@@ -2360,9 +2451,10 @@ proc goforw {} {
 
 proc mergediff {id} {
     global parents diffmergeid diffopts mdifffd
 
 proc mergediff {id} {
     global parents diffmergeid diffopts mdifffd

-    global difffilestart
+    global difffilestart diffids

 
     set diffmergeid $id
 
     set diffmergeid $id

+    set diffids $id

     catch {unset difffilestart}
     # this doesn't seem to actually affect anything...
     set env(GIT_DIFF_OPTS) $diffopts
     catch {unset difffilestart}
     # this doesn't seem to actually affect anything...
     set env(GIT_DIFF_OPTS) $diffopts


@@ -2379,7 +2471,7 @@ proc mergediff {id} {
 
 proc getmergediffline {mdf id} {
     global diffmergeid ctext cflist nextupdate nparents mergemax
 
 proc getmergediffline {mdf id} {
     global diffmergeid ctext cflist nextupdate nparents mergemax

-    global difffilestart
+    global difffilestart mdifffd

 
     set n [gets $mdf line]
     if {$n < 0} {
 
     set n [gets $mdf line]
     if {$n < 0} {


@@ -2388,7 +2480,8 @@ proc getmergediffline {mdf id} {
        }
        return
     }
        }
        return
     }

-    if {![info exists diffmergeid] || $id != $diffmergeid} {
+    if {![info exists diffmergeid] || $id != $diffmergeid
+       || $mdf != $mdifffd($id)} {

        return
     }
     $ctext conf -state normal
        return
     }
     $ctext conf -state normal


@@ -2498,13 +2591,11 @@ proc gettreediffline {gdtf ids} {
        set treediffs($ids) $treediff
        unset treepending
        if {$ids != $diffids} {
        set treediffs($ids) $treediff
        unset treepending
        if {$ids != $diffids} {

-           gettreediffs $diffids
-       } else {
-           if {[info exists diffmergeid]} {
-               contmergediff $ids
-           } else {
-               addtocflist $ids
+           if {![info exists diffmergeid]} {
+               gettreediffs $diffids

            }
            }

+       } else {
+           addtocflist $ids

        }
        return
     }
        }
        return
     }


@@ -2580,7 +2671,9 @@ proc getblobdiffline {bdf ids} {
        set pad [string range "----------------------------------------" 1 $l]
        $ctext insert end "$pad $header $pad\n" filesep
        set diffinhdr 1
        set pad [string range "----------------------------------------" 1 $l]
        $ctext insert end "$pad $header $pad\n" filesep
        set diffinhdr 1

-    } elseif {[regexp {^(---|\+\+\+)} $line]} {
+    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
+       # do nothing
+    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {

        set diffinhdr 0
     } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
                   $line match f1l f1c f2l f2c rest]} {
        set diffinhdr 0
     } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
                   $line match f1l f1c f2l f2c rest]} {


@@ -2725,9 +2818,9 @@ proc gotocommit {} {
        set id [string tolower $sha1string]
        if {[regexp {^[0-9a-f]{4,39}$} $id]} {
            set matches {}
        set id [string tolower $sha1string]
        if {[regexp {^[0-9a-f]{4,39}$} $id]} {
            set matches {}

-           for {set l 0} {$l < $numcommits} {incr l} {
-               if {[string match $id* [lindex $displayorder $l]]} {
-                   lappend matches [lindex $displayorder $l]
+           foreach i $displayorder {
+               if {[string match $id* $i]} {
+                   lappend matches $i

                }
            }
            if {$matches ne {}} {
                }
            }
            if {$matches ne {}} {


@@ -2755,7 +2848,7 @@ proc lineenter {x y id} {
     global hoverx hovery hoverid hovertimer
     global commitinfo canv
 
     global hoverx hovery hoverid hovertimer
     global commitinfo canv
 

-    if {![info exists commitinfo($id)]} return
+    if {![info exists commitinfo($id)] && ![getcommit $id]} return

     set hoverx $x
     set hovery $y
     set hoverid $id
     set hoverx $x
     set hovery $y
     set hoverid $id


@@ -2849,13 +2942,14 @@ proc arrowjump {id n y} {
 proc lineclick {x y id isnew} {
     global ctext commitinfo children cflist canv thickerline
 
 proc lineclick {x y id isnew} {
     global ctext commitinfo children cflist canv thickerline
 

+    if {![info exists commitinfo($id)] && ![getcommit $id]} return

     unmarkmatches
     unselectline
     normalline
     $canv delete hover
     # draw this line thicker than normal
     unmarkmatches
     unselectline
     normalline
     $canv delete hover
     # draw this line thicker than normal

-    drawlines $id 1

     set thickerline $id
     set thickerline $id

+    drawlines $id

     if {$isnew} {
        set ymax [lindex [$canv cget -scrollregion] 3]
        if {$ymax eq {}} return
     if {$isnew} {
        set ymax [lindex [$canv cget -scrollregion] 3]
        if {$ymax eq {}} return


@@ -2890,6 +2984,7 @@ proc lineclick {x y id isnew} {
        set i 0
        foreach child $children($id) {
            incr i
        set i 0
        foreach child $children($id) {
            incr i

+           if {![info exists commitinfo($child)] && ![getcommit $child]} continue

            set info $commitinfo($child)
            $ctext insert end "\n\t"
            $ctext insert end $child [list link link$i]
            set info $commitinfo($child)
            $ctext insert end "\n\t"
            $ctext insert end $child [list link link$i]


@@ -2908,8 +3003,9 @@ proc lineclick {x y id isnew} {
 proc normalline {} {
     global thickerline
     if {[info exists thickerline]} {
 proc normalline {} {
     global thickerline
     if {[info exists thickerline]} {

-       drawlines $thickerline 0
+       set id $thickerline

        unset thickerline
        unset thickerline

+       drawlines $id

     }
 }
 
     }
 }