gitk: Fix display of "(...)" for parents/children we haven't drawn

[git.git] / gitk

diff --git a/gitk b/gitk
index 9ba3d16..d59debf 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -16,110 +16,128 @@ proc gitdir {} {
     }
 }
 
     }
 }
 

-proc parse_args {rargs} {
-    global parsed_args
-
-    if {[catch {
-       set parse_args [concat --default HEAD $rargs]
-       set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
-    }]} {
-       # if git-rev-parse failed for some reason...
-       if {$rargs == {}} {
-           set rargs HEAD
-       }
-       set parsed_args $rargs
-    }
-    return $parsed_args
-}
-
-proc start_rev_list {rlargs} {
+proc start_rev_list {view} {

     global startmsecs nextupdate ncmupdate
     global startmsecs nextupdate ncmupdate

-    global commfd leftover tclencoding
+    global commfd leftover tclencoding datemode
+    global viewargs viewfiles commitidx

 
     set startmsecs [clock clicks -milliseconds]
     set nextupdate [expr {$startmsecs + 100}]
     set ncmupdate 1
 
     set startmsecs [clock clicks -milliseconds]
     set nextupdate [expr {$startmsecs + 100}]
     set ncmupdate 1

+    set commitidx($view) 0
+    set args $viewargs($view)
+    if {$viewfiles($view) ne {}} {
+       set args [concat $args "--" $viewfiles($view)]
+    }
+    set order "--topo-order"
+    if {$datemode} {
+       set order "--date-order"
+    }

     if {[catch {
     if {[catch {

-       set commfd [open [concat | git-rev-list --header --topo-order \
-                             --parents $rlargs] r]
+       set fd [open [concat | git-rev-list --header $order \
+                         --parents --boundary --default HEAD $args] r]

     } err]} {
        puts stderr "Error executing git-rev-list: $err"
        exit 1
     }
     } err]} {
        puts stderr "Error executing git-rev-list: $err"
        exit 1
     }

-    set leftover {}
-    fconfigure $commfd -blocking 0 -translation lf
+    set commfd($view) $fd
+    set leftover($view) {}
+    fconfigure $fd -blocking 0 -translation lf

     if {$tclencoding != {}} {
     if {$tclencoding != {}} {

-       fconfigure $commfd -encoding $tclencoding
+       fconfigure $fd -encoding $tclencoding

     }
     }

-    fileevent $commfd readable [list getcommitlines $commfd]
-    . config -cursor watch
-    settextcursor watch
+    fileevent $fd readable [list getcommitlines $fd $view]
+    nowbusy $view

 }
 
 }
 

-proc getcommits {rargs} {
-    global oldcommits commits phase canv mainfont env
+proc stop_rev_list {} {
+    global commfd curview

 
 

-    # check that we can find a .git directory somewhere...
-    set gitdir [gitdir]
-    if {![file isdirectory $gitdir]} {
-       error_popup "Cannot find the git directory \"$gitdir\"."
-       exit 1
+    if {![info exists commfd($curview)]} return
+    set fd $commfd($curview)
+    catch {
+       set pid [pid $fd]
+       exec kill $pid

     }
     }

-    set oldcommits {}
-    set commits {}
+    catch {close $fd}
+    unset commfd($curview)
+}
+
+proc getcommits {} {
+    global phase canv mainfont curview
+

     set phase getcommits
     set phase getcommits

-    start_rev_list [parse_args $rargs]
-    $canv delete all
-    $canv create text 3 3 -anchor nw -text "Reading commits..." \
-       -font $mainfont -tags textitems
+    initlayout
+    start_rev_list $curview
+    show_status "Reading commits..."

 }
 
 }
 

-proc getcommitlines {commfd}  {
-    global oldcommits commits parents cdate children nchildren
-    global commitlisted phase nextupdate
-    global stopped redisplaying leftover
-    global canv
+proc getcommitlines {fd view}  {
+    global commitlisted nextupdate
+    global leftover commfd
+    global displayorder commitidx commitrow commitdata
+    global parentlist childlist children curview hlview
+    global vparentlist vchildlist vdisporder vcmitlisted

 
 

-    set stuff [read $commfd]
+    set stuff [read $fd]

     if {$stuff == {}} {
     if {$stuff == {}} {

-       if {![eof $commfd]} return
+       if {![eof $fd]} return
+       global viewname
+       unset commfd($view)
+       notbusy $view

        # set it blocking so we wait for the process to terminate
        # set it blocking so we wait for the process to terminate

-       fconfigure $commfd -blocking 1
-       if {![catch {close $commfd} err]} {
-           after idle finishcommits
-           return
+       fconfigure $fd -blocking 1
+       if {[catch {close $fd} err]} {
+           set fv {}
+           if {$view != $curview} {
+               set fv " for the \"$viewname($view)\" view"
+           }
+           if {[string range $err 0 4] == "usage"} {
+               set err "Gitk: error reading commits$fv:\
+                       bad arguments to git-rev-list."
+               if {$viewname($view) eq "Command line"} {
+                   append err \
+                       "  (Note: arguments to gitk are passed to git-rev-list\
+                        to allow selection of commits to be displayed.)"
+               }
+           } else {
+               set err "Error reading commits$fv: $err"
+           }
+           error_popup $err

        }
        }

-       if {[string range $err 0 4] == "usage"} {
-           set err \
-               "Gitk: error reading commits: bad arguments to git-rev-list.\
-               (Note: arguments to gitk are passed to git-rev-list\
-               to allow selection of commits to be displayed.)"
-       } else {
-           set err "Error reading commits: $err"
+       if {$view == $curview} {
+           after idle finishcommits

        }
        }

-       error_popup $err
-       exit 1
+       return

     }
     set start 0
     }
     set start 0

+    set gotsome 0

     while 1 {
        set i [string first "\0" $stuff $start]
        if {$i < 0} {
     while 1 {
        set i [string first "\0" $stuff $start]
        if {$i < 0} {

-           append leftover [string range $stuff $start end]
-           return
+           append leftover($view) [string range $stuff $start end]
+           break

        }
        }

-       set cmit [string range $stuff $start [expr {$i - 1}]]

        if {$start == 0} {
        if {$start == 0} {

-           set cmit "$leftover$cmit"
-           set leftover {}
+           set cmit $leftover($view)
+           append cmit [string range $stuff 0 [expr {$i - 1}]]
+           set leftover($view) {}
+       } else {
+           set cmit [string range $stuff $start [expr {$i - 1}]]

        }
        set start [expr {$i + 1}]
        set j [string first "\n" $cmit]
        set ok 0
        }
        set start [expr {$i + 1}]
        set j [string first "\n" $cmit]
        set ok 0

+       set listed 1

        if {$j >= 0} {
            set ids [string range $cmit 0 [expr {$j - 1}]]
        if {$j >= 0} {
            set ids [string range $cmit 0 [expr {$j - 1}]]

+           if {[string range $ids 0 0] == "-"} {
+               set listed 0
+               set ids [string range $ids 1 end]
+           }

            set ok 1
            foreach id $ids {
            set ok 1
            foreach id $ids {

-               if {![regexp {^[0-9a-f]{40}$} $id]} {
+               if {[string length $id] != 40} {

                    set ok 0
                    break
                }
                    set ok 0
                    break
                }


@@ -134,37 +152,54 @@ proc getcommitlines {commfd}  {
            exit 1
        }
        set id [lindex $ids 0]
            exit 1
        }
        set id [lindex $ids 0]

-       set olds [lrange $ids 1 end]
-       set cmit [string range $cmit [expr {$j + 1}] end]
-       lappend commits $id
-       set commitlisted($id) 1
-       parsecommit $id $cmit 1 [lrange $ids 1 end]
-       drawcommit $id 1
-       if {[clock clicks -milliseconds] >= $nextupdate} {
-           doupdate 1
-       }
-       while {$redisplaying} {
-           set redisplaying 0
-           if {$stopped == 1} {
-               set stopped 0
-               set phase "getcommits"
-               foreach id $commits {
-                   drawcommit $id 1
-                   if {$stopped} break
-                   if {[clock clicks -milliseconds] >= $nextupdate} {
-                       doupdate 1
-                   }
+       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

                }
                }

+               incr i

            }
            }

+       } else {
+           set olds {}
+       }
+       if {![info exists children($view,$id)]} {
+           set children($view,$id) {}
+       }
+       set commitdata($id) [string range $cmit [expr {$j + 1}] end]
+       set commitrow($view,$id) $commitidx($view)
+       incr commitidx($view)
+       if {$view == $curview} {
+           lappend parentlist $olds
+           lappend childlist $children($view,$id)
+           lappend displayorder $id
+           lappend commitlisted $listed
+       } else {
+           lappend vparentlist($view) $olds
+           lappend vchildlist($view) $children($view,$id)
+           lappend vdisporder($view) $id
+           lappend vcmitlisted($view) $listed

        }
        }

+       set gotsome 1
+    }
+    if {$gotsome} {
+       if {$view == $curview} {
+           layoutmore
+       } elseif {[info exists hlview] && $view == $hlview} {
+           highlightmore
+       }
+    }
+    if {[clock clicks -milliseconds] >= $nextupdate} {
+       doupdate

     }
 }
 
     }
 }
 

-proc doupdate {reading} {
+proc doupdate {} {

     global commfd nextupdate numcommits ncmupdate
 
     global commfd nextupdate numcommits ncmupdate
 

-    if {$reading} {
-       fileevent $commfd readable {}
+    foreach v [array names commfd] {
+       fileevent $commfd($v) readable {}

     }
     update
     set nextupdate [expr {[clock clicks -milliseconds] + 100}]
     }
     update
     set nextupdate [expr {[clock clicks -milliseconds] + 100}]


@@ -175,130 +210,37 @@ proc doupdate {reading} {
     } else {
        set ncmupdate [expr {$numcommits + 100}]
     }
     } else {
        set ncmupdate [expr {$numcommits + 100}]
     }

-    if {$reading} {
-       fileevent $commfd readable [list getcommitlines $commfd]
+    foreach v [array names commfd] {
+       set fd $commfd($v)
+       fileevent $fd readable [list getcommitlines $fd $v]

     }
 }
 
 proc readcommit {id} {
     if {[catch {set contents [exec git-cat-file commit $id]}]} return
     }
 }
 
 proc readcommit {id} {
     if {[catch {set contents [exec git-cat-file commit $id]}]} return

-    parsecommit $id $contents 0 {}
+    parsecommit $id $contents 0

 }
 
 }
 

-proc updatecommits {rargs} {
-    global commitlisted commfd phase
-    global startmsecs nextupdate ncmupdate
-    global idtags idheads idotherrefs
-    global leftover
-    global parsed_args
-    global canv mainfont
-    global oldcommits commits
-    global parents nchildren children ncleft
-
-    set old_args $parsed_args
-    parse_args $rargs
-
-    if {$phase == "getcommits" || $phase == "incrdraw"} {
-       # havent read all the old commits, just start again from scratch
-       stopfindproc
-       set oldcommits {}
-       set commits {}
-       foreach v {children nchildren parents commitlisted commitinfo
-                  selectedline matchinglines treediffs
-                  mergefilelist currentid rowtextx} {
-           global $v
-           catch {unset $v}
-       }
-       readrefs
-       if {$phase == "incrdraw"} {
-           allcanvs delete all
-           $canv create text 3 3 -anchor nw -text "Reading commits..." \
-               -font $mainfont -tags textitems
-           set phase getcommits
-       }
-       start_rev_list $parsed_args
-       return
-    }
-
-    foreach id $old_args {
-       if {![regexp {^[0-9a-f]{40}$} $id]} continue
-       if {[info exists oldref($id)]} continue
-       set oldref($id) $id
-       lappend ignoreold "^$id"
-    }
-    foreach id $parsed_args {
-       if {![regexp {^[0-9a-f]{40}$} $id]} continue
-       if {[info exists ref($id)]} continue
-       set ref($id) $id
-       lappend ignorenew "^$id"
-    }
-
-    foreach a $old_args {
-       if {![info exists ref($a)]} {
-           lappend ignorenew $a
-       }
-    }
+proc updatecommits {} {
+    global viewdata curview phase displayorder
+    global children commitrow

 
 

-    set phase updatecommits
-    set oldcommits $commits
-    set commits {}
-    set removed_commits [split [eval exec git-rev-list $ignorenew] "\n" ]
-    if {[llength $removed_commits] > 0} {
-       allcanvs delete all
-       foreach c $removed_commits {
-           set i [lsearch -exact $oldcommits $c]
-           if {$i >= 0} {
-               set oldcommits [lreplace $oldcommits $i $i]
-               unset commitlisted($c)
-               foreach p $parents($c) {
-                   if {[info exists nchildren($p)]} {
-                       set j [lsearch -exact $children($p) $c]
-                       if {$j >= 0} {
-                           set children($p) [lreplace $children($p) $j $j]
-                           incr nchildren($p) -1
-                       }
-                   }
-               }
-           }
-       }
-       set phase removecommits
+    if {$phase ne {}} {
+       stop_rev_list
+       set phase {}

     }
     }

-
-    set args {}
-    foreach a $parsed_args {
-       if {![info exists oldref($a)]} {
-           lappend args $a
-       }
+    set n $curview
+    foreach id $displayorder {
+       catch {unset children($n,$id)}
+       catch {unset commitrow($n,$id)}

     }
     }

-
+    set curview -1
+    catch {unset viewdata($n)}

     readrefs
     readrefs

-    start_rev_list [concat $ignoreold $args]
-}
-
-proc updatechildren {id olds} {
-    global children nchildren parents nparents ncleft
-
-    if {![info exists nchildren($id)]} {
-       set children($id) {}
-       set nchildren($id) 0
-       set ncleft($id) 0
-    }
-    set parents($id) $olds
-    set nparents($id) [llength $olds]
-    foreach p $olds {
-       if {![info exists nchildren($p)]} {
-           set children($p) [list $id]
-           set nchildren($p) 1
-           set ncleft($p) 1
-       } elseif {[lsearch -exact $children($p) $id] < 0} {
-           lappend children($p) $id
-           incr nchildren($p)
-           incr ncleft($p)
-       }
-    }
+    showview $n

 }
 
 }
 

-proc parsecommit {id contents listed olds} {
+proc parsecommit {id contents listed} {

     global commitinfo cdate
 
     set inhdr 1
     global commitinfo cdate
 
     set inhdr 1


@@ -308,7 +250,6 @@ proc parsecommit {id contents listed olds} {
     set audate {}
     set comname {}
     set comdate {}
     set audate {}
     set comname {}
     set comdate {}

-    updatechildren $id $olds

     set hdrend [string first "\n\n" $contents]
     if {$hdrend < 0} {
        # should never happen...
     set hdrend [string first "\n\n" $contents]
     if {$hdrend < 0} {
        # should never happen...


@@ -352,6 +293,20 @@ proc parsecommit {id contents listed olds} {
                             $comname $comdate $comment]
 }
 
                             $comname $comdate $comment]
 }
 

+proc getcommit {id} {
+    global commitdata commitinfo
+
+    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"}
+       }
+    }
+    return 1
+}
+

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


@@ -359,16 +314,22 @@ proc readrefs {} {
     foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
        catch {unset $v}
     }
     foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
        catch {unset $v}
     }

-    set refd [open [list | git-ls-remote [gitdir]] r]
+    set refd [open [list | git ls-remote [gitdir]] r]

     while {0 <= [set n [gets $refd line]]} {
        if {![regexp {^([0-9a-f]{40})   refs/([^^]*)$} $line \
            match id path]} {
            continue
        }
     while {0 <= [set n [gets $refd line]]} {
        if {![regexp {^([0-9a-f]{40})   refs/([^^]*)$} $line \
            match id path]} {
            continue
        }

+       if {[regexp {^remotes/.*/HEAD$} $path match]} {
+           continue
+       }

        if {![regexp {^(tags|heads)/(.*)$} $path match type name]} {
            set type others
            set name $path
        }
        if {![regexp {^(tags|heads)/(.*)$} $path match type name]} {
            set type others
            set name $path
        }

+       if {[regexp {^remotes/} $path match]} {
+           set type heads
+       }

        if {$type == "tags"} {
            set tagids($name) $id
            lappend idtags($id) $name
        if {$type == "tags"} {
            set tagids($name) $id
            lappend idtags($id) $name


@@ -396,20 +357,26 @@ proc readrefs {} {
     close $refd
 }
 
     close $refd
 }
 

-proc error_popup msg {
-    set w .error
-    toplevel $w
-    wm transient $w .
+proc show_error {w msg} {

     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"
     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"

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

     tkwait window $w
 }
 
     tkwait window $w
 }
 

-proc makewindow {rargs} {
-    global canv canv2 canv3 linespc charspc ctext cflist textfont
+proc error_popup msg {
+    set w .error
+    toplevel $w
+    wm transient $w .
+    show_error $w $msg
+}
+
+proc makewindow {} {
+    global canv canv2 canv3 linespc charspc ctext cflist
+    global textfont mainfont uifont

     global findtype findtypemenu findloc findstring fstring geometry
     global entries sha1entry sha1string sha1but
     global maincursor textcursor curtextcursor
     global findtype findtypemenu findloc findstring fstring geometry
     global entries sha1entry sha1string sha1but
     global maincursor textcursor curtextcursor


@@ -417,16 +384,38 @@ proc makewindow {rargs} {
 
     menu .bar
     .bar add cascade -label "File" -menu .bar.file
 
     menu .bar
     .bar add cascade -label "File" -menu .bar.file

+    .bar configure -font $uifont

     menu .bar.file
     menu .bar.file

-    .bar.file add command -label "Update" -command [list updatecommits $rargs]
+    .bar.file add command -label "Update" -command updatecommits

     .bar.file add command -label "Reread references" -command rereadrefs
     .bar.file add command -label "Quit" -command doquit
     .bar.file add command -label "Reread references" -command rereadrefs
     .bar.file add command -label "Quit" -command doquit

+    .bar.file configure -font $uifont

     menu .bar.edit
     .bar add cascade -label "Edit" -menu .bar.edit
     .bar.edit add command -label "Preferences" -command doprefs
     menu .bar.edit
     .bar add cascade -label "Edit" -menu .bar.edit
     .bar.edit add command -label "Preferences" -command doprefs

+    .bar.edit configure -font $uifont
+
+    menu .bar.view -font $uifont
+    menu .bar.view.hl -font $uifont -tearoff 0
+    .bar add cascade -label "View" -menu .bar.view
+    .bar.view add command -label "New view..." -command {newview 0}
+    .bar.view add command -label "Edit view..." -command editview \
+       -state disabled
+    .bar.view add command -label "Delete view" -command delview -state disabled
+    .bar.view add cascade -label "Highlight" -menu .bar.view.hl
+    .bar.view add separator
+    .bar.view add radiobutton -label "All files" -command {showview 0} \
+       -variable selectedview -value 0
+    .bar.view.hl add command -label "New view..." -command {newview 1}
+    .bar.view.hl add command -label "Remove" -command delhighlight \
+       -state disabled
+    .bar.view.hl add separator
+    

     menu .bar.help
     .bar add cascade -label "Help" -menu .bar.help
     .bar.help add command -label "About gitk" -command about
     menu .bar.help
     .bar add cascade -label "Help" -menu .bar.help
     .bar.help add command -label "About gitk" -command about

+    .bar.help add command -label "Key bindings" -command keys
+    .bar.help configure -font $uifont

     . configure -menu .bar
 
     if {![info exists geometry(canv1)]} {
     . configure -menu .bar
 
     if {![info exists geometry(canv1)]} {


@@ -457,7 +446,7 @@ proc makewindow {rargs} {
     set canv .ctop.top.clist.canv
     canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
        -bg white -bd 0 \
     set canv .ctop.top.clist.canv
     canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
        -bg white -bd 0 \

-       -yscrollincr $linespc -yscrollcommand "$cscroll set"
+       -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"

     .ctop.top.clist add $canv
     set canv2 .ctop.top.clist.canv2
     canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
     .ctop.top.clist add $canv
     set canv2 .ctop.top.clist.canv2
     canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \


@@ -473,7 +462,7 @@ proc makewindow {rargs} {
     set entries $sha1entry
     set sha1but .ctop.top.bar.sha1label
     button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
     set entries $sha1entry
     set sha1but .ctop.top.bar.sha1label
     button $sha1but -text "SHA1 ID: " -state disabled -relief flat \

-       -command gotocommit -width 8
+       -command gotocommit -width 8 -font $uifont

     $sha1but conf -disabledforeground [$sha1but cget -foreground]
     pack .ctop.top.bar.sha1label -side left
     entry $sha1entry -width 40 -font $textfont -textvariable sha1string
     $sha1but conf -disabledforeground [$sha1but cget -foreground]
     pack .ctop.top.bar.sha1label -side left
     entry $sha1entry -width 40 -font $textfont -textvariable sha1string


@@ -503,19 +492,24 @@ proc makewindow {rargs} {
        -state disabled -width 26
     pack .ctop.top.bar.rightbut -side left -fill y
 
        -state disabled -width 26
     pack .ctop.top.bar.rightbut -side left -fill y
 

-    button .ctop.top.bar.findbut -text "Find" -command dofind
+    button .ctop.top.bar.findbut -text "Find" -command dofind -font $uifont

     pack .ctop.top.bar.findbut -side left
     set findstring {}
     set fstring .ctop.top.bar.findstring
     lappend entries $fstring
     pack .ctop.top.bar.findbut -side left
     set findstring {}
     set fstring .ctop.top.bar.findstring
     lappend entries $fstring

-    entry $fstring -width 30 -font $textfont -textvariable findstring
+    entry $fstring -width 30 -font $textfont -textvariable findstring -font $textfont

     pack $fstring -side left -expand 1 -fill x
     set findtype Exact
     set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
                          findtype Exact IgnCase Regexp]
     pack $fstring -side left -expand 1 -fill x
     set findtype Exact
     set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
                          findtype Exact IgnCase Regexp]

+    .ctop.top.bar.findtype configure -font $uifont
+    .ctop.top.bar.findtype.menu configure -font $uifont

     set findloc "All fields"
     tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
        Comments Author Committer Files Pickaxe
     set findloc "All fields"
     tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
        Comments Author Committer Files Pickaxe

+    .ctop.top.bar.findloc configure -font $uifont
+    .ctop.top.bar.findloc.menu configure -font $uifont
+

     pack .ctop.top.bar.findloc -side right
     pack .ctop.top.bar.findtype -side right
     # for making sure type==Exact whenever loc==Pickaxe
     pack .ctop.top.bar.findloc -side right
     pack .ctop.top.bar.findtype -side right
     # for making sure type==Exact whenever loc==Pickaxe


@@ -527,7 +521,7 @@ proc makewindow {rargs} {
     set ctext .ctop.cdet.left.ctext
     text $ctext -bg white -state disabled -font $textfont \
        -width $geometry(ctextw) -height $geometry(ctexth) \
     set ctext .ctop.cdet.left.ctext
     text $ctext -bg white -state disabled -font $textfont \
        -width $geometry(ctextw) -height $geometry(ctexth) \

-       -yscrollcommand ".ctop.cdet.left.sb set" -wrap none
+       -yscrollcommand {.ctop.cdet.left.sb set} -wrap none

     scrollbar .ctop.cdet.left.sb -command "$ctext yview"
     pack .ctop.cdet.left.sb -side right -fill y
     pack $ctext -side left -fill both -expand 1
     scrollbar .ctop.cdet.left.sb -command "$ctext yview"
     pack .ctop.cdet.left.sb -side right -fill y
     pack $ctext -side left -fill both -expand 1


@@ -542,19 +536,43 @@ proc makewindow {rargs} {
     $ctext tag conf m2 -fore green
     $ctext tag conf m3 -fore purple
     $ctext tag conf m4 -fore brown
     $ctext tag conf m2 -fore green
     $ctext tag conf m3 -fore purple
     $ctext tag conf m4 -fore brown

+    $ctext tag conf m5 -fore "#009090"
+    $ctext tag conf m6 -fore magenta
+    $ctext tag conf m7 -fore "#808000"
+    $ctext tag conf m8 -fore "#009000"
+    $ctext tag conf m9 -fore "#ff0080"
+    $ctext tag conf m10 -fore cyan
+    $ctext tag conf m11 -fore "#b07070"
+    $ctext tag conf m12 -fore "#70b0f0"
+    $ctext tag conf m13 -fore "#70f0b0"
+    $ctext tag conf m14 -fore "#f0b070"
+    $ctext tag conf m15 -fore "#ff70b0"

     $ctext tag conf mmax -fore darkgrey
     $ctext tag conf mmax -fore darkgrey

-    set mergemax 5
+    set mergemax 16

     $ctext tag conf mresult -font [concat $textfont bold]
     $ctext tag conf msep -font [concat $textfont bold]
     $ctext tag conf found -back yellow
 
     frame .ctop.cdet.right
     $ctext tag conf mresult -font [concat $textfont bold]
     $ctext tag conf msep -font [concat $textfont bold]
     $ctext tag conf found -back yellow
 
     frame .ctop.cdet.right

+    frame .ctop.cdet.right.mode
+    radiobutton .ctop.cdet.right.mode.patch -text "Patch" \
+       -command reselectline -variable cmitmode -value "patch"
+    radiobutton .ctop.cdet.right.mode.tree -text "Tree" \
+       -command reselectline -variable cmitmode -value "tree"
+    grid .ctop.cdet.right.mode.patch .ctop.cdet.right.mode.tree -sticky ew
+    pack .ctop.cdet.right.mode -side top -fill x

     set cflist .ctop.cdet.right.cfiles
     set cflist .ctop.cdet.right.cfiles

-    listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
-       -yscrollcommand ".ctop.cdet.right.sb set"
+    set indent [font measure $mainfont "nn"]
+    text $cflist -width $geometry(cflistw) -background white -font $mainfont \
+       -tabs [list $indent [expr {2 * $indent}]] \
+       -yscrollcommand ".ctop.cdet.right.sb set" \
+       -cursor [. cget -cursor] \
+       -spacing1 1 -spacing3 1

     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
     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

+    $cflist tag configure highlight \
+       -background [$cflist cget -selectbackground]

     .ctop.cdet add .ctop.cdet.right
     bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
 
     .ctop.cdet add .ctop.cdet.right
     bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
 


@@ -564,14 +582,22 @@ proc makewindow {rargs} {
     #bindall <B1-Motion> {selcanvline %W %x %y}
     bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
     bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
     #bindall <B1-Motion> {selcanvline %W %x %y}
     bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
     bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"

-    bindall <2> "allcanvs scan mark 0 %y"
-    bindall <B2-Motion> "allcanvs scan dragto 0 %y"
+    bindall <2> "canvscan mark %W %x %y"
+    bindall <B2-Motion> "canvscan dragto %W %x %y"
+    bindkey <Home> selfirstline
+    bindkey <End> sellastline

     bind . <Key-Up> "selnextline -1"
     bind . <Key-Down> "selnextline 1"
     bind . <Key-Up> "selnextline -1"
     bind . <Key-Down> "selnextline 1"

-    bind . <Key-Right> "goforw"
-    bind . <Key-Left> "goback"
-    bind . <Key-Prior> "allcanvs yview scroll -1 pages"
-    bind . <Key-Next> "allcanvs yview scroll 1 pages"
+    bindkey <Key-Right> "goforw"
+    bindkey <Key-Left> "goback"
+    bind . <Key-Prior> "selnextpage -1"
+    bind . <Key-Next> "selnextpage 1"
+    bind . <Control-Home> "allcanvs yview moveto 0.0"
+    bind . <Control-End> "allcanvs yview moveto 1.0"
+    bind . <Control-Key-Up> "allcanvs yview scroll -1 units"
+    bind . <Control-Key-Down> "allcanvs yview scroll 1 units"
+    bind . <Control-Key-Prior> "allcanvs yview scroll -1 pages"
+    bind . <Control-Key-Next> "allcanvs yview scroll 1 pages"

     bindkey <Key-Delete> "$ctext yview scroll -1 pages"
     bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
     bindkey <Key-space> "$ctext yview scroll 1 pages"
     bindkey <Key-Delete> "$ctext yview scroll -1 pages"
     bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
     bindkey <Key-space> "$ctext yview scroll 1 pages"


@@ -598,12 +624,14 @@ proc makewindow {rargs} {
     bind . <Control-KP_Add> {incrfont 1}
     bind . <Control-minus> {incrfont -1}
     bind . <Control-KP_Subtract> {incrfont -1}
     bind . <Control-KP_Add> {incrfont 1}
     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
     bind $sha1entry <Key-Return> gotocommit
     bind $sha1entry <<PasteSelection>> clearsha1
     bind . <Destroy> {savestuff %W}
     bind . <Button-1> "click %W"
     bind $fstring <Key-Return> dofind
     bind $sha1entry <Key-Return> gotocommit
     bind $sha1entry <<PasteSelection>> clearsha1

+    bind $cflist <1> {sel_flist %W %x %y; break}
+    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
+    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}

 
     set maincursor [. cget -cursor]
     set textcursor [$ctext cget -cursor]
 
     set maincursor [. cget -cursor]
     set textcursor [$ctext cget -cursor]


@@ -620,6 +648,24 @@ proc makewindow {rargs} {
     $rowctxmenu add command -label "Write commit to file" -command writecommit
 }
 
     $rowctxmenu add command -label "Write commit to file" -command writecommit
 }
 

+# mouse-2 makes all windows scan vertically, but only the one
+# the cursor is in scans horizontally
+proc canvscan {op w x y} {
+    global canv canv2 canv3
+    foreach c [list $canv $canv2 $canv3] {
+       if {$c == $w} {
+           $c scan $op $x $y
+       } else {
+           $c scan $op 0 $y
+       }
+    }
+}
+
+proc scrollcanv {cscroll f0 f1} {
+    $cscroll set $f0 $f1
+    drawfrac $f0 $f1
+}
+

 # 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.
 # 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.


@@ -646,9 +692,11 @@ proc click {w} {
 }
 
 proc savestuff {w} {
 }
 
 proc savestuff {w} {

-    global canv canv2 canv3 ctext cflist mainfont textfont
+    global canv canv2 canv3 ctext cflist mainfont textfont uifont

     global stuffsaved findmergefiles maxgraphpct
     global maxwidth
     global stuffsaved findmergefiles maxgraphpct
     global maxwidth

+    global viewname viewfiles viewargs viewperm nextviewnum
+    global cmitmode

 
     if {$stuffsaved} return
     if {![winfo viewable .]} return
 
     if {$stuffsaved} return
     if {![winfo viewable .]} return


@@ -656,9 +704,11 @@ proc savestuff {w} {
        set f [open "~/.gitk-new" w]
        puts $f [list set mainfont $mainfont]
        puts $f [list set textfont $textfont]
        set f [open "~/.gitk-new" w]
        puts $f [list set mainfont $mainfont]
        puts $f [list set textfont $textfont]

+       puts $f [list set uifont $uifont]

        puts $f [list set findmergefiles $findmergefiles]
        puts $f [list set maxgraphpct $maxgraphpct]
        puts $f [list set maxwidth $maxwidth]
        puts $f [list set findmergefiles $findmergefiles]
        puts $f [list set maxgraphpct $maxgraphpct]
        puts $f [list set maxwidth $maxwidth]

+       puts $f [list set cmitmode $cmitmode]

        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(width) [winfo width .ctop]"
        puts $f "set geometry(height) [winfo height .ctop]"
        puts $f "set geometry(canv1) [expr {[winfo width $canv]-2}]"


@@ -671,6 +721,13 @@ proc savestuff {w} {
        set wid [expr {([winfo width $cflist] - 11) \
                           / [font measure [$cflist cget -font] "0"]}]
        puts $f "set geometry(cflistw) $wid"
        set wid [expr {([winfo width $cflist] - 11) \
                           / [font measure [$cflist cget -font] "0"]}]
        puts $f "set geometry(cflistw) $wid"

+       puts -nonewline $f "set permviews {"
+       for {set v 0} {$v < $nextviewnum} {incr v} {
+           if {$viewperm($v)} {
+               puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v)]}"
+           }
+       }
+       puts $f "}"

        close $f
        file rename -force "~/.gitk-new" "~/.gitk"
     }
        close $f
        file rename -force "~/.gitk-new" "~/.gitk"
     }


@@ -752,9 +809,9 @@ proc about {} {
     toplevel $w
     wm title $w "About gitk"
     message $w.m -text {
     toplevel $w
     wm title $w "About gitk"
     message $w.m -text {

-Gitk version 1.2
+Gitk - a commit viewer for git

 
 

-Copyright © 2005 Paul Mackerras
+Copyright © 2005-2006 Paul Mackerras

 
 Use and redistribute under the terms of the GNU General Public License} \
            -justify center -aspect 400
 
 Use and redistribute under the terms of the GNU General Public License} \
            -justify center -aspect 400


@@ -763,832 +820,1862 @@ Use and redistribute under the terms of the GNU General Public License} \
     pack $w.ok -side bottom
 }
 
     pack $w.ok -side bottom
 }
 

-proc assigncolor {id} {
-    global colormap commcolors colors nextcolor
-    global parents nparents children nchildren
-    global cornercrossings crossings
-
-    if {[info exists colormap($id)]} return
-    set ncolors [llength $colors]
-    if {$nparents($id) <= 1 && $nchildren($id) == 1} {
-       set child [lindex $children($id) 0]
-       if {[info exists colormap($child)]
-           && $nparents($child) == 1} {
-           set colormap($id) $colormap($child)
-           return
-       }
+proc keys {} {
+    set w .keys
+    if {[winfo exists $w]} {
+       raise $w
+       return

     }
     }

-    set badcolors {}
-    if {[info exists cornercrossings($id)]} {
-       foreach x $cornercrossings($id) {
-           if {[info exists colormap($x)]
-               && [lsearch -exact $badcolors $colormap($x)] < 0} {
-               lappend badcolors $colormap($x)
+    toplevel $w
+    wm title $w "Gitk key bindings"
+    message $w.m -text {
+Gitk key bindings:
+
+<Ctrl-Q>               Quit
+<Home>         Move to first commit
+<End>          Move to last commit
+<Up>, p, i     Move up one commit
+<Down>, n, k   Move down one commit
+<Left>, z, j   Go back in history list
+<Right>, x, l  Go forward in history list
+<PageUp>       Move up one page in commit list
+<PageDown>     Move down one page in commit list
+<Ctrl-Home>    Scroll to top of commit list
+<Ctrl-End>     Scroll to bottom of commit list
+<Ctrl-Up>      Scroll commit list up one line
+<Ctrl-Down>    Scroll commit list down one line
+<Ctrl-PageUp>  Scroll commit list up one page
+<Ctrl-PageDown>        Scroll commit list down one page
+<Delete>, b    Scroll diff view up one page
+<Backspace>    Scroll diff view up one page
+<Space>                Scroll diff view down one page
+u              Scroll diff view up 18 lines
+d              Scroll diff view down 18 lines
+<Ctrl-F>               Find
+<Ctrl-G>               Move to next find hit
+<Ctrl-R>               Move to previous find hit
+<Return>       Move to next find hit
+/              Move to next find hit, or redo find
+?              Move to previous find hit
+f              Scroll diff view to next file
+<Ctrl-KP+>     Increase font size
+<Ctrl-plus>    Increase font size
+<Ctrl-KP->     Decrease font size
+<Ctrl-minus>   Decrease font size
+} \
+           -justify left -bg white -border 2 -relief sunken
+    pack $w.m -side top -fill both
+    button $w.ok -text Close -command "destroy $w"
+    pack $w.ok -side bottom
+}
+
+# Procedures for manipulating the file list window at the
+# bottom right of the overall window.
+
+proc treeview {w l openlevs} {
+    global treecontents treediropen treeheight treeparent treeindex
+
+    set ix 0
+    set treeindex() 0
+    set lev 0
+    set prefix {}
+    set prefixend -1
+    set prefendstack {}
+    set htstack {}
+    set ht 0
+    set treecontents() {}
+    $w conf -state normal
+    foreach f $l {
+       while {[string range $f 0 $prefixend] ne $prefix} {
+           if {$lev <= $openlevs} {
+               $w mark set e:$treeindex($prefix) "end -1c"
+               $w mark gravity e:$treeindex($prefix) left

            }
            }

-       }
-       if {[llength $badcolors] >= $ncolors} {
-           set badcolors {}
-       }
-    }
-    set origbad $badcolors
-    if {[llength $badcolors] < $ncolors - 1} {
-       if {[info exists crossings($id)]} {
-           foreach x $crossings($id) {
-               if {[info exists colormap($x)]
-                   && [lsearch -exact $badcolors $colormap($x)] < 0} {
-                   lappend badcolors $colormap($x)
-               }
+           set treeheight($prefix) $ht
+           incr ht [lindex $htstack end]
+           set htstack [lreplace $htstack end end]
+           set prefixend [lindex $prefendstack end]
+           set prefendstack [lreplace $prefendstack end end]
+           set prefix [string range $prefix 0 $prefixend]
+           incr lev -1
+       }
+       set tail [string range $f [expr {$prefixend+1}] end]
+       while {[set slash [string first "/" $tail]] >= 0} {
+           lappend htstack $ht
+           set ht 0
+           lappend prefendstack $prefixend
+           incr prefixend [expr {$slash + 1}]
+           set d [string range $tail 0 $slash]
+           lappend treecontents($prefix) $d
+           set oldprefix $prefix
+           append prefix $d
+           set treecontents($prefix) {}
+           set treeindex($prefix) [incr ix]
+           set treeparent($prefix) $oldprefix
+           set tail [string range $tail [expr {$slash+1}] end]
+           if {$lev <= $openlevs} {
+               set ht 1
+               set treediropen($prefix) [expr {$lev < $openlevs}]
+               set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
+               $w mark set d:$ix "end -1c"
+               $w mark gravity d:$ix left
+               set str "\n"
+               for {set i 0} {$i < $lev} {incr i} {append str "\t"}
+               $w insert end $str
+               $w image create end -align center -image $bm -padx 1 \
+                   -name a:$ix
+               $w insert end $d
+               $w mark set s:$ix "end -1c"
+               $w mark gravity s:$ix left

            }
            }

-           if {[llength $badcolors] >= $ncolors} {
-               set badcolors $origbad
+           incr lev
+       }
+       if {$tail ne {}} {
+           if {$lev <= $openlevs} {
+               incr ht
+               set str "\n"
+               for {set i 0} {$i < $lev} {incr i} {append str "\t"}
+               $w insert end $str
+               $w insert end $tail

            }
            }

+           lappend treecontents($prefix) $tail

        }
        }

-       set origbad $badcolors

     }
     }

-    if {[llength $badcolors] < $ncolors - 1} {
-       foreach child $children($id) {
-           if {[info exists colormap($child)]
-               && [lsearch -exact $badcolors $colormap($child)] < 0} {
-               lappend badcolors $colormap($child)
+    while {$htstack ne {}} {
+       set treeheight($prefix) $ht
+       incr ht [lindex $htstack end]
+       set htstack [lreplace $htstack end end]
+    }
+    $w conf -state disabled
+}
+
+proc linetoelt {l} {
+    global treeheight treecontents
+
+    set y 2
+    set prefix {}
+    while {1} {
+       foreach e $treecontents($prefix) {
+           if {$y == $l} {
+               return "$prefix$e"

            }
            }

-           if {[info exists parents($child)]} {
-               foreach p $parents($child) {
-                   if {[info exists colormap($p)]
-                       && [lsearch -exact $badcolors $colormap($p)] < 0} {
-                       lappend badcolors $colormap($p)
-                   }
+           set n 1
+           if {[string index $e end] eq "/"} {
+               set n $treeheight($prefix$e)
+               if {$y + $n > $l} {
+                   append prefix $e
+                   incr y
+                   break

                }
            }
                }
            }

-       }
-       if {[llength $badcolors] >= $ncolors} {
-           set badcolors $origbad
-       }
+           incr y $n
+       }
+    }
+}
+
+proc treeclosedir {w dir} {
+    global treediropen treeheight treeparent treeindex
+
+    set ix $treeindex($dir)
+    $w conf -state normal
+    $w delete s:$ix e:$ix
+    set treediropen($dir) 0
+    $w image configure a:$ix -image tri-rt
+    $w conf -state disabled
+    set n [expr {1 - $treeheight($dir)}]
+    while {$dir ne {}} {
+       incr treeheight($dir) $n
+       set dir $treeparent($dir)
+    }
+}
+
+proc treeopendir {w dir} {
+    global treediropen treeheight treeparent treecontents treeindex
+
+    set ix $treeindex($dir)
+    $w conf -state normal
+    $w image configure a:$ix -image tri-dn
+    $w mark set e:$ix s:$ix
+    $w mark gravity e:$ix right
+    set lev 0
+    set str "\n"
+    set n [llength $treecontents($dir)]
+    for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
+       incr lev
+       append str "\t"
+       incr treeheight($x) $n
+    }
+    foreach e $treecontents($dir) {
+       if {[string index $e end] eq "/"} {
+           set de $dir$e
+           set iy $treeindex($de)
+           $w mark set d:$iy e:$ix
+           $w mark gravity d:$iy left
+           $w insert e:$ix $str
+           set treediropen($de) 0
+           $w image create e:$ix -align center -image tri-rt -padx 1 \
+               -name a:$iy
+           $w insert e:$ix $e
+           $w mark set s:$iy e:$ix
+           $w mark gravity s:$iy left
+           set treeheight($de) 1
+       } else {
+           $w insert e:$ix $str
+           $w insert e:$ix $e
+       }
+    }
+    $w mark gravity e:$ix left
+    $w conf -state disabled
+    set treediropen($dir) 1
+    set top [lindex [split [$w index @0,0] .] 0]
+    set ht [$w cget -height]
+    set l [lindex [split [$w index s:$ix] .] 0]
+    if {$l < $top} {
+       $w yview $l.0
+    } elseif {$l + $n + 1 > $top + $ht} {
+       set top [expr {$l + $n + 2 - $ht}]
+       if {$l < $top} {
+           set top $l
+       }
+       $w yview $top.0
+    }
+}
+
+proc treeclick {w x y} {
+    global treediropen cmitmode ctext cflist cflist_top
+
+    if {$cmitmode ne "tree"} return
+    if {![info exists cflist_top]} return
+    set l [lindex [split [$w index "@$x,$y"] "."] 0]
+    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
+    $cflist tag add highlight $l.0 "$l.0 lineend"
+    set cflist_top $l
+    if {$l == 1} {
+       $ctext yview 1.0
+       return

     }
     }

-    for {set i 0} {$i <= $ncolors} {incr i} {
-       set c [lindex $colors $nextcolor]
-       if {[incr nextcolor] >= $ncolors} {
-           set nextcolor 0
-       }
-       if {[lsearch -exact $badcolors $c]} break
+    set e [linetoelt $l]
+    if {[string index $e end] ne "/"} {
+       showfile $e
+    } elseif {$treediropen($e)} {
+       treeclosedir $w $e
+    } else {
+       treeopendir $w $e
+    }
+}
+
+proc setfilelist {id} {
+    global treefilelist cflist
+
+    treeview $cflist $treefilelist($id) 0
+}
+
+image create bitmap tri-rt -background black -foreground blue -data {
+    #define tri-rt_width 13
+    #define tri-rt_height 13
+    static unsigned char tri-rt_bits[] = {
+       0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,
+       0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
+       0x00, 0x00};
+} -maskdata {
+    #define tri-rt-mask_width 13
+    #define tri-rt-mask_height 13
+    static unsigned char tri-rt-mask_bits[] = {
+       0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,
+       0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,
+       0x08, 0x00};
+}
+image create bitmap tri-dn -background black -foreground blue -data {
+    #define tri-dn_width 13
+    #define tri-dn_height 13
+    static unsigned char tri-dn_bits[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,
+       0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00};
+} -maskdata {
+    #define tri-dn-mask_width 13
+    #define tri-dn-mask_height 13
+    static unsigned char tri-dn-mask_bits[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
+       0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00};
+}
+
+proc init_flist {first} {
+    global cflist cflist_top selectedline difffilestart
+
+    $cflist conf -state normal
+    $cflist delete 0.0 end
+    if {$first ne {}} {
+       $cflist insert end $first
+       set cflist_top 1
+       $cflist tag add highlight 1.0 "1.0 lineend"
+    } else {
+       catch {unset cflist_top}

     }
     }

-    set colormap($id) $c
+    $cflist conf -state disabled
+    set difffilestart {}

 }
 
 }
 

-proc initgraph {} {
-    global canvy canvy0 lineno numcommits nextcolor linespc
-    global nchildren ncleft
-    global displist nhyperspace
+proc add_flist {fl} {
+    global flistmode cflist

 
 

-    allcanvs delete all
-    set nextcolor 0
-    set canvy $canvy0
-    set lineno -1
-    set numcommits 0
-    foreach v {mainline mainlinearrow sidelines colormap cornercrossings
-               crossings idline lineid} {
-       global $v
-       catch {unset $v}
-    }
-    foreach id [array names nchildren] {
-       set ncleft($id) $nchildren($id)
+    $cflist conf -state normal
+    if {$flistmode eq "flat"} {
+       foreach f $fl {
+           $cflist insert end "\n$f"
+       }

     }
     }

-    set displist {}
-    set nhyperspace 0
+    $cflist conf -state disabled

 }
 
 }
 

-proc bindline {t id} {
-    global canv
+proc sel_flist {w x y} {
+    global flistmode ctext difffilestart cflist cflist_top cmitmode

 
 

-    $canv bind $t <Enter> "lineenter %x %y $id"
-    $canv bind $t <Motion> "linemotion %x %y $id"
-    $canv bind $t <Leave> "lineleave $id"
-    $canv bind $t <Button-1> "lineclick %x %y $id 1"
+    if {$cmitmode eq "tree"} return
+    if {![info exists cflist_top]} return
+    set l [lindex [split [$w index "@$x,$y"] "."] 0]
+    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
+    $cflist tag add highlight $l.0 "$l.0 lineend"
+    set cflist_top $l
+    if {$l == 1} {
+       $ctext yview 1.0
+    } else {
+       catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
+    }

 }
 
 }
 

-proc drawlines {id xtra delold} {
-    global mainline mainlinearrow sidelines lthickness colormap canv
+# Functions for adding and removing shell-type quoting

 
 

-    if {$delold} {
-       $canv delete lines.$id
+proc shellquote {str} {
+    if {![string match "*\['\"\\ \t]*" $str]} {
+       return $str

     }
     }

-    if {[info exists mainline($id)]} {
-       set t [$canv create line $mainline($id) \
-                  -width [expr {($xtra + 1) * $lthickness}] \
-                  -fill $colormap($id) -tags lines.$id \
-                  -arrow $mainlinearrow($id)]
-       $canv lower $t
-       bindline $t $id
-    }
-    if {[info exists sidelines($id)]} {
-       foreach ls $sidelines($id) {
-           set coords [lindex $ls 0]
-           set thick [lindex $ls 1]
-           set arrow [lindex $ls 2]
-           set t [$canv create line $coords -fill $colormap($id) \
-                      -width [expr {($thick + $xtra) * $lthickness}] \
-                      -arrow $arrow -tags lines.$id]
-           $canv lower $t
-           bindline $t $id
-       }
+    if {![string match "*\['\"\\]*" $str]} {
+       return "\"$str\""

     }
     }

+    if {![string match "*'*" $str]} {
+       return "'$str'"
+    }
+    return "\"[string map {\" \\\" \\ \\\\} $str]\""

 }
 
 }
 

-# level here is an index in displist
-proc drawcommitline {level} {
-    global parents children nparents displist
-    global canv canv2 canv3 mainfont namefont canvy linespc
-    global lineid linehtag linentag linedtag commitinfo
-    global colormap numcommits currentparents dupparents
-    global idtags idline idheads idotherrefs
-    global lineno lthickness mainline mainlinearrow sidelines
-    global commitlisted rowtextx idpos lastuse displist
-    global oldnlines olddlevel olddisplist
-
-    incr numcommits
-    incr lineno
-    set id [lindex $displist $level]
-    set lastuse($id) $lineno
-    set lineid($lineno) $id
-    set idline($id) $lineno
-    set ofill [expr {[info exists commitlisted($id)]? "blue": "white"}]
-    if {![info exists commitinfo($id)]} {
-       readcommit $id
-       if {![info exists commitinfo($id)]} {
-           set commitinfo($id) {"No commit information available"}
-           set nparents($id) 0
+proc shellarglist {l} {
+    set str {}
+    foreach a $l {
+       if {$str ne {}} {
+           append str " "

        }
        }

+       append str [shellquote $a]

     }
     }

-    assigncolor $id
-    set currentparents {}
-    set dupparents {}
-    if {[info exists commitlisted($id)] && [info exists parents($id)]} {
-       foreach p $parents($id) {
-           if {[lsearch -exact $currentparents $p] < 0} {
-               lappend currentparents $p
-           } else {
-               # remember that this parent was listed twice
-               lappend dupparents $p
+    return $str
+}
+
+proc shelldequote {str} {
+    set ret {}
+    set used -1
+    while {1} {
+       incr used
+       if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
+           append ret [string range $str $used end]
+           set used [string length $str]
+           break
+       }
+       set first [lindex $first 0]
+       set ch [string index $str $first]
+       if {$first > $used} {
+           append ret [string range $str $used [expr {$first - 1}]]
+           set used $first
+       }
+       if {$ch eq " " || $ch eq "\t"} break
+       incr used
+       if {$ch eq "'"} {
+           set first [string first "'" $str $used]
+           if {$first < 0} {
+               error "unmatched single-quote"

            }
            }

+           append ret [string range $str $used [expr {$first - 1}]]
+           set used $first
+           continue

        }
        }

-    }
-    set x [xcoord $level $level $lineno]
-    set y1 $canvy
-    set canvy [expr {$canvy + $linespc}]
-    allcanvs conf -scrollregion \
-       [list 0 0 0 [expr {$y1 + 0.5 * $linespc + 2}]]
-    if {[info exists mainline($id)]} {
-       lappend mainline($id) $x $y1
-       if {$mainlinearrow($id) ne "none"} {
-           set mainline($id) [trimdiagstart $mainline($id)]
+       if {$ch eq "\\"} {
+           if {$used >= [string length $str]} {
+               error "trailing backslash"
+           }
+           append ret [string index $str $used]
+           continue
+       }
+       # here ch == "\""
+       while {1} {
+           if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
+               error "unmatched double-quote"
+           }
+           set first [lindex $first 0]
+           set ch [string index $str $first]
+           if {$first > $used} {
+               append ret [string range $str $used [expr {$first - 1}]]
+               set used $first
+           }
+           if {$ch eq "\""} break
+           incr used
+           append ret [string index $str $used]
+           incr used

        }
     }
        }
     }

-    drawlines $id 0 0
-    set orad [expr {$linespc / 3}]
-    set t [$canv create oval [expr {$x - $orad}] [expr {$y1 - $orad}] \
-              [expr {$x + $orad - 1}] [expr {$y1 + $orad - 1}] \
-              -fill $ofill -outline black -width 1]
-    $canv raise $t
-    $canv bind $t <1> {selcanvline {} %x %y}
-    set xt [xcoord [llength $displist] $level $lineno]
-    if {[llength $currentparents] > 2} {
-       set xt [expr {$xt + ([llength $currentparents] - 2) * $linespc}]
-    }
-    set rowtextx($lineno) $xt
-    set idpos($id) [list $x $xt $y1]
-    if {[info exists idtags($id)] || [info exists idheads($id)]
-       || [info exists idotherrefs($id)]} {
-       set xt [drawtags $id $x $xt $y1]
+    return [list $used $ret]
+}
+
+proc shellsplit {str} {
+    set l {}
+    while {1} {
+       set str [string trimleft $str]
+       if {$str eq {}} break
+       set dq [shelldequote $str]
+       set n [lindex $dq 0]
+       set word [lindex $dq 1]
+       set str [string range $str $n end]
+       lappend l $word

     }
     }

-    set headline [lindex $commitinfo($id) 0]
-    set name [lindex $commitinfo($id) 1]
-    set date [lindex $commitinfo($id) 2]
-    set date [formatdate $date]
-    set linehtag($lineno) [$canv create text $xt $y1 -anchor w \
-                              -text $headline -font $mainfont ]
-    $canv bind $linehtag($lineno) <Button-3> "rowmenu %X %Y $id"
-    set linentag($lineno) [$canv2 create text 3 $y1 -anchor w \
-                              -text $name -font $namefont]
-    set linedtag($lineno) [$canv3 create text 3 $y1 -anchor w \
-                              -text $date -font $mainfont]
+    return $l
+}
+
+# Code to implement multiple views

 
 

-    set olddlevel $level
-    set olddisplist $displist
-    set oldnlines [llength $displist]
+proc newview {ishighlight} {
+    global nextviewnum newviewname newviewperm uifont newishighlight
+    global newviewargs revtreeargs
+
+    set newishighlight $ishighlight
+    set top .gitkview
+    if {[winfo exists $top]} {
+       raise $top
+       return
+    }
+    set newviewname($nextviewnum) "View $nextviewnum"
+    set newviewperm($nextviewnum) 0
+    set newviewargs($nextviewnum) [shellarglist $revtreeargs]
+    vieweditor $top $nextviewnum "Gitk view definition" 

 }
 
 }
 

-proc drawtags {id x xt y1} {
-    global idtags idheads idotherrefs
-    global linespc lthickness
-    global canv mainfont idline rowtextx
+proc editview {} {
+    global curview
+    global viewname viewperm newviewname newviewperm
+    global viewargs newviewargs

 
 

-    set marks {}
-    set ntags 0
-    set nheads 0
-    if {[info exists idtags($id)]} {
-       set marks $idtags($id)
-       set ntags [llength $marks]
+    set top .gitkvedit-$curview
+    if {[winfo exists $top]} {
+       raise $top
+       return

     }
     }

-    if {[info exists idheads($id)]} {
-       set marks [concat $marks $idheads($id)]
-       set nheads [llength $idheads($id)]
+    set newviewname($curview) $viewname($curview)
+    set newviewperm($curview) $viewperm($curview)
+    set newviewargs($curview) [shellarglist $viewargs($curview)]
+    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
+}
+
+proc vieweditor {top n title} {
+    global newviewname newviewperm viewfiles
+    global uifont
+
+    toplevel $top
+    wm title $top $title
+    label $top.nl -text "Name" -font $uifont
+    entry $top.name -width 20 -textvariable newviewname($n)
+    grid $top.nl $top.name -sticky w -pady 5
+    checkbutton $top.perm -text "Remember this view" -variable newviewperm($n)
+    grid $top.perm - -pady 5 -sticky w
+    message $top.al -aspect 1000 -font $uifont \
+       -text "Commits to include (arguments to git-rev-list):"
+    grid $top.al - -sticky w -pady 5
+    entry $top.args -width 50 -textvariable newviewargs($n) \
+       -background white
+    grid $top.args - -sticky ew -padx 5
+    message $top.l -aspect 1000 -font $uifont \
+       -text "Enter files and directories to include, one per line:"
+    grid $top.l - -sticky w
+    text $top.t -width 40 -height 10 -background white
+    if {[info exists viewfiles($n)]} {
+       foreach f $viewfiles($n) {
+           $top.t insert end $f
+           $top.t insert end "\n"
+       }
+       $top.t delete {end - 1c} end
+       $top.t mark set insert 0.0
+    }
+    grid $top.t - -sticky ew -padx 5
+    frame $top.buts
+    button $top.buts.ok -text "OK" -command [list newviewok $top $n]
+    button $top.buts.can -text "Cancel" -command [list destroy $top]
+    grid $top.buts.ok $top.buts.can
+    grid columnconfigure $top.buts 0 -weight 1 -uniform a
+    grid columnconfigure $top.buts 1 -weight 1 -uniform a
+    grid $top.buts - -pady 10 -sticky ew
+    focus $top.t
+}
+
+proc doviewmenu {m first cmd op args} {
+    set nmenu [$m index end]
+    for {set i $first} {$i <= $nmenu} {incr i} {
+       if {[$m entrycget $i -command] eq $cmd} {
+           eval $m $op $i $args
+           break
+       }

     }
     }

-    if {[info exists idotherrefs($id)]} {
-       set marks [concat $marks $idotherrefs($id)]
+}
+
+proc allviewmenus {n op args} {
+    doviewmenu .bar.view 7 [list showview $n] $op $args
+    doviewmenu .bar.view.hl 3 [list addhighlight $n] $op $args
+}
+
+proc newviewok {top n} {
+    global nextviewnum newviewperm newviewname newishighlight
+    global viewname viewfiles viewperm selectedview curview
+    global viewargs newviewargs
+
+    if {[catch {
+       set newargs [shellsplit $newviewargs($n)]
+    } err]} {
+       error_popup "Error in commit selection arguments: $err"
+       wm raise $top
+       focus $top
+       return

     }
     }

-    if {$marks eq {}} {
-       return $xt
+    set files {}
+    foreach f [split [$top.t get 0.0 end] "\n"] {
+       set ft [string trim $f]
+       if {$ft ne {}} {
+           lappend files $ft
+       }
+    }
+    if {![info exists viewfiles($n)]} {
+       # creating a new view
+       incr nextviewnum
+       set viewname($n) $newviewname($n)
+       set viewperm($n) $newviewperm($n)
+       set viewfiles($n) $files
+       set viewargs($n) $newargs
+       addviewmenu $n
+       if {!$newishighlight} {
+           after idle showview $n
+       } else {
+           after idle addhighlight $n
+       }
+    } else {
+       # editing an existing view
+       set viewperm($n) $newviewperm($n)
+       if {$newviewname($n) ne $viewname($n)} {
+           set viewname($n) $newviewname($n)
+           allviewmenus $n entryconf -label $viewname($n)
+       }
+       if {$files ne $viewfiles($n) || $newargs ne $viewargs($n)} {
+           set viewfiles($n) $files
+           set viewargs($n) $newargs
+           if {$curview == $n} {
+               after idle updatecommits
+           }
+       }

     }
     }

+    catch {destroy $top}
+}

 
 

-    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
-    set yt [expr {$y1 - 0.5 * $linespc}]
-    set yb [expr {$yt + $linespc - 1}]
-    set xvals {}
-    set wvals {}
-    foreach tag $marks {
-       set wid [font measure $mainfont $tag]
-       lappend xvals $xt
-       lappend wvals $wid
-       set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
+proc delview {} {
+    global curview viewdata viewperm
+
+    if {$curview == 0} return
+    allviewmenus $curview delete
+    set viewdata($curview) {}
+    set viewperm($curview) 0
+    showview 0
+}
+
+proc addviewmenu {n} {
+    global viewname
+
+    .bar.view add radiobutton -label $viewname($n) \
+       -command [list showview $n] -variable selectedview -value $n
+    .bar.view.hl add radiobutton -label $viewname($n) \
+       -command [list addhighlight $n] -variable selectedhlview -value $n
+}
+
+proc flatten {var} {
+    global $var
+
+    set ret {}
+    foreach i [array names $var] {
+       lappend ret $i [set $var\($i\)]

     }
     }

-    set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
-              -width $lthickness -fill black -tags tag.$id]
-    $canv lower $t
-    foreach tag $marks x $xvals wid $wvals {
-       set xl [expr {$x + $delta}]
-       set xr [expr {$x + $delta + $wid + $lthickness}]
-       if {[incr ntags -1] >= 0} {
-           # draw a tag
-           set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
-                      $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
-                      -width 1 -outline black -fill yellow -tags tag.$id]
-           $canv bind $t <1> [list showtag $tag 1]
-           set rowtextx($idline($id)) [expr {$xr + $linespc}]
+    return $ret
+}
+
+proc unflatten {var l} {
+    global $var
+
+    catch {unset $var}
+    foreach {i v} $l {
+       set $var\($i\) $v
+    }
+}
+
+proc showview {n} {
+    global curview viewdata viewfiles
+    global displayorder parentlist childlist rowidlist rowoffsets
+    global colormap rowtextx commitrow nextcolor canvxmax
+    global numcommits rowrangelist commitlisted idrowranges
+    global selectedline currentid canv canvy0
+    global matchinglines treediffs
+    global pending_select phase
+    global commitidx rowlaidout rowoptim linesegends
+    global commfd nextupdate
+    global selectedview hlview selectedhlview
+    global vparentlist vchildlist vdisporder vcmitlisted
+
+    if {$n == $curview} return
+    set selid {}
+    if {[info exists selectedline]} {
+       set selid $currentid
+       set y [yc $selectedline]
+       set ymax [lindex [$canv cget -scrollregion] 3]
+       set span [$canv yview]
+       set ytop [expr {[lindex $span 0] * $ymax}]
+       set ybot [expr {[lindex $span 1] * $ymax}]
+       if {$ytop < $y && $y < $ybot} {
+           set yscreen [expr {$y - $ytop}]

        } else {
        } else {

-           # draw a head or other ref
-           if {[incr nheads -1] >= 0} {
-               set col green
-           } else {
-               set col "#ddddff"
-           }
-           set xl [expr {$xl - $delta/2}]
-           $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-               -width 1 -outline black -fill $col -tags tag.$id
+           set yscreen [expr {($ybot - $ytop) / 2}]

        }
        }

-       set t [$canv create text $xl $y1 -anchor w -text $tag \
-                  -font $mainfont -tags tag.$id]
-       if {$ntags >= 0} {
-           $canv bind $t <1> [list showtag $tag 1]
+    }
+    unselectline
+    normalline
+    stopfindproc
+    if {$curview >= 0} {
+       set vparentlist($curview) $parentlist
+       set vchildlist($curview) $childlist
+       set vdisporder($curview) $displayorder
+       set vcmitlisted($curview) $commitlisted
+       if {$phase ne {}} {
+           set viewdata($curview) \
+               [list $phase $rowidlist $rowoffsets $rowrangelist \
+                    [flatten idrowranges] [flatten idinlist] \
+                    $rowlaidout $rowoptim $numcommits $linesegends]
+       } elseif {![info exists viewdata($curview)]
+                 || [lindex $viewdata($curview) 0] ne {}} {
+           set viewdata($curview) \
+               [list {} $rowidlist $rowoffsets $rowrangelist]

        }
     }
        }
     }

-    return $xt
-}
+    catch {unset matchinglines}
+    catch {unset treediffs}
+    clear_display
+
+    set curview $n
+    set selectedview $n
+    set selectedhlview -1
+    .bar.view entryconf 2 -state [expr {$n == 0? "disabled": "normal"}]
+    .bar.view entryconf 3 -state [expr {$n == 0? "disabled": "normal"}]
+    catch {unset hlview}
+    .bar.view.hl entryconf 1 -state disabled
+
+    if {![info exists viewdata($n)]} {
+       set pending_select $selid
+       getcommits
+       return
+    }

 
 

-proc notecrossings {id lo hi corner} {
-    global olddisplist crossings cornercrossings
+    set v $viewdata($n)
+    set phase [lindex $v 0]
+    set displayorder $vdisporder($n)
+    set parentlist $vparentlist($n)
+    set childlist $vchildlist($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]
+       catch {unset idrowranges}
+    } else {
+       unflatten idrowranges [lindex $v 4]
+       unflatten idinlist [lindex $v 5]
+       set rowlaidout [lindex $v 6]
+       set rowoptim [lindex $v 7]
+       set numcommits [lindex $v 8]
+       set linesegends [lindex $v 9]
+    }

 
 

-    for {set i $lo} {[incr i] < $hi} {} {
-       set p [lindex $olddisplist $i]
-       if {$p == {}} continue
-       if {$i == $corner} {
-           if {![info exists cornercrossings($id)]
-               || [lsearch -exact $cornercrossings($id) $p] < 0} {
-               lappend cornercrossings($id) $p
-           }
-           if {![info exists cornercrossings($p)]
-               || [lsearch -exact $cornercrossings($p) $id] < 0} {
-               lappend cornercrossings($p) $id
-           }
+    catch {unset colormap}
+    catch {unset rowtextx}
+    set nextcolor 0
+    set canvxmax [$canv cget -width]
+    set curview $n
+    set row 0
+    setcanvscroll
+    set yf 0
+    set row 0
+    if {$selid ne {} && [info exists commitrow($n,$selid)]} {
+       set row $commitrow($n,$selid)
+       # try to get the selected row in the same position on the screen
+       set ymax [lindex [$canv cget -scrollregion] 3]
+       set ytop [expr {[yc $row] - $yscreen}]
+       if {$ytop < 0} {
+           set ytop 0
+       }
+       set yf [expr {$ytop * 1.0 / $ymax}]
+    }
+    allcanvs yview moveto $yf
+    drawvisible
+    selectline $row 0
+    if {$phase ne {}} {
+       if {$phase eq "getcommits"} {
+           show_status "Reading commits..."
+       }
+       if {[info exists commfd($n)]} {
+           layoutmore

        } else {
        } else {

-           if {![info exists crossings($id)]
-               || [lsearch -exact $crossings($id) $p] < 0} {
-               lappend crossings($id) $p
-           }
-           if {![info exists crossings($p)]
-               || [lsearch -exact $crossings($p) $id] < 0} {
-               lappend crossings($p) $id
-           }
+           finishcommits

        }
        }

+    } elseif {$numcommits == 0} {
+       show_status "No commits selected"

     }
 }
 
     }
 }
 

-proc xcoord {i level ln} {
-    global canvx0 xspc1 xspc2
+proc addhighlight {n} {
+    global hlview curview viewdata highlighted highlightedrows
+    global selectedhlview

 
 

-    set x [expr {$canvx0 + $i * $xspc1($ln)}]
-    if {$i > 0 && $i == $level} {
-       set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
-    } elseif {$i > $level} {
-       set x [expr {$x + $xspc2 - $xspc1($ln)}]
+    if {[info exists hlview]} {
+       delhighlight
+    }
+    set hlview $n
+    set selectedhlview $n
+    .bar.view.hl entryconf 1 -state normal
+    set highlighted($n) 0
+    set highlightedrows {}
+    if {$n != $curview && ![info exists viewdata($n)]} {
+       set viewdata($n) [list getcommits {{}} {{}} {} {} {} 0 0 0 {}]
+       set vparentlist($n) {}
+       set vchildlist($n) {}
+       set vdisporder($n) {}
+       set vcmitlisted($n) {}
+       start_rev_list $n
+    } else {
+       highlightmore

     }
     }

-    return $x

 }
 
 }
 

-# it seems Tk can't draw arrows on the end of diagonal line segments...
-proc trimdiagend {line} {
-    while {[llength $line] > 4} {
-       set x1 [lindex $line end-3]
-       set y1 [lindex $line end-2]
-       set x2 [lindex $line end-1]
-       set y2 [lindex $line end]
-       if {($x1 == $x2) != ($y1 == $y2)} break
-       set line [lreplace $line end-1 end]
+proc delhighlight {} {
+    global hlview highlightedrows canv linehtag mainfont
+    global selectedhlview selectedline
+
+    if {![info exists hlview]} return
+    unset hlview
+    set selectedhlview {}
+    .bar.view.hl entryconf 1 -state disabled
+    foreach l $highlightedrows {
+       $canv itemconf $linehtag($l) -font $mainfont
+       if {$l == $selectedline} {
+           $canv delete secsel
+           set t [eval $canv create rect [$canv bbox $linehtag($l)] \
+                      -outline {{}} -tags secsel \
+                      -fill [$canv cget -selectbackground]]
+           $canv lower $t
+       }

     }
     }

-    return $line

 }
 
 }
 

-proc trimdiagstart {line} {
-    while {[llength $line] > 4} {
-       set x1 [lindex $line 0]
-       set y1 [lindex $line 1]
-       set x2 [lindex $line 2]
-       set y2 [lindex $line 3]
-       if {($x1 == $x2) != ($y1 == $y2)} break
-       set line [lreplace $line 0 1]
-    }
-    return $line
-}
-
-proc drawslants {id needonscreen nohs} {
-    global canv mainline mainlinearrow sidelines
-    global canvx0 canvy xspc1 xspc2 lthickness
-    global currentparents dupparents
-    global lthickness linespc canvy colormap lineno geometry
-    global maxgraphpct maxwidth
-    global displist onscreen lastuse
-    global parents commitlisted
-    global oldnlines olddlevel olddisplist
-    global nhyperspace numcommits nnewparents
-
-    if {$lineno < 0} {
-       lappend displist $id
-       set onscreen($id) 1
-       return 0
-    }
-
-    set y1 [expr {$canvy - $linespc}]
-    set y2 $canvy
-
-    # work out what we need to get back on screen
-    set reins {}
-    if {$onscreen($id) < 0} {
-       # next to do isn't displayed, better get it on screen...
-       lappend reins [list $id 0]
-    }
-    # make sure all the previous commits's parents are on the screen
-    foreach p $currentparents {
-       if {$onscreen($p) < 0} {
-           lappend reins [list $p 0]
-       }
-    }
-    # bring back anything requested by caller
-    if {$needonscreen ne {}} {
-       lappend reins $needonscreen
-    }
-
-    # try the shortcut
-    if {$currentparents == $id && $onscreen($id) == 0 && $reins eq {}} {
-       set dlevel $olddlevel
-       set x [xcoord $dlevel $dlevel $lineno]
-       set mainline($id) [list $x $y1]
-       set mainlinearrow($id) none
-       set lastuse($id) $lineno
-       set displist [lreplace $displist $dlevel $dlevel $id]
-       set onscreen($id) 1
-       set xspc1([expr {$lineno + 1}]) $xspc1($lineno)
-       return $dlevel
-    }
-
-    # update displist
-    set displist [lreplace $displist $olddlevel $olddlevel]
-    set j $olddlevel
-    foreach p $currentparents {
-       set lastuse($p) $lineno
-       if {$onscreen($p) == 0} {
-           set displist [linsert $displist $j $p]
-           set onscreen($p) 1
-           incr j
-       }
-    }
-    if {$onscreen($id) == 0} {
-       lappend displist $id
-       set onscreen($id) 1
-    }
-
-    # remove the null entry if present
-    set nullentry [lsearch -exact $displist {}]
-    if {$nullentry >= 0} {
-       set displist [lreplace $displist $nullentry $nullentry]
-    }
-
-    # bring back the ones we need now (if we did it earlier
-    # it would change displist and invalidate olddlevel)
-    foreach pi $reins {
-       # test again in case of duplicates in reins
-       set p [lindex $pi 0]
-       if {$onscreen($p) < 0} {
-           set onscreen($p) 1
-           set lastuse($p) $lineno
-           set displist [linsert $displist [lindex $pi 1] $p]
-           incr nhyperspace -1
-       }
-    }
-
-    set lastuse($id) $lineno
-
-    # see if we need to make any lines jump off into hyperspace
-    set displ [llength $displist]
-    if {$displ > $maxwidth} {
-       set ages {}
-       foreach x $displist {
-           lappend ages [list $lastuse($x) $x]
-       }
-       set ages [lsort -integer -index 0 $ages]
-       set k 0
-       while {$displ > $maxwidth} {
-           set use [lindex $ages $k 0]
-           set victim [lindex $ages $k 1]
-           if {$use >= $lineno - 5} break
-           incr k
-           if {[lsearch -exact $nohs $victim] >= 0} continue
-           set i [lsearch -exact $displist $victim]
-           set displist [lreplace $displist $i $i]
-           set onscreen($victim) -1
-           incr nhyperspace
-           incr displ -1
-           if {$i < $nullentry} {
-               incr nullentry -1
-           }
-           set x [lindex $mainline($victim) end-1]
-           lappend mainline($victim) $x $y1
-           set line [trimdiagend $mainline($victim)]
-           set arrow "last"
-           if {$mainlinearrow($victim) ne "none"} {
-               set line [trimdiagstart $line]
-               set arrow "both"
+proc highlightmore {} {
+    global hlview highlighted commitidx highlightedrows linehtag mainfont
+    global displayorder vdisporder curview canv commitrow selectedline
+
+    set font [concat $mainfont bold]
+    set max $commitidx($hlview)
+    if {$hlview == $curview} {
+       set disp $displayorder
+    } else {
+       set disp $vdisporder($hlview)
+    }
+    for {set i $highlighted($hlview)} {$i < $max} {incr i} {
+       set id [lindex $disp $i]
+       if {[info exists commitrow($curview,$id)]} {
+           set row $commitrow($curview,$id)
+           if {[info exists linehtag($row)]} {
+               $canv itemconf $linehtag($row) -font $font
+               lappend highlightedrows $row
+               if {$row == $selectedline} {
+                   $canv delete secsel
+                   set t [eval $canv create rect \
+                              [$canv bbox $linehtag($row)] \
+                              -outline {{}} -tags secsel \
+                              -fill [$canv cget -selectbackground]]
+                   $canv lower $t
+               }

            }
            }

-           lappend sidelines($victim) [list $line 1 $arrow]
-           unset mainline($victim)

        }
     }
        }
     }

+    set highlighted($hlview) $max
+}

 
 

-    set dlevel [lsearch -exact $displist $id]
+# Graph layout functions

 
 

-    # If we are reducing, put in a null entry
-    if {$displ < $oldnlines} {
-       # does the next line look like a merge?
-       # i.e. does it have > 1 new parent?
-       if {$nnewparents($id) > 1} {
-           set i [expr {$dlevel + 1}]
-       } elseif {$nnewparents([lindex $olddisplist $olddlevel]) == 0} {
-           set i $olddlevel
-           if {$nullentry >= 0 && $nullentry < $i} {
-               incr i -1
-           }
-       } elseif {$nullentry >= 0} {
-           set i $nullentry
-           while {$i < $displ
-                  && [lindex $olddisplist $i] == [lindex $displist $i]} {
-               incr i
-           }
+proc shortids {ids} {
+    set res {}
+    foreach id $ids {
+       if {[llength $id] > 1} {
+           lappend res [shortids $id]
+       } elseif {[regexp {^[0-9a-f]{40}$} $id]} {
+           lappend res [string range $id 0 7]

        } else {
        } else {

-           set i $olddlevel
-           if {$dlevel >= $i} {
-               incr i
-           }
+           lappend res $id

        }
        }

-       if {$i < $displ} {
-           set displist [linsert $displist $i {}]
-           incr displ
-           if {$dlevel >= $i} {
-               incr dlevel
-           }
+    }
+    return $res
+}
+
+proc incrange {l x o} {
+    set n [llength $l]
+    while {$x < $n} {
+       set e [lindex $l $x]
+       if {$e ne {}} {
+           lset l $x [expr {$e + $o}]

        }
        }

+       incr x

     }
     }

+    return $l
+}

 
 

-    # decide on the line spacing for the next line
-    set lj [expr {$lineno + 1}]
-    set maxw [expr {$maxgraphpct * $geometry(canv1) / 100}]
-    if {$displ <= 1 || $canvx0 + $displ * $xspc2 <= $maxw} {
-       set xspc1($lj) $xspc2
+proc ntimes {n o} {
+    set ret {}
+    for {} {$n > 0} {incr n -1} {
+       lappend ret $o
+    }
+    return $ret
+}
+
+proc usedinrange {id l1 l2} {
+    global children commitrow childlist curview
+
+    if {[info exists commitrow($curview,$id)]} {
+       set r $commitrow($curview,$id)
+       if {$l1 <= $r && $r <= $l2} {
+           return [expr {$r - $l1 + 1}]
+       }
+       set kids [lindex $childlist $r]

     } else {
     } else {

-       set xspc1($lj) [expr {($maxw - $canvx0 - $xspc2) / ($displ - 1)}]
-       if {$xspc1($lj) < $lthickness} {
-           set xspc1($lj) $lthickness
-       }
-    }
-
-    foreach idi $reins {
-       set id [lindex $idi 0]
-       set j [lsearch -exact $displist $id]
-       set xj [xcoord $j $dlevel $lj]
-       set mainline($id) [list $xj $y2]
-       set mainlinearrow($id) first
-    }
-
-    set i -1
-    foreach id $olddisplist {
-       incr i
-       if {$id == {}} continue
-       if {$onscreen($id) <= 0} continue
-       set xi [xcoord $i $olddlevel $lineno]
-       if {$i == $olddlevel} {
-           foreach p $currentparents {
-               set j [lsearch -exact $displist $p]
-               set coords [list $xi $y1]
-               set xj [xcoord $j $dlevel $lj]
-               if {$xj < $xi - $linespc} {
-                   lappend coords [expr {$xj + $linespc}] $y1
-                   notecrossings $p $j $i [expr {$j + 1}]
-               } elseif {$xj > $xi + $linespc} {
-                   lappend coords [expr {$xj - $linespc}] $y1
-                   notecrossings $p $i $j [expr {$j - 1}]
-               }
-               if {[lsearch -exact $dupparents $p] >= 0} {
-                   # draw a double-width line to indicate the doubled parent
-                   lappend coords $xj $y2
-                   lappend sidelines($p) [list $coords 2 none]
-                   if {![info exists mainline($p)]} {
-                       set mainline($p) [list $xj $y2]
-                       set mainlinearrow($p) none
-                   }
-               } else {
-                   # normal case, no parent duplicated
-                   set yb $y2
-                   set dx [expr {abs($xi - $xj)}]
-                   if {0 && $dx < $linespc} {
-                       set yb [expr {$y1 + $dx}]
-                   }
-                   if {![info exists mainline($p)]} {
-                       if {$xi != $xj} {
-                           lappend coords $xj $yb
-                       }
-                       set mainline($p) $coords
-                       set mainlinearrow($p) none
-                   } else {
-                       lappend coords $xj $yb
-                       if {$yb < $y2} {
-                           lappend coords $xj $y2
-                       }
-                       lappend sidelines($p) [list $coords 1 none]
-                   }
+       set kids $children($curview,$id)
+    }
+    foreach c $kids {
+       set r $commitrow($curview,$c)
+       if {$l1 <= $r && $r <= $l2} {
+           return [expr {$r - $l1 + 1}]
+       }
+    }
+    return 0
+}
+
+proc sanity {row {full 0}} {
+    global rowidlist rowoffsets
+
+    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

            }
            }

-       } else {
-           set j $i
-           if {[lindex $displist $i] != $id} {
-               set j [lsearch -exact $displist $id]
+           if {!$full} break
+           set o [lindex $rowoffsets $y $x]
+       }
+    }
+}
+
+proc makeuparrow {oid x y z} {
+    global rowidlist rowoffsets uparrowlen idrowranges
+
+    for {set i 1} {$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

            }
            }

-           if {$j != $i || $xspc1($lineno) != $xspc1($lj)
-               || ($olddlevel < $i && $i < $dlevel)
-               || ($dlevel < $i && $i < $olddlevel)} {
-               set xj [xcoord $j $dlevel $lj]
-               lappend mainline($id) $xi $y1 $xj $y2
+           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]

     }
     }

-    return $dlevel
+    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
+    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
+    lappend idrowranges($oid) $y

 }
 
 }
 

-# search for x in a list of lists
-proc llsearch {llist x} {
-    set i 0
-    foreach l $llist {
-       if {$l == $x || [lsearch -exact $l $x] >= 0} {
-           return $i
+proc initlayout {} {
+    global rowidlist rowoffsets displayorder commitlisted
+    global rowlaidout rowoptim
+    global idinlist rowchk rowrangelist idrowranges
+    global numcommits canvxmax canv
+    global nextcolor
+    global parentlist childlist children
+    global colormap rowtextx
+    global linesegends
+
+    set numcommits 0
+    set displayorder {}
+    set commitlisted {}
+    set parentlist {}
+    set childlist {}
+    set rowrangelist {}
+    set nextcolor 0
+    set rowidlist {{}}
+    set rowoffsets {{}}
+    catch {unset idinlist}
+    catch {unset rowchk}
+    set rowlaidout 0
+    set rowoptim 0
+    set canvxmax [$canv cget -width]
+    catch {unset colormap}
+    catch {unset rowtextx}
+    catch {unset idrowranges}
+    set linesegends {}
+}
+
+proc setcanvscroll {} {
+    global canv canv2 canv3 numcommits linespc canvxmax canvy0
+
+    set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
+    $canv conf -scrollregion [list 0 0 $canvxmax $ymax]
+    $canv2 conf -scrollregion [list 0 0 0 $ymax]
+    $canv3 conf -scrollregion [list 0 0 0 $ymax]
+}
+
+proc visiblerows {} {
+    global canv numcommits linespc
+
+    set ymax [lindex [$canv cget -scrollregion] 3]
+    if {$ymax eq {} || $ymax == 0} return
+    set f [$canv yview]
+    set y0 [expr {int([lindex $f 0] * $ymax)}]
+    set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
+    if {$r0 < 0} {
+       set r0 0
+    }
+    set y1 [expr {int([lindex $f 1] * $ymax)}]
+    set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
+    if {$r1 >= $numcommits} {
+       set r1 [expr {$numcommits - 1}]
+    }
+    return [list $r0 $r1]
+}
+
+proc layoutmore {} {
+    global rowlaidout rowoptim commitidx numcommits optim_delay
+    global uparrowlen curview
+
+    set row $rowlaidout
+    set rowlaidout [layoutrows $row $commitidx($curview) 0]
+    set orow [expr {$rowlaidout - $uparrowlen - 1}]
+    if {$orow > $rowoptim} {
+       optimize_rows $rowoptim 0 $orow
+       set rowoptim $orow
+    }
+    set canshow [expr {$rowoptim - $optim_delay}]
+    if {$canshow > $numcommits} {
+       showstuff $canshow
+    }
+}
+
+proc showstuff {canshow} {
+    global numcommits commitrow pending_select selectedline
+    global linesegends idrowranges idrangedrawn curview
+
+    if {$numcommits == 0} {
+       global phase
+       set phase "incrdraw"
+       allcanvs delete all
+    }
+    set row $numcommits
+    set numcommits $canshow
+    setcanvscroll
+    set rows [visiblerows]
+    set r0 [lindex $rows 0]
+    set r1 [lindex $rows 1]
+    set selrow -1
+    for {set r $row} {$r < $canshow} {incr r} {
+       foreach id [lindex $linesegends [expr {$r+1}]] {
+           set i -1
+           foreach {s e} [rowranges $id] {
+               incr i
+               if {$e ne {} && $e < $numcommits && $s <= $r1 && $e >= $r0
+                   && ![info exists idrangedrawn($id,$i)]} {
+                   drawlineseg $id $i
+                   set idrangedrawn($id,$i) 1
+               }
+           }

        }
        }

-       incr i

     }
     }

-    return -1
+    if {$canshow > $r1} {
+       set canshow $r1
+    }
+    while {$row < $canshow} {
+       drawcmitrow $row
+       incr row
+    }
+    if {[info exists pending_select] &&
+       [info exists commitrow($curview,$pending_select)] &&
+       $commitrow($curview,$pending_select) < $numcommits} {
+       selectline $commitrow($curview,$pending_select) 1
+    }
+    if {![info exists selectedline] && ![info exists pending_select]} {
+       selectline 0 1
+    }

 }
 
 }
 

-proc drawmore {reading} {
-    global displayorder numcommits ncmupdate nextupdate
-    global stopped nhyperspace parents commitlisted
-    global maxwidth onscreen displist currentparents olddlevel
+proc layoutrows {row endrow last} {
+    global rowidlist rowoffsets displayorder
+    global uparrowlen downarrowlen maxwidth mingaplen
+    global childlist parentlist
+    global idrowranges linesegends
+    global commitidx curview
+    global idinlist rowchk rowrangelist

 
 

-    set n [llength $displayorder]
-    while {$numcommits < $n} {
-       set id [lindex $displayorder $numcommits]
-       set ctxend [expr {$numcommits + 10}]
-       if {!$reading && $ctxend > $n} {
-           set ctxend $n
+    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] {
+           if {![info exists idinlist($p)]} {
+               lappend newolds $p
+           } elseif {!$idinlist($p)} {
+               lappend oldolds $p
+           }

        }
        }

-       set dlist {}
-       if {$numcommits > 0} {
-           set dlist [lreplace $displist $olddlevel $olddlevel]
-           set i $olddlevel
-           foreach p $currentparents {
-               if {$onscreen($p) == 0} {
-                   set dlist [linsert $dlist $i $p]
-                   incr i
+       set lse {}
+       set nev [expr {[llength $idlist] + [llength $newolds]
+                      + [llength $oldolds] - $maxwidth + 1}]
+       if {$nev > 0} {
+           if {!$last &&
+               $row + $uparrowlen + $mingaplen >= $commitidx($curview)} break
+           for {set x [llength $idlist]} {[incr x -1] >= 0} {} {
+               set i [lindex $idlist $x]
+               if {![info exists rowchk($i)] || $row >= $rowchk($i)} {
+                   set r [usedinrange $i [expr {$row - $downarrowlen}] \
+                              [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 lse $i
+                       lappend idrowranges($i) $rm1
+                       if {[incr nev -1] <= 0} break
+                       continue
+                   }
+                   set rowchk($id) [expr {$row + $r}]

                }
            }
                }
            }

+           lset rowidlist $row $idlist
+           lset rowoffsets $row $offs
+       }
+       lappend linesegends $lse
+       set col [lsearch -exact $idlist $id]
+       if {$col < 0} {
+           set col [llength $idlist]
+           lappend idlist $id
+           lset rowidlist $row $idlist
+           set z {}
+           if {[lindex $childlist $row] 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
+           }
+       } else {
+           unset idinlist($id)
+       }
+       set ranges {}
+       if {[info exists idrowranges($id)]} {
+           set ranges $idrowranges($id)
+           lappend ranges $row
+           unset idrowranges($id)
+       }
+       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 nohs {}
-       set reins {}
-       set isfat [expr {[llength $dlist] > $maxwidth}]
-       if {$nhyperspace > 0 || $isfat} {
-           if {$ctxend > $n} break
-           # work out what to bring back and
-           # what we want to don't want to send into hyperspace
-           set room 1
-           for {set k $numcommits} {$k < $ctxend} {incr k} {
-               set x [lindex $displayorder $k]
-               set i [llsearch $dlist $x]
-               if {$i < 0} {
-                   set i [llength $dlist]
-                   lappend dlist $x
+       foreach i $newolds {
+           set idinlist($i) 1
+           set idrowranges($i) $row
+       }
+       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
+       }
+       lappend rowidlist $idlist
+       lappend rowoffsets $offs
+    }
+    return $row
+}
+
+proc addextraid {id row} {
+    global displayorder commitrow commitinfo
+    global commitidx commitlisted
+    global parentlist childlist children curview
+
+    incr commitidx($curview)
+    lappend displayorder $id
+    lappend commitlisted 0
+    lappend parentlist {}
+    set commitrow($curview,$id) $row
+    readcommit $id
+    if {![info exists commitinfo($id)]} {
+       set commitinfo($id) {"No commit information available"}
+    }
+    if {![info exists children($curview,$id)]} {
+       set children($curview,$id) {}
+    }
+    lappend childlist $children($curview,$id)
+}
+
+proc layouttail {} {
+    global rowidlist rowoffsets idinlist commitidx curview
+    global idrowranges rowrangelist
+
+    set row $commitidx($curview)
+    set idlist [lindex $rowidlist $row]
+    while {$idlist ne {}} {
+       set col [expr {[llength $idlist] - 1}]
+       set id [lindex $idlist $col]
+       addextraid $id $row
+       unset idinlist($id)
+       lappend idrowranges($id) $row
+       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] {
+       addextraid $id $row
+       lset rowidlist $row [list $id]
+       lset rowoffsets $row 0
+       makeuparrow $id 0 $row 0
+       lappend idrowranges($id) $row
+       lappend rowrangelist $idrowranges($id)
+       unset idrowranges($id)
+       incr row
+       lappend rowidlist {}
+       lappend rowoffsets {}
+    }
+}
+
+proc insert_pad {row col npad} {
+    global rowidlist rowoffsets
+
+    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}]]
+}
+
+proc optimize_rows {row col endrow} {
+    global rowidlist rowoffsets idrowranges displayorder
+
+    for {} {$row < $endrow} {incr row} {
+       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 haspad 1
+               continue
+           }
+           set z [lindex $offs $col]
+           if {$z eq {}} continue
+           set isarrow 0
+           set x0 [expr {$col + $z}]
+           set y0 [expr {$row - 1}]
+           set z0 [lindex $rowoffsets $y0 $x0]
+           if {$z0 eq {}} {
+               set id [lindex $idlist $col]
+               set ranges [rowranges $id]
+               if {$ranges ne {} && $y0 > [lindex $ranges 0]} {
+                   set isarrow 1

                }
                }

-               if {[lsearch -exact $nohs $x] < 0} {
-                   lappend nohs $x
+           }
+           if {$z < -1 || ($z < 0 && $isarrow)} {
+               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

                }
                }

-               if {$reins eq {} && $onscreen($x) < 0 && $room} {
-                   set reins [list $x $i]
+               set z [lindex $offs $col]
+               set x0 [expr {$col + $z}]
+               set z0 [lindex $rowoffsets $y0 $x0]
+           } elseif {$z > 1 || ($z > 0 && $isarrow)} {
+               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 newp {}
-               if {[info exists commitlisted($x)]} {
-                   set right 0
-                   foreach p $parents($x) {
-                       if {[llsearch $dlist $p] < 0} {
-                           lappend newp $p
-                           if {[lsearch -exact $nohs $p] < 0} {
-                               lappend nohs $p
-                           }
-                           if {$reins eq {} && $onscreen($p) < 0 && $room} {
-                               set reins [list $p [expr {$i + $right}]]
-                           }
+               set pad [ntimes $npad {}]
+               set idlist [eval linsert \$idlist $col $pad]
+               set tmp [eval linsert \$offs $col $pad]
+               incr col $npad
+               set offs [incrange $tmp $col [expr {-$npad}]]
+               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]
+               optimize_rows $y0 [expr {$x0 + 1}] $row
+           }
+       }
+       if {!$haspad} {
+           set o {}
+           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]
+                   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 right 1

                    }
                }
                    }
                }

-               set l [lindex $dlist $i]
-               if {[llength $l] == 1} {
-                   set l $newp
-               } else {
-                   set j [lsearch -exact $l $x]
-                   set l [concat [lreplace $l $j $j] $newp]
-               }
-               set dlist [lreplace $dlist $i $i $l]
-               if {$room && $isfat && [llength $newp] <= 1} {
-                   set room 0
+               if {$o eq {} || $o <= 0} break
+           }
+           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

                }
                }

+               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
+    }
+}

 
 

-       set dlevel [drawslants $id $reins $nohs]
-       drawcommitline $dlevel
-       if {[clock clicks -milliseconds] >= $nextupdate
-           && $numcommits >= $ncmupdate} {
-           doupdate $reading
-           if {$stopped} break
-       }
+proc xc {row col} {
+    global canvx0 linespc
+    return [expr {$canvx0 + $col * $linespc}]
+}
+
+proc yc {row} {
+    global canvy0 linespc
+    return [expr {$canvy0 + $row * $linespc}]
+}
+
+proc linewidth {id} {
+    global thickerline lthickness
+
+    set wid $lthickness
+    if {[info exists thickerline] && $id eq $thickerline} {
+       set wid [expr {2 * $lthickness}]

     }
     }

+    return $wid

 }
 
 }
 

-# level here is an index in todo
-proc updatetodo {level noshortcut} {
-    global ncleft todo nnewparents
-    global commitlisted parents onscreen
+proc rowranges {id} {
+    global phase idrowranges commitrow rowlaidout rowrangelist curview

 
 

-    set id [lindex $todo $level]
-    set olds {}
-    if {[info exists commitlisted($id)]} {
-       foreach p $parents($id) {
-           if {[lsearch -exact $olds $p] < 0} {
-               lappend olds $p
+    set ranges {}
+    if {$phase eq {} ||
+       ([info exists commitrow($curview,$id)]
+        && $commitrow($curview,$id) < $rowlaidout)} {
+       set ranges [lindex $rowrangelist $commitrow($curview,$id)]
+    } elseif {[info exists idrowranges($id)]} {
+       set ranges $idrowranges($id)
+    }
+    return $ranges
+}
+
+proc drawlineseg {id i} {
+    global rowoffsets rowidlist
+    global displayorder
+    global canv colormap linespc
+    global numcommits commitrow curview
+
+    set ranges [rowranges $id]
+    set downarrow 1
+    if {[info exists commitrow($curview,$id)]
+       && $commitrow($curview,$id) < $numcommits} {
+       set downarrow [expr {$i < [llength $ranges] / 2 - 1}]
+    } else {
+       set downarrow 1
+    }
+    set startrow [lindex $ranges [expr {2 * $i}]]
+    set row [lindex $ranges [expr {2 * $i + 1}]]
+    if {$startrow == $row} return
+    assigncolor $id
+    set coords {}
+    set col [lsearch -exact [lindex $rowidlist $row] $id]
+    if {$col < 0} {
+       puts "oops: drawline: id $id not on row $row"
+       return
+    }
+    set lasto {}
+    set ns 0
+    while {1} {
+       set o [lindex $rowoffsets $row $col]
+       if {$o eq {}} break
+       if {$o ne $lasto} {
+           # changing direction
+           set x [xc $row $col]
+           set y [yc $row]
+           lappend coords $x $y
+           set lasto $o
+       }
+       incr col $o
+       incr row -1
+    }
+    set x [xc $row $col]
+    set y [yc $row]
+    lappend coords $x $y
+    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
+    if {$downarrow} {
+       # This line has an arrow at the lower end: check if the arrow is
+       # on a diagonal segment, and if so, work around the Tk 8.4
+       # refusal to draw arrows on diagonal lines.
+       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]

            }
        }
     }
            }
        }
     }

-    if {!$noshortcut && [llength $olds] == 1} {
-       set p [lindex $olds 0]
-       if {$ncleft($p) == 1 && [lsearch -exact $todo $p] < 0} {
-           set ncleft($p) 0
-           set todo [lreplace $todo $level $level $p]
-           set onscreen($p) 0
-           set nnewparents($id) 1
-           return 0
+    set arrow [expr {2 * ($i > 0) + $downarrow}]
+    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
+}
+
+proc drawparentlinks {id row col olds} {
+    global rowidlist canv colormap
+
+    set row2 [expr {$row + 1}]
+    set x [xc $row $col]
+    set y [yc $row]
+    set y2 [yc $row2]
+    set ids [lindex $rowidlist $row2]
+    # rmx = right-most X coord used
+    set rmx 0
+    foreach p $olds {
+       set i [lsearch -exact $ids $p]
+       if {$i < 0} {
+           puts "oops, parent $p of $id not in list"
+           continue
+       }
+       set x2 [xc $row2 $i]
+       if {$x2 > $rmx} {
+           set rmx $x2
+       }
+       set ranges [rowranges $p]
+       if {$ranges ne {} && $row2 == [lindex $ranges 0]
+           && $row2 < [lindex $ranges 1]} {
+           # 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
+       }
+       lappend coords $x2 $y2
+       set t [$canv create line $coords -width [linewidth $p] \
+                  -fill $colormap($p) -tags lines.$p]
+       $canv lower $t
+       bindline $t $p
+    }
+    return $rmx
+}
+
+proc drawlines {id} {
+    global colormap canv
+    global idrangedrawn
+    global children iddrawn commitrow rowidlist curview
+
+    $canv delete lines.$id
+    set nr [expr {[llength [rowranges $id]] / 2}]
+    for {set i 0} {$i < $nr} {incr i} {
+       if {[info exists idrangedrawn($id,$i)]} {
+           drawlineseg $id $i
+       }
+    }
+    foreach child $children($curview,$id) {
+       if {[info exists iddrawn($child)]} {
+           set row $commitrow($curview,$child)
+           set col [lsearch -exact [lindex $rowidlist $row] $child]
+           if {$col >= 0} {
+               drawparentlinks $child $row $col [list $id]
+           }

        }
     }
        }
     }

+}

 
 

-    set todo [lreplace $todo $level $level]
-    set i $level
-    set n 0
-    foreach p $olds {
-       incr ncleft($p) -1
-       set k [lsearch -exact $todo $p]
-       if {$k < 0} {
-           set todo [linsert $todo $i $p]
-           set onscreen($p) 0
+proc drawcmittext {id row col rmx} {
+    global linespc canv canv2 canv3 canvy0
+    global commitlisted commitinfo rowidlist
+    global rowtextx idpos idtags idheads idotherrefs
+    global linehtag linentag linedtag
+    global mainfont canvxmax
+    global hlview commitrow highlightedrows
+
+    set ofill [expr {[lindex $commitlisted $row]? "blue": "white"}]
+    set x [xc $row $col]
+    set y [yc $row]
+    set orad [expr {$linespc / 3}]
+    set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
+              [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
+              -fill $ofill -outline black -width 1]
+    $canv raise $t
+    $canv bind $t <1> {selcanvline {} %x %y}
+    set xt [xc $row [llength [lindex $rowidlist $row]]]
+    if {$xt < $rmx} {
+       set xt $rmx
+    }
+    set rowtextx($row) $xt
+    set idpos($id) [list $x $xt $y]
+    if {[info exists idtags($id)] || [info exists idheads($id)]
+       || [info exists idotherrefs($id)]} {
+       set xt [drawtags $id $x $xt $y]
+    }
+    set headline [lindex $commitinfo($id) 0]
+    set name [lindex $commitinfo($id) 1]
+    set date [lindex $commitinfo($id) 2]
+    set date [formatdate $date]
+    set font $mainfont
+    if {[info exists hlview] && [info exists commitrow($hlview,$id)]} {
+       lappend font bold
+       lappend highlightedrows $row
+    }
+    set linehtag($row) [$canv create text $xt $y -anchor w \
+                           -text $headline -font $font]
+    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
+    set linentag($row) [$canv2 create text 3 $y -anchor w \
+                           -text $name -font $mainfont]
+    set linedtag($row) [$canv3 create text 3 $y -anchor w \
+                           -text $date -font $mainfont]
+    set xr [expr {$xt + [font measure $mainfont $headline]}]
+    if {$xr > $canvxmax} {
+       set canvxmax $xr
+       setcanvscroll
+    }
+}
+
+proc drawcmitrow {row} {
+    global displayorder rowidlist
+    global idrangedrawn iddrawn
+    global commitinfo parentlist numcommits
+
+    if {$row >= $numcommits} return
+    foreach id [lindex $rowidlist $row] {
+       if {$id eq {}} continue
+       set i -1
+       foreach {s e} [rowranges $id] {

            incr i
            incr i

-           incr n
+           if {$row < $s} continue
+           if {$e eq {}} break
+           if {$row <= $e} {
+               if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
+                   drawlineseg $id $i
+                   set idrangedrawn($id,$i) 1
+               }
+               break
+           }

        }
     }
        }
     }

-    set nnewparents($id) $n

 
 

-    return 1
+    set id [lindex $displayorder $row]
+    if {[info exists iddrawn($id)]} return
+    set col [lsearch -exact [lindex $rowidlist $row] $id]
+    if {$col < 0} {
+       puts "oops, row $row id $id not in list"
+       return
+    }
+    if {![info exists commitinfo($id)]} {
+       getcommit $id
+    }
+    assigncolor $id
+    set olds [lindex $parentlist $row]
+    if {$olds ne {}} {
+       set rmx [drawparentlinks $id $row $col $olds]
+    } else {
+       set rmx 0
+    }
+    drawcmittext $id $row $col $rmx
+    set iddrawn($id) 1

 }
 
 }
 

-proc decidenext {{noread 0}} {
-    global ncleft todo
-    global datemode cdate
-    global commitinfo
+proc drawfrac {f0 f1} {
+    global numcommits canv
+    global linespc

 
 

-    # choose which one to do next time around
-    set todol [llength $todo]
-    set level -1
-    set latest {}
-    for {set k $todol} {[incr k -1] >= 0} {} {
-       set p [lindex $todo $k]
-       if {$ncleft($p) == 0} {
-           if {$datemode} {
-               if {![info exists commitinfo($p)]} {
-                   if {$noread} {
-                       return {}
+    set ymax [lindex [$canv cget -scrollregion] 3]
+    if {$ymax eq {} || $ymax == 0} return
+    set y0 [expr {int($f0 * $ymax)}]
+    set row [expr {int(($y0 - 3) / $linespc) - 1}]
+    if {$row < 0} {
+       set row 0
+    }
+    set y1 [expr {int($f1 * $ymax)}]
+    set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
+    if {$endrow >= $numcommits} {
+       set endrow [expr {$numcommits - 1}]
+    }
+    for {} {$row <= $endrow} {incr row} {
+       drawcmitrow $row
+    }
+}
+
+proc drawvisible {} {
+    global canv
+    eval drawfrac [$canv yview]
+}
+
+proc clear_display {} {
+    global iddrawn idrangedrawn
+
+    allcanvs delete all
+    catch {unset iddrawn}
+    catch {unset idrangedrawn}
+}
+
+proc findcrossings {id} {
+    global rowidlist parentlist numcommits rowoffsets displayorder
+
+    set cross {}
+    set ccross {}
+    foreach {s e} [rowranges $id] {
+       if {$e >= $numcommits} {
+           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 olds [lindex $parentlist $row]
+           set kid [lindex $displayorder $row]
+           set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
+           if {$kidx < 0} continue
+           set nextrow [lindex $rowidlist [expr {$row + 1}]]
+           foreach p $olds {
+               set px [lsearch -exact $nextrow $p]
+               if {$px < 0} continue
+               if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
+                   if {[lsearch -exact $ccross $p] >= 0} continue
+                   if {$x == $px + ($kidx < $px? -1: 1)} {
+                       lappend ccross $p
+                   } elseif {[lsearch -exact $cross $p] < 0} {
+                       lappend cross $p

                    }
                    }

-                   readcommit $p

                }
                }

-               if {$latest == {} || $cdate($p) > $latest} {
-                   set level $k
-                   set latest $cdate($p)
+           }
+           set inc [lindex $rowoffsets $row $x]
+           if {$inc eq {}} break
+           incr x $inc
+       }
+    }
+    return [concat $ccross {{}} $cross]
+}
+
+proc assigncolor {id} {
+    global colormap colors nextcolor
+    global commitrow parentlist children children curview
+
+    if {[info exists colormap($id)]} return
+    set ncolors [llength $colors]
+    if {[info exists children($curview,$id)]} {
+       set kids $children($curview,$id)
+    } else {
+       set kids {}
+    }
+    if {[llength $kids] == 1} {
+       set child [lindex $kids 0]
+       if {[info exists colormap($child)]
+           && [llength [lindex $parentlist $commitrow($curview,$child)]] == 1} {
+           set colormap($id) $colormap($child)
+           return
+       }
+    }
+    set badcolors {}
+    set origbad {}
+    foreach x [findcrossings $id] {
+       if {$x eq {}} {
+           # delimiter between corner crossings and other crossings
+           if {[llength $badcolors] >= $ncolors - 1} break
+           set origbad $badcolors
+       }
+       if {[info exists colormap($x)]
+           && [lsearch -exact $badcolors $colormap($x)] < 0} {
+           lappend badcolors $colormap($x)
+       }
+    }
+    if {[llength $badcolors] >= $ncolors} {
+       set badcolors $origbad
+    }
+    set origbad $badcolors
+    if {[llength $badcolors] < $ncolors - 1} {
+       foreach child $kids {
+           if {[info exists colormap($child)]
+               && [lsearch -exact $badcolors $colormap($child)] < 0} {
+               lappend badcolors $colormap($child)
+           }
+           foreach p [lindex $parentlist $commitrow($curview,$child)] {
+               if {[info exists colormap($p)]
+                   && [lsearch -exact $badcolors $colormap($p)] < 0} {
+                   lappend badcolors $colormap($p)

                }
                }

-           } else {
-               set level $k
-               break

            }
        }
            }
        }

+       if {[llength $badcolors] >= $ncolors} {
+           set badcolors $origbad
+       }

     }
     }

+    for {set i 0} {$i <= $ncolors} {incr i} {
+       set c [lindex $colors $nextcolor]
+       if {[incr nextcolor] >= $ncolors} {
+           set nextcolor 0
+       }
+       if {[lsearch -exact $badcolors $c]} break
+    }
+    set colormap($id) $c
+}
+
+proc bindline {t id} {
+    global canv

 
 

-    return $level
+    $canv bind $t <Enter> "lineenter %x %y $id"
+    $canv bind $t <Motion> "linemotion %x %y $id"
+    $canv bind $t <Leave> "lineleave $id"
+    $canv bind $t <Button-1> "lineclick %x %y $id 1"

 }
 
 }
 

-proc drawcommit {id reading} {
-    global phase todo nchildren datemode nextupdate revlistorder ncleft
-    global numcommits ncmupdate displayorder todo onscreen parents
-    global commitlisted commitordered
+proc drawtags {id x xt y1} {
+    global idtags idheads idotherrefs
+    global linespc lthickness
+    global canv mainfont commitrow rowtextx curview

 
 

-    if {$phase != "incrdraw"} {
-       set phase incrdraw
-       set displayorder {}
-       set todo {}
-       initgraph
-       catch {unset commitordered}
+    set marks {}
+    set ntags 0
+    set nheads 0
+    if {[info exists idtags($id)]} {
+       set marks $idtags($id)
+       set ntags [llength $marks]
+    }
+    if {[info exists idheads($id)]} {
+       set marks [concat $marks $idheads($id)]
+       set nheads [llength $idheads($id)]

     }
     }

-    set commitordered($id) 1
-    if {$nchildren($id) == 0} {
-       lappend todo $id
-       set onscreen($id) 0
+    if {[info exists idotherrefs($id)]} {
+       set marks [concat $marks $idotherrefs($id)]

     }
     }

-    if {$revlistorder} {
-       set level [lsearch -exact $todo $id]
-       if {$level < 0} {
-           error_popup "oops, $id isn't in todo"
-           return
-       }
-       lappend displayorder $id
-       updatetodo $level 0
-    } else {
-       set level [decidenext 1]
-       if {$level == {} || $level < 0} return
-       while 1 {
-           set id [lindex $todo $level]
-           if {![info exists commitordered($id)]} {
-               break
+    if {$marks eq {}} {
+       return $xt
+    }
+
+    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
+    set yt [expr {$y1 - 0.5 * $linespc}]
+    set yb [expr {$yt + $linespc - 1}]
+    set xvals {}
+    set wvals {}
+    foreach tag $marks {
+       set wid [font measure $mainfont $tag]
+       lappend xvals $xt
+       lappend wvals $wid
+       set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
+    }
+    set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
+              -width $lthickness -fill black -tags tag.$id]
+    $canv lower $t
+    foreach tag $marks x $xvals wid $wvals {
+       set xl [expr {$x + $delta}]
+       set xr [expr {$x + $delta + $wid + $lthickness}]
+       if {[incr ntags -1] >= 0} {
+           # draw a tag
+           set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
+                      $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
+                      -width 1 -outline black -fill yellow -tags tag.$id]
+           $canv bind $t <1> [list showtag $tag 1]
+           set rowtextx($commitrow($curview,$id)) [expr {$xr + $linespc}]
+       } else {
+           # draw a head or other ref
+           if {[incr nheads -1] >= 0} {
+               set col green
+           } else {
+               set col "#ddddff"

            }
            }

-           lappend displayorder [lindex $todo $level]
-           if {[updatetodo $level $datemode]} {
-               set level [decidenext 1]
-               if {$level == {} || $level < 0} break
+           set xl [expr {$xl - $delta/2}]
+           $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
+               -width 1 -outline black -fill $col -tags tag.$id
+           if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
+               set rwid [font measure $mainfont $remoteprefix]
+               set xi [expr {$x + 1}]
+               set yti [expr {$yt + 1}]
+               set xri [expr {$x + $rwid}]
+               $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
+                       -width 0 -fill "#ffddaa" -tags tag.$id

            }
        }
            }
        }

+       set t [$canv create text $xl $y1 -anchor w -text $tag \
+                  -font $mainfont -tags tag.$id]
+       if {$ntags >= 0} {
+           $canv bind $t <1> [list showtag $tag 1]
+       }
+    }
+    return $xt
+}
+
+proc xcoord {i level ln} {
+    global canvx0 xspc1 xspc2
+
+    set x [expr {$canvx0 + $i * $xspc1($ln)}]
+    if {$i > 0 && $i == $level} {
+       set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
+    } elseif {$i > $level} {
+       set x [expr {$x + $xspc2 - $xspc1($ln)}]

     }
     }

-    drawmore $reading
+    return $x
+}
+
+proc show_status {msg} {
+    global canv mainfont
+
+    clear_display
+    $canv create text 3 3 -anchor nw -text $msg -font $mainfont -tags textitems

 }
 
 proc finishcommits {} {
 }
 
 proc finishcommits {} {

-    global phase oldcommits commits
+    global commitidx phase curview

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

-    global parents displayorder todo
+    global findinprogress pending_select

 
 

-    if {$phase == "incrdraw" || $phase == "removecommits"} {
-       foreach id $oldcommits {
-           lappend commits $id
-           drawcommit $id 0
-       }
-       set oldcommits {}
+    if {$commitidx($curview) > 0} {

        drawrest
        drawrest

-    } elseif {$phase == "updatecommits"} {
-       # there were no new commits, in fact
-       set commits $oldcommits
-       set oldcommits {}
-       set phase {}

     } else {
     } else {

-       $canv delete all
-       $canv create text 3 3 -anchor nw -text "No commits selected" \
-           -font $mainfont -tags textitems
-       set phase {}
+       show_status "No commits selected"

     }
     }

-    . config -cursor $maincursor
-    settextcursor $textcursor
+    set phase {}
+    catch {unset pending_select}

 }
 
 # 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,


@@ -1602,61 +2689,44 @@ proc settextcursor {c} {
     set curtextcursor $c
 }
 
     set curtextcursor $c
 }
 

-proc drawgraph {} {
-    global nextupdate startmsecs ncmupdate
-    global displayorder onscreen
+proc nowbusy {what} {
+    global isbusy

 
 

-    if {$displayorder == {}} return
-    set startmsecs [clock clicks -milliseconds]
-    set nextupdate [expr {$startmsecs + 100}]
-    set ncmupdate 1
-    initgraph
-    foreach id $displayorder {
-       set onscreen($id) 0
+    if {[array names isbusy] eq {}} {
+       . config -cursor watch
+       settextcursor watch

     }
     }

-    drawmore 0
+    set isbusy($what) 1

 }
 
 }
 

-proc drawrest {} {
-    global phase stopped redisplaying selectedline
-    global datemode todo displayorder ncleft
-    global numcommits ncmupdate
-    global nextupdate startmsecs revlistorder
-
-    set level [decidenext]
-    if {$level >= 0} {
-       set phase drawgraph
-       while 1 {
-           lappend displayorder [lindex $todo $level]
-           set hard [updatetodo $level $datemode]
-           if {$hard} {
-               set level [decidenext]
-               if {$level < 0} break
-           }
-       }
+proc notbusy {what} {
+    global isbusy maincursor textcursor
+
+    catch {unset isbusy($what)}
+    if {[array names isbusy] eq {}} {
+       . config -cursor $maincursor
+       settextcursor $textcursor

     }
     }

-    if {$todo != {}} {
-       puts "ERROR: none of the pending commits can be done yet:"
-       foreach p $todo {
-           puts "  $p ($ncleft($p))"
-       }
+}
+
+proc drawrest {} {
+    global numcommits
+    global startmsecs
+    global canvy0 numcommits linespc
+    global rowlaidout commitidx curview
+    global pending_select
+
+    set row $rowlaidout
+    layoutrows $rowlaidout $commitidx($curview) 1
+    layouttail
+    optimize_rows $row 0 $commitidx($curview)
+    showstuff $commitidx($curview)
+    if {[info exists pending_select]} {
+       selectline 0 1

     }
 
     }
 

-    drawmore 0
-    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"

-    if {$redisplaying} {
-       if {$stopped == 0 && [info exists selectedline]} {
-           selectline $selectedline 0
-       }
-       if {$stopped == 1} {
-           set stopped 0
-           after idle drawgraph
-       } else {
-           set redisplaying 0
-       }
-    }

 }
 
 proc findmatches {f} {
 }
 
 proc findmatches {f} {


@@ -1681,9 +2751,10 @@ proc findmatches {f} {
 
 proc dofind {} {
     global findtype findloc findstring markedmatches commitinfo
 
 proc dofind {} {
     global findtype findloc findstring markedmatches commitinfo

-    global numcommits lineid linehtag linentag linedtag
-    global mainfont namefont canv canv2 canv3 selectedline
-    global matchinglines foundstring foundstrlen
+    global numcommits displayorder linehtag linentag linedtag
+    global mainfont canv canv2 canv3 selectedline
+    global matchinglines foundstring foundstrlen matchstring
+    global commitdata

 
     stopfindproc
     unmarkmatches
 
     stopfindproc
     unmarkmatches


@@ -1700,6 +2771,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


@@ -1711,8 +2784,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 $lineid($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 {


@@ -1723,10 +2809,13 @@ proc dofind {} {
            if {$matches == {}} continue
            set doesmatch 1
            if {$ty == "Headline"} {
            if {$matches == {}} continue
            set doesmatch 1
            if {$ty == "Headline"} {

+               drawcmitrow $l

                markmatches $canv $l $f $linehtag($l) $matches $mainfont
            } elseif {$ty == "Author"} {
                markmatches $canv $l $f $linehtag($l) $matches $mainfont
            } elseif {$ty == "Author"} {

-               markmatches $canv2 $l $f $linentag($l) $matches $namefont
+               drawcmitrow $l
+               markmatches $canv2 $l $f $linentag($l) $matches $mainfont

            } elseif {$ty == "Date"} {
            } elseif {$ty == "Date"} {

+               drawcmitrow $l

                markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
            }
        }
                markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
            }
        }


@@ -1822,19 +2911,14 @@ proc stopfindproc {{done 0}} {
        catch {close $findprocfile}
        unset findprocpid
     }
        catch {close $findprocfile}
        unset findprocpid
     }

-    if {[info exists findinprogress]} {
-       unset findinprogress
-       if {$phase != "incrdraw"} {
-           . config -cursor $maincursor
-           settextcursor $textcursor
-       }
-    }
+    catch {unset findinprogress}
+    notbusy find

 }
 
 proc findpatches {} {
     global findstring selectedline numcommits
     global findprocpid findprocfile
 }
 
 proc findpatches {} {
     global findstring selectedline numcommits
     global findprocpid findprocfile

-    global finddidsel ctext lineid findinprogress
+    global finddidsel ctext displayorder findinprogress

     global findinsertpos
 
     if {$numcommits == 0} return
     global findinsertpos
 
     if {$numcommits == 0} return


@@ -1851,7 +2935,7 @@ proc findpatches {} {
        if {[incr l] >= $numcommits} {
            set l 0
        }
        if {[incr l] >= $numcommits} {
            set l 0
        }

-       append inputids $lineid($l) "\n"
+       append inputids [lindex $displayorder $l] "\n"

     }
 
     if {[catch {
     }
 
     if {[catch {


@@ -1868,14 +2952,13 @@ proc findpatches {} {
     fconfigure $f -blocking 0
     fileevent $f readable readfindproc
     set finddidsel 0
     fconfigure $f -blocking 0
     fileevent $f readable readfindproc
     set finddidsel 0

-    . config -cursor watch
-    settextcursor watch
+    nowbusy find

     set findinprogress 1
 }
 
 proc readfindproc {} {
     global findprocfile finddidsel
     set findinprogress 1
 }
 
 proc readfindproc {} {
     global findprocfile finddidsel

-    global idline matchinglines findinsertpos
+    global commitrow matchinglines findinsertpos curview

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


@@ -1892,11 +2975,11 @@ proc readfindproc {} {
        stopfindproc
        return
     }
        stopfindproc
        return
     }

-    if {![info exists idline($id)]} {
+    if {![info exists commitrow($curview,$id)]} {

        puts stderr "spurious id: $id"
        return
     }
        puts stderr "spurious id: $id"
        return
     }

-    set l $idline($id)
+    set l $commitrow($curview,$id)

     insertmatch $l $id
 }
 
     insertmatch $l $id
 }
 


@@ -1922,10 +3005,10 @@ proc insertmatch {l id} {
 }
 
 proc findfiles {} {
 }
 
 proc findfiles {} {

-    global selectedline numcommits lineid ctext
-    global ffileline finddidsel parents nparents
+    global selectedline numcommits displayorder ctext
+    global ffileline finddidsel parentlist

     global findinprogress findstartline findinsertpos
     global findinprogress findstartline findinsertpos

-    global treediffs fdiffids fdiffsneeded fdiffpos
+    global treediffs fdiffid fdiffsneeded fdiffpos

     global findmergefiles
 
     if {$numcommits == 0} return
     global findmergefiles
 
     if {$numcommits == 0} return


@@ -1940,13 +3023,11 @@ proc findfiles {} {
     set diffsneeded {}
     set fdiffsneeded {}
     while 1 {
     set diffsneeded {}
     set fdiffsneeded {}
     while 1 {

-       set id $lineid($l)
-       if {$findmergefiles || $nparents($id) == 1} {
-           foreach p $parents($id) {
-               if {![info exists treediffs([list $id $p])]} {
-                   append diffsneeded "$id $p\n"
-                   lappend fdiffsneeded [list $id $p]
-               }
+       set id [lindex $displayorder $l]
+       if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
+           if {![info exists treediffs($id)]} {
+               append diffsneeded "$id\n"
+               lappend fdiffsneeded $id

            }
        }
        if {[incr l] >= $numcommits} {
            }
        }
        if {[incr l] >= $numcommits} {


@@ -1963,7 +3044,7 @@ proc findfiles {} {
            error_popup "Error starting search process: $err"
            return
        }
            error_popup "Error starting search process: $err"
            return
        }

-       catch {unset fdiffids}
+       catch {unset fdiffid}

        set fdiffpos 0
        fconfigure $df -blocking 0
        fileevent $df readable [list readfilediffs $df]
        set fdiffpos 0
        fconfigure $df -blocking 0
        fileevent $df readable [list readfilediffs $df]


@@ -1971,17 +3052,15 @@ proc findfiles {} {
 
     set finddidsel 0
     set findinsertpos end
 
     set finddidsel 0
     set findinsertpos end

-    set id $lineid($l)
-    set p [lindex $parents($id) 0]
-    . config -cursor watch
-    settextcursor watch
+    set id [lindex $displayorder $l]
+    nowbusy find

     set findinprogress 1
     set findinprogress 1

-    findcont [list $id $p]
+    findcont

     update
 }
 
 proc readfilediffs {df} {
     update
 }
 
 proc readfilediffs {df} {

-    global findids fdiffids fdiffs
+    global findid fdiffid fdiffs

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


@@ -1991,19 +3070,19 @@ proc readfilediffs {df} {
                stopfindproc
                bell
                error_popup "Error in git-diff-tree: $err"
                stopfindproc
                bell
                error_popup "Error in git-diff-tree: $err"

-           } elseif {[info exists findids]} {
-               set ids $findids
+           } elseif {[info exists findid]} {
+               set id $findid

                stopfindproc
                bell
                stopfindproc
                bell

-               error_popup "Couldn't find diffs for {$ids}"
+               error_popup "Couldn't find diffs for $id"

            }
        }
        return
     }
            }
        }
        return
     }

-    if {[regexp {^([0-9a-f]{40}) \(from ([0-9a-f]{40})\)} $line match id p]} {
+    if {[regexp {^([0-9a-f]{40})$} $line match id]} {

        # start of a new string of diffs
        donefilediff
        # start of a new string of diffs
        donefilediff

-       set fdiffids [list $id $p]
+       set fdiffid $id

        set fdiffs {}
     } elseif {[string match ":*" $line]} {
        lappend fdiffs [lindex $line 5]
        set fdiffs {}
     } elseif {[string match ":*" $line]} {
        lappend fdiffs [lindex $line 5]


@@ -2011,53 +3090,51 @@ proc readfilediffs {df} {
 }
 
 proc donefilediff {} {
 }
 
 proc donefilediff {} {

-    global fdiffids fdiffs treediffs findids
+    global fdiffid fdiffs treediffs findid

     global fdiffsneeded fdiffpos
 
     global fdiffsneeded fdiffpos
 

-    if {[info exists fdiffids]} {
-       while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffids
+    if {[info exists fdiffid]} {
+       while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffid

               && $fdiffpos < [llength $fdiffsneeded]} {
            # git-diff-tree doesn't output anything for a commit
            # which doesn't change anything
               && $fdiffpos < [llength $fdiffsneeded]} {
            # git-diff-tree doesn't output anything for a commit
            # which doesn't change anything

-           set nullids [lindex $fdiffsneeded $fdiffpos]
-           set treediffs($nullids) {}
-           if {[info exists findids] && $nullids eq $findids} {
-               unset findids
-               findcont $nullids
+           set nullid [lindex $fdiffsneeded $fdiffpos]
+           set treediffs($nullid) {}
+           if {[info exists findid] && $nullid eq $findid} {
+               unset findid
+               findcont

            }
            incr fdiffpos
        }
        incr fdiffpos
 
            }
            incr fdiffpos
        }
        incr fdiffpos
 

-       if {![info exists treediffs($fdiffids)]} {
-           set treediffs($fdiffids) $fdiffs
+       if {![info exists treediffs($fdiffid)]} {
+           set treediffs($fdiffid) $fdiffs

        }
        }

-       if {[info exists findids] && $fdiffids eq $findids} {
-           unset findids
-           findcont $fdiffids
+       if {[info exists findid] && $fdiffid eq $findid} {
+           unset findid
+           findcont

        }
     }
 }
 
        }
     }
 }
 

-proc findcont {ids} {
-    global findids treediffs parents nparents
+proc findcont {} {
+    global findid treediffs parentlist

     global ffileline findstartline finddidsel
     global ffileline findstartline finddidsel

-    global lineid numcommits matchinglines findinprogress
+    global displayorder numcommits matchinglines findinprogress

     global findmergefiles
 
     global findmergefiles
 

-    set id [lindex $ids 0]
-    set p [lindex $ids 1]
-    set pi [lsearch -exact $parents($id) $p]

     set l $ffileline
     set l $ffileline

-    while 1 {
-       if {$findmergefiles || $nparents($id) == 1} {
-           if {![info exists treediffs($ids)]} {
-               set findids $ids
+    while {1} {
+       set id [lindex $displayorder $l]
+       if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
+           if {![info exists treediffs($id)]} {
+               set findid $id

                set ffileline $l
                return
            }
            set doesmatch 0
                set ffileline $l
                return
            }
            set doesmatch 0

-           foreach f $treediffs($ids) {
+           foreach f $treediffs($id) {

                set x [findmatches $f]
                if {$x != {}} {
                    set doesmatch 1
                set x [findmatches $f]
                if {$x != {}} {
                    set doesmatch 1


@@ -2066,21 +3143,12 @@ proc findcont {ids} {
            }
            if {$doesmatch} {
                insertmatch $l $id
            }
            if {$doesmatch} {
                insertmatch $l $id

-               set pi $nparents($id)

            }
            }

-       } else {
-           set pi $nparents($id)

        }
        }

-       if {[incr pi] >= $nparents($id)} {
-           set pi 0
-           if {[incr l] >= $numcommits} {
-               set l 0
-           }
-           if {$l == $findstartline} break
-           set id $lineid($l)
+       if {[incr l] >= $numcommits} {
+           set l 0

        }
        }

-       set p [lindex $parents($id) $pi]
-       set ids [list $id $p]
+       if {$l == $findstartline} break

     }
     stopfindproc
     if {!$finddidsel} {
     }
     stopfindproc
     if {!$finddidsel} {


@@ -2091,8 +3159,9 @@ proc findcont {ids} {
 # 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)]
     set t [$canv create rect $bbox -outline {} -tags matches -fill yellow]
     $canv lower $t
     set bbox [$canv bbox $linehtag($l)]
     set t [$canv create rect $bbox -outline {} -tags matches -fill yellow]
     $canv lower $t


@@ -2126,7 +3195,7 @@ proc unmarkmatches {} {
 
 proc selcanvline {w x y} {
     global canv canvy0 ctext linespc
 
 proc selcanvline {w x y} {
     global canv canvy0 ctext linespc

-    global lineid linehtag linentag linedtag rowtextx
+    global rowtextx

     set ymax [lindex [$canv cget -scrollregion] 3]
     if {$ymax == {}} return
     set yfrac [lindex [$canv yview] 0]
     set ymax [lindex [$canv cget -scrollregion] 3]
     if {$ymax == {}} return
     set yfrac [lindex [$canv yview] 0]


@@ -2144,8 +3213,11 @@ proc selcanvline {w x y} {
 
 proc commit_descriptor {p} {
     global commitinfo
 
 proc commit_descriptor {p} {
     global commitinfo

+    if {![info exists commitinfo($p)]} {
+       getcommit $p
+    }

     set l "..."
     set l "..."

-    if {[info exists commitinfo($p)]} {
+    if {[llength $commitinfo($p)] > 1} {

        set l [lindex $commitinfo($p) 0]
     }
     return "$p ($l)"
        set l [lindex $commitinfo($p) 0]
     }
     return "$p ($l)"


@@ -2154,7 +3226,7 @@ proc commit_descriptor {p} {
 # append some text to the ctext widget, and make any SHA1 ID
 # that we know about be a clickable link.
 proc appendwithlinks {text} {
 # append some text to the ctext widget, and make any SHA1 ID
 # that we know about be a clickable link.
 proc appendwithlinks {text} {

-    global ctext idline linknum
+    global ctext commitrow linknum curview

 
     set start [$ctext index "end - 1c"]
     $ctext insert end $text
 
     set start [$ctext index "end - 1c"]
     $ctext insert end $text


@@ -2164,11 +3236,12 @@ proc appendwithlinks {text} {
        set s [lindex $l 0]
        set e [lindex $l 1]
        set linkid [string range $text $s $e]
        set s [lindex $l 0]
        set e [lindex $l 1]
        set linkid [string range $text $s $e]

-       if {![info exists idline($linkid)]} continue
+       if {![info exists commitrow($curview,$linkid)]} continue

        incr e
        $ctext tag add link "$start + $s c" "$start + $e c"
        $ctext tag add link$linknum "$start + $s c" "$start + $e c"
        incr e
        $ctext tag add link "$start + $s c" "$start + $e c"
        $ctext tag add link$linknum "$start + $s c" "$start + $e c"

-       $ctext tag bind link$linknum <1> [list selectline $idline($linkid) 1]
+       $ctext tag bind link$linknum <1> \
+           [list selectline $commitrow($curview,$linkid) 1]

        incr linknum
     }
     $ctext tag conf link -foreground blue -underline 1
        incr linknum
     }
     $ctext tag conf link -foreground blue -underline 1


@@ -2176,28 +3249,35 @@ proc appendwithlinks {text} {
     $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
 }
 
     $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
 }
 

+proc viewnextline {dir} {
+    global canv linespc
+
+    $canv delete hover
+    set ymax [lindex [$canv cget -scrollregion] 3]
+    set wnow [$canv yview]
+    set wtop [expr {[lindex $wnow 0] * $ymax}]
+    set newtop [expr {$wtop + $dir * $linespc}]
+    if {$newtop < 0} {
+       set newtop 0
+    } elseif {$newtop > $ymax} {
+       set newtop $ymax
+    }
+    allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
+}
+

 proc selectline {l isnew} {
     global canv canv2 canv3 ctext commitinfo selectedline
 proc selectline {l isnew} {
     global canv canv2 canv3 ctext commitinfo selectedline

-    global lineid linehtag linentag linedtag
-    global canvy0 linespc parents nparents children
-    global cflist currentid sha1entry
-    global commentend idtags idline linknum
-
+    global displayorder linehtag linentag linedtag
+    global canvy0 linespc parentlist childlist
+    global currentid sha1entry
+    global commentend idtags linknum
+    global mergemax numcommits pending_select
+    global cmitmode
+
+    catch {unset pending_select}

     $canv delete hover
     normalline
     $canv delete hover
     normalline

-    if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
-    $canv delete secsel
-    set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
-              -tags secsel -fill [$canv cget -selectbackground]]
-    $canv lower $t
-    $canv2 delete secsel
-    set t [eval $canv2 create rect [$canv2 bbox $linentag($l)] -outline {{}} \
-              -tags secsel -fill [$canv2 cget -selectbackground]]
-    $canv2 lower $t
-    $canv3 delete secsel
-    set t [eval $canv3 create rect [$canv3 bbox $linedtag($l)] -outline {{}} \
-              -tags secsel -fill [$canv3 cget -selectbackground]]
-    $canv3 lower $t
+    if {$l < 0 || $l >= $numcommits} return

     set y [expr {$canvy0 + $l * $linespc}]
     set ymax [lindex [$canv cget -scrollregion] 3]
     set ytop [expr {$y - $linespc - 1}]
     set y [expr {$canvy0 + $l * $linespc}]
     set ymax [lindex [$canv cget -scrollregion] 3]
     set ytop [expr {$y - $linespc - 1}]


@@ -2231,15 +3311,30 @@ proc selectline {l isnew} {
            set newtop 0
        }
        allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
            set newtop 0
        }
        allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]

+       drawvisible

     }
 
     }
 

+    if {![info exists linehtag($l)]} return
+    $canv delete secsel
+    set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
+              -tags secsel -fill [$canv cget -selectbackground]]
+    $canv lower $t
+    $canv2 delete secsel
+    set t [eval $canv2 create rect [$canv2 bbox $linentag($l)] -outline {{}} \
+              -tags secsel -fill [$canv2 cget -selectbackground]]
+    $canv2 lower $t
+    $canv3 delete secsel
+    set t [eval $canv3 create rect [$canv3 bbox $linedtag($l)] -outline {{}} \
+              -tags secsel -fill [$canv3 cget -selectbackground]]
+    $canv3 lower $t
+

     if {$isnew} {
        addtohistory [list selectline $l 0]
     }
 
     set selectedline $l
 
     if {$isnew} {
        addtohistory [list selectline $l 0]
     }
 
     set selectedline $l
 

-    set id $lineid($l)
+    set id [lindex $displayorder $l]

     set currentid $id
     $sha1entry delete 0 end
     $sha1entry insert 0 $id
     set currentid $id
     $sha1entry delete 0 end
     $sha1entry insert 0 $id


@@ -2249,8 +3344,6 @@ proc selectline {l isnew} {
     $ctext conf -state normal
     $ctext delete 0.0 end
     set linknum 0
     $ctext conf -state normal
     $ctext delete 0.0 end
     set linknum 0

-    $ctext mark set fmark.0 0.0
-    $ctext mark gravity fmark.0 left

     set info $commitinfo($id)
     set date [formatdate [lindex $info 2]]
     $ctext insert end "Author: [lindex $info 1]  $date\n"
     set info $commitinfo($id)
     set date [formatdate [lindex $info 2]]
     $ctext insert end "Author: [lindex $info 1]  $date\n"


@@ -2265,15 +3358,27 @@ proc selectline {l isnew} {
     }
  
     set comment {}
     }
  
     set comment {}

-    if {[info exists parents($id)]} {
-       foreach p $parents($id) {
+    set olds [lindex $parentlist $l]
+    if {[llength $olds] > 1} {
+       set np 0
+       foreach p $olds {
+           if {$np >= $mergemax} {
+               set tag mmax
+           } else {
+               set tag m$np
+           }
+           $ctext insert end "Parent: " $tag
+           appendwithlinks [commit_descriptor $p]
+           incr np
+       }
+    } else {
+       foreach p $olds {

            append comment "Parent: [commit_descriptor $p]\n"
        }
     }
            append comment "Parent: [commit_descriptor $p]\n"
        }
     }

-    if {[info exists children($id)]} {
-       foreach c $children($id) {
-           append comment "Child:  [commit_descriptor $c]\n"
-       }
+
+    foreach c [lindex $childlist $l] {
+       append comment "Child:  [commit_descriptor $c]\n"

     }
     append comment "\n"
     append comment [lindex $info 5]
     }
     append comment "\n"
     append comment [lindex $info 5]


@@ -2286,15 +3391,28 @@ proc selectline {l isnew} {
     $ctext conf -state disabled
     set commentend [$ctext index "end - 1c"]
 
     $ctext conf -state disabled
     set commentend [$ctext index "end - 1c"]
 

-    $cflist delete 0 end
-    $cflist insert end "Comments"
-    if {$nparents($id) == 1} {
+    init_flist "Comments"
+    if {$cmitmode eq "tree"} {
+       gettree $id
+    } elseif {[llength $olds] <= 1} {

        startdiff $id
        startdiff $id

-    } elseif {$nparents($id) > 1} {
-       mergediff $id
+    } else {
+       mergediff $id $l

     }
 }
 
     }
 }
 

+proc selfirstline {} {
+    unmarkmatches
+    selectline 0 1
+}
+
+proc sellastline {} {
+    global numcommits
+    unmarkmatches
+    set l [expr {$numcommits - 1}]
+    selectline $l 1
+}
+

 proc selnextline {dir} {
     global selectedline
     if {![info exists selectedline]} return
 proc selnextline {dir} {
     global selectedline
     if {![info exists selectedline]} return


@@ -2303,25 +3421,54 @@ proc selnextline {dir} {
     selectline $l 1
 }
 
     selectline $l 1
 }
 

+proc selnextpage {dir} {
+    global canv linespc selectedline numcommits
+
+    set lpp [expr {([winfo height $canv] - 2) / $linespc}]
+    if {$lpp < 1} {
+       set lpp 1
+    }
+    allcanvs yview scroll [expr {$dir * $lpp}] units
+    if {![info exists selectedline]} return
+    set l [expr {$selectedline + $dir * $lpp}]
+    if {$l < 0} {
+       set l 0
+    } elseif {$l >= $numcommits} {
+        set l [expr $numcommits - 1]
+    }
+    unmarkmatches
+    selectline $l 1    
+}
+

 proc unselectline {} {
 proc unselectline {} {

-    global selectedline
+    global selectedline currentid

 
     catch {unset selectedline}
 
     catch {unset selectedline}

+    catch {unset currentid}

     allcanvs delete secsel
 }
 
     allcanvs delete secsel
 }
 

+proc reselectline {} {
+    global selectedline
+
+    if {[info exists selectedline]} {
+       selectline $selectedline 0
+    }
+}
+

 proc addtohistory {cmd} {
 proc addtohistory {cmd} {

-    global history historyindex
+    global history historyindex curview

 
 

+    set elt [list $curview $cmd]

     if {$historyindex > 0
     if {$historyindex > 0

-       && [lindex $history [expr {$historyindex - 1}]] == $cmd} {
+       && [lindex $history [expr {$historyindex - 1}]] == $elt} {

        return
     }
 
     if {$historyindex < [llength $history]} {
        return
     }
 
     if {$historyindex < [llength $history]} {

-       set history [lreplace $history $historyindex end $cmd]
+       set history [lreplace $history $historyindex end $elt]

     } else {
     } else {

-       lappend history $cmd
+       lappend history $elt

     }
     incr historyindex
     if {$historyindex > 1} {
     }
     incr historyindex
     if {$historyindex > 1} {


@@ -2332,13 +3479,23 @@ proc addtohistory {cmd} {
     .ctop.top.bar.rightbut conf -state disabled
 }
 
     .ctop.top.bar.rightbut conf -state disabled
 }
 

+proc godo {elt} {
+    global curview
+
+    set view [lindex $elt 0]
+    set cmd [lindex $elt 1]
+    if {$curview != $view} {
+       showview $view
+    }
+    eval $cmd
+}
+

 proc goback {} {
     global history historyindex
 
     if {$historyindex > 1} {
        incr historyindex -1
 proc goback {} {
     global history historyindex
 
     if {$historyindex > 1} {
        incr historyindex -1

-       set cmd [lindex $history [expr {$historyindex - 1}]]
-       eval $cmd
+       godo [lindex $history [expr {$historyindex - 1}]]

        .ctop.top.bar.rightbut conf -state normal
     }
     if {$historyindex <= 1} {
        .ctop.top.bar.rightbut conf -state normal
     }
     if {$historyindex <= 1} {


@@ -2352,7 +3509,7 @@ proc goforw {} {
     if {$historyindex < [llength $history]} {
        set cmd [lindex $history $historyindex]
        incr historyindex
     if {$historyindex < [llength $history]} {
        set cmd [lindex $history $historyindex]
        incr historyindex

-       eval $cmd
+       godo $cmd

        .ctop.top.bar.leftbut conf -state normal
     }
     if {$historyindex >= [llength $history]} {
        .ctop.top.bar.leftbut conf -state normal
     }
     if {$historyindex >= [llength $history]} {


@@ -2360,530 +3517,188 @@ proc goforw {} {
     }
 }
 
     }
 }
 

-proc mergediff {id} {
-    global parents diffmergeid diffmergegca mergefilelist diffpindex
-
-    set diffmergeid $id
-    set diffpindex -1
-    set diffmergegca [findgca $parents($id)]
-    if {[info exists mergefilelist($id)]} {
-       if {$mergefilelist($id) ne {}} {
-           showmergediff
-       }
-    } else {
-       contmergediff {}
-    }
-}
+proc gettree {id} {
+    global treefilelist treeidlist diffids diffmergeid treepending

 
 

-proc findgca {ids} {
-    set gca {}
-    foreach id $ids {
-       if {$gca eq {}} {
-           set gca $id
-       } else {
-           if {[catch {
-               set gca [exec git-merge-base $gca $id]
-           } err]} {
-               return {}
+    set diffids $id
+    catch {unset diffmergeid}
+    if {![info exists treefilelist($id)]} {
+       if {![info exists treepending]} {
+           if {[catch {set gtf [open [concat | git-ls-tree -r $id] r]}]} {
+               return

            }
            }

+           set treepending $id
+           set treefilelist($id) {}
+           set treeidlist($id) {}
+           fconfigure $gtf -blocking 0
+           fileevent $gtf readable [list gettreeline $gtf $id]

        }
        }

+    } else {
+       setfilelist $id

     }
     }

-    return $gca

 }
 
 }
 

-proc contmergediff {ids} {
-    global diffmergeid diffpindex parents nparents diffmergegca
-    global treediffs mergefilelist diffids treepending
+proc gettreeline {gtf id} {
+    global treefilelist treeidlist treepending cmitmode diffids

 
 

-    # diff the child against each of the parents, and diff
-    # each of the parents against the GCA.
-    while 1 {
-       if {[lindex $ids 1] == $diffmergeid && $diffmergegca ne {}} {
-           set ids [list $diffmergegca [lindex $ids 0]]
-       } else {
-           if {[incr diffpindex] >= $nparents($diffmergeid)} break
-           set p [lindex $parents($diffmergeid) $diffpindex]
-           set ids [list $p $diffmergeid]
-       }
-       if {![info exists treediffs($ids)]} {
-           set diffids $ids
-           if {![info exists treepending]} {
-               gettreediffs $ids
-           }
-           return
-       }
+    while {[gets $gtf line] >= 0} {
+       if {[lindex $line 1] ne "blob"} continue
+       set sha1 [lindex $line 2]
+       set fname [lindex $line 3]
+       lappend treefilelist($id) $fname
+       lappend treeidlist($id) $sha1

     }
     }

-
-    # If a file in some parent is different from the child and also
-    # different from the GCA, then it's interesting.
-    # If we don't have a GCA, then a file is interesting if it is
-    # different from the child in all the parents.
-    if {$diffmergegca ne {}} {
-       set files {}
-       foreach p $parents($diffmergeid) {
-           set gcadiffs $treediffs([list $diffmergegca $p])
-           foreach f $treediffs([list $p $diffmergeid]) {
-               if {[lsearch -exact $files $f] < 0
-                   && [lsearch -exact $gcadiffs $f] >= 0} {
-                   lappend files $f
-               }
-           }
+    if {![eof $gtf]} return
+    close $gtf
+    unset treepending
+    if {$cmitmode ne "tree"} {
+       if {![info exists diffmergeid]} {
+           gettreediffs $diffids

        }
        }

-       set files [lsort $files]
+    } elseif {$id ne $diffids} {
+       gettree $diffids

     } else {
     } else {

-       set p [lindex $parents($diffmergeid) 0]
-       set files $treediffs([list $diffmergeid $p])
-       for {set i 1} {$i < $nparents($diffmergeid) && $files ne {}} {incr i} {
-           set p [lindex $parents($diffmergeid) $i]
-           set df $treediffs([list $p $diffmergeid])
-           set nf {}
-           foreach f $files {
-               if {[lsearch -exact $df $f] >= 0} {
-                   lappend nf $f
-               }
-           }
-           set files $nf
-       }
-    }
-
-    set mergefilelist($diffmergeid) $files
-    if {$files ne {}} {
-       showmergediff
+       setfilelist $id

     }
 }
 
     }
 }
 

-proc showmergediff {} {
-    global cflist diffmergeid mergefilelist parents
-    global diffopts diffinhunk currentfile currenthunk filelines
-    global diffblocked groupfilelast mergefds groupfilenum grouphunks
+proc showfile {f} {
+    global treefilelist treeidlist diffids
+    global ctext commentend

 
 

-    set files $mergefilelist($diffmergeid)
-    foreach f $files {
-       $cflist insert end $f
+    set i [lsearch -exact $treefilelist($diffids) $f]
+    if {$i < 0} {
+       puts "oops, $f not in list for id $diffids"
+       return

     }
     }

-    set env(GIT_DIFF_OPTS) $diffopts
-    set flist {}
-    catch {unset currentfile}
-    catch {unset currenthunk}
-    catch {unset filelines}
-    catch {unset groupfilenum}
-    catch {unset grouphunks}
-    set groupfilelast -1
-    foreach p $parents($diffmergeid) {
-       set cmd [list | git-diff-tree -p $p $diffmergeid]
-       set cmd [concat $cmd $mergefilelist($diffmergeid)]
-       if {[catch {set f [open $cmd r]} err]} {
-           error_popup "Error getting diffs: $err"
-           foreach f $flist {
-               catch {close $f}
-           }
-           return
-       }
-       lappend flist $f
-       set ids [list $diffmergeid $p]
-       set mergefds($ids) $f
-       set diffinhunk($ids) 0
-       set diffblocked($ids) 0
-       fconfigure $f -blocking 0
-       fileevent $f readable [list getmergediffline $f $ids $diffmergeid]
+    set blob [lindex $treeidlist($diffids) $i]
+    if {[catch {set bf [open [concat | git-cat-file blob $blob] r]} err]} {
+       puts "oops, error reading blob $blob: $err"
+       return

     }
     }

+    fconfigure $bf -blocking 0
+    fileevent $bf readable [list getblobline $bf $diffids]
+    $ctext config -state normal
+    $ctext delete $commentend end
+    $ctext insert end "\n"
+    $ctext insert end "$f\n" filesep
+    $ctext config -state disabled
+    $ctext yview $commentend

 }
 
 }
 

-proc getmergediffline {f ids id} {
-    global diffmergeid diffinhunk diffoldlines diffnewlines
-    global currentfile currenthunk
-    global diffoldstart diffnewstart diffoldlno diffnewlno
-    global diffblocked mergefilelist
-    global noldlines nnewlines difflcounts filelines
-
-    set n [gets $f line]
-    if {$n < 0} {
-       if {![eof $f]} return
-    }
+proc getblobline {bf id} {
+    global diffids cmitmode ctext

 
 

-    if {!([info exists diffmergeid] && $diffmergeid == $id)} {
-       if {$n < 0} {
-           close $f
-       }
+    if {$id ne $diffids || $cmitmode ne "tree"} {
+       catch {close $bf}

        return
     }
        return
     }

-
-    if {$diffinhunk($ids) != 0} {
-       set fi $currentfile($ids)
-       if {$n > 0 && [regexp {^[-+ \\]} $line match]} {
-           # continuing an existing hunk
-           set line [string range $line 1 end]
-           set p [lindex $ids 1]
-           if {$match eq "-" || $match eq " "} {
-               set filelines($p,$fi,$diffoldlno($ids)) $line
-               incr diffoldlno($ids)
-           }
-           if {$match eq "+" || $match eq " "} {
-               set filelines($id,$fi,$diffnewlno($ids)) $line
-               incr diffnewlno($ids)
-           }
-           if {$match eq " "} {
-               if {$diffinhunk($ids) == 2} {
-                   lappend difflcounts($ids) \
-                       [list $noldlines($ids) $nnewlines($ids)]
-                   set noldlines($ids) 0
-                   set diffinhunk($ids) 1
-               }
-               incr noldlines($ids)
-           } elseif {$match eq "-" || $match eq "+"} {
-               if {$diffinhunk($ids) == 1} {
-                   lappend difflcounts($ids) [list $noldlines($ids)]
-                   set noldlines($ids) 0
-                   set nnewlines($ids) 0
-                   set diffinhunk($ids) 2
-               }
-               if {$match eq "-"} {
-                   incr noldlines($ids)
-               } else {
-                   incr nnewlines($ids)
-               }
-           }
-           # and if it's \ No newline at end of line, then what?
-           return
-       }
-       # end of a hunk
-       if {$diffinhunk($ids) == 1 && $noldlines($ids) != 0} {
-           lappend difflcounts($ids) [list $noldlines($ids)]
-       } elseif {$diffinhunk($ids) == 2
-                 && ($noldlines($ids) != 0 || $nnewlines($ids) != 0)} {
-           lappend difflcounts($ids) [list $noldlines($ids) $nnewlines($ids)]
-       }
-       set currenthunk($ids) [list $currentfile($ids) \
-                                  $diffoldstart($ids) $diffnewstart($ids) \
-                                  $diffoldlno($ids) $diffnewlno($ids) \
-                                  $difflcounts($ids)]
-       set diffinhunk($ids) 0
-       # -1 = need to block, 0 = unblocked, 1 = is blocked
-       set diffblocked($ids) -1
-       processhunks
-       if {$diffblocked($ids) == -1} {
-           fileevent $f readable {}
-           set diffblocked($ids) 1
-       }
+    $ctext config -state normal
+    while {[gets $bf line] >= 0} {
+       $ctext insert end "$line\n"

     }
     }

-
-    if {$n < 0} {
-       # eof
-       if {!$diffblocked($ids)} {
-           close $f
-           set currentfile($ids) [llength $mergefilelist($diffmergeid)]
-           set currenthunk($ids) [list $currentfile($ids) 0 0 0 0 {}]
-           processhunks
-       }
-    } elseif {[regexp {^diff --git a/(.*) b/} $line match fname]} {
-       # start of a new file
-       set currentfile($ids) \
-           [lsearch -exact $mergefilelist($diffmergeid) $fname]
-    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
-                  $line match f1l f1c f2l f2c rest]} {
-       if {[info exists currentfile($ids)] && $currentfile($ids) >= 0} {
-           # start of a new hunk
-           if {$f1l == 0 && $f1c == 0} {
-               set f1l 1
-           }
-           if {$f2l == 0 && $f2c == 0} {
-               set f2l 1
-           }
-           set diffinhunk($ids) 1
-           set diffoldstart($ids) $f1l
-           set diffnewstart($ids) $f2l
-           set diffoldlno($ids) $f1l
-           set diffnewlno($ids) $f2l
-           set difflcounts($ids) {}
-           set noldlines($ids) 0
-           set nnewlines($ids) 0
-       }
+    if {[eof $bf]} {
+       # delete last newline
+       $ctext delete "end - 2c" "end - 1c"
+       close $bf

     }
     }

+    $ctext config -state disabled

 }
 
 }
 

-proc processhunks {} {
-    global diffmergeid parents nparents currenthunk
-    global mergefilelist diffblocked mergefds
-    global grouphunks grouplinestart grouplineend groupfilenum
-
-    set nfiles [llength $mergefilelist($diffmergeid)]
-    while 1 {
-       set fi $nfiles
-       set lno 0
-       # look for the earliest hunk
-       foreach p $parents($diffmergeid) {
-           set ids [list $diffmergeid $p]
-           if {![info exists currenthunk($ids)]} return
-           set i [lindex $currenthunk($ids) 0]
-           set l [lindex $currenthunk($ids) 2]
-           if {$i < $fi || ($i == $fi && $l < $lno)} {
-               set fi $i
-               set lno $l
-               set pi $p
-           }
-       }
-
-       if {$fi < $nfiles} {
-           set ids [list $diffmergeid $pi]
-           set hunk $currenthunk($ids)
-           unset currenthunk($ids)
-           if {$diffblocked($ids) > 0} {
-               fileevent $mergefds($ids) readable \
-                   [list getmergediffline $mergefds($ids) $ids $diffmergeid]
-           }
-           set diffblocked($ids) 0
-
-           if {[info exists groupfilenum] && $groupfilenum == $fi
-               && $lno <= $grouplineend} {
-               # add this hunk to the pending group
-               lappend grouphunks($pi) $hunk
-               set endln [lindex $hunk 4]
-               if {$endln > $grouplineend} {
-                   set grouplineend $endln
-               }
-               continue
-           }
-       }
-
-       # succeeding stuff doesn't belong in this group, so
-       # process the group now
-       if {[info exists groupfilenum]} {
-           processgroup
-           unset groupfilenum
-           unset grouphunks
-       }
-
-       if {$fi >= $nfiles} break
+proc mergediff {id l} {
+    global diffmergeid diffopts mdifffd
+    global diffids
+    global parentlist

 
 

-       # start a new group
-       set groupfilenum $fi
-       set grouphunks($pi) [list $hunk]
-       set grouplinestart $lno
-       set grouplineend [lindex $hunk 4]
+    set diffmergeid $id
+    set diffids $id
+    # this doesn't seem to actually affect anything...
+    set env(GIT_DIFF_OPTS) $diffopts
+    set cmd [concat | git-diff-tree --no-commit-id --cc $id]
+    if {[catch {set mdf [open $cmd r]} err]} {
+       error_popup "Error getting merge diffs: $err"
+       return

     }
     }

+    fconfigure $mdf -blocking 0
+    set mdifffd($id) $mdf
+    set np [llength [lindex $parentlist $l]]
+    fileevent $mdf readable [list getmergediffline $mdf $id $np]
+    set nextupdate [expr {[clock clicks -milliseconds] + 100}]

 }
 
 }
 

-proc processgroup {} {
-    global groupfilelast groupfilenum difffilestart
-    global mergefilelist diffmergeid ctext filelines
-    global parents diffmergeid diffoffset
-    global grouphunks grouplinestart grouplineend nparents
-    global mergemax
+proc getmergediffline {mdf id np} {
+    global diffmergeid ctext cflist nextupdate mergemax
+    global difffilestart mdifffd

 
 

+    set n [gets $mdf line]
+    if {$n < 0} {
+       if {[eof $mdf]} {
+           close $mdf
+       }
+       return
+    }
+    if {![info exists diffmergeid] || $id != $diffmergeid
+       || $mdf != $mdifffd($id)} {
+       return
+    }

     $ctext conf -state normal
     $ctext conf -state normal

-    set id $diffmergeid
-    set f $groupfilenum
-    if {$groupfilelast != $f} {
+    if {[regexp {^diff --cc (.*)} $line match fname]} {
+       # start of a new file

        $ctext insert end "\n"
        set here [$ctext index "end - 1c"]
        $ctext insert end "\n"
        set here [$ctext index "end - 1c"]

-       set difffilestart($f) $here
-       set mark fmark.[expr {$f + 1}]
-       $ctext mark set $mark $here
-       $ctext mark gravity $mark left
-       set header [lindex $mergefilelist($id) $f]
-       set l [expr {(78 - [string length $header]) / 2}]
+       lappend difffilestart $here
+       add_flist [list $fname]
+       set l [expr {(78 - [string length $fname]) / 2}]

        set pad [string range "----------------------------------------" 1 $l]
        set pad [string range "----------------------------------------" 1 $l]

-       $ctext insert end "$pad $header $pad\n" filesep
-       set groupfilelast $f
-       foreach p $parents($id) {
-           set diffoffset($p) 0
-       }
-    }
-
-    $ctext insert end "@@" msep
-    set nlines [expr {$grouplineend - $grouplinestart}]
-    set events {}
-    set pnum 0
-    foreach p $parents($id) {
-       set startline [expr {$grouplinestart + $diffoffset($p)}]
-       set ol $startline
-       set nl $grouplinestart
-       if {[info exists grouphunks($p)]} {
-           foreach h $grouphunks($p) {
-               set l [lindex $h 2]
-               if {$nl < $l} {
-                   for {} {$nl < $l} {incr nl} {
-                       set filelines($p,$f,$ol) $filelines($id,$f,$nl)
-                       incr ol
-                   }
-               }
-               foreach chunk [lindex $h 5] {
-                   if {[llength $chunk] == 2} {
-                       set olc [lindex $chunk 0]
-                       set nlc [lindex $chunk 1]
-                       set nnl [expr {$nl + $nlc}]
-                       lappend events [list $nl $nnl $pnum $olc $nlc]
-                       incr ol $olc
-                       set nl $nnl
-                   } else {
-                       incr ol [lindex $chunk 0]
-                       incr nl [lindex $chunk 0]
-                   }
-               }
-           }
-       }
-       if {$nl < $grouplineend} {
-           for {} {$nl < $grouplineend} {incr nl} {
-               set filelines($p,$f,$ol) $filelines($id,$f,$nl)
-               incr ol
-           }
-       }
-       set nlines [expr {$ol - $startline}]
-       $ctext insert end " -$startline,$nlines" msep
-       incr pnum
-    }
-
-    set nlines [expr {$grouplineend - $grouplinestart}]
-    $ctext insert end " +$grouplinestart,$nlines @@\n" msep
-
-    set events [lsort -integer -index 0 $events]
-    set nevents [llength $events]
-    set nmerge $nparents($diffmergeid)
-    set l $grouplinestart
-    for {set i 0} {$i < $nevents} {set i $j} {
-       set nl [lindex $events $i 0]
-       while {$l < $nl} {
-           $ctext insert end " $filelines($id,$f,$l)\n"
-           incr l
-       }
-       set e [lindex $events $i]
-       set enl [lindex $e 1]
-       set j $i
-       set active {}
-       while 1 {
-           set pnum [lindex $e 2]
-           set olc [lindex $e 3]
-           set nlc [lindex $e 4]
-           if {![info exists delta($pnum)]} {
-               set delta($pnum) [expr {$olc - $nlc}]
-               lappend active $pnum
+       $ctext insert end "$pad $fname $pad\n" filesep
+    } elseif {[regexp {^@@} $line]} {
+       $ctext insert end "$line\n" hunksep
+    } elseif {[regexp {^[0-9a-f]{40}$} $line] || [regexp {^index} $line]} {
+       # do nothing
+    } else {
+       # parse the prefix - one ' ', '-' or '+' for each parent
+       set spaces {}
+       set minuses {}
+       set pluses {}
+       set isbad 0
+       for {set j 0} {$j < $np} {incr j} {
+           set c [string range $line $j $j]
+           if {$c == " "} {
+               lappend spaces $j
+           } elseif {$c == "-"} {
+               lappend minuses $j
+           } elseif {$c == "+"} {
+               lappend pluses $j

            } else {
            } else {

-               incr delta($pnum) [expr {$olc - $nlc}]
-           }
-           if {[incr j] >= $nevents} break
-           set e [lindex $events $j]
-           if {[lindex $e 0] >= $enl} break
-           if {[lindex $e 1] > $enl} {
-               set enl [lindex $e 1]
-           }
-       }
-       set nlc [expr {$enl - $l}]
-       set ncol mresult
-       set bestpn -1
-       if {[llength $active] == $nmerge - 1} {
-           # no diff for one of the parents, i.e. it's identical
-           for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
-               if {![info exists delta($pnum)]} {
-                   if {$pnum < $mergemax} {
-                       lappend ncol m$pnum
-                   } else {
-                       lappend ncol mmax
-                   }
-                   break
-               }
-           }
-       } elseif {[llength $active] == $nmerge} {
-           # all parents are different, see if one is very similar
-           set bestsim 30
-           for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
-               set sim [similarity $pnum $l $nlc $f \
-                            [lrange $events $i [expr {$j-1}]]]
-               if {$sim > $bestsim} {
-                   set bestsim $sim
-                   set bestpn $pnum
-               }
-           }
-           if {$bestpn >= 0} {
-               lappend ncol m$bestpn
-           }
-       }
-       set pnum -1
-       foreach p $parents($id) {
-           incr pnum
-           if {![info exists delta($pnum)] || $pnum == $bestpn} continue
-           set olc [expr {$nlc + $delta($pnum)}]
-           set ol [expr {$l + $diffoffset($p)}]
-           incr diffoffset($p) $delta($pnum)
-           unset delta($pnum)
-           for {} {$olc > 0} {incr olc -1} {
-               $ctext insert end "-$filelines($p,$f,$ol)\n" m$pnum
-               incr ol
+               set isbad 1
+               break

            }
        }
            }
        }

-       set endl [expr {$l + $nlc}]
-       if {$bestpn >= 0} {
-           # show this pretty much as a normal diff
-           set p [lindex $parents($id) $bestpn]
-           set ol [expr {$l + $diffoffset($p)}]
-           incr diffoffset($p) $delta($bestpn)
-           unset delta($bestpn)
-           for {set k $i} {$k < $j} {incr k} {
-               set e [lindex $events $k]
-               if {[lindex $e 2] != $bestpn} continue
-               set nl [lindex $e 0]
-               set ol [expr {$ol + $nl - $l}]
-               for {} {$l < $nl} {incr l} {
-                   $ctext insert end "+$filelines($id,$f,$l)\n" $ncol
-               }
-               set c [lindex $e 3]
-               for {} {$c > 0} {incr c -1} {
-                   $ctext insert end "-$filelines($p,$f,$ol)\n" m$bestpn
-                   incr ol
-               }
-               set nl [lindex $e 1]
-               for {} {$l < $nl} {incr l} {
-                   $ctext insert end "+$filelines($id,$f,$l)\n" mresult
-               }
+       set tags {}
+       set num {}
+       if {!$isbad && $minuses ne {} && $pluses eq {}} {
+           # line doesn't appear in result, parents in $minuses have the line
+           set num [lindex $minuses 0]
+       } elseif {!$isbad && $pluses ne {} && $minuses eq {}} {
+           # line appears in result, parents in $pluses don't have the line
+           lappend tags mresult
+           set num [lindex $spaces 0]
+       }
+       if {$num ne {}} {
+           if {$num >= $mergemax} {
+               set num "max"

            }
            }

+           lappend tags m$num

        }
        }

-       for {} {$l < $endl} {incr l} {
-           $ctext insert end "+$filelines($id,$f,$l)\n" $ncol
-       }
-    }
-    while {$l < $grouplineend} {
-       $ctext insert end " $filelines($id,$f,$l)\n"
-       incr l
+       $ctext insert end "$line\n" $tags

     }
     $ctext conf -state disabled
     }
     $ctext conf -state disabled

-}
-
-proc similarity {pnum l nlc f events} {
-    global diffmergeid parents diffoffset filelines
-
-    set id $diffmergeid
-    set p [lindex $parents($id) $pnum]
-    set ol [expr {$l + $diffoffset($p)}]
-    set endl [expr {$l + $nlc}]
-    set same 0
-    set diff 0
-    foreach e $events {
-       if {[lindex $e 2] != $pnum} continue
-       set nl [lindex $e 0]
-       set ol [expr {$ol + $nl - $l}]
-       for {} {$l < $nl} {incr l} {
-           incr same [string length $filelines($id,$f,$l)]
-           incr same
-       }
-       set oc [lindex $e 3]
-       for {} {$oc > 0} {incr oc -1} {
-           incr diff [string length $filelines($p,$f,$ol)]
-           incr diff
-           incr ol
-       }
-       set nl [lindex $e 1]
-       for {} {$l < $nl} {incr l} {
-           incr diff [string length $filelines($id,$f,$l)]
-           incr diff
-       }
-    }
-    for {} {$l < $endl} {incr l} {
-       incr same [string length $filelines($id,$f,$l)]
-       incr same
-    }
-    if {$same == 0} {
-       return 0
+    if {[clock clicks -milliseconds] >= $nextupdate} {
+       incr nextupdate 100
+       fileevent $mdf readable {}
+       update
+       fileevent $mdf readable [list getmergediffline $mdf $id $np]

     }
     }

-    return [expr {200 * $same / (2 * $same + $diff)}]

 }
 
 proc startdiff {ids} {
 }
 
 proc startdiff {ids} {


@@ -2902,14 +3717,12 @@ proc startdiff {ids} {
 
 proc addtocflist {ids} {
     global treediffs cflist
 
 proc addtocflist {ids} {
     global treediffs cflist

-    foreach f $treediffs($ids) {
-       $cflist insert end $f
-    }
+    add_flist $treediffs($ids)

     getblobdiffs $ids
 }
 
 proc gettreediffs {ids} {
     getblobdiffs $ids
 }
 
 proc gettreediffs {ids} {

-    global treediff parents treepending
+    global treediff treepending

     set treepending $ids
     set treediff {}
     if {[catch \
     set treepending $ids
     set treediff {}
     if {[catch \


@@ -2921,6 +3734,7 @@ proc gettreediffs {ids} {
 
 proc gettreediffline {gdtf ids} {
     global treediff treediffs treepending diffids diffmergeid
 
 proc gettreediffline {gdtf ids} {
     global treediff treediffs treepending diffids diffmergeid

+    global cmitmode

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


@@ -2928,14 +3742,14 @@ proc gettreediffline {gdtf ids} {
        close $gdtf
        set treediffs($ids) $treediff
        unset treepending
        close $gdtf
        set treediffs($ids) $treediff
        unset treepending

-       if {$ids != $diffids} {
-           gettreediffs $diffids
-       } else {
-           if {[info exists diffmergeid]} {
-               contmergediff $ids
-           } else {
-               addtocflist $ids
+       if {$cmitmode eq "tree"} {
+           gettree $diffids
+       } elseif {$ids != $diffids} {
+           if {![info exists diffmergeid]} {
+               gettreediffs $diffids

            }
            }

+       } else {
+           addtocflist $ids

        }
        return
     }
        }
        return
     }


@@ -2945,7 +3759,7 @@ proc gettreediffline {gdtf ids} {
 
 proc getblobdiffs {ids} {
     global diffopts blobdifffd diffids env curdifftag curtagstart
 
 proc getblobdiffs {ids} {
     global diffopts blobdifffd diffids env curdifftag curtagstart

-    global difffilestart nextupdate diffinhdr treediffs
+    global nextupdate diffinhdr treediffs

 
     set env(GIT_DIFF_OPTS) $diffopts
     set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids]
 
     set env(GIT_DIFF_OPTS) $diffopts
     set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids]


@@ -2958,11 +3772,23 @@ proc getblobdiffs {ids} {
     set blobdifffd($ids) $bdf
     set curdifftag Comments
     set curtagstart 0.0
     set blobdifffd($ids) $bdf
     set curdifftag Comments
     set curtagstart 0.0

-    catch {unset difffilestart}

     fileevent $bdf readable [list getblobdiffline $bdf $diffids]
     set nextupdate [expr {[clock clicks -milliseconds] + 100}]
 }
 
     fileevent $bdf readable [list getblobdiffline $bdf $diffids]
     set nextupdate [expr {[clock clicks -milliseconds] + 100}]
 }
 

+proc setinlist {var i val} {
+    global $var
+
+    while {[llength [set $var]] < $i} {
+       lappend $var {}
+    }
+    if {[llength [set $var]] == $i} {
+       lappend $var $val
+    } else {
+       lset $var $i $val
+    }
+}
+

 proc getblobdiffline {bdf ids} {
     global diffids blobdifffd ctext curdifftag curtagstart
     global diffnexthead diffnextnote difffilestart
 proc getblobdiffline {bdf ids} {
     global diffids blobdifffd ctext curdifftag curtagstart
     global diffnexthead diffnextnote difffilestart


@@ -2986,23 +3812,17 @@ proc getblobdiffline {bdf ids} {
        # start of a new file
        $ctext insert end "\n"
        $ctext tag add $curdifftag $curtagstart end
        # start of a new file
        $ctext insert end "\n"
        $ctext tag add $curdifftag $curtagstart end

-       set curtagstart [$ctext index "end - 1c"]
-       set header $newname

        set here [$ctext index "end - 1c"]
        set here [$ctext index "end - 1c"]

-       set i [lsearch -exact $treediffs($diffids) $fname]
+       set curtagstart $here
+       set header $newname
+       set i [lsearch -exact $treediffs($ids) $fname]

        if {$i >= 0} {
        if {$i >= 0} {

-           set difffilestart($i) $here
-           incr i
-           $ctext mark set fmark.$i $here
-           $ctext mark gravity fmark.$i left
+           setinlist difffilestart $i $here

        }
        }

-       if {$newname != $fname} {
-           set i [lsearch -exact $treediffs($diffids) $newname]
+       if {$newname ne $fname} {
+           set i [lsearch -exact $treediffs($ids) $newname]

            if {$i >= 0} {
            if {$i >= 0} {

-               set difffilestart($i) $here
-               incr i
-               $ctext mark set fmark.$i $here
-               $ctext mark gravity fmark.$i left
+               setinlist difffilestart $i $here

            }
        }
        set curdifftag "f:$fname"
            }
        }
        set curdifftag "f:$fname"


@@ -3011,7 +3831,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]} {


@@ -3050,26 +3872,11 @@ proc getblobdiffline {bdf ids} {
 proc nextfile {} {
     global difffilestart ctext
     set here [$ctext index @0,0]
 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]} {
-           if {![info exists pos]
-               || [$ctext compare $difffilestart($i) < $pos]} {
-               set pos $difffilestart($i)
-           }
+    foreach loc $difffilestart {
+       if {[$ctext compare $loc > $here]} {
+           $ctext yview $loc

        }
     }
        }
     }

-    if {[info exists pos]} {
-       $ctext yview $pos
-    }
-}
-
-proc listboxsel {} {
-    global ctext cflist currentid
-    if {![info exists currentid]} return
-    set sel [lsort [$cflist curselection]]
-    if {$sel eq {}} return
-    set first [lindex $sel 0]
-    catch {$ctext yview fmark.$first}

 }
 
 proc setcoords {} {
 }
 
 proc setcoords {} {


@@ -3078,31 +3885,34 @@ proc setcoords {} {
 
     set linespc [font metrics $mainfont -linespace]
     set charspc [font measure $mainfont "m"]
 
     set linespc [font metrics $mainfont -linespace]
     set charspc [font measure $mainfont "m"]

-    set canvy0 [expr {3 + 0.5 * $linespc}]
-    set canvx0 [expr {3 + 0.5 * $linespc}]
+    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
+    set canvx0 [expr {int(3 + 0.5 * $linespc)}]

     set lthickness [expr {int($linespc / 9) + 1}]
     set xspc1(0) $linespc
     set xspc2 $linespc
 }
 
 proc redisplay {} {
     set lthickness [expr {int($linespc / 9) + 1}]
     set xspc1(0) $linespc
     set xspc2 $linespc
 }
 
 proc redisplay {} {

-    global stopped redisplaying phase
-    if {$stopped > 1} return
-    if {$phase == "getcommits"} return
-    set redisplaying 1
-    if {$phase == "drawgraph" || $phase == "incrdraw"} {
-       set stopped 1
-    } else {
-       drawgraph
+    global canv
+    global selectedline
+
+    set ymax [lindex [$canv cget -scrollregion] 3]
+    if {$ymax eq {} || $ymax == 0} return
+    set span [$canv yview]
+    clear_display
+    setcanvscroll
+    allcanvs yview moveto [lindex $span 0]
+    drawvisible
+    if {[info exists selectedline]} {
+       selectline $selectedline 0

     }
 }
 
 proc incrfont {inc} {
     }
 }
 
 proc incrfont {inc} {

-    global mainfont namefont textfont ctext canv phase
+    global mainfont textfont ctext canv phase

     global stopped entries
     unmarkmatches
     set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
     global stopped entries
     unmarkmatches
     set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]

-    set namefont [lreplace $namefont 1 1 [expr {[lindex $namefont 1] + $inc}]]

     set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
     setcoords
     $ctext conf -font $textfont
     set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
     setcoords
     $ctext conf -font $textfont


@@ -3110,7 +3920,7 @@ proc incrfont {inc} {
     foreach e $entries {
        $e conf -font $mainfont
     }
     foreach e $entries {
        $e conf -font $mainfont
     }

-    if {$phase == "getcommits"} {
+    if {$phase eq "getcommits"} {

        $canv itemconf textitems -font $mainfont
     }
     redisplay
        $canv itemconf textitems -font $mainfont
     }
     redisplay


@@ -3140,20 +3950,22 @@ proc sha1change {n1 n2 op} {
 }
 
 proc gotocommit {} {
 }
 
 proc gotocommit {} {

-    global sha1string currentid idline tagids
-    global lineid numcommits
+    global sha1string currentid commitrow tagids headids
+    global displayorder numcommits curview

 
     if {$sha1string == {}
        || ([info exists currentid] && $sha1string == $currentid)} return
     if {[info exists tagids($sha1string)]} {
        set id $tagids($sha1string)
 
     if {$sha1string == {}
        || ([info exists currentid] && $sha1string == $currentid)} return
     if {[info exists tagids($sha1string)]} {
        set id $tagids($sha1string)

+    } elseif {[info exists headids($sha1string)]} {
+       set id $headids($sha1string)

     } else {
        set id [string tolower $sha1string]
        if {[regexp {^[0-9a-f]{4,39}$} $id]} {
            set matches {}
     } else {
        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* $lineid($l)]} {
-                   lappend matches $lineid($l)
+           foreach i $displayorder {
+               if {[string match $id* $i]} {
+                   lappend matches $i

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


@@ -3165,14 +3977,14 @@ proc gotocommit {} {
            }
        }
     }
            }
        }
     }

-    if {[info exists idline($id)]} {
-       selectline $idline($id) 1
+    if {[info exists commitrow($curview,$id)]} {
+       selectline $commitrow($curview,$id) 1

        return
     }
     if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
        set type "SHA1 id"
     } else {
        return
     }
     if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
        set type "SHA1 id"
     } else {

-       set type "Tag"
+       set type "Tag/Head"

     }
     error_popup "$type $sha1string is not known"
 }
     }
     error_popup "$type $sha1string is not known"
 }


@@ -3181,7 +3993,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


@@ -3241,65 +4053,27 @@ proc linehover {} {
 }
 
 proc clickisonarrow {id y} {
 }
 
 proc clickisonarrow {id y} {

-    global mainline mainlinearrow sidelines lthickness
+    global lthickness

 
 

+    set ranges [rowranges $id]

     set thresh [expr {2 * $lthickness + 6}]
     set thresh [expr {2 * $lthickness + 6}]

-    if {[info exists mainline($id)]} {
-       if {$mainlinearrow($id) ne "none"} {
-           if {abs([lindex $mainline($id) 1] - $y) < $thresh} {
-               return "up"
-           }
-       }
-    }
-    if {[info exists sidelines($id)]} {
-       foreach ls $sidelines($id) {
-           set coords [lindex $ls 0]
-           set arrow [lindex $ls 2]
-           if {$arrow eq "first" || $arrow eq "both"} {
-               if {abs([lindex $coords 1] - $y) < $thresh} {
-                   return "up"
-               }
-           }
-           if {$arrow eq "last" || $arrow eq "both"} {
-               if {abs([lindex $coords end] - $y) < $thresh} {
-                   return "down"
-               }
-           }
+    set n [expr {[llength $ranges] - 1}]
+    for {set i 1} {$i < $n} {incr i} {
+       set row [lindex $ranges $i]
+       if {abs([yc $row] - $y) < $thresh} {
+           return $i

        }
     }
     return {}
 }
 
        }
     }
     return {}
 }
 

-proc arrowjump {id dirn y} {
-    global mainline sidelines canv canv2 canv3
+proc arrowjump {id n y} {
+    global canv

 
 

-    set yt {}
-    if {$dirn eq "down"} {
-       if {[info exists mainline($id)]} {
-           set y1 [lindex $mainline($id) 1]
-           if {$y1 > $y} {
-               set yt $y1
-           }
-       }
-       if {[info exists sidelines($id)]} {
-           foreach ls $sidelines($id) {
-               set y1 [lindex $ls 0 1]
-               if {$y1 > $y && ($yt eq {} || $y1 < $yt)} {
-                   set yt $y1
-               }
-           }
-       }
-    } else {
-       if {[info exists sidelines($id)]} {
-           foreach ls $sidelines($id) {
-               set y1 [lindex $ls 0 end]
-               if {$y1 < $y && ($yt eq {} || $y1 > $yt)} {
-                   set yt $y1
-               }
-           }
-       }
-    }
-    if {$yt eq {}} return
+    # 1 <-> 2, 3 <-> 4, etc...
+    set n [expr {(($n - 1) ^ 1) + 1}]
+    set row [lindex [rowranges $id] $n]
+    set yt [yc $row]

     set ymax [lindex [$canv cget -scrollregion] 3]
     if {$ymax eq {} || $ymax <= 0} return
     set view [$canv yview]
     set ymax [lindex [$canv cget -scrollregion] 3]
     if {$ymax eq {} || $ymax <= 0} return
     set view [$canv yview]


@@ -3308,21 +4082,20 @@ proc arrowjump {id dirn y} {
     if {$yfrac < 0} {
        set yfrac 0
     }
     if {$yfrac < 0} {
        set yfrac 0
     }

-    $canv yview moveto $yfrac
-    $canv2 yview moveto $yfrac
-    $canv3 yview moveto $yfrac
+    allcanvs yview moveto $yfrac

 }
 
 proc lineclick {x y id isnew} {
 }
 
 proc lineclick {x y id isnew} {

-    global ctext commitinfo children cflist canv thickerline
+    global ctext commitinfo children canv thickerline curview

 
 

+    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 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


@@ -3352,11 +4125,13 @@ proc lineclick {x y id isnew} {
     $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
     set date [formatdate [lindex $info 2]]
     $ctext insert end "\tDate:\t$date\n"
     $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
     set date [formatdate [lindex $info 2]]
     $ctext insert end "\tDate:\t$date\n"

-    if {[info exists children($id)]} {
+    set kids $children($curview,$id)
+    if {$kids ne {}} {

        $ctext insert end "\nChildren:"
        set i 0
        $ctext insert end "\nChildren:"
        set i 0

-       foreach child $children($id) {
+       foreach child $kids {

            incr i
            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]


@@ -3368,22 +4143,22 @@ proc lineclick {x y id isnew} {
        }
     }
     $ctext conf -state disabled
        }
     }
     $ctext conf -state disabled

-
-    $cflist delete 0 end
+    init_flist {}

 }
 
 proc normalline {} {
     global thickerline
     if {[info exists thickerline]} {
 }
 
 proc normalline {} {
     global thickerline
     if {[info exists thickerline]} {

-       drawlines $thickerline 0 1
+       set id $thickerline

        unset thickerline
        unset thickerline

+       drawlines $id

     }
 }
 
 proc selbyid {id} {
     }
 }
 
 proc selbyid {id} {

-    global idline
-    if {[info exists idline($id)]} {
-       selectline $idline($id) 1
+    global commitrow curview
+    if {[info exists commitrow($curview,$id)]} {
+       selectline $commitrow($curview,$id) 1

     }
 }
 
     }
 }
 


@@ -3396,9 +4171,10 @@ proc mstime {} {
 }
 
 proc rowmenu {x y id} {
 }
 
 proc rowmenu {x y id} {

-    global rowctxmenu idline selectedline rowmenuid
+    global rowctxmenu commitrow selectedline rowmenuid curview

 
 

-    if {![info exists selectedline] || $idline($id) eq $selectedline} {
+    if {![info exists selectedline]
+       || $commitrow($curview,$id) eq $selectedline} {

        set state disabled
     } else {
        set state normal
        set state disabled
     } else {
        set state normal


@@ -3411,30 +4187,27 @@ proc rowmenu {x y id} {
 }
 
 proc diffvssel {dirn} {
 }
 
 proc diffvssel {dirn} {

-    global rowmenuid selectedline lineid
+    global rowmenuid selectedline displayorder

 
     if {![info exists selectedline]} return
     if {$dirn} {
 
     if {![info exists selectedline]} return
     if {$dirn} {

-       set oldid $lineid($selectedline)
+       set oldid [lindex $displayorder $selectedline]

        set newid $rowmenuid
     } else {
        set oldid $rowmenuid
        set newid $rowmenuid
     } else {
        set oldid $rowmenuid

-       set newid $lineid($selectedline)
+       set newid [lindex $displayorder $selectedline]

     }
     addtohistory [list doseldiff $oldid $newid]
     doseldiff $oldid $newid
 }
 
 proc doseldiff {oldid newid} {
     }
     addtohistory [list doseldiff $oldid $newid]
     doseldiff $oldid $newid
 }
 
 proc doseldiff {oldid newid} {

-    global ctext cflist
+    global ctext

     global commitinfo
 
     $ctext conf -state normal
     $ctext delete 0.0 end
     global commitinfo
 
     $ctext conf -state normal
     $ctext delete 0.0 end

-    $ctext mark set fmark.0 0.0
-    $ctext mark gravity fmark.0 left
-    $cflist delete 0 end
-    $cflist insert end "Top"
+    init_flist "Top"

     $ctext insert end "From "
     $ctext tag conf link -foreground blue -underline 1
     $ctext tag bind link <Enter> { %W configure -cursor hand2 }
     $ctext insert end "From "
     $ctext tag conf link -foreground blue -underline 1
     $ctext tag bind link <Enter> { %W configure -cursor hand2 }


@@ -3601,13 +4374,15 @@ proc domktag {} {
 }
 
 proc redrawtags {id} {
 }
 
 proc redrawtags {id} {

-    global canv linehtag idline idpos selectedline
+    global canv linehtag commitrow idpos selectedline curview

 
 

-    if {![info exists idline($id)]} return
+    if {![info exists commitrow($curview,$id)]} return
+    drawcmitrow $commitrow($curview,$id)

     $canv delete tag.$id
     set xt [eval drawtags $id $idpos($id)]
     $canv delete tag.$id
     set xt [eval drawtags $id $idpos($id)]

-    $canv coords $linehtag($idline($id)) $xt [lindex $idpos($id) 2]
-    if {[info exists selectedline] && $selectedline == $idline($id)} {
+    $canv coords $linehtag($commitrow($curview,$id)) $xt [lindex $idpos($id) 2]
+    if {[info exists selectedline]
+       && $selectedline == $commitrow($curview,$id)} {

        selectline $selectedline 0
     }
 }
        selectline $selectedline 0
     }
 }


@@ -3699,7 +4474,6 @@ proc listrefs {id} {
 
 proc rereadrefs {} {
     global idtags idheads idotherrefs
 
 proc rereadrefs {} {
     global idtags idheads idotherrefs

-    global tagids headids otherrefids

 
     set refids [concat [array names idtags] \
                    [array names idheads] [array names idotherrefs]]
 
     set refids [concat [array names idtags] \
                    [array names idheads] [array names idotherrefs]]


@@ -3720,7 +4494,7 @@ proc rereadrefs {} {
 }
 
 proc showtag {tag isnew} {
 }
 
 proc showtag {tag isnew} {

-    global ctext cflist tagcontents tagids linknum
+    global ctext tagcontents tagids linknum

 
     if {$isnew} {
        addtohistory [list showtag $tag 0]
 
     if {$isnew} {
        addtohistory [list showtag $tag 0]


@@ -3735,7 +4509,7 @@ proc showtag {tag isnew} {
     }
     appendwithlinks $text
     $ctext conf -state disabled
     }
     appendwithlinks $text
     $ctext conf -state disabled

-    $cflist delete 0 end
+    init_flist {}

 }
 
 proc doquit {} {
 }
 
 proc doquit {} {


@@ -4108,18 +4882,22 @@ if {$tclencoding == {}} {
 
 set mainfont {Helvetica 9}
 set textfont {Courier 9}
 
 set mainfont {Helvetica 9}
 set textfont {Courier 9}

+set uifont {Helvetica 9 bold}

 set findmergefiles 0
 set maxgraphpct 50
 set maxwidth 16
 set revlistorder 0
 set fastdate 0
 set findmergefiles 0
 set maxgraphpct 50
 set maxwidth 16
 set revlistorder 0
 set fastdate 0

+set uparrowlen 7
+set downarrowlen 7
+set mingaplen 30
+set flistmode "flat"
+set cmitmode "patch"

 
 set colors {green red blue magenta darkgrey brown orange}
 
 catch {source ~/.gitk}
 
 
 set colors {green red blue magenta darkgrey brown orange}
 
 catch {source ~/.gitk}
 

-set namefont $mainfont
-

 font create optionfont -family sans-serif -size -12
 
 set revtreeargs {}
 font create optionfont -family sans-serif -size -12
 
 set revtreeargs {}


@@ -4127,21 +4905,86 @@ foreach arg $argv {
     switch -regexp -- $arg {
        "^$" { }
        "^-d" { set datemode 1 }
     switch -regexp -- $arg {
        "^$" { }
        "^-d" { set datemode 1 }

-       "^-r" { set revlistorder 1 }

        default {
            lappend revtreeargs $arg
        }
     }
 }
 
        default {
            lappend revtreeargs $arg
        }
     }
 }
 

+# check that we can find a .git directory somewhere...
+set gitdir [gitdir]
+if {![file isdirectory $gitdir]} {
+    show_error . "Cannot find the git directory \"$gitdir\"."
+    exit 1
+}
+
+set cmdline_files {}
+set i [lsearch -exact $revtreeargs "--"]
+if {$i >= 0} {
+    set cmdline_files [lrange $revtreeargs [expr {$i + 1}] end]
+    set revtreeargs [lrange $revtreeargs 0 [expr {$i - 1}]]
+} elseif {$revtreeargs ne {}} {
+    if {[catch {
+       set f [eval exec git-rev-parse --no-revs --no-flags $revtreeargs]
+       set cmdline_files [split $f "\n"]
+       set n [llength $cmdline_files]
+       set revtreeargs [lrange $revtreeargs 0 end-$n]
+    } err]} {
+       # unfortunately we get both stdout and stderr in $err,
+       # so look for "fatal:".
+       set i [string first "fatal:" $err]
+       if {$i > 0} {
+           set err [string range [expr {$i + 6}] end]
+       }
+       show_error . "Bad arguments to gitk:\n$err"
+       exit 1
+    }
+}
+

 set history {}
 set historyindex 0
 
 set history {}
 set historyindex 0
 

+set optim_delay 16
+
+set nextviewnum 1
+set curview 0
+set selectedview 0
+set selectedhlview {}
+set viewfiles(0) {}
+set viewperm(0) 0
+set viewargs(0) {}
+
+set cmdlineok 0

 set stopped 0
 set stopped 0

-set redisplaying 0

 set stuffsaved 0
 set patchnum 0
 setcoords
 set stuffsaved 0
 set patchnum 0
 setcoords

-makewindow $revtreeargs
+makewindow

 readrefs
 readrefs

-getcommits $revtreeargs
+
+if {$cmdline_files ne {} || $revtreeargs ne {}} {
+    # create a view for the files/dirs specified on the command line
+    set curview 1
+    set selectedview 1
+    set nextviewnum 2
+    set viewname(1) "Command line"
+    set viewfiles(1) $cmdline_files
+    set viewargs(1) $revtreeargs
+    set viewperm(1) 0
+    addviewmenu 1
+    .bar.view entryconf 2 -state normal
+    .bar.view entryconf 3 -state normal
+}
+
+if {[info exists permviews]} {
+    foreach v $permviews {
+       set n $nextviewnum
+       incr nextviewnum
+       set viewname($n) [lindex $v 0]
+       set viewfiles($n) [lindex $v 1]
+       set viewargs($n) [lindex $v 2]
+       set viewperm($n) 1
+       addviewmenu $n
+    }
+}
+getcommits