codingstyle: remove trailing spaces in various text files

Better do it once than see random changes in diffs later.

contrib/hgk

@@ -1,4124 +1,4124
 #!/usr/bin/env wish
 
 # Copyright (C) 2005 Paul Mackerras.  All rights reserved.
 # This program is free software; it may be used, copied, modified
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
 #
 # See hgk.py for extension usage and configuration.
 
 
 # Modified version of Tip 171:
 # http://www.tcl.tk/cgi-bin/tct/tip/171.html
 #
 # The in_mousewheel global was added to fix strange reentrancy issues.
 # The whole snipped is activated only under windows, mouse wheel
 # bindings working already under MacOSX and Linux.
 
 if {[catch {package require Ttk}]} {
     # use a shim
     namespace eval ttk {
         proc style args {}
 
         proc entry args {
             eval [linsert $args 0 ::entry] -relief flat
         }
     }
 
     interp alias {} ttk::button {} button
     interp alias {} ttk::frame {} frame
     interp alias {} ttk::label {} label
     interp alias {} ttk::scrollbar {} scrollbar
     interp alias {} ttk::optionMenu {} tk_optionMenu
 
     proc updatepalette {} {}
 } else {
     proc ::ttk::optionMenu {w varName firstValue args} {
         upvar #0 $varName var
 
         if {![info exists var]} {
             set var $firstValue
         }
         ttk::menubutton $w -textvariable $varName -menu $w.menu \
                 -direction flush
         menu $w.menu -tearoff 0
         $w.menu add radiobutton -label $firstValue -variable $varName
         foreach i $args {
             $w.menu add radiobutton -label $i -variable $varName
         }
         return $w.menu
     }
     proc updatepalette {} {
         catch {
             tk_setPalette background [ttk::style lookup client -background]
         }
     }
 }
 
 if {[tk windowingsystem] eq "win32"} {
 
 ttk::style theme use xpnative
 
 set mw_classes [list Text Listbox Table TreeCtrl]
    foreach class $mw_classes { bind $class <MouseWheel> {} }
 
 set in_mousewheel 0
 
 proc ::tk::MouseWheel {wFired X Y D {shifted 0}} {
     global in_mousewheel
     if { $in_mousewheel != 0 } { return }
     # Set event to check based on call
     set evt "<[expr {$shifted?{Shift-}:{}}]MouseWheel>"
     # do not double-fire in case the class already has a binding
     if {[bind [winfo class $wFired] $evt] ne ""} { return }
     # obtain the window the mouse is over
     set w [winfo containing $X $Y]
     # if we are outside the app, try and scroll the focus widget
     if {![winfo exists $w]} { catch {set w [focus]} }
     if {[winfo exists $w]} {
 
         if {[bind $w $evt] ne ""} {
             # Awkward ... this widget has a MouseWheel binding, but to
             # trigger successfully in it, we must give it focus.
             catch {focus} old
             if {$w ne $old} { focus $w }
             set in_mousewheel 1
             event generate $w $evt -rootx $X -rooty $Y -delta $D
             set in_mousewheel 0
             if {$w ne $old} { focus $old }
             return
         }
 
         # aqua and x11/win32 have different delta handling
         if {[tk windowingsystem] ne "aqua"} {
             set delta [expr {- ($D / 30)}]
         } else {
             set delta [expr {- ($D)}]
         }
         # scrollbars have different call conventions
         if {[string match "*Scrollbar" [winfo class $w]]} {
             catch {tk::ScrollByUnits $w \
                        [string index [$w cget -orient] 0] $delta}
         } else {
             set cmd [list $w [expr {$shifted ? "xview" : "yview"}] \
                          scroll $delta units]
             # Walking up to find the proper widget (handles cases like
             # embedded widgets in a canvas)
             while {[catch $cmd] && [winfo toplevel $w] ne $w} {
                 set w [winfo parent $w]
             }
         }
     }
 }
 
 bind all <MouseWheel> [list ::tk::MouseWheel %W %X %Y %D 0]
 
 # end of win32 section
 } else {
 
 if {[catch {
     set theme [ttk::style theme use]
 }]} {
     set theme $::ttk::currentTheme
 }
 if {$theme eq "default"} {
     ttk::style theme use clam
 }
 
 }
 
 updatepalette
 
 # Unify right mouse button handling.
 # See "mouse buttons on macintosh" thread on comp.lang.tcl
 if {[tk windowingsystem] eq "aqua"} {
     event add <<B3>> <Control-ButtonPress-1>
     event add <<B3>> <Button-2>
 } else {
     event add <<B3>> <Button-3>
 }
 
 proc gitdir {} {
     global env
     if {[info exists env(GIT_DIR)]} {
 	return $env(GIT_DIR)
     } else {
 	return ".hg"
     }
 }
 
 proc popupify {w} {
     wm resizable $w 0 0
     wm withdraw $w
     update
     set x [expr {([winfo screenwidth .]-[winfo reqwidth $w])/2}]
     set y [expr {([winfo screenheight .]-[winfo reqheight $w])/2}]
     wm geometry  $w +$x+$y
     wm transient $w .
     wm deiconify $w
     wm resizable $w 1 1
 }
 
 proc getcommits {rargs} {
     global commits commfd phase canv mainfont env
     global startmsecs nextupdate ncmupdate
     global ctext maincursor textcursor leftover
 
     # 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
     set limit 0
     set revargs {}
     for {set i 0} {$i < [llength $rargs]} {incr i} {
 	set opt [lindex $rargs $i]
 	if {$opt == "--limit"} {
 	    incr i
 	    set limit [lindex $rargs $i]
 	} else {
 	    lappend revargs $opt
 	}
     }
     if [catch {
 	set parse_args [concat --default HEAD $revargs]
 	set parse_temp [eval exec {$env(HG)} --config ui.report_untrusted=false debug-rev-parse $parse_args]
 	regsub -all "\r\n" $parse_temp "\n" parse_temp
 	set parsed_args [split $parse_temp "\n"]
     } err] {
 	# if git-rev-parse failed for some reason...
 	if {$rargs == {}} {
 	    set revargs HEAD
 	}
 	set parsed_args $revargs
     }
     if {$limit > 0} {
 	set parsed_args [concat -n $limit $parsed_args]
     }
     if [catch {
 	set commfd [open "|{$env(HG)} --config ui.report_untrusted=false debug-rev-list --header --topo-order --parents $parsed_args" r]
     } err] {
 	puts stderr "Error executing hg debug-rev-list: $err"
 	exit 1
     }
     set leftover {}
     fconfigure $commfd -blocking 0 -translation lf
     fileevent $commfd readable [list getcommitlines $commfd]
     $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}  {
     global commits parents cdate children
     global commitlisted phase commitinfo nextupdate
     global stopped redisplaying leftover
 
     set stuff [read $commfd]
     if {$stuff == {}} {
 	if {![eof $commfd]} return
 	# set it blocking so we wait for the process to terminate
 	fconfigure $commfd -blocking 1
 	if {![catch {close $commfd} err]} {
 	    after idle finishcommits
 	    return
 	}
 	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"
 	}
 	error_popup $err
 	exit 1
     }
     set start 0
     while 1 {
 	set i [string first "\0" $stuff $start]
 	if {$i < 0} {
 	    append leftover [string range $stuff $start end]
 	    return
 	}
 	set cmit [string range $stuff $start [expr {$i - 1}]]
 	if {$start == 0} {
 	    set cmit "$leftover$cmit"
 	    set leftover {}
 	}
 	set start [expr {$i + 1}]
 	regsub -all "\r\n" $cmit "\n" cmit
 	set j [string first "\n" $cmit]
 	set ok 0
 	if {$j >= 0} {
 	    set ids [string range $cmit 0 [expr {$j - 1}]]
 	    set ok 1
 	    foreach id $ids {
 		if {![regexp {^[0-9a-f]{12}$} $id]} {
 		    set ok 0
 		    break
 		}
 	    }
 	}
 	if {!$ok} {
 	    set shortcmit $cmit
 	    if {[string length $shortcmit] > 80} {
 		set shortcmit "[string range $shortcmit 0 80]..."
 	    }
 	    error_popup "Can't parse hg debug-rev-list output: {$shortcmit}"
 	    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
 	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
 		    if {$stopped} break
 		    if {[clock clicks -milliseconds] >= $nextupdate} {
 			doupdate 1
 		    }
 		}
 	    }
 	}
     }
 }
 
 proc doupdate {reading} {
     global commfd nextupdate numcommits ncmupdate
 
     if {$reading} {
 	fileevent $commfd readable {}
     }
     update
     set nextupdate [expr {[clock clicks -milliseconds] + 100}]
     if {$numcommits < 100} {
 	set ncmupdate [expr {$numcommits + 1}]
     } elseif {$numcommits < 10000} {
 	set ncmupdate [expr {$numcommits + 10}]
     } else {
 	set ncmupdate [expr {$numcommits + 100}]
     }
     if {$reading} {
 	fileevent $commfd readable [list getcommitlines $commfd]
     }
 }
 
 proc readcommit {id} {
     global env
     if [catch {set contents [exec $env(HG) --config ui.report_untrusted=false debug-cat-file commit $id]}] return
     parsecommit $id $contents 0 {}
 }
 
 proc parsecommit {id contents listed olds} {
     global commitinfo children nchildren parents nparents cdate ncleft
     global firstparents
 
     set inhdr 1
     set comment {}
     set headline {}
     set auname {}
     set audate {}
     set comname {}
     set comdate {}
     set rev {}
     set branch {}
     set bookmark {}
     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)
 	}
     }
     regsub -all "\r\n" $contents "\n" contents
     foreach line [split $contents "\n"] {
 	if {$inhdr} {
 	    set line [split $line]
 	    if {$line == {}} {
 		set inhdr 0
 	    } else {
 		set tag [lindex $line 0]
 		if {$tag == "author"} {
 		    set x [expr {[llength $line] - 2}]
 		    set audate [lindex $line $x]
 		    set auname [join [lrange $line 1 [expr {$x - 1}]]]
 		} elseif {$tag == "committer"} {
 		    set x [expr {[llength $line] - 2}]
 		    set comdate [lindex $line $x]
 		    set comname [join [lrange $line 1 [expr {$x - 1}]]]
 		} elseif {$tag == "revision"} {
 		    set rev [lindex $line 1]
         } elseif {$tag == "branch"} {
 		    set branch [join [lrange $line 1 end]]
         } elseif {$tag == "bookmark"} {
 		    set bookmark [join [lrange $line 1 end]]
         }
 	    }
 	} else {
 	    if {$comment == {}} {
 		set headline [string trim $line]
 	    } else {
 		append comment "\n"
 	    }
 	    if {!$listed} {
 		# git-rev-list indents the comment by 4 spaces;
 		# if we got this via git-cat-file, add the indentation
 		append comment "    "
 	    }
 	    append comment $line
 	}
     }
     if {$audate != {}} {
 	set audate [clock format $audate]
     }
     if {$comdate != {}} {
 	set cdate($id) $comdate
 	set comdate [clock format $comdate]
     }
     set commitinfo($id) [list $headline $auname $audate \
 			     $comname $comdate $comment $rev $branch $bookmark]
 
     if {[info exists firstparents]} {
         set i [lsearch $firstparents $id]
         if {$i != -1} {
             # remove the parent from firstparents, possible building
             # an empty list
             set firstparents [concat \
                                   [lrange $firstparents 0 [expr $i - 1]] \
                                   [lrange $firstparents [expr $i + 1] end]]
             if {$firstparents eq {}} {
                 # we have found all parents of the first changeset
                 # which means that we can safely select the first line
                 after idle {
                     selectline 0 0
                 }
             }
         }
     } else {
         # this is the first changeset, save the parents
         set firstparents $olds
         if {$firstparents eq {}} {
             # a repository with a single changeset
             after idle {
                 selectline 0 0
             }
         }
     }
 }
 
 proc readrefs {} {
     global bookmarkcurrent bookmarkids tagids idtags idbookmarks headids idheads tagcontents env curid
 
     set status [catch {exec $env(HG) --config ui.report_untrusted=false id} curid]
     if { $status != 0 } {
         puts $::errorInfo
         if { ![string equal $::errorCode NONE] } {
             exit 2
         }
     }
     regexp -- {[[:xdigit:]]+} $curid curid
 
     set status [catch {exec $env(HG) --config ui.report_untrusted=false tags} tags]
     if { $status != 0 } {
         puts $::errorInfo
         if { ![string equal $::errorCode NONE] } {
             exit 2
         }
     }
 
     foreach {tag rev} $tags {
         # we use foreach as Tcl8.4 doesn't support lassign
         foreach {- id} [split $rev :] {
             lappend tagids($tag) $id
             lappend idtags($id) $tag
         }
     }
 
     set status [catch {exec $env(HG) --config ui.report_untrusted=false heads} heads]
     if { $status != 0 } {
         puts $::errorInfo
         if { ![string equal $::errorCode NONE] } {
             exit 2
         }
     }
 
     set lines [split $heads \r\n]
     foreach f $lines {
         set match ""
         regexp {changeset:\s+(\S+):(\S+)$} $f match id sha
         if {$match != ""} {
         lappend idheads($sha) $id
         }
     }
 
     set status [catch {exec $env(HG) --config ui.report_untrusted=false bookmarks} bookmarks]
     if { $status != 0 } {
         puts $::errorInfo
         if { ![string equal $::errorCode NONE] } {
             exit 2
         }
     }
     set lines [split $bookmarks "\n"]
     set bookmarkcurrent 0
     foreach f $lines {
 	regexp {(\S+)$} $f full
 	regsub {\s+(\S+)$} $f "" direct
 	set sha [split $full ':']
 	set bookmark [lindex $sha 1]
 	set current [string first " * " $direct)]
 	regsub {^\s(\*|\s)\s} $direct "" direct
 	lappend bookmarkids($direct) $bookmark
 	lappend idbookmarks($bookmark) $direct
 	if {$current >= 0} {
 		set bookmarkcurrent $direct
 	}
     }
 }
 
 proc readotherrefs {base dname excl} {
     global otherrefids idotherrefs
 
     set git [gitdir]
     set files [glob -nocomplain -types f [file join $git $base *]]
     foreach f $files {
 	catch {
 	    set fd [open $f r]
 	    set line [read $fd 40]
 	    if {[regexp {^[0-9a-f]{12}} $line id]} {
 		set name "$dname[file tail $f]"
 		set otherrefids($name) $id
 		lappend idotherrefs($id) $name
 	    }
 	    close $fd
 	}
     }
     set dirs [glob -nocomplain -types d [file join $git $base *]]
     foreach d $dirs {
 	set dir [file tail $d]
 	if {[lsearch -exact $excl $dir] >= 0} continue
 	readotherrefs [file join $base $dir] "$dname$dir/" {}
     }
 }
 
 proc allcansmousewheel {delta} {
     set delta [expr -5*(int($delta)/abs($delta))]
     allcanvs yview scroll $delta units
 }
 
 proc error_popup msg {
     set w .error
     toplevel $w
     wm transient $w .
     message $w.m -text $msg -justify center -aspect 400
     pack $w.m -side top -fill x -padx 20 -pady 20
     ttk::button $w.ok -text OK -command "destroy $w"
     pack $w.ok -side bottom -fill x
     bind $w <Visibility> "grab $w; focus $w"
     popupify $w
     tkwait window $w
 }
 
 proc makewindow {} {
     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 hgvdiff bgcolor fgcolor diffremcolor diffaddcolor diffmerge1color
     global diffmerge2color hunksepcolor
     global posx posy
 
     if {[info exists posx]} {
         wm geometry . +$posx+$posy
     }
-    
+
     menu .bar
     .bar add cascade -label "File" -menu .bar.file
     menu .bar.file
     .bar.file add command -label "Reread references" -command rereadrefs
     .bar.file add command -label "Quit" -command doquit
     menu .bar.help
     .bar add cascade -label "Help" -menu .bar.help
     .bar.help add command -label "About hgk" -command about
     . configure -menu .bar
 
     if {![info exists geometry(canv1)]} {
 	set geometry(canv1) [expr 45 * $charspc]
 	set geometry(canv2) [expr 30 * $charspc]
 	set geometry(canv3) [expr 15 * $charspc]
 	set geometry(canvh) [expr 25 * $linespc + 4]
 	set geometry(ctextw) 80
 	set geometry(ctexth) 30
 	set geometry(cflistw) 30
     }
     panedwindow .ctop -orient vertical
     if {[info exists geometry(width)]} {
 	.ctop conf -width $geometry(width) -height $geometry(height)
 	set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
 	set geometry(ctexth) [expr {($texth - 8) /
 				    [font metrics $textfont -linespace]}]
     }
     ttk::frame .ctop.top
     ttk::frame .ctop.top.bar
     pack .ctop.top.bar -side bottom -fill x
     set cscroll .ctop.top.csb
     ttk::scrollbar $cscroll -command {allcanvs yview}
     pack $cscroll -side right -fill y
     panedwindow .ctop.top.clist -orient horizontal -sashpad 0 -handlesize 4
     pack .ctop.top.clist -side top -fill both -expand 1
     .ctop add .ctop.top
     set canv .ctop.top.clist.canv
     canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
 	-bg $bgcolor -bd 0 \
 	-yscrollincr $linespc -yscrollcommand "$cscroll set" -selectbackground "#c0c0c0"
     .ctop.top.clist add $canv
     set canv2 .ctop.top.clist.canv2
     canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
 	-bg $bgcolor -bd 0 -yscrollincr $linespc -selectbackground "#c0c0c0"
     .ctop.top.clist add $canv2
     set canv3 .ctop.top.clist.canv3
     canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
 	-bg $bgcolor -bd 0 -yscrollincr $linespc -selectbackground "#c0c0c0"
     .ctop.top.clist add $canv3
     bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
 
     set sha1entry .ctop.top.bar.sha1
     set entries $sha1entry
     set sha1but .ctop.top.bar.sha1label
     button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
 	-command gotocommit -width 8
     $sha1but conf -disabledforeground [$sha1but cget -foreground]
     pack .ctop.top.bar.sha1label -side left
     ttk::entry $sha1entry -width 40 -font $textfont -textvariable sha1string
     trace add variable sha1string write sha1change
     pack $sha1entry -side left -pady 2
 
     image create bitmap bm-left -data {
 	#define left_width 16
 	#define left_height 16
 	static unsigned char left_bits[] = {
 	0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
 	0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
 	0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
     }
     image create bitmap bm-right -data {
 	#define right_width 16
 	#define right_height 16
 	static unsigned char right_bits[] = {
 	0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
 	0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
 	0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
     }
     ttk::button .ctop.top.bar.leftbut -image bm-left -command goback \
 	-state disabled -width 26
     pack .ctop.top.bar.leftbut -side left -fill y
     ttk::button .ctop.top.bar.rightbut -image bm-right -command goforw \
 	-state disabled -width 26
     pack .ctop.top.bar.rightbut -side left -fill y
 
     ttk::button .ctop.top.bar.findbut -text "Find" -command dofind
     pack .ctop.top.bar.findbut -side left
     set findstring {}
     set fstring .ctop.top.bar.findstring
     lappend entries $fstring
     ttk::entry $fstring -width 30 -font $textfont -textvariable findstring
     pack $fstring -side left -expand 1 -fill x
     set findtype Exact
     set findtypemenu [ttk::optionMenu .ctop.top.bar.findtype \
 			  findtype Exact IgnCase Regexp]
     set findloc "All fields"
     ttk::optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
 	Comments Author Files Pickaxe
     pack .ctop.top.bar.findloc -side right
     pack .ctop.top.bar.findtype -side right
     # for making sure type==Exact whenever loc==Pickaxe
     trace add variable findloc write findlocchange
 
     panedwindow .ctop.cdet -orient horizontal
     .ctop add .ctop.cdet
     ttk::frame .ctop.cdet.left
     set ctext .ctop.cdet.left.ctext
     text $ctext -fg $fgcolor -bg $bgcolor -state disabled -font $textfont \
 	-width $geometry(ctextw) -height $geometry(ctexth) \
 	-yscrollcommand ".ctop.cdet.left.sb set" \
 	-xscrollcommand ".ctop.cdet.left.hb set" -wrap none
     ttk::scrollbar .ctop.cdet.left.sb -command "$ctext yview"
     ttk::scrollbar .ctop.cdet.left.hb -orient horizontal -command "$ctext xview"
     pack .ctop.cdet.left.sb -side right -fill y
     pack .ctop.cdet.left.hb -side bottom -fill x
     pack $ctext -side left -fill both -expand 1
     .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 $hunksepcolor
 	$ctext tag conf d0 -fore $diffremcolor
 	$ctext tag conf d1 -fore $diffaddcolor
 
 	# The mX colours seem to be used in merge changesets, where m0
 	# is first parent, m1 is second parent and so on. Git can have
 	# several parents, Hg cannot, so I think the m2..mmax would be
 	# unused.
 	$ctext tag conf m0 -fore $diffmerge1color
 	$ctext tag conf m1 -fore $diffmerge2color
 	$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
     }
 
     ttk::frame .ctop.cdet.right
     set cflist .ctop.cdet.right.cfiles
     listbox $cflist -fg $fgcolor -bg $bgcolor \
         -selectmode extended -width $geometry(cflistw) \
 	-yscrollcommand ".ctop.cdet.right.sb set"
     ttk::scrollbar .ctop.cdet.right.sb -command "$cflist yview"
     pack .ctop.cdet.right.sb -side right -fill y
     pack $cflist -side left -fill both -expand 1
     .ctop.cdet add .ctop.cdet.right
     bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
 
     pack .ctop -side top -fill both -expand 1
 
     bindall <1> {selcanvline %W %x %y}
     #bindall <B1-Motion> {selcanvline %W %x %y}
     bindall <MouseWheel> "allcansmousewheel %D"
     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"
     bind . <Key-Up> "selnextline -1"
     bind . <Key-Down> "selnextline 1"
     bind . <Key-Prior> "allcanvs yview scroll -1 pages"
     bind . <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 p "selnextline -1"
     bindkey n "selnextline 1"
     bindkey b "$ctext yview scroll -1 pages"
     bindkey d "$ctext yview scroll 18 units"
     bindkey u "$ctext yview scroll -18 units"
     bindkey / {findnext 1}
     bindkey <Key-Return> {findnext 0}
     bindkey ? findprev
     bindkey f nextfile
     bind . <Control-q> doquit
     bind . <Control-w> doquit
     bind . <Control-f> dofind
     bind . <Control-g> {findnext 0}
     bind . <Control-r> findprev
     bind . <Control-equal> {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
 
     set maincursor [. cget -cursor]
     set textcursor [$ctext cget -cursor]
     set curtextcursor $textcursor
 
     set rowctxmenu .rowctxmenu
     menu $rowctxmenu -tearoff 0
     $rowctxmenu add command -label "Diff this -> selected" \
 	-command {diffvssel 0}
     $rowctxmenu add command -label "Diff selected -> this" \
 	-command {diffvssel 1}
     $rowctxmenu add command -label "Make patch" -command mkpatch
     $rowctxmenu add command -label "Create tag" -command mktag
     $rowctxmenu add command -label "Write commit to file" -command writecommit
     if { $hgvdiff ne "" } {
 	$rowctxmenu add command -label "Visual diff with parent" \
 	    -command {vdiff 1}
 	$rowctxmenu add command -label "Visual diff with selected" \
 	    -command {vdiff 0}
     }
 }
 
 # when we make a key binding for the toplevel, make sure
 # it doesn't get triggered when that key is pressed in the
 # find string entry widget.
 proc bindkey {ev script} {
     global entries
     bind . $ev $script
     set escript [bind Entry $ev]
     if {$escript == {}} {
 	set escript [bind Entry <Key>]
     }
     foreach e $entries {
 	bind $e $ev "$escript; break"
     }
 }
 
 # set the focus back to the toplevel for any click outside
 # the entry widgets
 proc click {w} {
     global entries
     foreach e $entries {
 	if {$w == $e} return
     }
     focus .
 }
 
 proc savestuff {w} {
     global canv canv2 canv3 ctext cflist mainfont textfont
     global stuffsaved findmergefiles gaudydiff maxgraphpct
     global maxwidth authorcolors curidfont bgcolor fgcolor
     global diffremcolor diffaddcolor hunksepcolor
     global diffmerge1color diffmerge2color
 
     if {$stuffsaved} return
     if {![winfo viewable .]} return
     catch {
 	set f [open "~/.hgk-new" w]
 	puts $f [list set mainfont $mainfont]
 	puts $f [list set curidfont $curidfont]
 	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 "set geometry(canv1) [expr [winfo width $canv]-2]"
 	puts $f "set geometry(canv2) [expr [winfo width $canv2]-2]"
 	puts $f "set geometry(canv3) [expr [winfo width $canv3]-2]"
 	puts $f "set geometry(canvh) [expr [winfo height $canv]-2]"
 	set wid [expr {([winfo width $ctext] - 8) \
 			   / [font measure $textfont "0"]}]
 	puts $f "set geometry(ctextw) $wid"
 	set wid [expr {([winfo width $cflist] - 11) \
 			   / [font measure [$cflist cget -font] "0"]}]
 	puts $f "set geometry(cflistw) $wid"
 	puts $f "#"
 	puts $f "# main window position:"
 	puts $f "set posx [winfo x .]"
 	puts $f "set posy [winfo y .]"
 	puts $f "#"
 	puts $f "# authorcolors format:"
 	puts $f "#"
 	puts $f "# zero or more sublists of"
 	puts $f "#"
 	puts $f "#    { regex color }"
 	puts $f "#"
 	puts $f "# followed by a list of colors"
 	puts $f "#"
 	puts $f "# If the commit author matches a regex in a sublist,"
 	puts $f "# the commit will be colored by that color"
 	puts $f "# otherwise the next unused entry from the list of colors"
 	puts $f "# will be assigned to this commit and also all other commits"
 	puts $f "# of the same author.  When the list of colors is exhausted,"
 	puts $f "# the last entry will be reused."
 	puts $f "#"
 	puts $f "set authorcolors {$authorcolors}"
 	puts $f "#"
 	puts $f "# The background color in the text windows"
 	puts $f "set bgcolor $bgcolor"
 	puts $f "#"
 	puts $f "# The text color used in the diff and file list view"
 	puts $f "set fgcolor $fgcolor"
 	puts $f "#"
 	puts $f "# Color to display + lines in diffs"
 	puts $f "set diffaddcolor $diffaddcolor"
 	puts $f "#"
 	puts $f "# Color to display - lines in diffs"
 	puts $f "set diffremcolor $diffremcolor"
 	puts $f "#"
 	puts $f "# Merge diffs: Color to signal lines from first parent"
 	puts $f "set diffmerge1color $diffmerge1color"
 	puts $f "#"
 	puts $f "# Merge diffs: Color to signal lines from second parent"
 	puts $f "set diffmerge2color $diffmerge2color"
 	puts $f "#"
 	puts $f "# Hunkseparator (@@ -lineno,lines +lineno,lines @@) color"
 	puts $f "set hunksepcolor $hunksepcolor"
 	close $f
 	file rename -force "~/.hgk-new" "~/.hgk"
     }
     set stuffsaved 1
 }
 
 proc resizeclistpanes {win w} {
     global oldwidth
     if [info exists oldwidth($win)] {
 	set s0 [$win sash coord 0]
 	set s1 [$win sash coord 1]
 	if {$w < 60} {
 	    set sash0 [expr {int($w/2 - 2)}]
 	    set sash1 [expr {int($w*5/6 - 2)}]
 	} else {
 	    set factor [expr {1.0 * $w / $oldwidth($win)}]
 	    set sash0 [expr {int($factor * [lindex $s0 0])}]
 	    set sash1 [expr {int($factor * [lindex $s1 0])}]
 	    if {$sash0 < 30} {
 		set sash0 30
 	    }
 	    if {$sash1 < $sash0 + 20} {
 		set sash1 [expr $sash0 + 20]
 	    }
 	    if {$sash1 > $w - 10} {
 		set sash1 [expr $w - 10]
 		if {$sash0 > $sash1 - 20} {
 		    set sash0 [expr $sash1 - 20]
 		}
 	    }
 	}
 	$win sash place 0 $sash0 [lindex $s0 1]
 	$win sash place 1 $sash1 [lindex $s1 1]
     }
     set oldwidth($win) $w
 }
 
 proc resizecdetpanes {win w} {
     global oldwidth
     if [info exists oldwidth($win)] {
 	set s0 [$win sash coord 0]
 	if {$w < 60} {
 	    set sash0 [expr {int($w*3/4 - 2)}]
 	} else {
 	    set factor [expr {1.0 * $w / $oldwidth($win)}]
 	    set sash0 [expr {int($factor * [lindex $s0 0])}]
 	    if {$sash0 < 45} {
 		set sash0 45
 	    }
 	    if {$sash0 > $w - 15} {
 		set sash0 [expr $w - 15]
 	    }
 	}
 	$win sash place 0 $sash0 [lindex $s0 1]
     }
     set oldwidth($win) $w
 }
 
 proc allcanvs args {
     global canv canv2 canv3
     eval $canv $args
     eval $canv2 $args
     eval $canv3 $args
 }
 
 proc bindall {event action} {
     global canv canv2 canv3
     bind $canv $event $action
     bind $canv2 $event $action
     bind $canv3 $event $action
 }
 
 proc about {} {
     set w .about
     if {[winfo exists $w]} {
 	raise $w
 	return
     }
     toplevel $w
     wm title $w "About hgk"
     message $w.m -text {
 Hgk version 1.2
 
 Copyright � 2005 Paul Mackerras
 
 Use and redistribute under the terms of the GNU General Public License} \
 	    -justify center -aspect 400
     pack $w.m -side top -fill x -padx 20 -pady 20
     ttk::button $w.ok -text Close -command "destroy $w"
     pack $w.ok -side bottom
     popupify $w
 }
 
 set aunextcolor 0
 proc assignauthorcolor {name} {
     global authorcolors aucolormap aunextcolor
     if [info exists aucolormap($name)] return
 
     set randomcolors {black}
     for {set i 0} {$i < [llength $authorcolors]} {incr i} {
 	set col [lindex $authorcolors $i]
 	if {[llength $col] > 1} {
 	    set re [lindex $col 0]
 	    set c [lindex $col 1]
 	    if {[regexp -- $re $name]} {
 		set aucolormap($name) $c
 		return
 	    }
 	} else {
 	    set randomcolors [lrange $authorcolors $i end]
 	    break
 	}
     }
 
     set ncolors [llength $randomcolors]
     set c [lindex $randomcolors $aunextcolor]
     if {[incr aunextcolor] >= $ncolors} {
 	incr aunextcolor -1
     }
     set aucolormap($name) $c
 }
 
 proc assigncolor {id} {
     global commitinfo 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
 	}
     }
     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)
 	    }
 	}
 	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)
 		}
 	    }
 	    if {[llength $badcolors] >= $ncolors} {
 		set badcolors $origbad
 	    }
 	}
 	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)
 	    }
 	    if {[info exists parents($child)]} {
 		foreach p $parents($child) {
 		    if {[info exists colormap($p)]
 			&& [lsearch -exact $badcolors $colormap($p)] < 0} {
 			lappend badcolors $colormap($p)
 		    }
 		}
 	    }
 	}
 	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 initgraph {} {
     global canvy canvy0 lineno numcommits nextcolor linespc
     global mainline mainlinearrow sidelines
     global nchildren ncleft
     global displist nhyperspace
 
     allcanvs delete all
     set nextcolor 0
     set canvy $canvy0
     set lineno -1
     set numcommits 0
     catch {unset mainline}
     catch {unset mainlinearrow}
     catch {unset sidelines}
     foreach id [array names nchildren] {
 	set ncleft($id) $nchildren($id)
     }
     set displist {}
     set nhyperspace 0
 }
 
 proc bindline {t id} {
     global canv
 
     $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 drawlines {id xtra} {
     global mainline mainlinearrow sidelines lthickness colormap canv
 
     $canv delete lines.$id
     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
 	}
     }
 }
 
 # 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 idbookmarks
     global lineno lthickness mainline mainlinearrow sidelines
     global commitlisted rowtextx idpos lastuse displist
     global oldnlines olddlevel olddisplist
     global aucolormap curid curidfont
 
     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
 	}
     }
     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
 	    }
 	}
     }
     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)]
 	}
     }
     drawlines $id 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)] || [info exists idbookmarks($id)]} {
 	set xt [drawtags $id $x $xt $y1]
     }
     set headline [lindex $commitinfo($id) 0]
     set name [lindex $commitinfo($id) 1]
     assignauthorcolor $name
     set fg $aucolormap($name)
     if {$id == $curid} {
 	set fn $curidfont
     } else {
 	set fn $mainfont
     }
 
     set date [lindex $commitinfo($id) 2]
     set linehtag($lineno) [$canv create text $xt $y1 -anchor w \
 			       -text $headline -font $fn \
 			       -fill $fg]
     $canv bind $linehtag($lineno) <<B3>> "rowmenu %X %Y $id"
     set linentag($lineno) [$canv2 create text 3 $y1 -anchor w \
 			       -text $name -font $namefont \
 			       -fill $fg]
     set linedtag($lineno) [$canv3 create text 3 $y1 -anchor w \
 			       -text $date -font $mainfont \
 			       -fill $fg]
 
     set olddlevel $level
     set olddisplist $displist
     set oldnlines [llength $displist]
 }
 
 proc drawtags {id x xt y1} {
     global bookmarkcurrent idtags idbookmarks idheads idotherrefs commitinfo
     global linespc lthickness
     global canv mainfont idline rowtextx
 
     set marks {}
     set nbookmarks 0
     set ntags 0
     set nheads 0
     if {[info exists idtags($id)]} {
 	set marks $idtags($id)
 	set ntags [llength $marks]
     }
     if {[info exists idbookmarks($id)]} {
 	set marks [concat $marks $idbookmarks($id)]
 	set nbookmarks [llength $idbookmarks($id)]
     }
     if {[info exists idheads($id)]} {
 	set headmark [lindex $commitinfo($id) 7]
 	if {$headmark ne "default"} {
 	    lappend marks $headmark
 	    set nheads 1
 	}
     }
     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($idline($id)) [expr {$xr + $linespc}]
 	} elseif {[incr nbookmarks -1] >= 0} {
             # draw a tag
             set col gray50
             if {[string compare $bookmarkcurrent $tag] == 0} {
                 set col gray
             }
             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
         } else {
             # draw a head or other ref
             if {[incr nheads -1] >= 0} {
                 set col "#00ff00"
             } 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 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 notecrossings {id lo hi corner} {
     global olddisplist crossings cornercrossings
 
     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
 	    }
 	} 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
 	    }
 	}
     }
 }
 
 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)}]
     }
     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]
     }
     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"
 	    }
 	    lappend sidelines($victim) [list $line 1 $arrow]
 	    unset mainline($victim)
 	}
     }
 
     set dlevel [lsearch -exact $displist $id]
 
     # 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
 	    }
 	} else {
 	    set i $olddlevel
 	    if {$dlevel >= $i} {
 		incr i
 	    }
 	}
 	if {$i < $displ} {
 	    set displist [linsert $displist $i {}]
 	    incr displ
 	    if {$dlevel >= $i} {
 		incr dlevel
 	    }
 	}
     }
 
     # 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
     } 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]
 		    }
 		}
 	    }
 	} else {
 	    set j $i
 	    if {[lindex $displist $i] != $id} {
 		set j [lsearch -exact $displist $id]
 	    }
 	    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
 	    }
 	}
     }
     return $dlevel
 }
 
 # 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
 	}
 	incr i
     }
     return -1
 }
 
 proc drawmore {reading} {
     global displayorder numcommits ncmupdate nextupdate
     global stopped nhyperspace parents commitlisted
     global maxwidth onscreen displist currentparents olddlevel
 
     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 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 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
 		}
 		if {[lsearch -exact $nohs $x] < 0} {
 		    lappend nohs $x
 		}
 		if {$reins eq {} && $onscreen($x) < 0 && $room} {
 		    set reins [list $x $i]
 		}
 		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 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
 		}
 	    }
 	}
 
 	set dlevel [drawslants $id $reins $nohs]
 	drawcommitline $dlevel
 	if {[clock clicks -milliseconds] >= $nextupdate
 	    && $numcommits >= $ncmupdate} {
 	    doupdate $reading
 	    if {$stopped} break
 	}
     }
 }
 
 # level here is an index in todo
 proc updatetodo {level noshortcut} {
     global ncleft todo nnewparents
     global commitlisted parents onscreen
 
     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
 	    }
 	}
     }
     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 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
 	    incr i
 	    incr n
 	}
     }
     set nnewparents($id) $n
 
     return 1
 }
 
 proc decidenext {{noread 0}} {
     global ncleft todo
     global datemode cdate
     global commitinfo
 
     # 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 {}
 		    }
 		    readcommit $p
 		}
 		if {$latest == {} || $cdate($p) > $latest} {
 		    set level $k
 		    set latest $cdate($p)
 		}
 	    } else {
 		set level $k
 		break
 	    }
 	}
     }
     if {$level < 0} {
 	if {$todo != {}} {
 	    puts "ERROR: none of the pending commits can be done yet:"
 	    foreach p $todo {
 		puts "  $p ($ncleft($p))"
 	    }
 	}
 	return -1
     }
 
     return $level
 }
 
 proc drawcommit {id} {
     global phase todo nchildren datemode nextupdate
     global numcommits ncmupdate displayorder todo onscreen
 
     if {$phase != "incrdraw"} {
 	set phase incrdraw
 	set displayorder {}
 	set todo {}
 	initgraph
     }
     if {$nchildren($id) == 0} {
 	lappend todo $id
 	set onscreen($id) 0
     }
     set level [decidenext 1]
     if {$level == {} || $id != [lindex $todo $level]} {
 	return
     }
     while 1 {
 	lappend displayorder [lindex $todo $level]
 	if {[updatetodo $level $datemode]} {
 	    set level [decidenext 1]
 	    if {$level == {}} break
 	}
 	set id [lindex $todo $level]
 	if {![info exists commitlisted($id)]} {
 	    break
 	}
     }
     drawmore 1
 }
 
 proc finishcommits {} {
     global phase
     global canv mainfont ctext maincursor textcursor
 
     if {$phase != "incrdraw"} {
 	$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
 }
 
 # Don't change the text pane cursor if it is currently the hand cursor,
 # showing that we are over a sha1 ID link.
 proc settextcursor {c} {
     global ctext curtextcursor
 
     if {[$ctext cget -cursor] == $curtextcursor} {
 	$ctext config -cursor $c
     }
     set curtextcursor $c
 }
 
 proc drawgraph {} {
     global nextupdate startmsecs ncmupdate
     global displayorder onscreen
 
     if {$displayorder == {}} return
     set startmsecs [clock clicks -milliseconds]
     set nextupdate [expr $startmsecs + 100]
     set ncmupdate 1
     initgraph
     foreach id $displayorder {
 	set onscreen($id) 0
     }
     drawmore 0
 }
 
 proc drawrest {} {
     global phase stopped redisplaying selectedline
     global datemode todo displayorder
     global numcommits ncmupdate
     global nextupdate startmsecs
 
     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
 	    }
 	}
 	drawmore 0
     }
     set phase {}
     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} {
     global findtype foundstring foundstrlen
     if {$findtype == "Regexp"} {
 	set matches [regexp -indices -all -inline $foundstring $f]
     } else {
 	if {$findtype == "IgnCase"} {
 	    set str [string tolower $f]
 	} else {
 	    set str $f
 	}
 	set matches {}
 	set i 0
 	while {[set j [string first $foundstring $str $i]] >= 0} {
 	    lappend matches [list $j [expr $j+$foundstrlen-1]]
 	    set i [expr $j + $foundstrlen]
 	}
     }
     return $matches
 }
 
 proc dofind {} {
     global findtype findloc findstring markedmatches commitinfo
     global numcommits lineid linehtag linentag linedtag
     global mainfont namefont canv canv2 canv3 selectedline
     global matchinglines foundstring foundstrlen
 
     stopfindproc
     unmarkmatches
     focus .
     set matchinglines {}
     if {$findloc == "Pickaxe"} {
 	findpatches
 	return
     }
     if {$findtype == "IgnCase"} {
 	set foundstring [string tolower $findstring]
     } else {
 	set foundstring $findstring
     }
     set foundstrlen [string length $findstring]
     if {$foundstrlen == 0} return
     if {$findloc == "Files"} {
 	findfiles
 	return
     }
     if {![info exists selectedline]} {
 	set oldsel -1
     } else {
 	set oldsel $selectedline
     }
     set didsel 0
     set fldtypes {Headline Author Date CDate Comment}
     for {set l 0} {$l < $numcommits} {incr l} {
 	set id $lineid($l)
 	set info $commitinfo($id)
 	set doesmatch 0
 	foreach f $info ty $fldtypes {
 	    if {$findloc != "All fields" && $findloc != $ty} {
 		continue
 	    }
 	    set matches [findmatches $f]
 	    if {$matches == {}} continue
 	    set doesmatch 1
 	    if {$ty == "Headline"} {
 		markmatches $canv $l $f $linehtag($l) $matches $mainfont
 	    } elseif {$ty == "Author"} {
 		markmatches $canv2 $l $f $linentag($l) $matches $namefont
 	    } elseif {$ty == "Date"} {
 		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
 	    }
 	}
 	if {$doesmatch} {
 	    lappend matchinglines $l
 	    if {!$didsel && $l > $oldsel} {
 		findselectline $l
 		set didsel 1
 	    }
 	}
     }
     if {$matchinglines == {}} {
 	bell
     } elseif {!$didsel} {
 	findselectline [lindex $matchinglines 0]
     }
 }
 
 proc findselectline {l} {
     global findloc commentend ctext
     selectline $l 1
     if {$findloc == "All fields" || $findloc == "Comments"} {
 	# highlight the matches in the comments
 	set f [$ctext get 1.0 $commentend]
 	set matches [findmatches $f]
 	foreach match $matches {
 	    set start [lindex $match 0]
 	    set end [expr [lindex $match 1] + 1]
 	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
 	}
     }
 }
 
 proc findnext {restart} {
     global matchinglines selectedline
     if {![info exists matchinglines]} {
 	if {$restart} {
 	    dofind
 	}
 	return
     }
     if {![info exists selectedline]} return
     foreach l $matchinglines {
 	if {$l > $selectedline} {
 	    findselectline $l
 	    return
 	}
     }
     bell
 }
 
 proc findprev {} {
     global matchinglines selectedline
     if {![info exists matchinglines]} {
 	dofind
 	return
     }
     if {![info exists selectedline]} return
     set prev {}
     foreach l $matchinglines {
 	if {$l >= $selectedline} break
 	set prev $l
     }
     if {$prev != {}} {
 	findselectline $prev
     } else {
 	bell
     }
 }
 
 proc findlocchange {name ix op} {
     global findloc findtype findtypemenu
     if {$findloc == "Pickaxe"} {
 	set findtype Exact
 	set state disabled
     } else {
 	set state normal
     }
     $findtypemenu entryconf 1 -state $state
     $findtypemenu entryconf 2 -state $state
 }
 
 proc stopfindproc {{done 0}} {
     global findprocpid findprocfile findids
     global ctext findoldcursor phase maincursor textcursor
     global findinprogress
 
     catch {unset findids}
     if {[info exists findprocpid]} {
 	if {!$done} {
 	    catch {exec kill $findprocpid}
 	}
 	catch {close $findprocfile}
 	unset findprocpid
     }
     if {[info exists findinprogress]} {
 	unset findinprogress
 	if {$phase != "incrdraw"} {
 	    . config -cursor $maincursor
 	    settextcursor $textcursor
 	}
     }
 }
 
 proc findpatches {} {
     global findstring selectedline numcommits
     global findprocpid findprocfile
     global finddidsel ctext lineid findinprogress
     global findinsertpos
     global env
 
     if {$numcommits == 0} return
 
     # make a list of all the ids to search, starting at the one
     # after the selected line (if any)
     if {[info exists selectedline]} {
 	set l $selectedline
     } else {
 	set l -1
     }
     set inputids {}
     for {set i 0} {$i < $numcommits} {incr i} {
 	if {[incr l] >= $numcommits} {
 	    set l 0
 	}
 	append inputids $lineid($l) "\n"
     }
 
     if {[catch {
 	set f [open [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree --stdin -s -r -S$findstring << $inputids] r]
     } err]} {
 	error_popup "Error starting search process: $err"
 	return
     }
 
     set findinsertpos end
     set findprocfile $f
     set findprocpid [pid $f]
     fconfigure $f -blocking 0
     fileevent $f readable readfindproc
     set finddidsel 0
     . config -cursor watch
     settextcursor watch
     set findinprogress 1
 }
 
 proc readfindproc {} {
     global findprocfile finddidsel
     global idline matchinglines findinsertpos
 
     set n [gets $findprocfile line]
     if {$n < 0} {
 	if {[eof $findprocfile]} {
 	    stopfindproc 1
 	    if {!$finddidsel} {
 		bell
 	    }
 	}
 	return
     }
     if {![regexp {^[0-9a-f]{12}} $line id]} {
 	error_popup "Can't parse git-diff-tree output: $line"
 	stopfindproc
 	return
     }
     if {![info exists idline($id)]} {
 	puts stderr "spurious id: $id"
 	return
     }
     set l $idline($id)
     insertmatch $l $id
 }
 
 proc insertmatch {l id} {
     global matchinglines findinsertpos finddidsel
 
     if {$findinsertpos == "end"} {
 	if {$matchinglines != {} && $l < [lindex $matchinglines 0]} {
 	    set matchinglines [linsert $matchinglines 0 $l]
 	    set findinsertpos 1
 	} else {
 	    lappend matchinglines $l
 	}
     } else {
 	set matchinglines [linsert $matchinglines $findinsertpos $l]
 	incr findinsertpos
     }
     markheadline $l $id
     if {!$finddidsel} {
 	findselectline $l
 	set finddidsel 1
     }
 }
 
 proc findfiles {} {
     global selectedline numcommits lineid ctext
     global ffileline finddidsel parents nparents
     global findinprogress findstartline findinsertpos
     global treediffs fdiffids fdiffsneeded fdiffpos
     global findmergefiles
     global env
 
     if {$numcommits == 0} return
 
     if {[info exists selectedline]} {
 	set l [expr {$selectedline + 1}]
     } else {
 	set l 0
     }
     set ffileline $l
     set findstartline $l
     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]
 		}
 	    }
 	}
 	if {[incr l] >= $numcommits} {
 	    set l 0
 	}
 	if {$l == $findstartline} break
     }
 
     # start off a git-diff-tree process if needed
     if {$diffsneeded ne {}} {
 	if {[catch {
 	    set df [open [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree -r --stdin << $diffsneeded] r]
 	} err ]} {
 	    error_popup "Error starting search process: $err"
 	    return
 	}
 	catch {unset fdiffids}
 	set fdiffpos 0
 	fconfigure $df -blocking 0
 	fileevent $df readable [list readfilediffs $df]
     }
 
     set finddidsel 0
     set findinsertpos end
     set id $lineid($l)
     set p [lindex $parents($id) 0]
     . config -cursor watch
     settextcursor watch
     set findinprogress 1
     findcont [list $id $p]
     update
 }
 
 proc readfilediffs {df} {
     global findids fdiffids fdiffs
 
     set n [gets $df line]
     if {$n < 0} {
 	if {[eof $df]} {
 	    donefilediff
 	    if {[catch {close $df} err]} {
 		stopfindproc
 		bell
 		error_popup "Error in hg debug-diff-tree: $err"
 	    } elseif {[info exists findids]} {
 		set ids $findids
 		stopfindproc
 		bell
 		error_popup "Couldn't find diffs for {$ids}"
 	    }
 	}
 	return
     }
     if {[regexp {^([0-9a-f]{12}) \(from ([0-9a-f]{12})\)} $line match id p]} {
 	# start of a new string of diffs
 	donefilediff
 	set fdiffids [list $id $p]
 	set fdiffs {}
     } elseif {[string match ":*" $line]} {
 	lappend fdiffs [lindex $line 5]
     }
 }
 
 proc donefilediff {} {
     global fdiffids fdiffs treediffs findids
     global fdiffsneeded fdiffpos
 
     if {[info exists fdiffids]} {
 	while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffids
 	       && $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
 	    }
 	    incr fdiffpos
 	}
 	incr fdiffpos
 
 	if {![info exists treediffs($fdiffids)]} {
 	    set treediffs($fdiffids) $fdiffs
 	}
 	if {[info exists findids] && $fdiffids eq $findids} {
 	    unset findids
 	    findcont $fdiffids
 	}
     }
 }
 
 proc findcont {ids} {
     global findids treediffs parents nparents
     global ffileline findstartline finddidsel
     global lineid numcommits matchinglines findinprogress
     global findmergefiles
 
     set id [lindex $ids 0]
     set p [lindex $ids 1]
     set pi [lsearch -exact $parents($id) $p]
     set l $ffileline
     while 1 {
 	if {$findmergefiles || $nparents($id) == 1} {
 	    if {![info exists treediffs($ids)]} {
 		set findids $ids
 		set ffileline $l
 		return
 	    }
 	    set doesmatch 0
 	    foreach f $treediffs($ids) {
 		set x [findmatches $f]
 		if {$x != {}} {
 		    set doesmatch 1
 		    break
 		}
 	    }
 	    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)
 	}
 	set p [lindex $parents($id) $pi]
 	set ids [list $id $p]
     }
     stopfindproc
     if {!$finddidsel} {
 	bell
     }
 }
 
 # mark a commit as matching by putting a yellow background
 # behind the headline
 proc markheadline {l id} {
     global canv mainfont linehtag commitinfo
 
     set bbox [$canv bbox $linehtag($l)]
     set t [$canv create rect $bbox -outline {} -tags matches -fill yellow]
     $canv lower $t
 }
 
 # mark the bits of a headline, author or date that match a find string
 proc markmatches {canv l str tag matches font} {
     set bbox [$canv bbox $tag]
     set x0 [lindex $bbox 0]
     set y0 [lindex $bbox 1]
     set y1 [lindex $bbox 3]
     foreach match $matches {
 	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 \
 		   -outline {} -tags matches -fill yellow]
 	$canv lower $t
     }
 }
 
 proc unmarkmatches {} {
     global matchinglines findids
     allcanvs delete matches
     catch {unset matchinglines}
     catch {unset findids}
 }
 
 proc selcanvline {w x y} {
     global canv canvy0 ctext linespc
     global lineid linehtag linentag linedtag rowtextx
     set ymax [lindex [$canv cget -scrollregion] 3]
     if {$ymax == {}} return
     set yfrac [lindex [$canv yview] 0]
     set y [expr {$y + $yfrac * $ymax}]
     set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
     if {$l < 0} {
 	set l 0
     }
     if {$w eq $canv} {
 	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
     }
     unmarkmatches
     selectline $l 1
 }
 
 proc commit_descriptor {p} {
     global commitinfo
     set l "..."
     if {[info exists commitinfo($p)]} {
 	set l [lindex $commitinfo($p) 0]
 	set r [lindex $commitinfo($p) 6]
     }
     return "$r:$p ($l)"
 }
 
 # 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
 
     set start [$ctext index "end - 1c"]
     $ctext insert end $text
     $ctext insert end "\n"
     set links [regexp -indices -all -inline {[0-9a-f]{12}} $text]
     foreach l $links {
 	set s [lindex $l 0]
 	set e [lindex $l 1]
 	set linkid [string range $text $s $e]
 	if {![info exists idline($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"
 	$ctext tag bind link$linknum <1> [list selectline $idline($linkid) 1]
 	incr linknum
     }
     $ctext tag conf link -foreground blue -underline 1
     $ctext tag bind link <Enter> { %W configure -cursor hand2 }
     $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
 }
 
 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 idbookmarks idline linknum
 
     $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
     set y [expr {$canvy0 + $l * $linespc}]
     set ymax [lindex [$canv cget -scrollregion] 3]
     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 wh [expr {$wbot - $wtop}]
     set newtop $wtop
     if {$ytop < $wtop} {
 	if {$ybot < $wtop} {
 	    set newtop [expr {$y - $wh / 2.0}]
 	} else {
 	    set newtop $ytop
 	    if {$newtop > $wtop - $linespc} {
 		set newtop [expr {$wtop - $linespc}]
 	    }
 	}
     } elseif {$ybot > $wbot} {
 	if {$ytop > $wbot} {
 	    set newtop [expr {$y - $wh / 2.0}]
 	} else {
 	    set newtop [expr {$ybot - $wh}]
 	    if {$newtop < $wtop + $linespc} {
 		set newtop [expr {$wtop + $linespc}]
 	    }
 	}
     }
     if {$newtop != $wtop} {
 	if {$newtop < 0} {
 	    set newtop 0
 	}
 	allcanvs yview moveto [expr $newtop * 1.0 / $ymax]
     }
 
     if {$isnew} {
 	addtohistory [list selectline $l 0]
     }
 
     set selectedline $l
 
     set id $lineid($l)
     set currentid $id
     $sha1entry delete 0 end
     $sha1entry insert 0 $id
     $sha1entry selection range 0 end
 
     $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)
     $ctext insert end "Changeset: [lindex $info 6]\n"
     if {[llength [lindex $info 7]] > 0} {
         $ctext insert end "Branch: [lindex $info 7]\n"
     }
     $ctext insert end "User: [lindex $info 1]\n"
     $ctext insert end "Date: [lindex $info 2]\n"
     if {[info exists idbookmarks($id)]} {
 	$ctext insert end "Bookmarks:"
 	foreach bookmark $idbookmarks($id) {
 	    $ctext insert end " $bookmark"
 	}
 	$ctext insert end "\n"
     }
 
     if {[info exists idtags($id)]} {
 	$ctext insert end "Tags:"
 	foreach tag $idtags($id) {
 	    $ctext insert end " $tag"
 	}
 	$ctext insert end "\n"
     }
 
     set comment {}
     if {[info exists parents($id)]} {
 	foreach p $parents($id) {
 	    append comment "Parent: [commit_descriptor $p]\n"
 	}
     }
     if {[info exists children($id)]} {
 	foreach c $children($id) {
 	    append comment "Child:  [commit_descriptor $c]\n"
 	}
     }
     append comment "\n"
     append comment [lindex $info 5]
 
     # make anything that looks like a SHA1 ID be a clickable link
     appendwithlinks $comment
 
     $ctext tag delete Comments
     $ctext tag remove found 1.0 end
     $ctext conf -state disabled
     set commentend [$ctext index "end - 1c"]
 
     $cflist delete 0 end
     $cflist insert end "Comments"
     if {$nparents($id) <= 1} {
     set parent "null"
     if {$nparents($id) == 1} {
         set parent $parents($id)
     }
 	startdiff [concat $id $parent]
     } elseif {$nparents($id) > 1} {
 	mergediff $id
     }
 }
 
 proc selnextline {dir} {
     global selectedline
     if {![info exists selectedline]} return
     set l [expr $selectedline + $dir]
     unmarkmatches
     selectline $l 1
 }
 
 proc unselectline {} {
     global selectedline
 
     catch {unset selectedline}
     allcanvs delete secsel
 }
 
 proc addtohistory {cmd} {
     global history historyindex
 
     if {$historyindex > 0
 	&& [lindex $history [expr {$historyindex - 1}]] == $cmd} {
 	return
     }
 
     if {$historyindex < [llength $history]} {
 	set history [lreplace $history $historyindex end $cmd]
     } else {
 	lappend history $cmd
     }
     incr historyindex
     if {$historyindex > 1} {
 	.ctop.top.bar.leftbut conf -state normal
     } else {
 	.ctop.top.bar.leftbut conf -state disabled
     }
     .ctop.top.bar.rightbut conf -state disabled
 }
 
 proc goback {} {
     global history historyindex
 
     if {$historyindex > 1} {
 	incr historyindex -1
 	set cmd [lindex $history [expr {$historyindex - 1}]]
 	eval $cmd
 	.ctop.top.bar.rightbut conf -state normal
     }
     if {$historyindex <= 1} {
 	.ctop.top.bar.leftbut conf -state disabled
     }
 }
 
 proc goforw {} {
     global history historyindex
 
     if {$historyindex < [llength $history]} {
 	set cmd [lindex $history $historyindex]
 	incr historyindex
 	eval $cmd
 	.ctop.top.bar.leftbut conf -state normal
     }
     if {$historyindex >= [llength $history]} {
 	.ctop.top.bar.rightbut conf -state disabled
     }
 }
 
 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 findgca {ids} {
     global env
     set gca {}
     foreach id $ids {
 	if {$gca eq {}} {
 	    set gca $id
 	} else {
 	    if {[catch {
 		set gca [exec $env(HG) --config ui.report_untrusted=false debug-merge-base $gca $id]
 	    } err]} {
 		return {}
 	    }
 	}
     }
     return $gca
 }
 
 proc contmergediff {ids} {
     global diffmergeid diffpindex parents nparents diffmergegca
     global treediffs mergefilelist diffids treepending
 
     # 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]
 	} else {
 	    if {[incr diffpindex] >= $nparents($diffmergeid)} break
 	    set p [lindex $parents($diffmergeid) $diffpindex]
 	    set ids [list $diffmergeid $p]
 	}
 	if {![info exists treediffs($ids)]} {
 	    set diffids $ids
 	    if {![info exists treepending]} {
 		gettreediffs $ids
 	    }
 	    return
 	}
     }
 
     # 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 $p $diffmergegca])
 	    foreach f $treediffs([list $diffmergeid $p]) {
 		if {[lsearch -exact $files $f] < 0
 		    && [lsearch -exact $gcadiffs $f] >= 0} {
 		    lappend files $f
 		}
 	    }
 	}
 	set files [lsort $files]
     } 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 $diffmergeid $p])
 	    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
     }
 }
 
 proc showmergediff {} {
     global cflist diffmergeid mergefilelist parents
     global diffopts diffinhunk currentfile currenthunk filelines
     global diffblocked groupfilelast mergefds groupfilenum grouphunks
     global env
 
     set files $mergefilelist($diffmergeid)
     foreach f $files {
 	$cflist insert end $f
     }
     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 | $env(HG) --config ui.report_untrusted=false debug-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]
     }
 }
 
 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
     }
 
     if {!([info exists diffmergeid] && $diffmergeid == $id)} {
 	if {$n < 0} {
 	    close $f
 	}
 	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
 	}
     }
 
     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
 	}
     }
 }
 
 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
 
 	# start a new group
 	set groupfilenum $fi
 	set grouphunks($pi) [list $hunk]
 	set grouplinestart $lno
 	set grouplineend [lindex $hunk 4]
     }
 }
 
 proc processgroup {} {
     global groupfilelast groupfilenum difffilestart
     global mergefilelist diffmergeid ctext filelines
     global parents diffmergeid diffoffset
     global grouphunks grouplinestart grouplineend nparents
     global mergemax
 
     $ctext conf -state normal
     set id $diffmergeid
     set f $groupfilenum
     if {$groupfilelast != $f} {
 	$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}]
 	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
 	    } 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 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
 		}
 	    }
 	}
 	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 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
     }
     return [expr {200 * $same / (2 * $same + $diff)}]
 }
 
 proc startdiff {ids} {
     global treediffs diffids treepending diffmergeid
 
     set diffids $ids
     catch {unset diffmergeid}
     if {![info exists treediffs($ids)]} {
 	if {![info exists treepending]} {
 	    gettreediffs $ids
 	}
     } else {
 	addtocflist $ids
     }
 }
 
 proc addtocflist {ids} {
     global treediffs cflist
     foreach f $treediffs($ids) {
 	$cflist insert end $f
     }
     getblobdiffs $ids
 }
 
 proc gettreediffs {ids} {
     global treediff parents treepending env
     set treepending $ids
     set treediff {}
     set id [lindex $ids 0]
     set p [lindex $ids 1]
     if [catch {set gdtf [open "|{$env(HG)} --config ui.report_untrusted=false debug-diff-tree -r $p $id" r]}] return
     fconfigure $gdtf -blocking 0
     fileevent $gdtf readable [list gettreediffline $gdtf $ids]
 }
 
 proc gettreediffline {gdtf ids} {
     global treediff treediffs treepending diffids diffmergeid
 
     set n [gets $gdtf line]
     if {$n < 0} {
 	if {![eof $gdtf]} return
 	close $gdtf
 	set treediffs($ids) $treediff
 	unset treepending
 	if {$ids != $diffids} {
 	    gettreediffs $diffids
 	} else {
 	    if {[info exists diffmergeid]} {
 		contmergediff $ids
 	    } else {
 		addtocflist $ids
 	    }
 	}
 	return
     }
     set tab1 [expr [string first "\t" $line] + 1]
     set tab2 [expr [string first "\t" $line $tab1] - 1]
     set file [string range $line $tab1 $tab2]
     lappend treediff $file
 }
 
 proc getblobdiffs {ids} {
     global diffopts blobdifffd diffids env curdifftag curtagstart
     global difffilestart nextupdate diffinhdr treediffs
 
     set id [lindex $ids 0]
     set p [lindex $ids 1]
     set env(GIT_DIFF_OPTS) $diffopts
     set cmd [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree -r -p -C $p $id]
     if {[catch {set bdf [open $cmd r]} err]} {
 	puts "error getting diffs: $err"
 	return
     }
     set diffinhdr 0
     fconfigure $bdf -blocking 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}]
 }
 
 proc getblobdiffline {bdf ids} {
     global diffids blobdifffd ctext curdifftag curtagstart
     global diffnexthead diffnextnote difffilestart
     global nextupdate diffinhdr treediffs
     global gaudydiff
 
     set n [gets $bdf line]
     if {$n < 0} {
 	if {[eof $bdf]} {
 	    close $bdf
 	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
 		$ctext tag add $curdifftag $curtagstart end
 	    }
 	}
 	return
     }
     if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
 	return
     }
     regsub -all "\r" $line "" line
     $ctext conf -state normal
     if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
 	# 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 i [lsearch -exact $treediffs($diffids) $fname]
 	if {$i >= 0} {
 	    set difffilestart($i) $here
 	    incr i
 	    $ctext mark set fmark.$i $here
 	    $ctext mark gravity fmark.$i left
 	}
 	if {$newname != $fname} {
 	    set i [lsearch -exact $treediffs($diffids) $newname]
 	    if {$i >= 0} {
 		set difffilestart($i) $here
 		incr i
 		$ctext mark set fmark.$i $here
 		$ctext mark gravity fmark.$i left
 	    }
 	}
 	set curdifftag "f:$fname"
 	$ctext tag delete $curdifftag
 	set l [expr {(78 - [string length $header]) / 2}]
 	set pad [string range "----------------------------------------" 1 $l]
 	$ctext insert end "$pad $header $pad\n" filesep
 	set diffinhdr 1
     } elseif {[regexp {^(---|\+\+\+) } $line] && $diffinhdr} {
 	set diffinhdr 1
     } 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
 	}
 	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 == " "} {
 	    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" filesep
 	} elseif  {$line != ""} {
 	    # Something else we don't recognize
 	    if {$curdifftag != "Comments"} {
 		$ctext insert end "\n"
 		$ctext tag add $curdifftag $curtagstart end
 		set curtagstart [$ctext index "end - 1c"]
 		set curdifftag Comments
 	    }
 	    $ctext insert end "$line\n" filesep
 	}
     }
     $ctext conf -state disabled
     if {[clock clicks -milliseconds] >= $nextupdate} {
 	incr nextupdate 100
 	fileevent $bdf readable {}
 	update
 	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
     }
 }
 
 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)
 	    }
 	}
     }
     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 {} {
     global linespc charspc canvx0 canvy0 mainfont
     global xspc1 xspc2 lthickness
 
     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 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
     }
 }
 
 proc incrfont {inc} {
     global mainfont namefont textfont ctext canv phase
     global stopped entries curidfont
     unmarkmatches
     set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
     set curidfont [lreplace $curidfont 1 1 [expr {[lindex $curidfont 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
     $ctext tag conf filesep -font [concat $textfont bold]
     foreach e $entries {
 	$e conf -font $mainfont
     }
     if {$phase == "getcommits"} {
 	$canv itemconf textitems -font $mainfont
     }
     redisplay
 }
 
 proc clearsha1 {} {
     global sha1entry sha1string
     if {[string length $sha1string] == 40} {
 	$sha1entry delete 0 end
     }
 }
 
 proc sha1change {n1 n2 op} {
     global sha1string currentid sha1but
     if {$sha1string == {}
 	|| ([info exists currentid] && $sha1string == $currentid)} {
 	set state disabled
     } else {
 	set state normal
     }
     if {[$sha1but cget -state] == $state} return
     if {$state == "normal"} {
 	$sha1but conf -state normal -relief raised -text "Goto: "
     } else {
 	$sha1but conf -state disabled -relief flat -text "SHA1 ID: "
     }
 }
 
 proc gotocommit {} {
     global sha1string currentid idline tagids
     global lineid numcommits
 
     if {$sha1string == {}
 	|| ([info exists currentid] && $sha1string == $currentid)} return
     if {[info exists tagids($sha1string)]} {
 	set id $tagids($sha1string)
     } 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)
 		}
 	    }
 	    if {$matches ne {}} {
 		if {[llength $matches] > 1} {
 		    error_popup "Short SHA1 id $id is ambiguous"
 		    return
 		}
 		set id [lindex $matches 0]
 	    }
 	}
     }
     if {[info exists idline($id)]} {
 	selectline $idline($id) 1
 	return
     }
     if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
 	set type "SHA1 id"
     } else {
 	set type "Tag"
     }
     error_popup "$type $sha1string is not known"
 }
 
 proc lineenter {x y id} {
     global hoverx hovery hoverid hovertimer
     global commitinfo canv
 
     if {![info exists commitinfo($id)]} return
     set hoverx $x
     set hovery $y
     set hoverid $id
     if {[info exists hovertimer]} {
 	after cancel $hovertimer
     }
     set hovertimer [after 500 linehover]
     $canv delete hover
 }
 
 proc linemotion {x y id} {
     global hoverx hovery hoverid hovertimer
 
     if {[info exists hoverid] && $id == $hoverid} {
 	set hoverx $x
 	set hovery $y
 	if {[info exists hovertimer]} {
 	    after cancel $hovertimer
 	}
 	set hovertimer [after 500 linehover]
     }
 }
 
 proc lineleave {id} {
     global hoverid hovertimer canv
 
     if {[info exists hoverid] && $id == $hoverid} {
 	$canv delete hover
 	if {[info exists hovertimer]} {
 	    after cancel $hovertimer
 	    unset hovertimer
 	}
 	unset hoverid
     }
 }
 
 proc linehover {} {
     global hoverx hovery hoverid hovertimer
     global canv linespc lthickness
     global commitinfo mainfont
 
     set text [lindex $commitinfo($hoverid) 0]
     set ymax [lindex [$canv cget -scrollregion] 3]
     if {$ymax == {}} return
     set yfrac [lindex [$canv yview] 0]
     set x [expr {$hoverx + 2 * $linespc}]
     set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
     set x0 [expr {$x - 2 * $lthickness}]
     set y0 [expr {$y - 2 * $lthickness}]
     set x1 [expr {$x + [font measure $mainfont $text] + 2 * $lthickness}]
     set y1 [expr {$y + $linespc + 2 * $lthickness}]
     set t [$canv create rectangle $x0 $y0 $x1 $y1 \
 	       -fill \#ffff80 -outline black -width 1 -tags hover]
     $canv raise $t
     set t [$canv create text $x $y -anchor nw -text $text -tags hover]
     $canv raise $t
 }
 
 proc clickisonarrow {id y} {
     global mainline mainlinearrow sidelines lthickness
 
     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"
 		}
 	    }
 	}
     }
     return {}
 }
 
 proc arrowjump {id dirn y} {
     global mainline sidelines 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
     set ymax [lindex [$canv cget -scrollregion] 3]
     if {$ymax eq {} || $ymax <= 0} return
     set view [$canv yview]
     set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
     set yfrac [expr {$yt / $ymax - $yspan / 2}]
     if {$yfrac < 0} {
 	set yfrac 0
     }
     $canv yview moveto $yfrac
 }
 
 proc lineclick {x y id isnew} {
     global ctext commitinfo children cflist canv thickerline
 
     unmarkmatches
     unselectline
     normalline
     $canv delete hover
     # draw this line thicker than normal
     drawlines $id 1
     set thickerline $id
     if {$isnew} {
 	set ymax [lindex [$canv cget -scrollregion] 3]
 	if {$ymax eq {}} return
 	set yfrac [lindex [$canv yview] 0]
 	set y [expr {$y + $yfrac * $ymax}]
     }
     set dirn [clickisonarrow $id $y]
     if {$dirn ne {}} {
 	arrowjump $id $dirn $y
 	return
     }
 
     if {$isnew} {
 	addtohistory [list lineclick $x $y $id 0]
     }
     # fill the details pane with info about this line
     $ctext conf -state normal
     $ctext delete 0.0 end
     $ctext tag conf link -foreground blue -underline 1
     $ctext tag bind link <Enter> { %W configure -cursor hand2 }
     $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
     $ctext insert end "Parent:\t"
     $ctext insert end $id [list link link0]
     $ctext tag bind link0 <1> [list selbyid $id]
     set info $commitinfo($id)
     $ctext insert end "\n\t[lindex $info 0]\n"
     $ctext insert end "\tUser:\t[lindex $info 1]\n"
     $ctext insert end "\tDate:\t[lindex $info 2]\n"
     if {[info exists children($id)]} {
 	$ctext insert end "\nChildren:"
 	set i 0
 	foreach child $children($id) {
 	    incr i
 	    set info $commitinfo($child)
 	    $ctext insert end "\n\t"
 	    $ctext insert end $child [list link link$i]
 	    $ctext tag bind link$i <1> [list selbyid $child]
 	    $ctext insert end "\n\t[lindex $info 0]"
 	    $ctext insert end "\n\tUser:\t[lindex $info 1]"
 	    $ctext insert end "\n\tDate:\t[lindex $info 2]\n"
 	}
     }
     $ctext conf -state disabled
 
     $cflist delete 0 end
 }
 
 proc normalline {} {
     global thickerline
     if {[info exists thickerline]} {
 	drawlines $thickerline 0
 	unset thickerline
     }
 }
 
 proc selbyid {id} {
     global idline
     if {[info exists idline($id)]} {
 	selectline $idline($id) 1
     }
 }
 
 proc mstime {} {
     global startmstime
     if {![info exists startmstime]} {
 	set startmstime [clock clicks -milliseconds]
     }
     return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
 }
 
 proc rowmenu {x y id} {
     global rowctxmenu idline selectedline rowmenuid hgvdiff
 
     if {![info exists selectedline] || $idline($id) eq $selectedline} {
 	set state disabled
     } else {
 	set state normal
     }
     $rowctxmenu entryconfigure 0 -state $state
     $rowctxmenu entryconfigure 1 -state $state
     $rowctxmenu entryconfigure 2 -state $state
     if { $hgvdiff ne "" } {
 	$rowctxmenu entryconfigure 6 -state $state
     }
     set rowmenuid $id
     tk_popup $rowctxmenu $x $y
 }
 
 proc diffvssel {dirn} {
     global rowmenuid selectedline lineid
 
     if {![info exists selectedline]} return
     if {$dirn} {
 	set oldid $lineid($selectedline)
 	set newid $rowmenuid
     } else {
 	set oldid $rowmenuid
 	set newid $lineid($selectedline)
     }
     addtohistory [list doseldiff $oldid $newid]
     doseldiff $oldid $newid
 }
 
 proc doseldiff {oldid newid} {
     global ctext cflist
     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"
     $ctext insert end "From "
     $ctext tag conf link -foreground blue -underline 1
     $ctext tag bind link <Enter> { %W configure -cursor hand2 }
     $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
     $ctext tag bind link0 <1> [list selbyid $oldid]
     $ctext insert end $oldid [list link link0]
     $ctext insert end "\n     "
     $ctext insert end [lindex $commitinfo($oldid) 0]
     $ctext insert end "\n\nTo   "
     $ctext tag bind link1 <1> [list selbyid $newid]
     $ctext insert end $newid [list link link1]
     $ctext insert end "\n     "
     $ctext insert end [lindex $commitinfo($newid) 0]
     $ctext insert end "\n"
     $ctext conf -state disabled
     $ctext tag delete Comments
     $ctext tag remove found 1.0 end
     startdiff [list $newid $oldid]
 }
 
 proc mkpatch {} {
     global rowmenuid currentid commitinfo patchtop patchnum
 
     if {![info exists currentid]} return
     set oldid $currentid
     set oldhead [lindex $commitinfo($oldid) 0]
     set newid $rowmenuid
     set newhead [lindex $commitinfo($newid) 0]
     set top .patch
     set patchtop $top
     catch {destroy $top}
     toplevel $top
     ttk::label $top.from -text "From:"
     ttk::entry $top.fromsha1 -width 40
     $top.fromsha1 insert 0 $oldid
     $top.fromsha1 conf -state readonly
     grid $top.from $top.fromsha1 -sticky w -pady {10 0}
     ttk::entry $top.fromhead -width 60
     $top.fromhead insert 0 $oldhead
     $top.fromhead conf -state readonly
     grid x $top.fromhead -sticky w
     ttk::label $top.to -text "To:"
     ttk::entry $top.tosha1 -width 40
     $top.tosha1 insert 0 $newid
     $top.tosha1 conf -state readonly
     grid $top.to $top.tosha1 -sticky w
     ttk::entry $top.tohead -width 60
     $top.tohead insert 0 $newhead
     $top.tohead conf -state readonly
     grid x $top.tohead -sticky w
     ttk::button $top.rev -text "Reverse" -command mkpatchrev
     grid $top.rev x -pady 10
     ttk::label $top.flab -text "Output file:"
     ttk::entry $top.fname -width 60
     $top.fname insert 0 [file normalize "patch$patchnum.patch"]
     incr patchnum
     grid $top.flab $top.fname -sticky w
     ttk::frame $top.buts
     ttk::button $top.buts.gen -text "Generate" -command mkpatchgo
     ttk::button $top.buts.can -text "Cancel" -command mkpatchcan
     grid $top.buts.gen $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.fname
     popupify $top
     wm title $top "Generate a patch"
 }
 
 proc mkpatchrev {} {
     global patchtop
 
     set oldid [$patchtop.fromsha1 get]
     set oldhead [$patchtop.fromhead get]
     set newid [$patchtop.tosha1 get]
     set newhead [$patchtop.tohead get]
     foreach e [list fromsha1 fromhead tosha1 tohead] \
 	    v [list $newid $newhead $oldid $oldhead] {
 	$patchtop.$e conf -state normal
 	$patchtop.$e delete 0 end
 	$patchtop.$e insert 0 $v
 	$patchtop.$e conf -state readonly
     }
 }
 
 proc mkpatchgo {} {
     global patchtop env
 
     set oldid [$patchtop.fromsha1 get]
     set newid [$patchtop.tosha1 get]
     set fname [$patchtop.fname get]
     if {[catch {exec $env(HG) --config ui.report_untrusted=false debug-diff-tree -p $oldid $newid >$fname &} err]} {
 	error_popup "Error creating patch: $err"
     }
     catch {destroy $patchtop}
     unset patchtop
 }
 
 proc mkpatchcan {} {
     global patchtop
 
     catch {destroy $patchtop}
     unset patchtop
 }
 
 proc mktag {} {
     global rowmenuid mktagtop commitinfo
 
     set top .maketag
     set mktagtop $top
     catch {destroy $top}
     toplevel $top
     ttk::label $top.id -text "ID:"
     ttk::entry $top.sha1 -width 40
     $top.sha1 insert 0 $rowmenuid
     $top.sha1 conf -state readonly
     grid $top.id $top.sha1 -sticky w -pady {10 0}
     ttk::entry $top.head -width 60
     $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
     $top.head conf -state readonly
     grid x $top.head -sticky w
     ttk::label $top.tlab -text "Tag name:"
     ttk::entry $top.tag -width 60
     grid $top.tlab $top.tag -sticky w
     ttk::frame $top.buts
     ttk::button $top.buts.gen -text "Create" -command mktaggo
     ttk::button $top.buts.can -text "Cancel" -command mktagcan
     grid $top.buts.gen $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.tag
     popupify $top
     wm title $top "Create a tag"
 }
 
 proc domktag {} {
     global mktagtop env tagids idtags
 
     set id [$mktagtop.sha1 get]
     set tag [$mktagtop.tag get]
     if {$tag == {}} {
 	error_popup "No tag name specified"
 	return
     }
     if {[info exists tagids($tag)]} {
 	error_popup "Tag \"$tag\" already exists"
 	return
     }
     if {[catch {
 	set out [exec $env(HG) --config ui.report_untrusted=false tag -r $id $tag]
     } err]} {
 	error_popup "Error creating tag: $err"
 	return
     }
 
     set tagids($tag) $id
     lappend idtags($id) $tag
     redrawtags $id
 }
 
 proc redrawtags {id} {
     global canv linehtag idline idpos selectedline
 
     if {![info exists idline($id)]} return
     $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)} {
 	selectline $selectedline 0
     }
 }
 
 proc mktagcan {} {
     global mktagtop
 
     catch {destroy $mktagtop}
     unset mktagtop
 }
 
 proc mktaggo {} {
     domktag
     mktagcan
 }
 
 proc writecommit {} {
     global rowmenuid wrcomtop commitinfo wrcomcmd
 
     set top .writecommit
     set wrcomtop $top
     catch {destroy $top}
     toplevel $top
     ttk::label $top.id -text "ID:"
     ttk::entry $top.sha1 -width 40
     $top.sha1 insert 0 $rowmenuid
     $top.sha1 conf -state readonly
     grid $top.id $top.sha1 -sticky w -pady {10 0}
     ttk::entry $top.head -width 60
     $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
     $top.head conf -state readonly
     grid x $top.head -sticky w
     ttk::label $top.clab -text "Command:"
     ttk::entry $top.cmd -width 60 -textvariable wrcomcmd
     grid $top.clab $top.cmd -sticky w -pady 10
     ttk::label $top.flab -text "Output file:"
     ttk::entry $top.fname -width 60
     $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
     grid $top.flab $top.fname -sticky w
     ttk::frame $top.buts
     ttk::button $top.buts.gen -text "Write" -command wrcomgo
     ttk::button $top.buts.can -text "Cancel" -command wrcomcan
     grid $top.buts.gen $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.fname
     popupify $top
     wm title $top "Write commit to a file"
 }
 
 proc wrcomgo {} {
     global wrcomtop
 
     set id [$wrcomtop.sha1 get]
     set cmd "echo $id | [$wrcomtop.cmd get]"
     set fname [$wrcomtop.fname get]
     if {[catch {exec sh -c $cmd > $fname &} err]} {
 	error_popup "Error writing commit: $err"
     }
     catch {destroy $wrcomtop}
     unset wrcomtop
 }
 
 proc wrcomcan {} {
     global wrcomtop
 
     catch {destroy $wrcomtop}
     unset wrcomtop
 }
 
 proc listrefs {id} {
     global idtags idheads idotherrefs idbookmarks
 
     set w {}
     if {[info exists idbookmarks($id)]} {
 	set w $idbookmarks($id)
     }
     set x {}
     if {[info exists idtags($id)]} {
 	set x $idtags($id)
     }
     set y {}
     if {[info exists idheads($id)]} {
 	set y $idheads($id)
     }
     set z {}
     if {[info exists idotherrefs($id)]} {
 	set z $idotherrefs($id)
     }
     return [list $w $x $y $z]
 }
 
 proc rereadrefs {} {
     global idbookmarks idtags idheads idotherrefs
     global bookmarkids tagids headids otherrefids
 
     set refids [concat [array names idtags] \
 		    [array names idheads] [array names idotherrefs] \
 		    [array names idbookmarks]]
     foreach id $refids {
 	if {![info exists ref($id)]} {
 	    set ref($id) [listrefs $id]
 	}
     }
     foreach v {tagids idtags headids idheads otherrefids idotherrefs \
         bookmarkids idbookmarks} {
 	catch {unset $v}
     }
     readrefs
     set refids [lsort -unique [concat $refids [array names idtags] \
 			[array names idheads] [array names idotherrefs] \
 			[array names idbookmarks]]]
     foreach id $refids {
 	set v [listrefs $id]
 	if {![info exists ref($id)] || $ref($id) != $v} {
 	    redrawtags $id
 	}
     }
 }
 
 proc vdiff {withparent} {
     global env rowmenuid selectedline lineid hgvdiff
 
     if {![info exists rowmenuid]} return
     set curid $rowmenuid
 
     if {$withparent} {
 	set parents [exec $env(HG) --config ui.report_untrusted=false parents --rev $curid --template "{node}\n"]
 	set firstparent [lindex [split $parents "\n"] 0]
 	set otherid $firstparent
     } else {
 	if {![info exists selectedline]} return
 	set otherid $lineid($selectedline)
     }
     set range "$otherid:$curid"
     if {[catch {exec $env(HG) --config ui.report_untrusted=false $hgvdiff -r $range} err]} {
         # Ignore errors, this is just visualization
     }
 }
 
 proc showtag {tag isnew} {
     global ctext cflist tagcontents tagids linknum
 
     if {$isnew} {
 	addtohistory [list showtag $tag 0]
     }
     $ctext conf -state normal
     $ctext delete 0.0 end
     set linknum 0
     if {[info exists tagcontents($tag)]} {
 	set text $tagcontents($tag)
     } else {
 	set text "Tag: $tag\nId:  $tagids($tag)"
     }
     appendwithlinks $text
     $ctext conf -state disabled
     $cflist delete 0 end
 }
 
 proc doquit {} {
     global stopped
     set stopped 100
     destroy .
 }
 
 proc getconfig {} {
     global env
 
     set lines [exec $env(HG) debug-config]
     regsub -all "\r\n" $lines "\n" config
     set config {}
     foreach line [split $lines "\n"] {
 	regsub "^(k|v)=" $line "" line
 	lappend config $line
     }
     return $config
 }
 
 # defaults...
 set datemode 0
 set boldnames 0
 set diffopts "-U 5 -p"
 set wrcomcmd "\"\$HG\" --config ui.report_untrusted=false debug-diff-tree --stdin -p --pretty"
 
 set mainfont {Helvetica 9}
 set curidfont {}
 set textfont {Courier 9}
 set findmergefiles 0
 set gaudydiff 0
 set maxgraphpct 50
 set maxwidth 16
 
 set colors {green red blue magenta darkgrey brown orange}
 set authorcolors {
     black blue deeppink mediumorchid blue burlywood4 goldenrod slateblue red2 navy dimgrey
 }
 set bgcolor white
 
 # This color should probably be some system color (provided by tk),
 # but as the bgcolor has always been set to white, I choose to ignore
 set fgcolor black
 set diffaddcolor "#00a000"
 set diffremcolor red
 set diffmerge1color red
 set diffmerge2color blue
 set hunksepcolor blue
 
 catch {source ~/.hgk}
 
 if {$curidfont == ""} {  # initialize late based on current mainfont
     set curidfont "$mainfont bold italic underline"
 }
 
 set namefont $mainfont
 if {$boldnames} {
     lappend namefont bold
 }
 
 set revtreeargs {}
 foreach arg $argv {
     switch -regexp -- $arg {
 	"^$" { }
 	"^-b" { set boldnames 1 }
 	"^-d" { set datemode 1 }
 	default {
 	    lappend revtreeargs $arg
 	}
     }
 }
 
 set history {}
 set historyindex 0
 
 set stopped 0
 set redisplaying 0
 set stuffsaved 0
 set patchnum 0
 
 array set config [getconfig]
 set hgvdiff $config(vdiff)
 setcoords
 makewindow
 readrefs
 set hgroot [exec $env(HG) root]
 wm title . "hgk $hgroot"
 getcommits $revtreeargs

contrib/pylintrc

@@ -1,313 +1,313
 # lint Python modules using external checkers.
-# 
+#
 # This is the main checker controlling the other ones and the reports
 # generation. It is itself both a raw checker and an astng checker in order
 # to:
 # * handle message activation / deactivation at the module level
 # * handle some basic but necessary stats'data (number of classes, methods...)
-# 
+#
 [MASTER]
 
 # Specify a configuration file.
 #rcfile=
 
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().
 #init-hook=
 
 # Profiled execution.
 profile=no
 
 # Add <file or directory> to the black list. It should be a base name, not a
 # path. You may set this option multiple times.
 ignore=CVS
 
 # Pickle collected data for later comparisons.
 persistent=yes
 
 # Set the cache size for astng objects.
 cache-size=500
 
 # List of plugins (as comma separated values of python modules names) to load,
 # usually to register additional checkers.
 load-plugins=
 
 
 [MESSAGES CONTROL]
 
 # Enable only checker(s) with the given id(s). This option conflicts with the
 # disable-checker option
 #enable-checker=
 
 # Enable all checker(s) except those with the given id(s). This option
 # conflicts with the enable-checker option
 #disable-checker=
 
 # Enable all messages in the listed categories (IRCWEF).
 #enable-msg-cat=
 
 # Disable all messages in the listed categories (IRCWEF).
 disable-msg-cat=I
 
 # Enable the message(s) with the given id(s).
 #enable-msg=
 
 # Disable the message(s) with the given id(s).
 # W0704: except: pass
 # C0111: missing docstring
 # W0403: for the time being absolute imports don't play nice with demandimport
 disable-msg=W0704,C0111,W0403
 
 
 [REPORTS]
 
 # Set the output format. Available formats are text, parseable, colorized, msvs
 # (visual studio) and html
 output-format=text
 
 # Include message's id in output
 include-ids=yes
 
 # Put messages in a separate file for each module / package specified on the
 # command line instead of printing them on stdout. Reports (if any) will be
 # written in a file name "pylint_global.[txt|html]".
 files-output=no
 
 # Tells whether to display a full report or only the messages
 reports=yes
 
 # Python expression which should return a note less than 10 (10 is the highest
 # note). You have access to the variables errors warning, statement which
 # respectively contain the number of errors / warnings messages and the total
 # number of statements analyzed. This is used by the global evaluation report
 # (R0004).
 evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
 
 # Add a comment according to your evaluation note. This is used by the global
 # evaluation report (R0004).
 comment=no
 
 # Enable the report(s) with the given id(s).
 #enable-report=
 
 # Disable the report(s) with the given id(s).
 #disable-report=
 
 
 # try to find bugs in the code using type inference
-# 
+#
 [TYPECHECK]
 
 # Tells whether missing members accessed in mixin class should be ignored. A
 # mixin class is detected if its name ends with "mixin" (case insensitive).
 ignore-mixin-members=yes
 
 # List of classes names for which member attributes should not be checked
 # (useful for classes with attributes dynamically set).
 ignored-classes=SQLObject
 
 # When zope mode is activated, add a predefined set of Zope acquired attributes
 # to generated-members.
 zope=no
 
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E0201 when accessed.
 generated-members=REQUEST,acl_users,aq_parent
 
 
 # checks for
 # * unused variables / imports
 # * undefined variables
 # * redefinition of variable from builtins or from an outer scope
 # * use of variable before assignment
-# 
+#
 [VARIABLES]
 
 # Tells whether we should check for unused import in __init__ files.
 init-import=yes
 
 # A regular expression matching names used for dummy variables (i.e. not used).
 dummy-variables-rgx=dummy
 
 # List of additional names supposed to be defined in builtins. Remember that
 # you should avoid to define new builtins when possible.
 additional-builtins=
 
 
 # checks for :
 # * doc strings
 # * modules / classes / functions / methods / arguments / variables name
 # * number of arguments, local variables, branches, returns and statements in
 # functions, methods
 # * required module attributes
 # * dangerous default values as arguments
 # * redefinition of function / method / class
 # * uses of the global statement
-# 
+#
 [BASIC]
 
 # Required attributes for module, separated by a comma
 required-attributes=
 
 # Regular expression which should only match functions or classes name which do
 # not require a docstring
 no-docstring-rgx=__.*__
 
 # Regular expression which should only match correct module names
 module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 
 # Regular expression which should only match correct module level names
 const-rgx=(([a-zA-Z_][a-zA-Z0-9_]*)|(__.*__))$
 
 # Regular expression which should only match correct class names
 class-rgx=[a-zA-Z_][a-zA-Z0-9]+$
 
 # Regular expression which should only match correct function names
 function-rgx=[a-z_][a-z0-9_]{2,30}$
 
 # Regular expression which should only match correct method names
 method-rgx=[a-z_][a-z0-9_]{2,30}$
 
 # Regular expression which should only match correct instance attribute names
 attr-rgx=[a-z_][a-z0-9_]{1,30}$
 
 # Regular expression which should only match correct argument names
 argument-rgx=[a-z_][a-z0-9_]{0,30}$
 
 # Regular expression which should only match correct variable names
 variable-rgx=[a-z_][a-z0-9_]{0,30}$
 
 # Regular expression which should only match correct list comprehension /
 # generator expression variable names
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
 # Good variable names which should always be accepted, separated by a comma
 good-names=i,j,k,ex,Run,_,ui,c,fn,f,fd,l
 
 # Bad variable names which should always be refused, separated by a comma
 bad-names=foo,bar,baz,toto,tutu,tata
 
 # List of builtins function names that should not be used, separated by a comma
 #bad-functions=map,filter,apply,input
 bad-functions=map,filter,apply,input
 
 
 # checks for
 # * external modules dependencies
 # * relative / wildcard imports
 # * cyclic imports
 # * uses of deprecated modules
-# 
+#
 [IMPORTS]
 
 # Deprecated modules which should not be used, separated by a comma
 deprecated-modules=regsub,TERMIOS,Bastion,rexec
 
 # Create a graph of every (i.e. internal and external) dependencies in the
 # given file (report R0402 must not be disabled)
 import-graph=
 
 # Create a graph of external dependencies in the given file (report R0402 must
 # not be disabled)
 ext-import-graph=
 
 # Create a graph of internal dependencies in the given file (report R0402 must
 # not be disabled)
 int-import-graph=
 
 
 # checks for sign of poor/misdesign:
 # * number of methods, attributes, local variables...
 # * size, complexity of functions, methods
-# 
+#
 [DESIGN]
 
 # Maximum number of arguments for function / method
 max-args=5
 
 # Maximum number of locals for function / method body
 max-locals=15
 
 # Maximum number of return / yield for function / method body
 max-returns=6
 
 # Maximum number of branch for function / method body
 max-branchs=12
 
 # Maximum number of statements in function / method body
 max-statements=50
 
 # Maximum number of parents for a class (see R0901).
 max-parents=7
 
 # Maximum number of attributes for a class (see R0902).
 max-attributes=7
 
 # Minimum number of public methods for a class (see R0903).
 min-public-methods=2
 
 # Maximum number of public methods for a class (see R0904).
 max-public-methods=20
 
 
 # checks for :
 # * methods without self as first argument
 # * overridden methods signature
 # * access only to existent members via self
 # * attributes not defined in the __init__ method
 # * supported interfaces implementation
 # * unreachable code
-# 
+#
 [CLASSES]
 
 # List of interface methods to ignore, separated by a comma. This is used for
 # instance to not check methods defines in Zope's Interface base class.
 ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
 
 # List of method names used to declare (i.e. assign) instance attributes.
 defining-attr-methods=__init__,__new__,setUp
 
 
 # checks for :
 # * unauthorized constructions
 # * strict indentation
 # * line length
 # * use of <> instead of !=
-# 
+#
 [FORMAT]
 
 # Maximum number of characters on a single line.
 max-line-length=80
 
 # Maximum number of lines in a module
 max-module-lines=1000
 
 # String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
 # tab).
 indent-string='    '
 
 
 # checks for:
 # * warning notes in the code like FIXME, XXX
 # * PEP 263: source code with non ascii character but no encoding declaration
-# 
+#
 [MISCELLANEOUS]
 
 # List of note tags to take in consideration, separated by a comma.
 notes=FIXME,XXX,TODO
 
 
 # checks for similarities and duplicated code. This computation may be
 # memory / CPU intensive, so you should disable it if you experiments some
 # problems.
-# 
+#
 [SIMILARITIES]
 
 # Minimum lines number of a similarity.
 min-similarity-lines=4
 
 # Ignore comments when computing similarities.
 ignore-comments=yes
 
 # Ignore docstrings when computing similarities.
 ignore-docstrings=yes

contrib/vim/hgcommand.vim

@@ -1,1703 +1,1703
 " vim600: set foldmethod=marker:
 "
 " Vim plugin to assist in working with HG-controlled files.
 "
 " Last Change:   2006/02/22
 " Version:       1.77
 " Maintainer:    Mathieu Clabaut <[e-mail]>
 " License:       This file is placed in the public domain.
 " Credits:
 "                Bob Hiestand <[e-mail]> for the fabulous
 "                cvscommand.vim from which this script was directly created by
 "                means of sed commands and minor tweaks.
-" Note:          
+" Note:
 "                For Vim7 the use of Bob Hiestand's vcscommand.vim
 "                <http://www.vim.org/scripts/script.php?script_id=90>
 "                in conjunction with Vladmir Marek's Hg backend
 "                <http://www.vim.org/scripts/script.php?script_id=1898>
 "                is recommended.
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "
 " Section: Documentation
 "----------------------------
 "
 " Documentation should be available by ":help hgcommand" command, once the
 " script has been copied in you .vim/plugin directory.
 "
 " You still can read the documentation at the end of this file. Locate it by
 " searching the "hgcommand-contents" string (and set ft=help to have
 " appropriate syntactic coloration).
 
 " Section: Plugin header {{{1
 
 " loaded_hgcommand is set to 1 when the initialization begins, and 2 when it
 " completes.  This allows various actions to only be taken by functions after
 " system initialization.
 
 if exists("g:loaded_hgcommand")
    finish
 endif
 let g:loaded_hgcommand = 1
 
 " store 'compatible' settings
 let s:save_cpo = &cpo
 set cpo&vim
 
 " run checks
 let s:script_name = expand("<sfile>:t:r")
 
 function! s:HGCleanupOnFailure(err)
   echohl WarningMsg
   echomsg s:script_name . ":" a:err "Plugin not loaded"
   echohl None
   let g:loaded_hgcommand = "no"
   unlet s:save_cpo s:script_name
 endfunction
 
 if v:version < 602
   call <SID>HGCleanupOnFailure("VIM 6.2 or later required.")
   finish
 endif
 
 if !exists("*system")
   call <SID>HGCleanupOnFailure("builtin system() function required.")
   finish
 endif
 
 let s:script_version = "v0.2"
 
 " Section: Event group setup {{{1
 
 augroup HGCommand
 augroup END
 
 " Section: Plugin initialization {{{1
 silent do HGCommand User HGPluginInit
 
 " Section: Script variable initialization {{{1
 
 let s:HGCommandEditFileRunning = 0
 unlet! s:vimDiffRestoreCmd
 unlet! s:vimDiffSourceBuffer
 unlet! s:vimDiffBufferCount
 unlet! s:vimDiffScratchList
 
 " Section: Utility functions {{{1
 
 " Function: s:HGResolveLink() {{{2
 " Fully resolve the given file name to remove shortcuts or symbolic links.
 
 function! s:HGResolveLink(fileName)
   let resolved = resolve(a:fileName)
   if resolved != a:fileName
     let resolved = <SID>HGResolveLink(resolved)
   endif
   return resolved
 endfunction
 
 " Function: s:HGChangeToCurrentFileDir() {{{2
 " Go to the directory in which the current HG-controlled file is located.
 " If this is a HG command buffer, first switch to the original file.
 
 function! s:HGChangeToCurrentFileDir(fileName)
   let oldCwd=getcwd()
   let fileName=<SID>HGResolveLink(a:fileName)
   let newCwd=fnamemodify(fileName, ':h')
   if strlen(newCwd) > 0
     execute 'cd' escape(newCwd, ' ')
   endif
   return oldCwd
 endfunction
 
 " Function: <SID>HGGetOption(name, default) {{{2
 " Grab a user-specified option to override the default provided.  Options are
 " searched in the window, buffer, then global spaces.
 
 function! s:HGGetOption(name, default)
   if exists("s:" . a:name . "Override")
     execute "return s:".a:name."Override"
   elseif exists("w:" . a:name)
     execute "return w:".a:name
   elseif exists("b:" . a:name)
     execute "return b:".a:name
   elseif exists("g:" . a:name)
     execute "return g:".a:name
   else
     return a:default
   endif
 endfunction
 
 " Function: s:HGEditFile(name, origBuffNR) {{{2
 " Wrapper around the 'edit' command to provide some helpful error text if the
 " current buffer can't be abandoned.  If name is provided, it is used;
 " otherwise, a nameless scratch buffer is used.
 " Returns: 0 if successful, -1 if an error occurs.
 
 function! s:HGEditFile(name, origBuffNR)
   "Name parameter will be pasted into expression.
   let name = escape(a:name, ' *?\')
 
   let editCommand = <SID>HGGetOption('HGCommandEdit', 'edit')
   if editCommand != 'edit'
     if <SID>HGGetOption('HGCommandSplit', 'horizontal') == 'horizontal'
       if name == ""
         let editCommand = 'rightbelow new'
       else
         let editCommand = 'rightbelow split ' . name
       endif
     else
       if name == ""
         let editCommand = 'vert rightbelow new'
       else
         let editCommand = 'vert rightbelow split ' . name
       endif
     endif
   else
     if name == ""
       let editCommand = 'enew'
     else
       let editCommand = 'edit ' . name
     endif
   endif
 
   " Protect against useless buffer set-up
   let s:HGCommandEditFileRunning = s:HGCommandEditFileRunning + 1
   try
     execute editCommand
   finally
     let s:HGCommandEditFileRunning = s:HGCommandEditFileRunning - 1
   endtry
 
   let b:HGOrigBuffNR=a:origBuffNR
   let b:HGCommandEdit='split'
 endfunction
 
 " Function: s:HGCreateCommandBuffer(cmd, cmdName, statusText, filename) {{{2
 " Creates a new scratch buffer and captures the output from execution of the
 " given command.  The name of the scratch buffer is returned.
 
 function! s:HGCreateCommandBuffer(cmd, cmdName, statusText, origBuffNR)
   let fileName=bufname(a:origBuffNR)
 
   let resultBufferName=''
 
   if <SID>HGGetOption("HGCommandNameResultBuffers", 0)
     let nameMarker = <SID>HGGetOption("HGCommandNameMarker", '_')
     if strlen(a:statusText) > 0
       let bufName=a:cmdName . ' -- ' . a:statusText
     else
       let bufName=a:cmdName
     endif
     let bufName=fileName . ' ' . nameMarker . bufName . nameMarker
     let counter=0
     let resultBufferName = bufName
     while buflisted(resultBufferName)
       let counter=counter + 1
       let resultBufferName=bufName . ' (' . counter . ')'
     endwhile
   endif
 
   let hgCommand = <SID>HGGetOption("HGCommandHGExec", "hg") . " " . a:cmd
   "echomsg "DBG :".hgCommand
   let hgOut = system(hgCommand)
   " HACK:  diff command does not return proper error codes
   if v:shell_error && a:cmdName != 'hgdiff'
     if strlen(hgOut) == 0
       echoerr "HG command failed"
     else
       echoerr "HG command failed:  " . hgOut
     endif
     return -1
   endif
   if strlen(hgOut) == 0
     " Handle case of no output.  In this case, it is important to check the
     " file status, especially since hg edit/unedit may change the attributes
     " of the file with no visible output.
 
     echomsg "No output from HG command"
     checktime
     return -1
   endif
 
   if <SID>HGEditFile(resultBufferName, a:origBuffNR) == -1
     return -1
   endif
 
   set buftype=nofile
   set noswapfile
   set filetype=
 
   if <SID>HGGetOption("HGCommandDeleteOnHide", 0)
     set bufhidden=delete
   endif
 
   silent 0put=hgOut
 
   " The last command left a blank line at the end of the buffer.  If the
   " last line is folded (a side effect of the 'put') then the attempt to
   " remove the blank line will kill the last fold.
   "
   " This could be fixed by explicitly detecting whether the last line is
   " within a fold, but I prefer to simply unfold the result buffer altogether.
 
   if has("folding")
     setlocal nofoldenable
   endif
 
   $d
   1
 
   " Define the environment and execute user-defined hooks.
 
   let b:HGSourceFile=fileName
   let b:HGCommand=a:cmdName
   if a:statusText != ""
     let b:HGStatusText=a:statusText
   endif
 
   silent do HGCommand User HGBufferCreated
   return bufnr("%")
 endfunction
 
 " Function: s:HGBufferCheck(hgBuffer) {{{2
 " Attempts to locate the original file to which HG operations were applied
 " for a given buffer.
 
 function! s:HGBufferCheck(hgBuffer)
   let origBuffer = getbufvar(a:hgBuffer, "HGOrigBuffNR")
   if origBuffer
     if bufexists(origBuffer)
       return origBuffer
     else
       " Original buffer no longer exists.
       return -1
     endif
   else
     " No original buffer
     return a:hgBuffer
   endif
 endfunction
 
 " Function: s:HGCurrentBufferCheck() {{{2
 " Attempts to locate the original file to which HG operations were applied
 " for the current buffer.
 
 function! s:HGCurrentBufferCheck()
   return <SID>HGBufferCheck(bufnr("%"))
 endfunction
 
 " Function: s:HGToggleDeleteOnHide() {{{2
 " Toggles on and off the delete-on-hide behavior of HG buffers
 
 function! s:HGToggleDeleteOnHide()
   if exists("g:HGCommandDeleteOnHide")
     unlet g:HGCommandDeleteOnHide
   else
     let g:HGCommandDeleteOnHide=1
   endif
 endfunction
 
 " Function: s:HGDoCommand(hgcmd, cmdName, statusText) {{{2
 " General skeleton for HG function execution.
 " Returns: name of the new command buffer containing the command results
 
 function! s:HGDoCommand(cmd, cmdName, statusText)
   let hgBufferCheck=<SID>HGCurrentBufferCheck()
   if hgBufferCheck == -1
     echo "Original buffer no longer exists, aborting."
     return -1
   endif
 
   let fileName=bufname(hgBufferCheck)
   if isdirectory(fileName)
     let fileName=fileName . "/" . getline(".")
   endif
   let realFileName = fnamemodify(<SID>HGResolveLink(fileName), ':t')
   let oldCwd=<SID>HGChangeToCurrentFileDir(fileName)
   try
      " TODO
     "if !filereadable('HG/Root')
       "throw fileName . ' is not a HG-controlled file.'
     "endif
     let fullCmd = a:cmd . ' "' . realFileName . '"'
     "echomsg "DEBUG".fullCmd
     let resultBuffer=<SID>HGCreateCommandBuffer(fullCmd, a:cmdName, a:statusText, hgBufferCheck)
     return resultBuffer
   catch
     echoerr v:exception
     return -1
   finally
     execute 'cd' escape(oldCwd, ' ')
   endtry
 endfunction
 
 
 " Function: s:HGGetStatusVars(revision, branch, repository) {{{2
 "
 " Obtains a HG revision number and branch name.  The 'revisionVar',
 " 'branchVar'and 'repositoryVar' arguments, if non-empty, contain the names of variables to hold
 " the corresponding results.
 "
 " Returns: string to be exec'd that sets the multiple return values.
 
 function! s:HGGetStatusVars(revisionVar, branchVar, repositoryVar)
   let hgBufferCheck=<SID>HGCurrentBufferCheck()
   "echomsg "DBG : in HGGetStatusVars"
   if hgBufferCheck == -1
     return ""
   endif
   let fileName=bufname(hgBufferCheck)
   let fileNameWithoutLink=<SID>HGResolveLink(fileName)
   let realFileName = fnamemodify(fileNameWithoutLink, ':t')
   let oldCwd=<SID>HGChangeToCurrentFileDir(realFileName)
   try
     let hgCommand = <SID>HGGetOption("HGCommandHGExec", "hg") . " root  "
     let roottext=system(hgCommand)
     " Suppress ending null char ! Does it work in window ?
     let roottext=substitute(roottext,'^.*/\([^/\n\r]*\)\n\_.*$','\1','')
     if match(getcwd()."/".fileNameWithoutLink, roottext) == -1
       return ""
     endif
     let returnExpression = ""
     if a:repositoryVar != ""
       let returnExpression=returnExpression . " | let " . a:repositoryVar . "='" . roottext . "'"
     endif
     let hgCommand = <SID>HGGetOption("HGCommandHGExec", "hg") . " status -mardui " . realFileName
     let statustext=system(hgCommand)
     if(v:shell_error)
       return ""
     endif
     if match(statustext, '^[?I]') >= 0
       let revision="NEW"
     elseif match(statustext, '^[R]') >= 0
       let revision="REMOVED"
     elseif match(statustext, '^[D]') >= 0
       let revision="DELETED"
     elseif match(statustext, '^[A]') >= 0
       let revision="ADDED"
     else
       " The file is tracked, we can try to get is revision number
       let hgCommand = <SID>HGGetOption("HGCommandHGExec", "hg") . " parents "
       let statustext=system(hgCommand)
       if(v:shell_error)
           return ""
       endif
       let revision=substitute(statustext, '^changeset:\s*\(\d\+\):.*\_$\_.*$', '\1', "")
 
       if a:branchVar != "" && match(statustext, '^\_.*\_^branch:') >= 0
         let branch=substitute(statustext, '^\_.*\_^branch:\s*\(\S\+\)\n\_.*$', '\1', "")
         let returnExpression=returnExpression . " | let " . a:branchVar . "='" . branch . "'"
       endif
     endif
     if (exists('revision'))
       let returnExpression = "let " . a:revisionVar . "='" . revision . "' " . returnExpression
     endif
 
     return returnExpression
   finally
     execute 'cd' escape(oldCwd, ' ')
   endtry
 endfunction
 
 " Function: s:HGSetupBuffer() {{{2
 " Attempts to set the b:HGBranch, b:HGRevision and b:HGRepository variables.
 
 function! s:HGSetupBuffer(...)
   if (exists("b:HGBufferSetup") && b:HGBufferSetup && !exists('a:1'))
     " This buffer is already set up.
     return
   endif
 
   if !<SID>HGGetOption("HGCommandEnableBufferSetup", 0)
         \ || @% == ""
         \ || s:HGCommandEditFileRunning > 0
         \ || exists("b:HGOrigBuffNR")
     unlet! b:HGRevision
     unlet! b:HGBranch
     unlet! b:HGRepository
     return
   endif
 
   if !filereadable(expand("%"))
     return -1
   endif
 
   let revision=""
   let branch=""
   let repository=""
 
   exec <SID>HGGetStatusVars('revision', 'branch', 'repository')
   "echomsg "DBG ".revision."#".branch."#".repository
   if revision != ""
     let b:HGRevision=revision
   else
     unlet! b:HGRevision
   endif
   if branch != ""
     let b:HGBranch=branch
   else
     unlet! b:HGBranch
   endif
   if repository != ""
      let b:HGRepository=repository
   else
      unlet! b:HGRepository
   endif
   silent do HGCommand User HGBufferSetup
   let b:HGBufferSetup=1
 endfunction
 
 " Function: s:HGMarkOrigBufferForSetup(hgbuffer) {{{2
 " Resets the buffer setup state of the original buffer for a given HG buffer.
 " Returns:  The HG buffer number in a passthrough mode.
 
 function! s:HGMarkOrigBufferForSetup(hgBuffer)
   checktime
   if a:hgBuffer != -1
     let origBuffer = <SID>HGBufferCheck(a:hgBuffer)
     "This should never not work, but I'm paranoid
     if origBuffer != a:hgBuffer
       call setbufvar(origBuffer, "HGBufferSetup", 0)
     endif
   else
     "We are presumably in the original buffer
     let b:HGBufferSetup = 0
     "We do the setup now as now event will be triggered allowing it later.
     call <SID>HGSetupBuffer()
   endif
   return a:hgBuffer
 endfunction
 
 " Function: s:HGOverrideOption(option, [value]) {{{2
 " Provides a temporary override for the given HG option.  If no value is
 " passed, the override is disabled.
 
 function! s:HGOverrideOption(option, ...)
   if a:0 == 0
     unlet! s:{a:option}Override
   else
     let s:{a:option}Override = a:1
   endif
 endfunction
 
 " Function: s:HGWipeoutCommandBuffers() {{{2
 " Clears all current HG buffers of the specified type for a given source.
 
 function! s:HGWipeoutCommandBuffers(originalBuffer, hgCommand)
   let buffer = 1
   while buffer <= bufnr('$')
     if getbufvar(buffer, 'HGOrigBuffNR') == a:originalBuffer
       if getbufvar(buffer, 'HGCommand') == a:hgCommand
         execute 'bw' buffer
       endif
     endif
     let buffer = buffer + 1
   endwhile
 endfunction
 
 " Function: s:HGInstallDocumentation(full_name, revision)              {{{2
 "   Install help documentation.
 " Arguments:
 "   full_name: Full name of this vim plugin script, including path name.
 "   revision:  Revision of the vim script. #version# mark in the document file
 "              will be replaced with this string with 'v' prefix.
 " Return:
 "   1 if new document installed, 0 otherwise.
 " Note: Cleaned and generalized by guo-peng Wen
 "'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 " Helper function to make mkdir as portable as possible
 function! s:HGFlexiMkdir(dir)
   if exists("*mkdir") " we can use Vim's own mkdir()
     call mkdir(a:dir)
   elseif !exists("+shellslash")
     call system("mkdir -p '".a:dir."'")
   else " M$
     let l:ssl = &shellslash
     try
       set shellslash
       " no single quotes?
       call system('mkdir "'.a:dir.'"')
     finally
       let &shellslash = l:ssl
     endtry
   endif
 endfunction
 
 function! s:HGInstallDocumentation(full_name)
   " Figure out document path based on full name of this script:
   let l:vim_doc_path = fnamemodify(a:full_name, ":h:h") . "/doc"
   if filewritable(l:vim_doc_path) != 2
     echomsg s:script_name . ": Trying to update docs at" l:vim_doc_path
     silent! call <SID>HGFlexiMkdir(l:vim_doc_path)
     if filewritable(l:vim_doc_path) != 2
       " Try first item in 'runtimepath':
       let l:vim_doc_path =
             \ substitute(&runtimepath, '^\([^,]*\).*', '\1/doc', 'e')
       if filewritable(l:vim_doc_path) != 2
         echomsg s:script_name . ": Trying to update docs at" l:vim_doc_path
         silent! call <SID>HGFlexiMkdir(l:vim_doc_path)
         if filewritable(l:vim_doc_path) != 2
           " Put a warning:
           echomsg "Unable to open documentation directory"
           echomsg " type `:help add-local-help' for more information."
           return 0
         endif
       endif
     endif
   endif
 
   " Full name of documentation file:
   let l:doc_file =
         \ l:vim_doc_path . "/" . s:script_name . ".txt"
   " Bail out if document file is still up to date:
   if filereadable(l:doc_file)  &&
         \ getftime(a:full_name) < getftime(l:doc_file)
     return 0
   endif
 
   " temporary global settings
   let l:lz = &lazyredraw
   let l:hls = &hlsearch
   set lazyredraw nohlsearch
   " Create a new buffer & read in the plugin file (me):
   1 new
   setlocal noswapfile modifiable nomodeline
   if has("folding")
     setlocal nofoldenable
   endif
   silent execute "read" escape(a:full_name, " ")
   let l:doc_buf = bufnr("%")
 
   1
   " Delete from first line to a line starts with
   " === START_DOC
   silent 1,/^=\{3,}\s\+START_DOC\C/ delete _
   " Delete from a line starts with
   " === END_DOC
   " to the end of the documents:
   silent /^=\{3,}\s\+END_DOC\C/,$ delete _
 
   " Add modeline for help doc: the modeline string is mangled intentionally
   " to avoid it be recognized by VIM:
   call append(line("$"), "")
   call append(line("$"), " v" . "im:tw=78:ts=8:ft=help:norl:")
 
   " Replace revision:
   silent execute "normal :1s/#version#/" . s:script_version . "/\<CR>"
   " Save the help document and wipe out buffer:
   silent execute "wq!" escape(l:doc_file, " ") "| bw" l:doc_buf
   " Build help tags:
   silent execute "helptags" l:vim_doc_path
 
   let &hlsearch = l:hls
   let &lazyredraw = l:lz
   return 1
 endfunction
 
 " Section: Public functions {{{1
 
 " Function: HGGetRevision() {{{2
 " Global function for retrieving the current buffer's HG revision number.
 " Returns: Revision number or an empty string if an error occurs.
 
 function! HGGetRevision()
   let revision=""
   exec <SID>HGGetStatusVars('revision', '', '')
   return revision
 endfunction
 
 " Function: HGDisableBufferSetup() {{{2
 " Global function for deactivating the buffer autovariables.
 
 function! HGDisableBufferSetup()
   let g:HGCommandEnableBufferSetup=0
   silent! augroup! HGCommandPlugin
 endfunction
 
 " Function: HGEnableBufferSetup() {{{2
 " Global function for activating the buffer autovariables.
 
 function! HGEnableBufferSetup()
   let g:HGCommandEnableBufferSetup=1
   augroup HGCommandPlugin
     au!
     au BufEnter * call <SID>HGSetupBuffer()
     au BufWritePost * call <SID>HGSetupBuffer()
     " Force resetting up buffer on external file change (HG update)
     au FileChangedShell * call <SID>HGSetupBuffer(1)
   augroup END
 
   " Only auto-load if the plugin is fully loaded.  This gives other plugins a
   " chance to run.
   if g:loaded_hgcommand == 2
     call <SID>HGSetupBuffer()
   endif
 endfunction
 
 " Function: HGGetStatusLine() {{{2
 " Default (sample) status line entry for HG files.  This is only useful if
 " HG-managed buffer mode is on (see the HGCommandEnableBufferSetup variable
 " for how to do this).
 
 function! HGGetStatusLine()
   if exists('b:HGSourceFile')
     " This is a result buffer
     let value='[' . b:HGCommand . ' ' . b:HGSourceFile
     if exists('b:HGStatusText')
       let value=value . ' ' . b:HGStatusText
     endif
     let value = value . ']'
     return value
   endif
 
   if exists('b:HGRevision')
         \ && b:HGRevision != ''
         \ && exists('b:HGRepository')
         \ && b:HGRepository != ''
         \ && exists('g:HGCommandEnableBufferSetup')
         \ && g:HGCommandEnableBufferSetup
     if !exists('b:HGBranch')
       let l:branch=''
     else
       let l:branch=b:HGBranch
     endif
     return '[HG ' . b:HGRepository . '/' . l:branch .'/' . b:HGRevision . ']'
   else
     return ''
   endif
 endfunction
 
 " Section: HG command functions {{{1
 
 " Function: s:HGAdd() {{{2
 function! s:HGAdd()
   return <SID>HGMarkOrigBufferForSetup(<SID>HGDoCommand('add', 'hgadd', ''))
 endfunction
 
 " Function: s:HGAnnotate(...) {{{2
 function! s:HGAnnotate(...)
   if a:0 == 0
     if &filetype == "HGAnnotate"
       " This is a HGAnnotate buffer.  Perform annotation of the version
       " indicated by the current line.
       let revision = substitute(getline("."),'\(^[0-9]*\):.*','\1','')
       if <SID>HGGetOption('HGCommandAnnotateParent', 0) != 0 && revision > 0
         let revision = revision - 1
       endif
     else
       let revision=HGGetRevision()
       if revision == ""
         echoerr "Unable to obtain HG version information."
         return -1
       endif
     endif
   else
     let revision=a:1
   endif
 
   if revision == "NEW"
     echo "No annotatation available for new file."
     return -1
   endif
 
   let resultBuffer=<SID>HGDoCommand('annotate -ndu -r ' . revision, 'hgannotate', revision)
   "echomsg "DBG: ".resultBuffer
   if resultBuffer !=  -1
     set filetype=HGAnnotate
   endif
 
   return resultBuffer
 endfunction
 
 " Function: s:HGCommit() {{{2
 function! s:HGCommit(...)
   " Handle the commit message being specified.  If a message is supplied, it
   " is used; if bang is supplied, an empty message is used; otherwise, the
   " user is provided a buffer from which to edit the commit message.
   if a:2 != "" || a:1 == "!"
     return <SID>HGMarkOrigBufferForSetup(<SID>HGDoCommand('commit -m "' . a:2 . '"', 'hgcommit', ''))
   endif
 
   let hgBufferCheck=<SID>HGCurrentBufferCheck()
   if hgBufferCheck ==  -1
     echo "Original buffer no longer exists, aborting."
     return -1
   endif
 
   " Protect against windows' backslashes in paths.  They confuse exec'd
   " commands.
 
   let shellSlashBak = &shellslash
   try
     set shellslash
 
     let messageFileName = tempname()
 
     let fileName=bufname(hgBufferCheck)
     let realFilePath=<SID>HGResolveLink(fileName)
     let newCwd=fnamemodify(realFilePath, ':h')
     if strlen(newCwd) == 0
       " Account for autochdir being in effect, which will make this blank, but
       " we know we'll be in the current directory for the original file.
       let newCwd = getcwd()
     endif
 
     let realFileName=fnamemodify(realFilePath, ':t')
 
     if <SID>HGEditFile(messageFileName, hgBufferCheck) == -1
       return
     endif
 
     " Protect against case and backslash issues in Windows.
     let autoPattern = '\c' . messageFileName
 
     " Ensure existence of group
     augroup HGCommit
     augroup END
 
     execute 'au HGCommit BufDelete' autoPattern 'call delete("' . messageFileName . '")'
     execute 'au HGCommit BufDelete' autoPattern 'au! HGCommit * ' autoPattern
 
     " Create a commit mapping.  The mapping must clear all autocommands in case
     " it is invoked when HGCommandCommitOnWrite is active, as well as to not
     " invoke the buffer deletion autocommand.
 
     execute 'nnoremap <silent> <buffer> <Plug>HGCommit '.
           \ ':au! HGCommit * ' . autoPattern . '<CR>'.
           \ ':g/^HG:/d<CR>'.
           \ ':update<CR>'.
           \ ':call <SID>HGFinishCommit("' . messageFileName . '",' .
           \                             '"' . newCwd . '",' .
           \                             '"' . realFileName . '",' .
           \                             hgBufferCheck . ')<CR>'
 
     silent 0put ='HG: ----------------------------------------------------------------------'
     silent put =\"HG: Enter Log.  Lines beginning with `HG:' are removed automatically\"
     silent put ='HG: Type <leader>cc (or your own <Plug>HGCommit mapping)'
 
     if <SID>HGGetOption('HGCommandCommitOnWrite', 1) == 1
       execute 'au HGCommit BufWritePre' autoPattern 'g/^HG:/d'
       execute 'au HGCommit BufWritePost' autoPattern 'call <SID>HGFinishCommit("' . messageFileName . '", "' . newCwd . '", "' . realFileName . '", ' . hgBufferCheck . ') | au! * ' autoPattern
       silent put ='HG: or write this buffer'
     endif
 
     silent put ='HG: to finish this commit operation'
     silent put ='HG: ----------------------------------------------------------------------'
     $
     let b:HGSourceFile=fileName
     let b:HGCommand='HGCommit'
     set filetype=hg
   finally
     let &shellslash = shellSlashBak
   endtry
 
 endfunction
 
 " Function: s:HGDiff(...) {{{2
 function! s:HGDiff(...)
   if a:0 == 1
     let revOptions = '-r' . a:1
     let caption = a:1 . ' -> current'
   elseif a:0 == 2
     let revOptions = '-r' . a:1 . ' -r' . a:2
     let caption = a:1 . ' -> ' . a:2
   else
     let revOptions = ''
     let caption = ''
   endif
 
   let hgdiffopt=<SID>HGGetOption('HGCommandDiffOpt', 'w')
 
   if hgdiffopt == ""
     let diffoptionstring=""
   else
     let diffoptionstring=" -" . hgdiffopt . " "
   endif
 
   let resultBuffer = <SID>HGDoCommand('diff ' . diffoptionstring . revOptions , 'hgdiff', caption)
   if resultBuffer != -1
     set filetype=diff
   endif
   return resultBuffer
 endfunction
 
 
 " Function: s:HGGotoOriginal(["!]) {{{2
 function! s:HGGotoOriginal(...)
   let origBuffNR = <SID>HGCurrentBufferCheck()
   if origBuffNR > 0
     let origWinNR = bufwinnr(origBuffNR)
     if origWinNR == -1
       execute 'buffer' origBuffNR
     else
       execute origWinNR . 'wincmd w'
     endif
     if a:0 == 1
       if a:1 == "!"
         let buffnr = 1
         let buffmaxnr = bufnr("$")
         while buffnr <= buffmaxnr
           if getbufvar(buffnr, "HGOrigBuffNR") == origBuffNR
             execute "bw" buffnr
           endif
           let buffnr = buffnr + 1
         endwhile
       endif
     endif
   endif
 endfunction
 
 " Function: s:HGFinishCommit(messageFile, targetDir, targetFile) {{{2
 function! s:HGFinishCommit(messageFile, targetDir, targetFile, origBuffNR)
   if filereadable(a:messageFile)
     let oldCwd=getcwd()
     if strlen(a:targetDir) > 0
       execute 'cd' escape(a:targetDir, ' ')
     endif
     let resultBuffer=<SID>HGCreateCommandBuffer('commit -l "' . a:messageFile . '" "'. a:targetFile . '"', 'hgcommit', '', a:origBuffNR)
     execute 'cd' escape(oldCwd, ' ')
     execute 'bw' escape(a:messageFile, ' *?\')
     silent execute 'call delete("' . a:messageFile . '")'
     return <SID>HGMarkOrigBufferForSetup(resultBuffer)
   else
     echoerr "Can't read message file; no commit is possible."
     return -1
   endif
 endfunction
 
 " Function: s:HGLog() {{{2
 function! s:HGLog(...)
   if a:0 == 0
     let versionOption = ""
     let caption = ''
   else
     let versionOption=" -r" . a:1
     let caption = a:1
   endif
 
   let resultBuffer=<SID>HGDoCommand('log' . versionOption, 'hglog', caption)
   if resultBuffer != ""
     set filetype=rcslog
   endif
   return resultBuffer
 endfunction
 
 " Function: s:HGRevert() {{{2
 function! s:HGRevert()
   return <SID>HGMarkOrigBufferForSetup(<SID>HGDoCommand('revert', 'hgrevert', ''))
 endfunction
 
 " Function: s:HGReview(...) {{{2
 function! s:HGReview(...)
   if a:0 == 0
     let versiontag=""
     if <SID>HGGetOption('HGCommandInteractive', 0)
       let versiontag=input('Revision:  ')
     endif
     if versiontag == ""
       let versiontag="(current)"
       let versionOption=""
     else
       let versionOption=" -r " . versiontag . " "
     endif
   else
     let versiontag=a:1
     let versionOption=" -r " . versiontag . " "
   endif
 
   let resultBuffer = <SID>HGDoCommand('cat' . versionOption, 'hgreview', versiontag)
   if resultBuffer > 0
     let &filetype=getbufvar(b:HGOrigBuffNR, '&filetype')
   endif
 
   return resultBuffer
 endfunction
 
 " Function: s:HGStatus() {{{2
 function! s:HGStatus()
   return <SID>HGDoCommand('status', 'hgstatus', '')
 endfunction
 
 
 " Function: s:HGUpdate() {{{2
 function! s:HGUpdate()
   return <SID>HGMarkOrigBufferForSetup(<SID>HGDoCommand('update', 'update', ''))
 endfunction
 
 " Function: s:HGVimDiff(...) {{{2
 function! s:HGVimDiff(...)
   let originalBuffer = <SID>HGCurrentBufferCheck()
   let s:HGCommandEditFileRunning = s:HGCommandEditFileRunning + 1
   try
     " If there's already a VimDiff'ed window, restore it.
     " There may only be one HGVimDiff original window at a time.
 
     if exists("s:vimDiffSourceBuffer") && s:vimDiffSourceBuffer != originalBuffer
       " Clear the existing vimdiff setup by removing the result buffers.
       call <SID>HGWipeoutCommandBuffers(s:vimDiffSourceBuffer, 'vimdiff')
     endif
 
     " Split and diff
     if(a:0 == 2)
       " Reset the vimdiff system, as 2 explicit versions were provided.
       if exists('s:vimDiffSourceBuffer')
         call <SID>HGWipeoutCommandBuffers(s:vimDiffSourceBuffer, 'vimdiff')
       endif
       let resultBuffer = <SID>HGReview(a:1)
       if resultBuffer < 0
         echomsg "Can't open HG revision " . a:1
         return resultBuffer
       endif
       let b:HGCommand = 'vimdiff'
       diffthis
       let s:vimDiffBufferCount = 1
       let s:vimDiffScratchList = '{'. resultBuffer . '}'
       " If no split method is defined, cheat, and set it to vertical.
       try
         call <SID>HGOverrideOption('HGCommandSplit', <SID>HGGetOption('HGCommandDiffSplit', <SID>HGGetOption('HGCommandSplit', 'vertical')))
         let resultBuffer=<SID>HGReview(a:2)
       finally
         call <SID>HGOverrideOption('HGCommandSplit')
       endtry
       if resultBuffer < 0
         echomsg "Can't open HG revision " . a:1
         return resultBuffer
       endif
       let b:HGCommand = 'vimdiff'
       diffthis
       let s:vimDiffBufferCount = 2
       let s:vimDiffScratchList = s:vimDiffScratchList . '{'. resultBuffer . '}'
     else
       " Add new buffer
       try
         " Force splitting behavior, otherwise why use vimdiff?
         call <SID>HGOverrideOption("HGCommandEdit", "split")
         call <SID>HGOverrideOption("HGCommandSplit", <SID>HGGetOption('HGCommandDiffSplit', <SID>HGGetOption('HGCommandSplit', 'vertical')))
         if(a:0 == 0)
           let resultBuffer=<SID>HGReview()
         else
           let resultBuffer=<SID>HGReview(a:1)
         endif
       finally
         call <SID>HGOverrideOption("HGCommandEdit")
         call <SID>HGOverrideOption("HGCommandSplit")
       endtry
       if resultBuffer < 0
         echomsg "Can't open current HG revision"
         return resultBuffer
       endif
       let b:HGCommand = 'vimdiff'
       diffthis
 
       if !exists('s:vimDiffBufferCount')
         " New instance of vimdiff.
         let s:vimDiffBufferCount = 2
         let s:vimDiffScratchList = '{' . resultBuffer . '}'
 
         " This could have been invoked on a HG result buffer, not the
         " original buffer.
         wincmd W
         execute 'buffer' originalBuffer
         " Store info for later original buffer restore
         let s:vimDiffRestoreCmd =
               \    "call setbufvar(".originalBuffer.", \"&diff\", ".getbufvar(originalBuffer, '&diff').")"
               \ . "|call setbufvar(".originalBuffer.", \"&foldcolumn\", ".getbufvar(originalBuffer, '&foldcolumn').")"
               \ . "|call setbufvar(".originalBuffer.", \"&foldenable\", ".getbufvar(originalBuffer, '&foldenable').")"
               \ . "|call setbufvar(".originalBuffer.", \"&foldmethod\", '".getbufvar(originalBuffer, '&foldmethod')."')"
               \ . "|call setbufvar(".originalBuffer.", \"&scrollbind\", ".getbufvar(originalBuffer, '&scrollbind').")"
               \ . "|call setbufvar(".originalBuffer.", \"&wrap\", ".getbufvar(originalBuffer, '&wrap').")"
               \ . "|if &foldmethod=='manual'|execute 'normal! zE'|endif"
         diffthis
         wincmd w
       else
         " Adding a window to an existing vimdiff
         let s:vimDiffBufferCount = s:vimDiffBufferCount + 1
         let s:vimDiffScratchList = s:vimDiffScratchList . '{' . resultBuffer . '}'
       endif
     endif
 
     let s:vimDiffSourceBuffer = originalBuffer
 
     " Avoid executing the modeline in the current buffer after the autocommand.
 
     let currentBuffer = bufnr('%')
     let saveModeline = getbufvar(currentBuffer, '&modeline')
     try
       call setbufvar(currentBuffer, '&modeline', 0)
       silent do HGCommand User HGVimDiffFinish
     finally
       call setbufvar(currentBuffer, '&modeline', saveModeline)
     endtry
     return resultBuffer
   finally
     let s:HGCommandEditFileRunning = s:HGCommandEditFileRunning - 1
   endtry
 endfunction
 
 " Section: Command definitions {{{1
 " Section: Primary commands {{{2
 com! HGAdd call <SID>HGAdd()
 com! -nargs=? HGAnnotate call <SID>HGAnnotate(<f-args>)
 com! -bang -nargs=? HGCommit call <SID>HGCommit(<q-bang>, <q-args>)
 com! -nargs=* HGDiff call <SID>HGDiff(<f-args>)
 com! -bang HGGotoOriginal call <SID>HGGotoOriginal(<q-bang>)
 com! -nargs=? HGLog call <SID>HGLog(<f-args>)
 com! HGRevert call <SID>HGRevert()
 com! -nargs=? HGReview call <SID>HGReview(<f-args>)
 com! HGStatus call <SID>HGStatus()
 com! HGUpdate call <SID>HGUpdate()
 com! -nargs=* HGVimDiff call <SID>HGVimDiff(<f-args>)
 
 " Section: HG buffer management commands {{{2
 com! HGDisableBufferSetup call HGDisableBufferSetup()
 com! HGEnableBufferSetup call HGEnableBufferSetup()
 
 " Allow reloading hgcommand.vim
 com! HGReload unlet! g:loaded_hgcommand | runtime plugin/hgcommand.vim
 
 " Section: Plugin command mappings {{{1
 nnoremap <silent> <Plug>HGAdd :HGAdd<CR>
 nnoremap <silent> <Plug>HGAnnotate :HGAnnotate<CR>
 nnoremap <silent> <Plug>HGCommit :HGCommit<CR>
 nnoremap <silent> <Plug>HGDiff :HGDiff<CR>
 nnoremap <silent> <Plug>HGGotoOriginal :HGGotoOriginal<CR>
 nnoremap <silent> <Plug>HGClearAndGotoOriginal :HGGotoOriginal!<CR>
 nnoremap <silent> <Plug>HGLog :HGLog<CR>
 nnoremap <silent> <Plug>HGRevert :HGRevert<CR>
 nnoremap <silent> <Plug>HGReview :HGReview<CR>
 nnoremap <silent> <Plug>HGStatus :HGStatus<CR>
 nnoremap <silent> <Plug>HGUpdate :HGUpdate<CR>
 nnoremap <silent> <Plug>HGVimDiff :HGVimDiff<CR>
 
 " Section: Default mappings {{{1
 if !hasmapto('<Plug>HGAdd')
   nmap <unique> <Leader>hga <Plug>HGAdd
 endif
 if !hasmapto('<Plug>HGAnnotate')
   nmap <unique> <Leader>hgn <Plug>HGAnnotate
 endif
 if !hasmapto('<Plug>HGClearAndGotoOriginal')
   nmap <unique> <Leader>hgG <Plug>HGClearAndGotoOriginal
 endif
 if !hasmapto('<Plug>HGCommit')
   nmap <unique> <Leader>hgc <Plug>HGCommit
 endif
 if !hasmapto('<Plug>HGDiff')
   nmap <unique> <Leader>hgd <Plug>HGDiff
 endif
 if !hasmapto('<Plug>HGGotoOriginal')
   nmap <unique> <Leader>hgg <Plug>HGGotoOriginal
 endif
 if !hasmapto('<Plug>HGLog')
   nmap <unique> <Leader>hgl <Plug>HGLog
 endif
 if !hasmapto('<Plug>HGRevert')
   nmap <unique> <Leader>hgq <Plug>HGRevert
 endif
 if !hasmapto('<Plug>HGReview')
   nmap <unique> <Leader>hgr <Plug>HGReview
 endif
 if !hasmapto('<Plug>HGStatus')
   nmap <unique> <Leader>hgs <Plug>HGStatus
 endif
 if !hasmapto('<Plug>HGUpdate')
   nmap <unique> <Leader>hgu <Plug>HGUpdate
 endif
 if !hasmapto('<Plug>HGVimDiff')
   nmap <unique> <Leader>hgv <Plug>HGVimDiff
 endif
 
 " Section: Menu items {{{1
 silent! aunmenu Plugin.HG
 amenu <silent> &Plugin.HG.&Add        <Plug>HGAdd
 amenu <silent> &Plugin.HG.A&nnotate   <Plug>HGAnnotate
 amenu <silent> &Plugin.HG.&Commit     <Plug>HGCommit
 amenu <silent> &Plugin.HG.&Diff       <Plug>HGDiff
 amenu <silent> &Plugin.HG.&Log        <Plug>HGLog
 amenu <silent> &Plugin.HG.Revert      <Plug>HGRevert
 amenu <silent> &Plugin.HG.&Review     <Plug>HGReview
 amenu <silent> &Plugin.HG.&Status     <Plug>HGStatus
 amenu <silent> &Plugin.HG.&Update     <Plug>HGUpdate
 amenu <silent> &Plugin.HG.&VimDiff    <Plug>HGVimDiff
 
 " Section: Autocommands to restore vimdiff state {{{1
 function! s:HGVimDiffRestore(vimDiffBuff)
   let s:HGCommandEditFileRunning = s:HGCommandEditFileRunning + 1
   try
     if exists("s:vimDiffSourceBuffer")
       if a:vimDiffBuff == s:vimDiffSourceBuffer
         " Original file is being removed.
         unlet! s:vimDiffSourceBuffer
         unlet! s:vimDiffBufferCount
         unlet! s:vimDiffRestoreCmd
         unlet! s:vimDiffScratchList
       elseif match(s:vimDiffScratchList, '{' . a:vimDiffBuff . '}') >= 0
         let s:vimDiffScratchList = substitute(s:vimDiffScratchList, '{' . a:vimDiffBuff . '}', '', '')
         let s:vimDiffBufferCount = s:vimDiffBufferCount - 1
         if s:vimDiffBufferCount == 1 && exists('s:vimDiffRestoreCmd')
           " All scratch buffers are gone, reset the original.
           " Only restore if the source buffer is still in Diff mode
 
           let sourceWinNR=bufwinnr(s:vimDiffSourceBuffer)
           if sourceWinNR != -1
             " The buffer is visible in at least one window
             let currentWinNR = winnr()
             while winbufnr(sourceWinNR) != -1
               if winbufnr(sourceWinNR) == s:vimDiffSourceBuffer
                 execute sourceWinNR . 'wincmd w'
                 if getwinvar('', "&diff")
                   execute s:vimDiffRestoreCmd
                 endif
               endif
               let sourceWinNR = sourceWinNR + 1
             endwhile
             execute currentWinNR . 'wincmd w'
           else
             " The buffer is hidden.  It must be visible in order to set the
             " diff option.
             let currentBufNR = bufnr('')
             execute "hide buffer" s:vimDiffSourceBuffer
             if getwinvar('', "&diff")
               execute s:vimDiffRestoreCmd
             endif
             execute "hide buffer" currentBufNR
           endif
 
           unlet s:vimDiffRestoreCmd
           unlet s:vimDiffSourceBuffer
           unlet s:vimDiffBufferCount
           unlet s:vimDiffScratchList
         elseif s:vimDiffBufferCount == 0
           " All buffers are gone.
           unlet s:vimDiffSourceBuffer
           unlet s:vimDiffBufferCount
           unlet s:vimDiffScratchList
         endif
       endif
     endif
   finally
     let s:HGCommandEditFileRunning = s:HGCommandEditFileRunning - 1
   endtry
 endfunction
 
 augroup HGVimDiffRestore
   au!
   au BufUnload * call <SID>HGVimDiffRestore(expand("<abuf>"))
 augroup END
 
 " Section: Optional activation of buffer management {{{1
 
 if s:HGGetOption('HGCommandEnableBufferSetup', 1)
   call HGEnableBufferSetup()
 endif
 
 " Section: Doc installation {{{1
 
 if <SID>HGInstallDocumentation(expand("<sfile>:p"))
   echomsg s:script_name s:script_version . ": updated documentation"
 endif
 
 " Section: Plugin completion {{{1
 
 " delete one-time vars and functions
 delfunction <SID>HGInstallDocumentation
 delfunction <SID>HGFlexiMkdir
 delfunction <SID>HGCleanupOnFailure
 unlet s:script_version s:script_name
 
 let g:loaded_hgcommand=2
 silent do HGCommand User HGPluginFinish
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
 " vim:se expandtab sts=2 sw=2:
 finish
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Section: Documentation content                                          {{{1
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 === START_DOC
 *hgcommand.txt*	  Mercurial vim integration		             #version#
 
 
 			 HGCOMMAND REFERENCE MANUAL~
 
 
 Author:  Mathieu Clabaut <[e-mail]>
 Credits:  Bob Hiestand <[e-mail]>
 Mercurial: http://mercurial.selenic.com/
    Mercurial (noted Hg) is a fast, lightweight Source Control Management
    system designed for efficient handling of very large distributed projects.
 
 ==============================================================================
 1. Contents						  *hgcommand-contents*
 
 	Installation		: |hgcommand-install|
         HGCommand Intro	        : |hgcommand|
 	HGCommand Manual	: |hgcommand-manual|
 	Customization		: |hgcommand-customize|
 	Bugs			: |hgcommand-bugs|
 
 ==============================================================================
 2. HGCommand Installation				   *hgcommand-install*
 
    In order to install the plugin, place the hgcommand.vim file into a plugin'
    directory in your runtime path (please see |add-global-plugin| and
    |'runtimepath'|.
 
    HGCommand may be customized by setting variables, creating maps, and
    specifying event handlers.  Please see |hgcommand-customize| for more
    details.
 
                                                          *hgcommand-auto-help*
    The help file is automagically generated when the |hgcommand| script is
    loaded for the first time.
 
 ==============================================================================
 
 3. HGCommand Intro					           *hgcommand*
                                                              *hgcommand-intro*
 
    The HGCommand plugin provides global ex commands for manipulating
    HG-controlled source files.  In general, each command operates on the
    current buffer and accomplishes a separate hg function, such as update,
    commit, log, and others (please see |hgcommand-commands| for a list of all
    available commands).  The results of each operation are displayed in a
    scratch buffer.  Several buffer variables are defined for those scratch
    buffers (please see |hgcommand-buffer-variables|).
 
    The notion of "current file" means either the current buffer, or, in the
    case of a directory buffer, the file on the current line within the buffer.
 
    For convenience, any HGCommand invoked on a HGCommand scratch buffer acts
    as though it was invoked on the original file and splits the screen so that
    the output appears in a new window.
 
    Many of the commands accept revisions as arguments.  By default, most
    operate on the most recent revision on the current branch if no revision is
    specified (though see |HGCommandInteractive| to prompt instead).
 
    Each HGCommand is mapped to a key sequence starting with the <Leader>
    keystroke.  The default mappings may be overridden by supplying different
    mappings before the plugin is loaded, such as in the vimrc, in the standard
    fashion for plugin mappings.  For examples, please see
    |hgcommand-mappings-override|.
 
    The HGCommand plugin may be configured in several ways.  For more details,
    please see |hgcommand-customize|.
 
 ==============================================================================
 4. HGCommand Manual					    *hgcommand-manual*
 
 4.1 HGCommand commands					  *hgcommand-commands*
 
    HGCommand defines the following commands:
 
       |:HGAdd|
       |:HGAnnotate|
       |:HGCommit|
       |:HGDiff|
       |:HGGotoOriginal|
       |:HGLog|
       |:HGRevert|
       |:HGReview|
       |:HGStatus|
       |:HGUpdate|
       |:HGVimDiff|
 
 :HGAdd							              *:HGAdd*
 
    This command performs "hg add" on the current file.  Please note, this does
    not commit the newly-added file.
 
 :HGAnnotate						         *:HGAnnotate*
 
    This command performs "hg annotate" on the current file.  If an argument is
    given, the argument is used as a revision number to display.  If not given
    an argument, it uses the most recent version of the file on the current
    branch.  Additionally, if the current buffer is a HGAnnotate buffer
    already, the version number on the current line is used.
 
    If the |HGCommandAnnotateParent| variable is set to a non-zero value, the
    version previous to the one on the current line is used instead.  This
    allows one to navigate back to examine the previous version of a line.
 
    The filetype of the HGCommand scratch buffer is set to 'HGAnnotate', to
    take advantage of the bundled syntax file.
 
 
 :HGCommit[!]						           *:HGCommit*
 
    If called with arguments, this performs "hg commit" using the arguments as
    the log message.
 
    If '!' is used with no arguments, an empty log message is committed.
 
    If called with no arguments, this is a two-step command.  The first step
    opens a buffer to accept a log message.  When that buffer is written, it is
    automatically closed and the file is committed using the information from
    that log message.  The commit can be abandoned if the log message buffer is
    deleted or wiped before being written.
 
    Alternatively, the mapping that is used to invoke :HGCommit (by default
    <Leader>hgc) can be used in the log message buffer to immediately commit.
    This is useful if the |HGCommandCommitOnWrite| variable is set to 0 to
    disable the normal commit-on-write behavior.
 
 :HGDiff						                     *:HGDiff*
 
    With no arguments, this performs "hg diff" on the current file against the
    current repository version.
 
    With one argument, "hg diff" is performed on the current file against the
    specified revision.
 
    With two arguments, hg diff is performed between the specified revisions of
    the current file.
 
    This command uses the 'HGCommandDiffOpt' variable to specify diff options.
    If that variable does not exist, then 'wbBc' is assumed.  If you wish to
    have no options, then set it to the empty string.
 
 
 :HGGotoOriginal					             *:HGGotoOriginal*
 
    This command returns the current window to the source buffer, if the
    current buffer is a HG command output buffer.
 
 :HGGotoOriginal!
 
    Like ":HGGotoOriginal" but also executes :bufwipeout on all HG command
    output buffers for the source buffer.
 
 :HGLog							              *:HGLog*
 
    Performs "hg log" on the current file.
 
    If an argument is given, it is passed as an argument to the "-r" option of
    "hg log".
 
 :HGRevert						           *:HGRevert*
 
    Replaces the current file with the most recent version from the repository
    in order to wipe out any undesired changes.
 
 :HGReview						           *:HGReview*
 
    Retrieves a particular version of the current file.  If no argument is
    given, the most recent version of the file on the current branch is
    retrieved.  Otherwise, the specified version is retrieved.
 
 :HGStatus					 	           *:HGStatus*
 
    Performs "hg status" on the current file.
 
 :HGUpdate						           *:HGUpdate*
 
    Performs "hg update" on the current file.  This intentionally does not
    automatically reload the current buffer, though vim should prompt the user
    to do so if the underlying file is altered by this command.
 
 :HGVimDiff						          *:HGVimDiff*
 
    With no arguments, this prompts the user for a revision and then uses
    vimdiff to display the differences between the current file and the
    specified revision.  If no revision is specified, the most recent version
    of the file on the current branch is used.
 
    With one argument, that argument is used as the revision as above.  With
    two arguments, the differences between the two revisions is displayed using
    vimdiff.
 
    With either zero or one argument, the original buffer is used to perform
    the vimdiff.  When the other buffer is closed, the original buffer will be
    returned to normal mode.
 
    Once vimdiff mode is started using the above methods, additional vimdiff
    buffers may be added by passing a single version argument to the command.
    There may be up to 4 vimdiff buffers total.
 
    Using the 2-argument form of the command resets the vimdiff to only those 2
    versions.  Additionally, invoking the command on a different file will
    close the previous vimdiff buffers.
 
 
 4.2 Mappings						  *hgcommand-mappings*
 
    By default, a mapping is defined for each command.  These mappings execute
    the default (no-argument) form of each command.
 
       <Leader>hga HGAdd
       <Leader>hgn HGAnnotate
       <Leader>hgc HGCommit
       <Leader>hgd HGDiff
       <Leader>hgg HGGotoOriginal
       <Leader>hgG HGGotoOriginal!
       <Leader>hgl HGLog
       <Leader>hgr HGReview
       <Leader>hgs HGStatus
       <Leader>hgu HGUpdate
       <Leader>hgv HGVimDiff
 
                                                  *hgcommand-mappings-override*
 
    The default mappings can be overridden by user-provided instead by mapping
    to <Plug>CommandName.  This is especially useful when these mappings
    collide with other existing mappings (vim will warn of this during plugin
    initialization, but will not clobber the existing mappings).
 
    For instance, to override the default mapping for :HGAdd to set it to
    '\add', add the following to the vimrc: >
 
       nmap \add <Plug>HGAdd
 <
 4.3 Automatic buffer variables			  *hgcommand-buffer-variables*
 
    Several buffer variables are defined in each HGCommand result buffer.
    These may be useful for additional customization in callbacks defined in
    the event handlers (please see |hgcommand-events|).
 
    The following variables are automatically defined:
 
 b:hgOrigBuffNR						      *b:hgOrigBuffNR*
 
    This variable is set to the buffer number of the source file.
 
 b:hgcmd						                     *b:hgcmd*
 
    This variable is set to the name of the hg command that created the result
    buffer.
 ==============================================================================
 
 5. Configuration and customization			 *hgcommand-customize*
                                                             *hgcommand-config*
 
    The HGCommand plugin can be configured in two ways:  by setting
    configuration variables (see |hgcommand-options|) or by defining HGCommand
    event handlers (see |hgcommand-events|).  Additionally, the HGCommand
    plugin provides several option for naming the HG result buffers (see
    |hgcommand-naming|) and supported a customized status line (see
    |hgcommand-statusline| and |hgcommand-buffer-management|).
 
 5.1 HGCommand configuration variables			   *hgcommand-options*
 
    Several variables affect the plugin's behavior.  These variables are
    checked at time of execution, and may be defined at the window, buffer, or
    global level and are checked in that order of precedence.
 
 
    The following variables are available:
 
       |HGCommandAnnotateParent|
       |HGCommandCommitOnWrite|
       |HGCommandHGExec|
       |HGCommandDeleteOnHide|
       |HGCommandDiffOpt|
       |HGCommandDiffSplit|
       |HGCommandEdit|
       |HGCommandEnableBufferSetup|
       |HGCommandInteractive|
       |HGCommandNameMarker|
       |HGCommandNameResultBuffers|
       |HGCommandSplit|
 
 HGCommandAnnotateParent			             *HGCommandAnnotateParent*
 
    This variable, if set to a non-zero value, causes the zero-argument form of
    HGAnnotate when invoked on a HGAnnotate buffer to go to the version
    previous to that displayed on the current line. If not set, it defaults to
    0.
 
 HGCommandCommitOnWrite				      *HGCommandCommitOnWrite*
 
    This variable, if set to a non-zero value, causes the pending hg commit to
    take place immediately as soon as the log message buffer is written.  If
    set to zero, only the HGCommit mapping will cause the pending commit to
    occur.  If not set, it defaults to 1.
 
 HGCommandHGExec				                     *HGCommandHGExec*
 
    This variable controls the executable used for all HG commands.  If not
    set, it defaults to "hg".
 
 HGCommandDeleteOnHide				       *HGCommandDeleteOnHide*
 
    This variable, if set to a non-zero value, causes the temporary HG result
    buffers to automatically delete themselves when hidden.
 
 HGCommandDiffOpt				            *HGCommandDiffOpt*
 
    This variable, if set, determines the options passed to the diff command of
    HG.  If not set, it defaults to 'w'.
 
 HGCommandDiffSplit				          *HGCommandDiffSplit*
 
    This variable overrides the |HGCommandSplit| variable, but only for buffers
    created with |:HGVimDiff|.
 
 HGCommandEdit					               *HGCommandEdit*
 
    This variable controls whether the original buffer is replaced ('edit') or
    split ('split').  If not set, it defaults to 'edit'.
 
 HGCommandEnableBufferSetup			  *HGCommandEnableBufferSetup*
 
    This variable, if set to a non-zero value, activates HG buffer management
    mode see (|hgcommand-buffer-management|).  This mode means that three
    buffer variables, 'HGRepository', 'HGRevision' and 'HGBranch', are set if
    the file is HG-controlled.  This is useful for displaying version
    information in the status bar.
 
 HGCommandInteractive				        *HGCommandInteractive*
 
    This variable, if set to a non-zero value, causes appropriate commands (for
    the moment, only |:HGReview|) to query the user for a revision to use
    instead of the current revision if none is specified.
 
 HGCommandNameMarker				         *HGCommandNameMarker*
 
    This variable, if set, configures the special attention-getting characters
    that appear on either side of the hg buffer type in the buffer name.  This
    has no effect unless |HGCommandNameResultBuffers| is set to a true value.
    If not set, it defaults to '_'.
 
 HGCommandNameResultBuffers			  *HGCommandNameResultBuffers*
 
    This variable, if set to a true value, causes the hg result buffers to be
    named in the old way ('<source file name> _<hg command>_').  If not set or
    set to a false value, the result buffer is nameless.
 
 HGCommandSplit					              *HGCommandSplit*
 
    This variable controls the orientation of the various window splits that
    may occur (such as with HGVimDiff, when using a HG command on a HG command
    buffer, or when the |HGCommandEdit| variable is set to 'split'.  If set to
    'horizontal', the resulting windows will be on stacked on top of one
    another.  If set to 'vertical', the resulting windows will be side-by-side.
    If not set, it defaults to 'horizontal' for all but HGVimDiff windows.
 
 5.2 HGCommand events				            *hgcommand-events*
 
    For additional customization, HGCommand can trigger user-defined events.
    Event handlers are provided by defining User event autocommands (see
    |autocommand|, |User|) in the HGCommand group with patterns matching the
    event name.
 
    For instance, the following could be added to the vimrc to provide a 'q'
    mapping to quit a HGCommand scratch buffer: >
 
       augroup HGCommand
          au HGCommand User HGBufferCreated silent! nmap <unique> <buffer> q:
          bwipeout<cr>
       augroup END
 <
 
    The following hooks are available:
 
 HGBufferCreated		This event is fired just after a hg command result
                         buffer is created and filled with the result of a hg
                         command.  It is executed within the context of the HG
                         command buffer.  The HGCommand buffer variables may be
                         useful for handlers of this event (please see
                         |hgcommand-buffer-variables|).
 
 HGBufferSetup		This event is fired just after HG buffer setup occurs,
                         if enabled.
 
 HGPluginInit		This event is fired when the HGCommand plugin first
                         loads.
 
 HGPluginFinish		This event is fired just after the HGCommand plugin
                         loads.
 
 HGVimDiffFinish		This event is fired just after the HGVimDiff command
                         executes to allow customization of, for instance,
                         window placement and focus.
 
 5.3 HGCommand buffer naming				    *hgcommand-naming*
 
    By default, the buffers containing the result of HG commands are nameless
    scratch buffers.  It is intended that buffer variables of those buffers be
    used to customize the statusline option so that the user may fully control
    the display of result buffers.
 
    If the old-style naming is desired, please enable the
    |HGCommandNameResultBuffers| variable.  Then, each result buffer will
    receive a unique name that includes the source file name, the HG command,
    and any extra data (such as revision numbers) that were part of the
    command.
 
 5.4 HGCommand status line support			*hgcommand-statusline*
 
    It is intended that the user will customize the |'statusline'| option to
    include HG result buffer attributes.  A sample function that may be used in
    the |'statusline'| option is provided by the plugin, HGGetStatusLine().  In
    order to use that function in the status line, do something like the
    following: >
 
       set statusline=%<%f\ %{HGGetStatusLine()}\ %h%m%r%=%l,%c%V\ %P
 <
    of which %{HGGetStatusLine()} is the relevant portion.
 
    The sample HGGetStatusLine() function handles both HG result buffers and
    HG-managed files if HGCommand buffer management is enabled (please see
    |hgcommand-buffer-management|).
 
 5.5 HGCommand buffer management		         *hgcommand-buffer-management*
 
    The HGCommand plugin can operate in buffer management mode, which means
    that it attempts to set two buffer variables ('HGRevision' and 'HGBranch')
    upon entry into a buffer.  This is rather slow because it means that 'hg
    status' will be invoked at each entry into a buffer (during the |BufEnter|
    autocommand).
 
    This mode is enabled by default.  In order to disable it, set the
    |HGCommandEnableBufferSetup| variable to a false (zero) value.  Enabling
    this mode simply provides the buffer variables mentioned above.  The user
    must explicitly include those in the |'statusline'| option if they are to
    appear in the status line (but see |hgcommand-statusline| for a simple way
    to do that).
 
 ==============================================================================
 9. Tips							      *hgcommand-tips*
 
 9.1 Split window annotation, by Michael Anderson >
 
    :nmap <Leader>hgN :vs<CR><C-w>h<Leader>hgn:vertical res 40<CR>
                  \ggdddd:set scb<CR>:set nowrap<CR><C-w>lgg:set scb<CR>
                  \:set nowrap<CR>
 <
 
    This splits the buffer vertically, puts an annotation on the left (minus
    the header) with the width set to 40. An editable/normal copy is placed on
    the right.  The two versions are scroll locked so they  move as one. and
    wrapping is turned off so that the lines line up correctly. The advantages
    are...
 
    1) You get a versioning on the right.
    2) You can still edit your own code.
    3) Your own code still has syntax highlighting.
 
 ==============================================================================
 
 8. Known bugs						      *hgcommand-bugs*
 
    Please let me know if you run across any.
 
    HGVimDiff, when using the original (real) source buffer as one of the diff
    buffers, uses some hacks to try to restore the state of the original buffer
    when the scratch buffer containing the other version is destroyed.  There
    may still be bugs in here, depending on many configuration details.
 
 ==============================================================================
 
 9. TODO  						      *hgcommand-todo*
 
    Integrate symlink tracking once HG will support them.
 ==============================================================================
 === END_DOC
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " v im:tw=78:ts=8:ft=help:norl:
 " vim600: set foldmethod=marker  tabstop=8 shiftwidth=2 softtabstop=2 smartindent smarttab  :
 "fileencoding=iso-8859-15

contrib/wix/guids.wxi

@@ -1,51 +1,51
 <Include>
   <!-- These are component GUIDs used for Mercurial installers.
        YOU MUST CHANGE ALL GUIDs below when copying this file
        and replace 'Mercurial' in this notice with the name of
        your project. Component GUIDs have global namespace!      -->
 
   <!-- contrib.wxs -->
   <?define contrib.guid = {F17D27B7-4A6B-4cd2-AE72-FED3CFAA585E} ?>
   <?define contrib.vim.guid = {BB04903A-652D-4C4F-9590-2BD07A2304F2} ?>
 
   <!-- dist.wxs -->
   <?define dist.guid = {C3B634A4-1B05-4A40-94A9-38EE853CF693} ?>
 
   <!-- doc.wxs -->
   <?define doc.hg.1.html.guid = {AAAA3FDA-EDC5-4220-B59D-D342722358A2} ?>
   <?define doc.hgignore.5.html.guid = {AA9118C4-F3A0-4429-A5F4-5A1906B2D67F} ?>
   <?define doc.hgrc.5.html = {E0CEA1EB-FA01-408c-844B-EE5965165BAE} ?>
   <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
 
   <!-- help.wxs -->
   <?define helpFolder.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?>
-  
+
   <!-- i18n.wxs -->
   <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?>
 
   <!-- templates.wxs -->
   <?define templates.root.guid = {8DF97574-33E9-412F-8414-65B48BB18783} ?>
   <?define templates.atom.guid = {AB5D2908-BC95-44BE-9D79-069EF43D93E2} ?>
   <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
   <?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?>
   <?define templates.monoblue.guid = {8060A1E4-BD4C-453E-92CB-9536DC44A9E3} ?>
   <?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?>
   <?define templates.raw.guid = {3F88E9B6-EA3C-41EB-8D8A-3F12E7DE9933} ?>
   <?define templates.rss.guid = {36069748-1E2A-472B-A212-506CB656A9C1} ?>
   <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
   <?define templates.static.guid = {B27D7311-050A-4A96-9971-B674A0EA21D0} ?>
 
   <!-- mercurial.wxs -->
   <?define ProductUpgradeCode = {A1CC6134-E945-4399-BE36-EB0017FDF7CF} ?>
 
   <?define ComponentMainExecutableGUID = {D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF} ?>
 
   <?define ReadMe.guid = {56A8E372-991D-4DCA-B91D-93D775974CF5} ?>
   <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?>
   <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?>
   <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?>
   <?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?>
   <?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?>
   <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
 
 </Include>

contrib/wix/i18n.wxs

@@ -1,26 +1,26
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?include guids.wxi ?>
   <?include defines.wxi ?>
 
-  <?define hg_po_langs = 
+  <?define hg_po_langs =
     da;de;el;fr;it;ja;pt_BR;ro;ru;sv;zh_CN;zh_TW
   ?>
 
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
       <Directory Id="i18ndir" Name="i18n" FileSource="$(var.SourceDir)">
         <Component Id="i18nFolder" Guid="$(var.i18nFolder.guid)" Win64='$(var.IsX64)'>
           <File Name="hggettext" KeyPath="yes" />
           <?foreach LANG in $(var.hg_po_langs) ?>
-            <File Id="hg.$(var.LANG).po" 
-                  Name="$(var.LANG).po" 
+            <File Id="hg.$(var.LANG).po"
+                  Name="$(var.LANG).po"
             />
           <?endforeach?>
         </Component>
       </Directory>
     </DirectoryRef>
   </Fragment>
 
 </Wix>

contrib/wix/mercurial.wxs

@@ -1,172 +1,172
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
   <!-- Copyright 2010 Steve Borho <[e-mail]>
 
   This software may be used and distributed according to the terms of the
   GNU General Public License version 2 or any later version. -->
 
   <?include guids.wxi ?>
   <?include defines.wxi ?>
 
   <?if $(var.Platform) = "x64" ?>
     <?define PFolder = ProgramFiles64Folder ?>
   <?else?>
     <?define PFolder = ProgramFilesFolder ?>
   <?endif?>
 
   <Product Id='*'
-    Name='Mercurial $(var.Version) ($(var.Platform))' 
+    Name='Mercurial $(var.Version) ($(var.Platform))'
     UpgradeCode='$(var.ProductUpgradeCode)'
     Language='1033' Codepage='1252' Version='$(var.Version)'
     Manufacturer='Matt Mackall and others'>
 
     <Package Id='*'
       Keywords='Installer'
       Description="Mercurial distributed SCM (version $(var.Version))"
       Comments='$(var.Comments)'
       Platform='$(var.Platform)'
       Manufacturer='Matt Mackall and others'
       InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
     <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'
            CompressionLevel='high' />
     <Property Id='DiskPrompt' Value="Mercurial $(var.Version) Installation [1]" />
 
     <Condition Message='Mercurial MSI installers require Windows XP or higher'>
         VersionNT >= 501
     </Condition>
 
     <Property Id="INSTALLDIR">
       <ComponentSearch Id='SearchForMainExecutableComponent'
                        Guid='$(var.ComponentMainExecutableGUID)' />
     </Property>
 
     <!--Property Id='ARPCOMMENTS'>any comments</Property-->
     <Property Id='ARPCONTACT'>[e-mail]</Property>
     <Property Id='ARPHELPLINK'>http://mercurial.selenic.com/wiki/</Property>
     <Property Id='ARPURLINFOABOUT'>http://mercurial.selenic.com/about/</Property>
     <Property Id='ARPURLUPDATEINFO'>http://mercurial.selenic.com/downloads/</Property>
     <Property Id='ARPHELPTELEPHONE'>http://mercurial.selenic.com/wiki/Support</Property>
     <Property Id='ARPPRODUCTICON'>hgIcon.ico</Property>
 
     <Property Id='INSTALLEDMERCURIALPRODUCTS' Secure='yes'></Property>
     <Property Id='REINSTALLMODE'>amus</Property>
 
     <!--Auto-accept the license page-->
     <Property Id='LicenseAccepted'>1</Property>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='$(var.PFolder)' Name='PFiles'>
         <Directory Id='INSTALLDIR' Name='Mercurial'>
           <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'>
             <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' />
             <Environment Id="Environment" Name="PATH" Part="last" System="yes"
                          Permanent="no" Value="[INSTALLDIR]" Action="set" />
           </Component>
           <Component Id='ReadMe' Guid='$(var.ReadMe.guid)' Win64='$(var.IsX64)'>
               <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html'
                     KeyPath='yes'/>
           </Component>
           <Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'>
             <File Id='COPYING' Name='COPYING.rtf' Source='contrib\wix\COPYING.rtf'
                   KeyPath='yes'/>
           </Component>
 
           <Directory Id='HGRCD' Name='hgrc.d'>
             <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)' Win64='$(var.IsX64)'>
               <File Id='mercurial.rc' Name='Mercurial.rc' Source='contrib\win32\mercurial.ini'
                     ReadOnly='yes' KeyPath='yes'/>
             </Component>
             <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'>
               <File Id='mergetools.rc' Name='MergeTools.rc' Source='contrib\mergetools.hgrc'
                     ReadOnly='yes' KeyPath='yes'/>
             </Component>
             <Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'>
               <CreateFolder/>
               <IniFile Id="ini0" Action="createLine" Directory="HGRCD" Name="Paths.rc"
                 Section="web" Key="cacerts" Value="[INSTALLDIR]hgrc.d\cacert.pem" />
             </Component>
             <Component Id='cacert.pem' Guid='$(var.cacert.pem.guid)' Win64='$(var.IsX64)'>
               <File Id='cacert.pem' Name='cacert.pem' Source='..\misc\cacert.pem'
                     ReadOnly='yes' KeyPath='yes'/>
             </Component>
           </Directory>
 
         </Directory>
       </Directory>
 
       <Directory Id="ProgramMenuFolder" Name="Programs">
         <Directory Id="ProgramMenuDir" Name="Mercurial $(var.Version)">
           <Component Id="ProgramMenuDir" Guid="$(var.ProgramMenuDir.guid)" Win64='$(var.IsX64)'>
             <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
             <RegistryValue Root='HKCU' Key='Software\Mercurial\InstallDir' Type='string'
                            Value='[INSTALLDIR]' KeyPath='yes' />
             <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site'
                       Target='[ARPHELPLINK]' Icon="hgIcon.ico" IconIndex='0' />
           </Component>
         </Directory>
       </Directory>
 
       <?if $(var.Platform) = "x86" ?>
         <Merge Id='VCRuntime' DiskId='1' Language='1033'
               SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' />
         <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
               SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />
       <?else?>
         <Merge Id='VCRuntime' DiskId='1' Language='1033'
               SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x64_msm.msm' />
         <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
               SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x64_msm.msm' />
       <?endif?>
     </Directory>
 
     <Feature Id='Complete' Title='Mercurial' Description='The complete package'
         Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
       <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app'
              Level='1' Absent='disallow' >
         <ComponentRef Id='MainExecutable' />
         <ComponentRef Id='distOutput' />
         <ComponentRef Id='ProgramMenuDir' />
         <ComponentRef Id='ReadMe' />
         <ComponentRef Id='COPYING' />
         <ComponentRef Id='mercurial.rc' />
         <ComponentRef Id='mergetools.rc' />
         <ComponentRef Id='paths.rc' />
         <ComponentRef Id='cacert.pem' />
         <ComponentRef Id='helpFolder' />
         <ComponentGroupRef Id='templatesFolder' />
         <MergeRef Id='VCRuntime' />
         <MergeRef Id='VCRuntimePolicy' />
       </Feature>
       <Feature Id='Locales' Title='Translations' Description='Translations' Level='1'>
         <ComponentGroupRef Id='localeFolder' />
         <ComponentRef Id='i18nFolder' />
       </Feature>
       <Feature Id='Documentation' Title='Documentation' Description='HTML man pages' Level='1'>
         <ComponentGroupRef Id='docFolder' />
       </Feature>
       <Feature Id='Misc' Title='Miscellaneous' Description='Contributed scripts' Level='1'>
         <ComponentGroupRef Id='contribFolder' />
       </Feature>
     </Feature>
 
     <UIRef Id="WixUI_FeatureTree" />
     <UIRef Id="WixUI_ErrorProgressText" />
 
     <WixVariable Id="WixUILicenseRtf" Value="contrib\wix\COPYING.rtf" />
 
     <Icon Id="hgIcon.ico" SourceFile="contrib/win32/mercurial.ico" />
 
     <Upgrade Id='$(var.ProductUpgradeCode)'>
       <UpgradeVersion
         IncludeMinimum='yes' Minimum='0.0.0' IncludeMaximum='no' OnlyDetect='no'
         Property='INSTALLEDMERCURIALPRODUCTS' />
     </Upgrade>
 
     <InstallExecuteSequence>
       <RemoveExistingProducts After='InstallInitialize'/>
     </InstallExecuteSequence>
 
   </Product>
 </Wix>

doc/style.css

@@ -1,309 +1,309
 /*
  * Styles for man pages, which match with http://mercurial.selenic.com/
  *
  * Color scheme & layout are borrowed from
  * http://mercurial.selenic.com/css/styles.css
  *
  * Some styles are from html4css1.css from Docutils, which is in the
  * public domain.
  */
 
 body {
     margin: 0;
     padding: 0;
     font-family: sans-serif;
 }
 
 .document {
     position: relative;  /* be a top of absolute positioning */
     margin: 1.5em 1.8em;
     padding: 0;
     line-height: 1.3;
 }
 
 /* layout: toc to right */
 #contents {
     position: absolute;
     right: 0;
     top: 0;
     width: 26%;
 }
 
 /* layout: others to left */
 h1.title, h2.subtitle, .section { width: 72%; }
 .section .section { width: auto; }
 table.docinfo { max-width: 72%; }
 
 /* headings */
 h1, h2, .topic-title, .admonition-title {
     font-family: "MgOpen Cosmetica", "Lucida Sans Unicode", sans-serif;
     font-weight: normal;
 }
 h1, h2, .topic-title, .admonition-title {
     margin: 1em 0 0.5em;
 }
 h1.title { font-size: 300%; }
 h2.subtitle, h1 { font-size: 200%; }
 h2, .topic-title, .admonition-title { font-size: 140%; }
 
 /* subtitle starts with lowercase in man pages, but not in HTML */
 h2.subtitle:first-letter { text-transform: uppercase; }
 
 /* override first/last margin */
 .first, h1.title, h2.subtitle { margin-top: 0 !important; }
 .last, .with-subtitle { margin-bottom: 0 !important; }
 
 blockquote, pre, dd .option-list, .field-list {
     margin: 0.2em 0 1em 2em;
 }
 
 kbd, tt, pre { font-family: monospace; }
 
 dt { font-weight: bold; }
 dd { margin-bottom: 0.5em; }
 
 th, td { padding: 0.1em 0.2em; border: 0 none; }
 th { font-weight: bold; text-align: left; }
 
 a:link, a:visited { text-decoration: underline; }
 a:hover, a:focus { text-decoration: none; }
 a:link { color: #00b5f1; }
 a:visited { color: #5c9caf; }
 a:link.toc-backref, a:visited.toc-backref {
     text-decoration: none;
     color: inherit;  /* NOTE: `inherit' is not supported by IE6 */
 }
 
 div.admonition, div.attention, div.caution,
 div.danger, div.error, div.hint, div.important,
 div.note, div.tip, div.warning {
     border-top: 1px #ccc solid;
     border-bottom: 1px #ccc solid;
     padding: 0.3em 1em;
     margin: 1em;
 }
 
 div.note {
     border-color: #fcc200;
 }
 
 
 /*
  * The following styles are from Docutils.
  * Please refine if necessary.
  */
 
 table.borderless td, table.borderless th {
     /* Override padding for "table.docutils td" with "! important".
        The right padding separates the table cells. */
     padding: 0 0.5em 0 0 ! important;
 }
 
 .hidden {
     display: none;
 }
 
 blockquote.epigraph {
     margin: 2em 5em;
 }
 
 div.abstract {
     margin: 2em 5em;
 }
 
 div.dedication {
     margin: 2em 5em;
     text-align: center;
     font-style: italic;
 }
 
 div.figure {
     margin-left: 2em;
     margin-right: 2em;
 }
 
 div.footer, div.header {
     clear: both;
     font-size: smaller;
 }
 
 div.line-block {
     display: block;
     margin-top: 1em;
     margin-bottom: 1em;
 }
 
 div.line-block div.line-block {
     margin-top: 0;
     margin-bottom: 0;
     margin-left: 1.5em;
 }
 
 div.sidebar {
     margin: 0 0 0.5em 1em;
     border: medium outset;
     padding: 1em;
     background-color: #ffffee;
     width: 40%;
     float: right;
     clear: right;
 }
 
 div.sidebar p.rubric {
     font-family: sans-serif;
     font-size: medium;
 }
 
 div.system-messages {
     margin: 5em;
 }
 
 div.system-messages h1 {
     color: red;
 }
 
 div.system-message {
     border: medium outset;
     padding: 1em;
 }
 
 div.system-message p.system-message-title {
     color: red;
     font-weight: bold;
 }
 
 h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
 h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
     margin-top: 0.4em;
 }
 
 hr.docutils {
     width: 75%;
 }
 
 img.align-left {
     clear: left;
 }
 
 img.align-right {
     clear: right;
 }
 
 ol.simple, ul.simple {
     margin-bottom: 1em;
 }
 
 ol.arabic {
     list-style: decimal;
 }
 
 ol.loweralpha {
     list-style: lower-alpha;
 }
 
 ol.upperalpha {
     list-style: upper-alpha;
 }
 
 ol.lowerroman {
     list-style: lower-roman;
 }
 
 ol.upperroman {
     list-style: upper-roman;
 }
 
 p.attribution {
     text-align: right;
     margin-left: 50%;
 }
 
 p.caption {
     font-style: italic;
 }
 
 p.credits {
     font-style: italic;
     font-size: smaller;
 }
 
 p.label {
     white-space: nowrap;
 }
 
 p.rubric {
     font-weight: bold;
     font-size: larger;
     color: maroon;
     text-align: center;
 }
 
 pre.address {
     margin-bottom: 0;
     margin-top: 0;
     font-family: serif;
     font-size: 100%;
 }
 
 pre.literal-block, pre.doctest-block {
     margin-left: 2em;
     margin-right: 2em;
 }
 
 span.classifier {
     font-family: sans-serif;
     font-style: oblique;
 }
 
 span.classifier-delimiter {
     font-family: sans-serif;
     font-weight: bold;
 }
 
 span.interpreted {
     font-family: sans-serif;
 }
 
 span.option {
     white-space: nowrap;
 }
 
 span.pre {
     white-space: pre;
 }
 
 span.problematic {
     color: red;
 }
 
 span.section-subtitle {
     /* font-size relative to parent (h1..h6 element) */
     font-size: 80%;
 }
 
 table.citation {
     border-left: solid 1px gray;
     margin-left: 1px;
 }
 
 table.footnote {
     border-left: solid 1px black;
     margin-left: 1px;
 }
 
 h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
 h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
     font-size: 100%;
 }
 
 ul.auto-toc {
     list-style-type: none;
 }
 
 div.contents.local {
     -moz-column-width: 10em;
     -moz-column-gap: 1em;
-    
+
     -webkit-column-width: 10em;
     -webkit-column-gap: 1em;
 }