gitk: Factored out some common code into a new start_rev_list procedure

[git.git] / gitk

diff --git a/gitk b/gitk
index 58b4abc..42e96d0 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -16,22 +16,9 @@ proc gitdir {} {
     }
 }
 
     }
 }
 

-proc getcommits {rargs} {
-    global commits commfd phase canv mainfont env
-    global startmsecs nextupdate ncmupdate
-    global ctext maincursor textcursor leftover
+proc parse_args {rargs} {
+    global parsed_args

 
 

-    # 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
-    }
-    set commits {}
-    set phase getcommits
-    set startmsecs [clock clicks -milliseconds]
-    set nextupdate [expr $startmsecs + 100]
-    set ncmupdate 1

     if [catch {
        set parse_args [concat --default HEAD $rargs]
        set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
     if [catch {
        set parse_args [concat --default HEAD $rargs]
        set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]


@@ -42,26 +29,53 @@ proc getcommits {rargs} {
        }
        set parsed_args $rargs
     }
        }
        set parsed_args $rargs
     }

+    return $parsed_args
+}
+
+proc start_rev_list {rlargs} {
+    global startmsecs nextupdate ncmupdate
+    global commfd leftover gitencoding
+
+    set startmsecs [clock clicks -milliseconds]
+    set nextupdate [expr {$startmsecs + 100}]
+    set ncmupdate 1

     if [catch {
     if [catch {

-       set commfd [open "|git-rev-list --header --topo-order --parents $parsed_args" r]
+       set commfd [open [concat | git-rev-list --header --topo-order \
+                             --parents $rlargs] r]

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

-    fconfigure $commfd -blocking 0 -translation lf
+    fconfigure $commfd -blocking 0 -translation lf -encoding $gitencoding

     fileevent $commfd readable [list getcommitlines $commfd]
     fileevent $commfd readable [list getcommitlines $commfd]

+    . config -cursor watch
+    settextcursor watch
+}
+
+proc getcommits {rargs} {
+    global oldcommits commits phase canv mainfont env
+
+    # 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
+    }
+    set oldcommits {}
+    set commits {}
+    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
     $canv delete all
     $canv create text 3 3 -anchor nw -text "Reading commits..." \
        -font $mainfont -tags textitems

-    . config -cursor watch
-    settextcursor watch

 }
 
 proc getcommitlines {commfd}  {
 }
 
 proc getcommitlines {commfd}  {

-    global commits parents cdate children
+    global oldcommits commits parents cdate children nchildren

     global commitlisted phase nextupdate
     global stopped redisplaying leftover
     global commitlisted phase nextupdate
     global stopped redisplaying leftover

+    global canv

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


@@ -74,9 +88,9 @@ proc getcommitlines {commfd}  {
        }
        if {[string range $err 0 4] == "usage"} {
            set 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.)}
+               "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"
        }
        } else {
            set err "Error reading commits: $err"
        }


@@ -119,10 +133,18 @@ to allow selection of commits to be displayed.)}
        set id [lindex $ids 0]
        set olds [lrange $ids 1 end]
        set cmit [string range $cmit [expr {$j + 1}] end]
        set id [lindex $ids 0]
        set olds [lrange $ids 1 end]
        set cmit [string range $cmit [expr {$j + 1}] end]

+       if {$phase == "updatecommits"} {
+           $canv delete all
+           set oldcommits $commits
+           set commits {}
+           unset children
+           unset nchildren
+           set phase getcommits
+       }

        lappend commits $id
        set commitlisted($id) 1
        parsecommit $id $cmit 1 [lrange $ids 1 end]
        lappend commits $id
        set commitlisted($id) 1
        parsecommit $id $cmit 1 [lrange $ids 1 end]

-       drawcommit $id
+       drawcommit $id 1

        if {[clock clicks -milliseconds] >= $nextupdate} {
            doupdate 1
        }
        if {[clock clicks -milliseconds] >= $nextupdate} {
            doupdate 1
        }


@@ -132,7 +154,7 @@ to allow selection of commits to be displayed.)}
                set stopped 0
                set phase "getcommits"
                foreach id $commits {
                set stopped 0
                set phase "getcommits"
                foreach id $commits {

-                   drawcommit $id
+                   drawcommit $id 1

                    if {$stopped} break
                    if {[clock clicks -milliseconds] >= $nextupdate} {
                        doupdate 1
                    if {$stopped} break
                    if {[clock clicks -milliseconds] >= $nextupdate} {
                        doupdate 1


@@ -168,16 +190,9 @@ proc readcommit {id} {
     parsecommit $id $contents 0 {}
 }
 
     parsecommit $id $contents 0 {}
 }
 

-proc parsecommit {id contents listed olds} {
-    global commitinfo children nchildren parents nparents cdate ncleft
+proc updatechildren {id olds} {
+    global children nchildren parents nparents ncleft

 
 

-    set inhdr 1
-    set comment {}
-    set headline {}
-    set auname {}
-    set audate {}
-    set comname {}
-    set comdate {}

     if {![info exists nchildren($id)]} {
        set children($id) {}
        set nchildren($id) 0
     if {![info exists nchildren($id)]} {
        set children($id) {}
        set nchildren($id) 0


@@ -196,6 +211,19 @@ proc parsecommit {id contents listed olds} {
            incr ncleft($p)
        }
     }
            incr ncleft($p)
        }
     }

+}
+
+proc parsecommit {id contents listed olds} {
+    global commitinfo cdate
+
+    set inhdr 1
+    set comment {}
+    set headline {}
+    set auname {}
+    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...


@@ -243,6 +271,9 @@ proc readrefs {} {
     global tagids idtags headids idheads tagcontents
     global otherrefids idotherrefs
 
     global tagids idtags headids idheads tagcontents
     global otherrefids idotherrefs
 

+    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
+       catch {unset $v}
+    }

     set refd [open [list | git-ls-remote [gitdir]] r]
     while {0 <= [set n [gets $refd line]]} {
        if {![regexp {^([0-9a-f]{40})   refs/([^^]*)$} $line \
     set refd [open [list | git-ls-remote [gitdir]] r]
     while {0 <= [set n [gets $refd line]]} {
        if {![regexp {^([0-9a-f]{40})   refs/([^^]*)$} $line \


@@ -292,28 +323,32 @@ proc error_popup msg {
     tkwait window $w
 }
 
     tkwait window $w
 }
 

-proc makewindow {} {
+proc makewindow {rargs} {

     global canv canv2 canv3 linespc charspc ctext cflist textfont
     global findtype findtypemenu findloc findstring fstring geometry
     global entries sha1entry sha1string sha1but
     global maincursor textcursor curtextcursor
     global canv canv2 canv3 linespc charspc ctext cflist textfont
     global findtype findtypemenu findloc findstring fstring geometry
     global entries sha1entry sha1string sha1but
     global maincursor textcursor curtextcursor

-    global rowctxmenu gaudydiff mergemax
+    global rowctxmenu mergemax

 
     menu .bar
     .bar add cascade -label "File" -menu .bar.file
     menu .bar.file
 
     menu .bar
     .bar add cascade -label "File" -menu .bar.file
     menu .bar.file

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

     .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

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

     menu .bar.help
     .bar add cascade -label "Help" -menu .bar.help
     .bar.help add command -label "About gitk" -command about
     . configure -menu .bar
 
     if {![info exists geometry(canv1)]} {
     menu .bar.help
     .bar add cascade -label "Help" -menu .bar.help
     .bar.help add command -label "About gitk" -command about
     . configure -menu .bar
 
     if {![info exists geometry(canv1)]} {

-       set geometry(canv1) [expr 45 * $charspc]
-       set geometry(canv2) [expr 30 * $charspc]
-       set geometry(canv3) [expr 15 * $charspc]
-       set geometry(canvh) [expr 25 * $linespc + 4]
+       set geometry(canv1) [expr {45 * $charspc}]
+       set geometry(canv2) [expr {30 * $charspc}]
+       set geometry(canv3) [expr {15 * $charspc}]
+       set geometry(canvh) [expr {25 * $linespc + 4}]

        set geometry(ctextw) 80
        set geometry(ctexth) 30
        set geometry(cflistw) 30
        set geometry(ctextw) 80
        set geometry(ctexth) 30
        set geometry(cflistw) 30


@@ -414,25 +449,19 @@ proc makewindow {} {
     .ctop.cdet add .ctop.cdet.left
 
     $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
     .ctop.cdet add .ctop.cdet.left
 
     $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"

-    if {$gaudydiff} {
-       $ctext tag conf hunksep -back blue -fore white
-       $ctext tag conf d0 -back "#ff8080"
-       $ctext tag conf d1 -back green
-    } else {
-       $ctext tag conf hunksep -fore blue
-       $ctext tag conf d0 -fore red
-       $ctext tag conf d1 -fore "#00a000"
-       $ctext tag conf m0 -fore red
-       $ctext tag conf m1 -fore blue
-       $ctext tag conf m2 -fore green
-       $ctext tag conf m3 -fore purple
-       $ctext tag conf m4 -fore brown
-       $ctext tag conf mmax -fore darkgrey
-       set mergemax 5
-       $ctext tag conf mresult -font [concat $textfont bold]
-       $ctext tag conf msep -font [concat $textfont bold]
-       $ctext tag conf found -back yellow
-    }
+    $ctext tag conf hunksep -fore blue
+    $ctext tag conf d0 -fore red
+    $ctext tag conf d1 -fore "#00a000"
+    $ctext tag conf m0 -fore red
+    $ctext tag conf m1 -fore blue
+    $ctext tag conf m2 -fore green
+    $ctext tag conf m3 -fore purple
+    $ctext tag conf m4 -fore brown
+    $ctext tag conf mmax -fore darkgrey
+    set mergemax 5
+    $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
     set cflist .ctop.cdet.right.cfiles
 
     frame .ctop.cdet.right
     set cflist .ctop.cdet.right.cfiles


@@ -533,7 +562,7 @@ proc click {w} {
 
 proc savestuff {w} {
     global canv canv2 canv3 ctext cflist mainfont textfont
 
 proc savestuff {w} {
     global canv canv2 canv3 ctext cflist mainfont textfont

-    global stuffsaved findmergefiles gaudydiff maxgraphpct
+    global stuffsaved findmergefiles maxgraphpct

     global maxwidth
 
     if {$stuffsaved} return
     global maxwidth
 
     if {$stuffsaved} return


@@ -543,15 +572,14 @@ proc savestuff {w} {
        puts $f [list set mainfont $mainfont]
        puts $f [list set textfont $textfont]
        puts $f [list set findmergefiles $findmergefiles]
        puts $f [list set mainfont $mainfont]
        puts $f [list set textfont $textfont]
        puts $f [list set findmergefiles $findmergefiles]

-       puts $f [list set gaudydiff $gaudydiff]

        puts $f [list set maxgraphpct $maxgraphpct]
        puts $f [list set maxwidth $maxwidth]
        puts $f "set geometry(width) [winfo width .ctop]"
        puts $f "set geometry(height) [winfo height .ctop]"
        puts $f [list set maxgraphpct $maxgraphpct]
        puts $f [list set maxwidth $maxwidth]
        puts $f "set geometry(width) [winfo width .ctop]"
        puts $f "set geometry(height) [winfo height .ctop]"

-       puts $f "set geometry(canv1) [expr [winfo width $canv]-2]"
-       puts $f "set geometry(canv2) [expr [winfo width $canv2]-2]"
-       puts $f "set geometry(canv3) [expr [winfo width $canv3]-2]"
-       puts $f "set geometry(canvh) [expr [winfo height $canv]-2]"
+       puts $f "set geometry(canv1) [expr {[winfo width $canv]-2}]"
+       puts $f "set geometry(canv2) [expr {[winfo width $canv2]-2}]"
+       puts $f "set geometry(canv3) [expr {[winfo width $canv3]-2}]"
+       puts $f "set geometry(canvh) [expr {[winfo height $canv]-2}]"

        set wid [expr {([winfo width $ctext] - 8) \
                           / [font measure $textfont "0"]}]
        puts $f "set geometry(ctextw) $wid"
        set wid [expr {([winfo width $ctext] - 8) \
                           / [font measure $textfont "0"]}]
        puts $f "set geometry(ctextw) $wid"


@@ -580,12 +608,12 @@ proc resizeclistpanes {win w} {
                set sash0 30
            }
            if {$sash1 < $sash0 + 20} {
                set sash0 30
            }
            if {$sash1 < $sash0 + 20} {

-               set sash1 [expr $sash0 + 20]
+               set sash1 [expr {$sash0 + 20}]

            }
            if {$sash1 > $w - 10} {
            }
            if {$sash1 > $w - 10} {

-               set sash1 [expr $w - 10]
+               set sash1 [expr {$w - 10}]

                if {$sash0 > $sash1 - 20} {
                if {$sash0 > $sash1 - 20} {

-                   set sash0 [expr $sash1 - 20]
+                   set sash0 [expr {$sash1 - 20}]

                }
            }
        }
                }
            }
        }


@@ -608,7 +636,7 @@ proc resizecdetpanes {win w} {
                set sash0 45
            }
            if {$sash0 > $w - 15} {
                set sash0 45
            }
            if {$sash0 > $w - 15} {

-               set sash0 [expr $w - 15]
+               set sash0 [expr {$w - 15}]

            }
        }
        $win sash place 0 $sash0 [lindex $s0 1]
            }
        }
        $win sash place 0 $sash0 [lindex $s0 1]


@@ -819,9 +847,9 @@ proc drawcommitline {level} {
     }
     set x [xcoord $level $level $lineno]
     set y1 $canvy
     }
     set x [xcoord $level $level $lineno]
     set y1 $canvy

-    set canvy [expr $canvy + $linespc]
+    set canvy [expr {$canvy + $linespc}]

     allcanvs conf -scrollregion \
     allcanvs conf -scrollregion \

-       [list 0 0 0 [expr $y1 + 0.5 * $linespc + 2]]
+       [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"} {
     if {[info exists mainline($id)]} {
        lappend mainline($id) $x $y1
        if {$mainlinearrow($id) ne "none"} {


@@ -830,8 +858,8 @@ proc drawcommitline {level} {
     }
     drawlines $id 0 0
     set orad [expr {$linespc / 3}]
     }
     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] \
+    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}
               -fill $ofill -outline black -width 1]
     $canv raise $t
     $canv bind $t <1> {selcanvline {} %x %y}


@@ -886,8 +914,8 @@ proc drawtags {id x xt y1} {
     }
 
     set delta [expr {int(0.5 * ($linespc - $lthickness))}]
     }
 
     set delta [expr {int(0.5 * ($linespc - $lthickness))}]

-    set yt [expr $y1 - 0.5 * $linespc]
-    set yb [expr $yt + $linespc - 1]
+    set yt [expr {$y1 - 0.5 * $linespc}]
+    set yb [expr {$yt + $linespc - 1}]

     set xvals {}
     set wvals {}
     foreach tag $marks {
     set xvals {}
     set wvals {}
     foreach tag $marks {


@@ -900,12 +928,12 @@ proc drawtags {id x xt y1} {
               -width $lthickness -fill black -tags tag.$id]
     $canv lower $t
     foreach tag $marks x $xvals wid $wvals {
               -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]
+       set xl [expr {$x + $delta}]
+       set xr [expr {$x + $delta + $wid + $lthickness}]

        if {[incr ntags -1] >= 0} {
            # draw a tag
        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] \
+           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}]
                       -width 1 -outline black -fill yellow -tags tag.$id]
            $canv bind $t <1> [list showtag $tag 1]
            set rowtextx($idline($id)) [expr {$xr + $linespc}]


@@ -916,7 +944,7 @@ proc drawtags {id x xt y1} {
            } else {
                set col "#ddddff"
            }
            } else {
                set col "#ddddff"
            }

-           set xl [expr $xl - $delta/2]
+           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
        }
            $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
                -width 1 -outline black -fill $col -tags tag.$id
        }


@@ -1416,8 +1444,9 @@ proc decidenext {{noread 0}} {
     return $level
 }
 
     return $level
 }
 

-proc drawcommit {id} {
+proc drawcommit {id reading} {

     global phase todo nchildren datemode nextupdate revlistorder
     global phase todo nchildren datemode nextupdate revlistorder

+    global numcommits ncmupdate displayorder todo onscreen

     global numcommits ncmupdate displayorder todo onscreen parents
 
     if {$phase != "incrdraw"} {
     global numcommits ncmupdate displayorder todo onscreen parents
 
     if {$phase != "incrdraw"} {


@@ -1455,20 +1484,29 @@ proc drawcommit {id} {
            }
        }
     }
            }
        }
     }

-    drawmore 1
+    drawmore $reading

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

-    global phase
+    global phase oldcommits commits

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

+    global parents

 
 

-    if {$phase != "incrdraw"} {
+    if {$phase == "incrdraw" || $phase == "removecommits"} {
+       foreach id $oldcommits {
+           lappend commits $id
+           updatechildren $id $parents($id)
+           drawcommit $id 0
+       }
+       set oldcommits {}
+       drawrest
+    } elseif {$phase == "updatecommits"} {
+       set phase {}
+    } else {

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

-    } else {
-       drawrest

     }
     . config -cursor $maincursor
     settextcursor $textcursor
     }
     . config -cursor $maincursor
     settextcursor $textcursor


@@ -1491,7 +1529,7 @@ proc drawgraph {} {
 
     if {$displayorder == {}} return
     set startmsecs [clock clicks -milliseconds]
 
     if {$displayorder == {}} return
     set startmsecs [clock clicks -milliseconds]

-    set nextupdate [expr $startmsecs + 100]
+    set nextupdate [expr {$startmsecs + 100}]

     set ncmupdate 1
     initgraph
     foreach id $displayorder {
     set ncmupdate 1
     initgraph
     foreach id $displayorder {


@@ -1520,7 +1558,7 @@ proc drawrest {} {
     }
     drawmore 0
     set phase {}
     }
     drawmore 0
     set phase {}

-    set drawmsecs [expr [clock clicks -milliseconds] - $startmsecs]
+    set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]

     #puts "overall $drawmsecs ms for $numcommits commits"
     if {$redisplaying} {
        if {$stopped == 0 && [info exists selectedline]} {
     #puts "overall $drawmsecs ms for $numcommits commits"
     if {$redisplaying} {
        if {$stopped == 0 && [info exists selectedline]} {


@@ -1548,8 +1586,8 @@ proc findmatches {f} {
        set matches {}
        set i 0
        while {[set j [string first $foundstring $str $i]] >= 0} {
        set matches {}
        set i 0
        while {[set j [string first $foundstring $str $i]] >= 0} {

-           lappend matches [list $j [expr $j+$foundstrlen-1]]
-           set i [expr $j + $foundstrlen]
+           lappend matches [list $j [expr {$j+$foundstrlen-1}]]
+           set i [expr {$j + $foundstrlen}]

        }
     }
     return $matches
        }
     }
     return $matches


@@ -1630,7 +1668,7 @@ proc findselectline {l} {
        set matches [findmatches $f]
        foreach match $matches {
            set start [lindex $match 0]
        set matches [findmatches $f]
        foreach match $matches {
            set start [lindex $match 0]

-           set end [expr [lindex $match 1] + 1]
+           set end [expr {[lindex $match 1] + 1}]

            $ctext tag add found "1.0 + $start c" "1.0 + $end c"
        }
     }
            $ctext tag add found "1.0 + $start c" "1.0 + $end c"
        }
     }


@@ -1984,9 +2022,10 @@ proc markmatches {canv l str tag matches font} {
        set start [lindex $match 0]
        set end [lindex $match 1]
        if {$start > $end} continue
        set start [lindex $match 0]
        set end [lindex $match 1]
        if {$start > $end} continue

-       set xoff [font measure $font [string range $str 0 [expr $start-1]]]
-       set xlen [font measure $font [string range $str 0 [expr $end]]]
-       set t [$canv create rect [expr $x0+$xoff] $y0 [expr $x0+$xlen+2] $y1 \
+       set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
+       set xlen [font measure $font [string range $str 0 [expr {$end}]]]
+       set t [$canv create rect [expr {$x0+$xoff}] $y0 \
+                  [expr {$x0+$xlen+2}] $y1 \

                   -outline {} -tags matches -fill yellow]
        $canv lower $t
     }
                   -outline {} -tags matches -fill yellow]
        $canv lower $t
     }


@@ -2078,8 +2117,8 @@ proc selectline {l isnew} {
     set ytop [expr {$y - $linespc - 1}]
     set ybot [expr {$y + $linespc + 1}]
     set wnow [$canv yview]
     set ytop [expr {$y - $linespc - 1}]
     set ybot [expr {$y + $linespc + 1}]
     set wnow [$canv yview]

-    set wtop [expr [lindex $wnow 0] * $ymax]
-    set wbot [expr [lindex $wnow 1] * $ymax]
+    set wtop [expr {[lindex $wnow 0] * $ymax}]
+    set wbot [expr {[lindex $wnow 1] * $ymax}]

     set wh [expr {$wbot - $wtop}]
     set newtop $wtop
     if {$ytop < $wtop} {
     set wh [expr {$wbot - $wtop}]
     set newtop $wtop
     if {$ytop < $wtop} {


@@ -2105,7 +2144,7 @@ proc selectline {l isnew} {
        if {$newtop < 0} {
            set newtop 0
        }
        if {$newtop < 0} {
            set newtop 0
        }

-       allcanvs yview moveto [expr $newtop * 1.0 / $ymax]
+       allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]

     }
 
     if {$isnew} {
     }
 
     if {$isnew} {


@@ -2164,7 +2203,7 @@ proc selectline {l isnew} {
     $cflist delete 0 end
     $cflist insert end "Comments"
     if {$nparents($id) == 1} {
     $cflist delete 0 end
     $cflist insert end "Comments"
     if {$nparents($id) == 1} {

-       startdiff [concat $id $parents($id)]
+       startdiff $id

     } elseif {$nparents($id) > 1} {
        mergediff $id
     }
     } elseif {$nparents($id) > 1} {
        mergediff $id
     }


@@ -2173,7 +2212,7 @@ proc selectline {l isnew} {
 proc selnextline {dir} {
     global selectedline
     if {![info exists selectedline]} return
 proc selnextline {dir} {
     global selectedline
     if {![info exists selectedline]} return

-    set l [expr $selectedline + $dir]
+    set l [expr {$selectedline + $dir}]

     unmarkmatches
     selectline $l 1
 }
     unmarkmatches
     selectline $l 1
 }


@@ -2273,12 +2312,12 @@ proc contmergediff {ids} {
     # diff the child against each of the parents, and diff
     # each of the parents against the GCA.
     while 1 {
     # diff the child against each of the parents, and diff
     # each of the parents against the GCA.
     while 1 {

-       if {[lindex $ids 0] == $diffmergeid && $diffmergegca ne {}} {
-           set ids [list [lindex $ids 1] $diffmergegca]
+       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]
        } else {
            if {[incr diffpindex] >= $nparents($diffmergeid)} break
            set p [lindex $parents($diffmergeid) $diffpindex]

-           set ids [list $diffmergeid $p]
+           set ids [list $p $diffmergeid]

        }
        if {![info exists treediffs($ids)]} {
            set diffids $ids
        }
        if {![info exists treediffs($ids)]} {
            set diffids $ids


@@ -2296,8 +2335,8 @@ proc contmergediff {ids} {
     if {$diffmergegca ne {}} {
        set files {}
        foreach p $parents($diffmergeid) {
     if {$diffmergegca ne {}} {
        set files {}
        foreach p $parents($diffmergeid) {

-           set gcadiffs $treediffs([list $p $diffmergegca])
-           foreach f $treediffs([list $diffmergeid $p]) {
+           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 {[lsearch -exact $files $f] < 0
                    && [lsearch -exact $gcadiffs $f] >= 0} {
                    lappend files $f


@@ -2310,7 +2349,7 @@ proc contmergediff {ids} {
        set files $treediffs([list $diffmergeid $p])
        for {set i 1} {$i < $nparents($diffmergeid) && $files ne {}} {incr i} {
            set p [lindex $parents($diffmergeid) $i]
        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 $diffmergeid $p])
+           set df $treediffs([list $p $diffmergeid])

            set nf {}
            foreach f $files {
                if {[lsearch -exact $df $f] >= 0} {
            set nf {}
            foreach f $files {
                if {[lsearch -exact $df $f] >= 0} {


@@ -2787,8 +2826,7 @@ proc gettreediffs {ids} {
     global treediff parents treepending
     set treepending $ids
     set treediff {}
     global treediff parents treepending
     set treepending $ids
     set treediff {}

-    set id [lindex $ids 0]
-    if [catch {set gdtf [open "|git-diff-tree --no-commit-id -r $id" r]}] return
+    if [catch {set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]}] return

     fconfigure $gdtf -blocking 0
     fileevent $gdtf readable [list gettreediffline $gdtf $ids]
 }
     fconfigure $gdtf -blocking 0
     fileevent $gdtf readable [list gettreediffline $gdtf $ids]
 }


@@ -2821,9 +2859,8 @@ proc getblobdiffs {ids} {
     global diffopts blobdifffd diffids env curdifftag curtagstart
     global difffilestart nextupdate diffinhdr treediffs
 
     global diffopts blobdifffd diffids env curdifftag curtagstart
     global difffilestart nextupdate diffinhdr treediffs
 

-    set id [lindex $ids 0]

     set env(GIT_DIFF_OPTS) $diffopts
     set env(GIT_DIFF_OPTS) $diffopts

-    set cmd [list | git-diff-tree --no-commit-id -r -p -C $id]
+    set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids]

     if {[catch {set bdf [open $cmd r]} err]} {
        puts "error getting diffs: $err"
        return
     if {[catch {set bdf [open $cmd r]} err]} {
        puts "error getting diffs: $err"
        return


@@ -2842,7 +2879,6 @@ proc getblobdiffline {bdf ids} {
     global diffids blobdifffd ctext curdifftag curtagstart
     global diffnexthead diffnextnote difffilestart
     global nextupdate diffinhdr treediffs
     global diffids blobdifffd ctext curdifftag curtagstart
     global diffnexthead diffnextnote difffilestart
     global nextupdate diffinhdr treediffs

-    global gaudydiff

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


@@ -2891,26 +2927,14 @@ proc getblobdiffline {bdf ids} {
        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]} {

-       if {$gaudydiff} {
-           $ctext insert end "\t" hunksep
-           $ctext insert end "    $f1l    " d0 "    $f2l    " d1
-           $ctext insert end "    $rest \n" hunksep
-       } else {
-           $ctext insert end "$line\n" hunksep
-       }
+       $ctext insert end "$line\n" hunksep

        set diffinhdr 0
     } else {
        set x [string range $line 0 0]
        if {$x == "-" || $x == "+"} {
            set tag [expr {$x == "+"}]
        set diffinhdr 0
     } else {
        set x [string range $line 0 0]
        if {$x == "-" || $x == "+"} {
            set tag [expr {$x == "+"}]

-           if {$gaudydiff} {
-               set line [string range $line 1 end]
-           }

            $ctext insert end "$line\n" d$tag
        } elseif {$x == " "} {
            $ctext insert end "$line\n" d$tag
        } elseif {$x == " "} {

-           if {$gaudydiff} {
-               set line [string range $line 1 end]
-           }

            $ctext insert end "$line\n"
        } elseif {$diffinhdr || $x == "\\"} {
            # e.g. "\ No newline at end of file"
            $ctext insert end "$line\n"
        } elseif {$diffinhdr || $x == "\\"} {
            # e.g. "\ No newline at end of file"


@@ -2966,8 +2990,8 @@ 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 {3 + 0.5 * $linespc}]
+    set canvx0 [expr {3 + 0.5 * $linespc}]

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


@@ -3340,7 +3364,7 @@ proc doseldiff {oldid newid} {
     $ctext conf -state disabled
     $ctext tag delete Comments
     $ctext tag remove found 1.0 end
     $ctext conf -state disabled
     $ctext tag delete Comments
     $ctext tag remove found 1.0 end

-    startdiff [list $newid $oldid]
+    startdiff [list $oldid $newid]

 }
 
 proc mkpatch {} {
 }
 
 proc mkpatch {} {


@@ -3596,9 +3620,6 @@ proc rereadrefs {} {
            set ref($id) [listrefs $id]
        }
     }
            set ref($id) [listrefs $id]
        }
     }

-    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
-       catch {unset $v}
-    }

     readrefs
     set refids [lsort -unique [concat $refids [array names idtags] \
                        [array names idheads] [array names idotherrefs]]]
     readrefs
     set refids [lsort -unique [concat $refids [array names idtags] \
                        [array names idheads] [array names idotherrefs]]]


@@ -3610,6 +3631,67 @@ proc rereadrefs {} {
     }
 }
 
     }
 }
 

+proc updatecommits {rargs} {
+    global commitlisted commfd phase
+    global startmsecs nextupdate ncmupdate
+    global idtags idheads idotherrefs
+    global leftover
+    global parsed_args
+    global canv
+    global oldcommits commits
+    global parents nchildren children ncleft
+
+    set old_args $parsed_args
+    parse_args $rargs
+
+    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
+       }
+    }
+
+    set phase updatecommits
+    set removed_commits [split [eval exec git-rev-list $ignorenew] "\n" ]
+    if {[llength $removed_commits] > 0} {
+       $canv delete all
+       set oldcommits {}
+       foreach c $commits {
+           if {[lsearch $c $removed_commits] < 0} {
+               lappend oldcommits $c
+           } else {
+               unset commitlisted($c)
+           }
+       }
+       set commits {}
+       unset children
+       unset nchildren
+       set phase removecommits
+    }
+
+    set args {}
+    foreach a $parsed_args {
+       if {![info exists oldref($a)]} {
+           lappend args $a
+       }
+    }
+
+    readrefs
+    start_rev_list [concat $ignoreold $args]
+}
+

 proc showtag {tag isnew} {
     global ctext cflist tagcontents tagids linknum
 
 proc showtag {tag isnew} {
     global ctext cflist tagcontents tagids linknum
 


@@ -3635,48 +3717,111 @@ proc doquit {} {
     destroy .
 }
 
     destroy .
 }
 

-proc formatdate {d} {
-    global hours nhours tfd
+proc doprefs {} {
+    global maxwidth maxgraphpct diffopts findmergefiles
+    global oldprefs prefstop
+
+    set top .gitkprefs
+    set prefstop $top
+    if {[winfo exists $top]} {
+       raise $top
+       return
+    }
+    foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
+       set oldprefs($v) [set $v]
+    }
+    toplevel $top
+    wm title $top "Gitk preferences"
+    label $top.ldisp -text "Commit list display options"
+    grid $top.ldisp - -sticky w -pady 10
+    label $top.spacer -text " "
+    label $top.maxwidthl -text "Maximum graph width (lines)" \
+       -font optionfont
+    spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
+    grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
+    label $top.maxpctl -text "Maximum graph width (% of pane)" \
+       -font optionfont
+    spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
+    grid x $top.maxpctl $top.maxpct -sticky w
+    checkbutton $top.findm -variable findmergefiles
+    label $top.findml -text "Include merges for \"Find\" in \"Files\"" \
+       -font optionfont
+    grid $top.findm $top.findml - -sticky w
+    label $top.ddisp -text "Diff display options"
+    grid $top.ddisp - -sticky w -pady 10
+    label $top.diffoptl -text "Options for diff program" \
+       -font optionfont
+    entry $top.diffopt -width 20 -textvariable diffopts
+    grid x $top.diffoptl $top.diffopt -sticky w
+    frame $top.buts
+    button $top.buts.ok -text "OK" -command prefsok
+    button $top.buts.can -text "Cancel" -command prefscan
+    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
+}
+
+proc prefscan {} {
+    global maxwidth maxgraphpct diffopts findmergefiles
+    global oldprefs prefstop
+
+    foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
+       set $v $oldprefs($v)
+    }
+    catch {destroy $prefstop}
+    unset prefstop
+}

 
 

-    set hr [expr {$d / 3600}]
-    set ms [expr {$d % 3600}]
-    if {![info exists hours($hr)]} {
-       set hours($hr) [clock format $d -format "%Y-%m-%d %H"]
-       set nhours($hr) 0
+proc prefsok {} {
+    global maxwidth maxgraphpct
+    global oldprefs prefstop
+
+    catch {destroy $prefstop}
+    unset prefstop
+    if {$maxwidth != $oldprefs(maxwidth)
+       || $maxgraphpct != $oldprefs(maxgraphpct)} {
+       redisplay

     }
     }

-    incr nhours($hr)
-    set minsec [format "%.2d:%.2d" [expr {$ms/60}] [expr {$ms%60}]]
-    return "$hours($hr):$minsec"
+}
+
+proc formatdate {d} {
+    return [clock format $d -format "%Y-%m-%d %H:%M:%S"]

 }
 
 # defaults...
 set datemode 0
 }
 
 # defaults...
 set datemode 0

-set boldnames 0

 set diffopts "-U 5 -p"
 set wrcomcmd "git-diff-tree --stdin -p --pretty"
 
 set diffopts "-U 5 -p"
 set wrcomcmd "git-diff-tree --stdin -p --pretty"
 

+set gitencoding ""
+catch {
+    set gitencoding [exec git-repo-config --get i18n.commitencoding]
+}
+if {$gitencoding == ""} {
+       set gitencoding "utf-8"
+}
+

 set mainfont {Helvetica 9}
 set textfont {Courier 9}
 set findmergefiles 0
 set mainfont {Helvetica 9}
 set textfont {Courier 9}
 set findmergefiles 0

-set gaudydiff 0

 set maxgraphpct 50
 set maxwidth 16
 set revlistorder 0
 set maxgraphpct 50
 set maxwidth 16
 set revlistorder 0

+set fastdate 0

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

-if {$boldnames} {
-    lappend namefont bold
-}
+
+font create optionfont -family sans-serif -size -12

 
 set revtreeargs {}
 foreach arg $argv {
     switch -regexp -- $arg {
        "^$" { }
 
 set revtreeargs {}
 foreach arg $argv {
     switch -regexp -- $arg {
        "^$" { }

-       "^-b" { set boldnames 1 }

        "^-d" { set datemode 1 }
        "^-r" { set revlistorder 1 }
        default {
        "^-d" { set datemode 1 }
        "^-r" { set revlistorder 1 }
        default {


@@ -3693,6 +3838,6 @@ set redisplaying 0
 set stuffsaved 0
 set patchnum 0
 setcoords
 set stuffsaved 0
 set patchnum 0
 setcoords

-makewindow
+makewindow $revtreeargs

 readrefs
 getcommits $revtreeargs
 readrefs
 getcommits $revtreeargs