{"thread":{"id":"54220","subject":"[PATCH 0/2] gitk: fix mix of tabs and spaces in indentation","startedAt":"2020-09-10T08:29:01Z","lastAt":"2020-10-03T09:14:29Z","messageCount":9,"participants":["Denton Liu","Paul Mackerras"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"405321","messageId":"cover.1599726439.git.liu.denton@gmail.com","threadId":"54220","inReplyTo":null,"subject":"[PATCH 0/2] gitk: fix mix of tabs and spaces in indentation","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2020-09-10T08:27:40Z","receivedAt":"2020-09-10T08:29:01Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"The source code of gitk has some funny indentation. It uses four spaces\nper level indent but uses tabs every other level (eight spaces).\nReindent gitk to just use tabs instead.\n\nThis series should be empty with `--ignore-all-space`.\n\nDenton Liu (2):\n gitk: replace spaces with tabs\n gitk: manually fix whitespace errors\n\n gitk | 20404 ++++++++++++++++++++++++++++-----------------------------\n 1 file changed, 10202 insertions(+), 10202 deletions(-)\n\n-- \n2.28.0.618.gf4bc123cb7\n\n"},{"id":"405322","messageId":"1b577821168c824f81bb0229efeea2e28536254c.1599726439.git.liu.denton@gmail.com","threadId":"54220","inReplyTo":"cover.1599726439.git.liu.denton@gmail.com","subject":"[PATCH 2/2] gitk: manually fix whitespace errors","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2020-09-10T08:27:42Z","receivedAt":"2020-09-10T08:29:27Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"The previous commit mechanically converted four-space indents into tabs,\nintroducing many whitespace errors. Manually fix these whitespace\nerrors. This was done by finding offending lines using a Python\nscript[0] and manually correcting them by comparing to the original\nversion.\n\nIf the lines were originally aligned with the line above, keep the\nalignment. Otherwise, if it's a line continuation, default to two\ntabs.\n\nThis patch should be empty with `--ignore-all-space`.\n\n[0]:\n\timport sys\n\n\ttab_level = 0\n\tfor lineno, line in enumerate(sys.stdin, 1):\n\t line = line.rstrip()\n\t if not line:\n\t\tcontinue\n\t tab_stripped = line.lstrip('\\t')\n\t new_tab_level = len(line) - len(tab_stripped)\n\t if new_tab_level - tab_level > 1:\n\t\tprint('more than one tab:', lineno)\n\t\tcontinue\n\t tab_level = new_tab_level\n\t space_stripped = tab_stripped.lstrip(' ')\n\t if len(tab_stripped) > len(space_stripped):\n\t\tprint('tabs and spaces mixed:', lineno)\n\t\tcontinue\n\nSigned-off-by: Denton Liu \n---\n gitk | 274 +++++++++++++++++++++++++++++------------------------------\n 1 file changed, 137 insertions(+), 137 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex 7efb106e52..60c1e45325 100755\n--- a/gitk\n+++ b/gitk\n@@ -11,7 +11,7 @@ package require Tk\n \n proc hasworktree {} {\n \treturn [expr {[exec git rev-parse --is-bare-repository] == \"false\" &&\n-\t\t\t\t [exec git rev-parse --is-inside-git-dir] == \"false\"}]\n+\t\t [exec git rev-parse --is-inside-git-dir] == \"false\"}]\n }\n \n proc reponame {} {\n@@ -391,10 +391,10 @@ proc start_rev_list {view} {\n \t\t\tglobal nr_unmerged\n \t\t\tif {$nr_unmerged == 0} {\n \t\t\t\terror_popup [mc \"No files selected: --merge specified but\\\n-\t\t\t\t\t\t\t no files are unmerged.\"]\n+\t\t\t\t\t no files are unmerged.\"]\n \t\t\t} else {\n \t\t\t\terror_popup [mc \"No files selected: --merge specified but\\\n-\t\t\t\t\t\t\t no unmerged files are within file limit.\"]\n+\t\t\t\t\t no unmerged files are within file limit.\"]\n \t\t\t}\n \t\t\treturn 0\n \t\t}\n@@ -413,7 +413,7 @@ proc start_rev_list {view} {\n \n \tif {[catch {\n \t\tset fd [open [concat | git log --no-color -z --pretty=raw $show_notes \\\n-\t\t\t\t\t\t--parents --boundary $args \"--\" $files] r]\n+\t\t\t\t--parents --boundary $args \"--\" $files] r]\n \t} err]} {\n \t\terror_popup \"[mc \"Error executing git log:\"] $err\"\n \t\treturn 0\n@@ -561,7 +561,7 @@ proc updatecommits {} {\n \t}\n \tif {[catch {\n \t\tset fd [open [concat | git log --no-color -z --pretty=raw $show_notes \\\n-\t\t\t\t\t\t--parents --boundary $args \"--\" $vfilelimit($view)] r]\n+\t\t\t\t--parents --boundary $args \"--\" $vfilelimit($view)] r]\n \t} err]} {\n \t\terror_popup \"[mc \"Error executing git log:\"] $err\"\n \t\treturn\n@@ -834,7 +834,7 @@ proc renumbervarc {a v} {\n \t\tset id [lindex $varcstart($v) $a]\n \t\tif {[llength $children($v,$id)] > 1} {\n \t\t\tset children($v,$id) [lsort -command [list vtokcmp $v] \\\n-\t\t\t\t\t\t\t\t\t $children($v,$id)]\n+\t\t\t\t\t$children($v,$id)]\n \t\t}\n \t\tset oldtok [lindex $varctok($v) $a]\n \t\tif {!$vdatemode($v)} {\n@@ -900,7 +900,7 @@ proc renumbervarc {a v} {\n \t\t\t\tset b [lindex $vleftptr($v) $c]\n \t\t\t}\n \t\t\twhile {$b != 0 && \\\n-\t\t\t\t\t [string compare $tok [lindex $varctok($v) $b]] >= 0} {\n+\t\t\t\t\t[string compare $tok [lindex $varctok($v) $b]] >= 0} {\n \t\t\t\tset c $b\n \t\t\t\tset b [lindex $vleftptr($v) $c]\n \t\t\t}\n@@ -921,7 +921,7 @@ proc renumbervarc {a v} {\n \tforeach id [array names sortkids] {\n \t\tif {[llength $children($v,$id)] > 1} {\n \t\t\tset children($v,$id) [lsort -command [list vtokcmp $v] \\\n-\t\t\t\t\t\t\t\t\t $children($v,$id)]\n+\t\t\t\t\t$children($v,$id)]\n \t\t}\n \t}\n \tset t2 [clock clicks -milliseconds]\n@@ -941,8 +941,8 @@ proc fix_reversal {p a v} {\n \t}\n \t# seeds always need to be renumbered\n \tif {[lindex $vupptr($v) $pa] == 0 ||\n-\t\t[string compare [lindex $varctok($v) $a] \\\n-\t\t\t [lindex $varctok($v) $pa]] > 0} {\n+\t\t\t[string compare [lindex $varctok($v) $a] \\\n+\t\t\t[lindex $varctok($v) $pa]] > 0} {\n \t\trenumbervarc $pa $v\n \t}\n }\n@@ -1090,7 +1090,7 @@ proc vtokcmp {v a b} {\n \tglobal varctok varcid\n \n \treturn [string compare [lindex $varctok($v) $varcid($v,$a)] \\\n-\t\t\t\t[lindex $varctok($v) $varcid($v,$b)]]\n+\t\t\t[lindex $varctok($v) $varcid($v,$b)]]\n }\n \n # This assumes that if lim is not given, the caller has checked that\n@@ -1237,7 +1237,7 @@ proc comes_before {a b} {\n \t}\n \tif {$varcid($v,$a) != $varcid($v,$b)} {\n \t\treturn [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \\\n-\t\t\t\t\t\t [lindex $varctok($v) $varcid($v,$b)]] < 0}]\n+\t\t\t\t[lindex $varctok($v) $varcid($v,$b)]] < 0}]\n \t}\n \treturn [expr {[rowofcommit $a] < [rowofcommit $b]}]\n }\n@@ -1369,7 +1369,7 @@ proc rewrite_commit {v id rwid} {\n \t\t# add $ch to $rwid's children and sort the list if necessary\n \t\tif {[llength [lappend children($v,$rwid) $ch]] > 1} {\n \t\t\tset children($v,$rwid) [lsort -command [list vtokcmp $v] \\\n-\t\t\t\t\t\t\t\t\t\t$children($v,$rwid)]\n+\t\t\t\t\t$children($v,$rwid)]\n \t\t}\n \t\t# fix the graph after joining $id to $rwid\n \t\tset a $varcid($v,$ch)\n@@ -1445,7 +1445,7 @@ proc getcommitlines {fd inst view updating} {\n \t\t\t}\n \t\t\tif {[string range $err 0 4] == \"usage\"} {\n \t\t\t\tset err \"Gitk: error reading commits$fv:\\\n-\t\t\t\t\t\tbad arguments to git log.\"\n+\t\t\t\t\tbad arguments to git log.\"\n \t\t\t\tif {$viewname($view) eq [mc \"Command line\"]} {\n \t\t\t\t\tappend err \\\n \t\t\t\t\t\t\" (Note: arguments to gitk are passed to git log\\\n@@ -1529,7 +1529,7 @@ proc getcommitlines {fd inst view updating} {\n \t\t\t# parent as a substitute parent for $id's children.\n \t\t\tif {![catch {\n \t\t\t\tset rwid [exec git rev-list --first-parent --max-count=1 \\\n-\t\t\t\t\t\t\t $id -- $vfilelimit($view)]\n+\t\t\t\t\t\t$id -- $vfilelimit($view)]\n \t\t\t}]} {\n \t\t\t\tif {$rwid ne {} && [info exists varcid($view,$rwid)]} {\n \t\t\t\t\t# use $rwid in place of $id\n@@ -1582,7 +1582,7 @@ proc getcommitlines {fd inst view updating} {\n \t\t\t\tif {[llength [lappend children($vp) $id]] > 1 &&\n \t\t\t\t\t[vtokcmp $view [lindex $children($vp) end-1] $id] > 0} {\n \t\t\t\t\tset children($vp) [lsort -command [list vtokcmp $view] \\\n-\t\t\t\t\t\t\t\t\t\t $children($vp)]\n+\t\t\t\t\t\t\t$children($vp)]\n \t\t\t\t\tunset -nocomplain ordertok\n \t\t\t\t}\n \t\t\t\tif {[info exists varcid($view,$p)]} {\n@@ -1730,7 +1730,7 @@ proc parsecommit {id contents listed} {\n \t\tset comment [string range $comment 0 $i-1]\n \t}\n \tset commitinfo($id) [list $headline $auname $audate \\\n-\t\t\t\t\t\t\t $comname $comdate $comment $hasnote $diff]\n+\t\t\t$comname $comdate $comment $hasnote $diff]\n }\n \n proc getcommit {id} {\n@@ -2053,8 +2053,8 @@ proc makedroplist {w varname args} {\n \t\t\tif {$cx > $width} {set width $cx}\n \t\t}\n \t\tset gm [ttk::combobox $w -width $width -state readonly\\\n-\t\t\t\t\t-textvariable $varname -values $args \\\n-\t\t\t\t\t-exportselection false]\n+\t\t\t\t-textvariable $varname -values $args \\\n+\t\t\t\t-exportselection false]\n \t\tbind $gm <> [list $gm selection clear]\n \t} else {\n \t\tset gm [eval [linsert $args 0 tk_optionMenu $w $varname]]\n@@ -2320,10 +2320,10 @@ proc makewindow {} {\n \t\t-side left -fill y\n \tset gdttype [mc \"containing:\"]\n \tset gm [makedroplist .tf.lbar.gdttype gdttype \\\n-\t\t\t\t[mc \"containing:\"] \\\n-\t\t\t\t[mc \"touching paths:\"] \\\n-\t\t\t\t[mc \"adding/removing string:\"] \\\n-\t\t\t\t[mc \"changing lines matching:\"]]\n+\t\t\t[mc \"containing:\"] \\\n+\t\t\t[mc \"touching paths:\"] \\\n+\t\t\t[mc \"adding/removing string:\"] \\\n+\t\t\t[mc \"changing lines matching:\"]]\n \ttrace add variable gdttype write gdttype_change\n \tpack .tf.lbar.gdttype -side left -fill y\n \n@@ -2334,7 +2334,7 @@ proc makewindow {} {\n \ttrace add variable findstring write find_change\n \tset findtype [mc \"Exact\"]\n \tset findtypemenu [makedroplist .tf.lbar.findtype \\\n-\t\t\t\t\t\t findtype [mc \"Exact\"] [mc \"IgnCase\"] [mc \"Regexp\"]]\n+\t\t\tfindtype [mc \"Exact\"] [mc \"IgnCase\"] [mc \"Regexp\"]]\n \ttrace add variable findtype write findcom_change\n \tset findloc [mc \"All fields\"]\n \tmakedroplist .tf.lbar.findloc findloc [mc \"All fields\"] [mc \"Headline\"] \\\n@@ -3112,7 +3112,7 @@ proc keys {} {\n [mc \"<%s-minus> Decrease font size\" $M1T]\n [mc \"\t\t\t\tUpdate\"]\n \" \\\n-\t\t\t-justify left -bg $bgcolor -border 2 -relief groove\n+\t\t-justify left -bg $bgcolor -border 2 -relief groove\n \tpack $w.m -side top -fill both -padx 2 -pady 2\n \t${NS}::button $w.ok -text [mc \"Close\"] -command \"destroy $w\" -default active\n \tbind $w [list destroy $w]\n@@ -3352,59 +3352,59 @@ image create bitmap tri-rt -background black -foreground blue -data {\n \t#define tri-rt_width 13\n \t#define tri-rt_height 13\n \tstatic unsigned char tri-rt_bits[] = {\n-\t 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,\n-\t 0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,\n-\t 0x00, 0x00};\n+\t\t0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,\n+\t\t0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00};\n } -maskdata {\n \t#define tri-rt-mask_width 13\n \t#define tri-rt-mask_height 13\n \tstatic unsigned char tri-rt-mask_bits[] = {\n-\t 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,\n-\t 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,\n-\t 0x08, 0x00};\n+\t\t0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,\n+\t\t0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,\n+\t\t0x08, 0x00};\n }\n image create bitmap tri-dn -background black -foreground blue -data {\n \t#define tri-dn_width 13\n \t#define tri-dn_height 13\n \tstatic unsigned char tri-dn_bits[] = {\n-\t 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,\n-\t 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t 0x00, 0x00};\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,\n+\t\t0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00};\n } -maskdata {\n \t#define tri-dn-mask_width 13\n \t#define tri-dn-mask_height 13\n \tstatic unsigned char tri-dn-mask_bits[] = {\n-\t 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,\n-\t 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t 0x00, 0x00};\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,\n+\t\t0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00};\n }\n \n image create bitmap reficon-T -background black -foreground yellow -data {\n \t#define tagicon_width 13\n \t#define tagicon_height 9\n \tstatic unsigned char tagicon_bits[] = {\n-\t 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07,\n-\t 0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};\n+\t\t0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07,\n+\t\t0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};\n } -maskdata {\n \t#define tagicon-mask_width 13\n \t#define tagicon-mask_height 9\n \tstatic unsigned char tagicon-mask_bits[] = {\n-\t 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,\n-\t 0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00};\n+\t\t0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,\n+\t\t0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00};\n }\n set rectdata {\n \t#define headicon_width 13\n \t#define headicon_height 9\n \tstatic unsigned char headicon_bits[] = {\n-\t 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07,\n-\t 0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00};\n+\t\t0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07,\n+\t\t0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00};\n }\n set rectmask {\n \t#define headicon-mask_width 13\n \t#define headicon-mask_height 9\n \tstatic unsigned char headicon-mask_bits[] = {\n-\t 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,\n-\t 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};\n+\t\t0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,\n+\t\t0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};\n }\n image create bitmap reficon-H -background black -foreground \"#00ff00\" \\\n \t-data $rectdata -maskdata $rectmask\n@@ -3622,7 +3622,7 @@ proc external_diff_get_one_file {diffid filename diffdir} {\n \t}\n \tset difffile [file join $diffdir \"\\[$diffid\\] [file tail $filename]\"]\n \treturn [save_file_from_commit $diffid:$filename $difffile \\\n-\t\t\t \"revision $diffid\"]\n+\t\t\t\"revision $diffid\"]\n }\n \n proc external_diff {} {\n@@ -3953,7 +3953,7 @@ proc read_line_source {fd inst} {\n \t\t\tselectline [rowofcommit $id] 1 [list $fname $lnum] 1\n \t\t} else {\n \t\t\terror_popup [mc \"That line comes from commit %s, \\\n-\t\t\t\t\t\t\t which is not in this view\" [shortids $id]]\n+\t\t\t\t\t which is not in this view\" [shortids $id]]\n \t\t}\n \t} else {\n \t\tputs \"oops couldn't parse git blame output\"\n@@ -4590,8 +4590,8 @@ proc bolden {id font} {\n \tif {[info exists currentid] && $id eq $currentid} {\n \t\t$canv delete secsel\n \t\tset t [eval $canv create rect [$canv bbox $linehtag($id)] \\\n-\t\t\t\t -outline {{}} -tags secsel \\\n-\t\t\t\t -fill [$canv cget -selectbackground]]\n+\t\t\t\t-outline {{}} -tags secsel \\\n+\t\t\t\t-fill [$canv cget -selectbackground]]\n \t\t$canv lower $t\n \t}\n \tif {[info exists markedid] && $id eq $markedid} {\n@@ -4608,8 +4608,8 @@ proc bolden_name {id font} {\n \tif {[info exists currentid] && $id eq $currentid} {\n \t\t$canv2 delete secsel\n \t\tset t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \\\n-\t\t\t\t -outline {{}} -tags secsel \\\n-\t\t\t\t -fill [$canv2 cget -selectbackground]]\n+\t\t\t\t-outline {{}} -tags secsel \\\n+\t\t\t\t-fill [$canv2 cget -selectbackground]]\n \t\t$canv2 lower $t\n \t}\n }\n@@ -4767,7 +4767,7 @@ proc findcom_change args {\n \t\tset findpattern $findstring\n \t} else {\n \t\tset e [string map {\"*\" \"\\\\*\" \"?\" \"\\\\?\" \"\\[\" \"\\\\\\[\" \"\\\\\" \"\\\\\\\\\"} \\\n-\t\t\t\t $findstring]\n+\t\t\t\t$findstring]\n \t\tset findpattern \"*$e*\"\n \t}\n }\n@@ -5057,7 +5057,7 @@ proc askrelhighlight {row id} {\n \t\t\tset isbold 1\n \t\t}\n \t} elseif {$highlight_related eq [mc \"Ancestor\"] ||\n-\t\t\t $highlight_related eq [mc \"Not ancestor\"]} {\n+\t\t $highlight_related eq [mc \"Not ancestor\"]} {\n \t\tif {![info exists ancestor($id)]} {\n \t\t\tis_ancestor $id\n \t\t}\n@@ -5162,7 +5162,7 @@ proc idcol {idlist id {i 0}} {\n \t} else {\n \t\tif {$t > [ordertoken [lindex $idlist $i]]} {\n \t\t\twhile {[incr i] < [llength $idlist] &&\n-\t\t\t\t $t >= [ordertoken [lindex $idlist $i]]} {}\n+\t\t\t $t >= [ordertoken [lindex $idlist $i]]} {}\n \t\t}\n \t}\n \treturn $i\n@@ -5243,7 +5243,7 @@ proc get_viewmainhead {view} {\n \n \tcatch {\n \t\tset rfd [open [concat | git rev-list -1 $mainheadid \\\n-\t\t\t\t\t\t -- $vfilelimit($view)] r]\n+\t\t\t\t-- $vfilelimit($view)] r]\n \t\tset j [reg_instance $rfd]\n \t\tlappend viewinstances($view) $j\n \t\tfconfigure $rfd -blocking 0\n@@ -5838,15 +5838,15 @@ proc rowranges {id} {\n \t\t\t# see if the line extends the whole way from prevrow to row\n \t\t\tif {$row > $prevrow + $uparrowlen + $downarrowlen &&\n \t\t\t\t[lsearch -exact [lindex $rowidlist \\\n-\t\t\t\t\t\t\t[expr {int(($row + $prevrow) / 2)}]] $id] < 0} {\n+\t\t\t\t\t\t[expr {int(($row + $prevrow) / 2)}]] $id] < 0} {\n \t\t\t\t# it doesn't, see where it ends\n \t\t\t\tset r [expr {$prevrow + $downarrowlen}]\n \t\t\t\tif {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {\n \t\t\t\t\twhile {[incr r -1] > $prevrow &&\n-\t\t\t\t\t\t [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}\n+\t\t\t\t\t [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}\n \t\t\t\t} else {\n \t\t\t\t\twhile {[incr r] <= $row &&\n-\t\t\t\t\t\t [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}\n+\t\t\t\t\t [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}\n \t\t\t\t\tincr r -1\n \t\t\t\t}\n \t\t\t\tlappend ret $r\n@@ -5854,10 +5854,10 @@ proc rowranges {id} {\n \t\t\t\tset r [expr {$row - $uparrowlen}]\n \t\t\t\tif {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {\n \t\t\t\t\twhile {[incr r] < $row &&\n-\t\t\t\t\t\t [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}\n+\t\t\t\t\t [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}\n \t\t\t\t} else {\n \t\t\t\t\twhile {[incr r -1] >= $prevrow &&\n-\t\t\t\t\t\t [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}\n+\t\t\t\t\t [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}\n \t\t\t\t\tincr r\n \t\t\t\t}\n \t\t\t\tlappend ret $r\n@@ -6000,7 +6000,7 @@ proc drawlineseg {id row endrow arrowlow} {\n \t\tif {!$joinhigh} {\n \t\t\tassigncolor $id\n \t\t\tset t [$canv create line $coords -width [linewidth $id] \\\n-\t\t\t\t\t -fill $colormap($id) -tags lines.$id -arrow $arrow]\n+\t\t\t\t\t-fill $colormap($id) -tags lines.$id -arrow $arrow]\n \t\t\t$canv lower $t\n \t\t\tbindline $t $id\n \t\t\tset lines [linsert $lines $i [list $row $le $t]]\n@@ -6097,7 +6097,7 @@ proc drawparentlinks {id row} {\n \t\t\tlappend coords $x2 $y2\n \t\t}\n \t\tset t [$canv create line $coords -width [linewidth $p] \\\n-\t\t\t\t -fill $colormap($p) -tags lines.$p]\n+\t\t\t\t-fill $colormap($p) -tags lines.$p]\n \t\t$canv lower $t\n \t\tbindline $t $p\n \t}\n@@ -6139,22 +6139,22 @@ proc drawcmittext {id row col} {\n \tset orad [expr {$linespc / 3}]\n \tif {$listed <= 2} {\n \t\tset t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \\\n-\t\t\t\t [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \\\n-\t\t\t\t -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]\n+\t\t\t\t[expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \\\n+\t\t\t\t-fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]\n \t} elseif {$listed == 3} {\n \t\t# triangle pointing left for left-side commits\n \t\tset t [$canv create polygon \\\n-\t\t\t\t [expr {$x - $orad}] $y \\\n-\t\t\t\t [expr {$x + $orad - 1}] [expr {$y - $orad}] \\\n-\t\t\t\t [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \\\n-\t\t\t\t -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]\n+\t\t\t\t[expr {$x - $orad}] $y \\\n+\t\t\t\t[expr {$x + $orad - 1}] [expr {$y - $orad}] \\\n+\t\t\t\t[expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \\\n+\t\t\t\t-fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]\n \t} else {\n \t\t# triangle pointing right for right-side commits\n \t\tset t [$canv create polygon \\\n-\t\t\t\t [expr {$x + $orad - 1}] $y \\\n-\t\t\t\t [expr {$x - $orad}] [expr {$y - $orad}] \\\n-\t\t\t\t [expr {$x - $orad}] [expr {$y + $orad - 1}] \\\n-\t\t\t\t -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]\n+\t\t\t\t[expr {$x + $orad - 1}] $y \\\n+\t\t\t\t[expr {$x - $orad}] [expr {$y - $orad}] \\\n+\t\t\t\t[expr {$x - $orad}] [expr {$y + $orad - 1}] \\\n+\t\t\t\t-fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]\n \t}\n \tset circleitem($row) $t\n \t$canv raise $t\n@@ -6196,12 +6196,12 @@ proc drawcmittext {id row col} {\n \t\t}\n \t}\n \tset linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \\\n-\t\t\t\t\t\t -text $headline -font $font -tags text]\n+\t\t\t-text $headline -font $font -tags text]\n \t$canv bind $linehtag($id) $ctxbut \"rowmenu %X %Y $id\"\n \tset linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \\\n-\t\t\t\t\t\t -text $name -font $nfont -tags text]\n+\t\t\t-text $name -font $nfont -tags text]\n \tset linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \\\n-\t\t\t\t\t\t -text $date -font mainfont -tags text]\n+\t\t\t-text $date -font mainfont -tags text]\n \tif {$selectedline == $row} {\n \t\tmake_secsel $id\n \t}\n@@ -6618,7 +6618,7 @@ proc drawtags {id x xt y1} {\n \t\tset xt [expr {$xt + $wid + $extra}]\n \t}\n \tset t [$canv create line $x $y1 [lindex $xvals end] $y1 \\\n-\t\t\t -width $lthickness -fill $reflinecolor -tags tag.$id]\n+\t\t\t-width $lthickness -fill $reflinecolor -tags tag.$id]\n \t$canv lower $t\n \tforeach tag $marks x $xvals wid $wvals {\n \t\tset tag_quoted [string map {% %%} $tag]\n@@ -6628,9 +6628,9 @@ proc drawtags {id x xt y1} {\n \t\tif {[incr ntags -1] >= 0} {\n \t\t\t# draw a tag\n \t\t\tset t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \\\n-\t\t\t\t\t $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \\\n-\t\t\t\t\t -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \\\n-\t\t\t\t\t -tags tag.$id]\n+\t\t\t\t\t$xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \\\n+\t\t\t\t\t-width 1 -outline $tagoutlinecolor -fill $tagbgcolor \\\n+\t\t\t\t\t-tags tag.$id]\n \t\t\tif {$singletag} {\n \t\t\t\tset tagclick [list showtags $id 1]\n \t\t\t} else {\n@@ -6661,7 +6661,7 @@ proc drawtags {id x xt y1} {\n \t\t\t}\n \t\t}\n \t\tset t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \\\n-\t\t\t\t -font $font -tags [list tag.$id text]]\n+\t\t\t\t-font $font -tags [list tag.$id text]]\n \t\tif {$ntags >= 0} {\n \t\t\t$canv bind $t <1> $tagclick\n \t\t} elseif {$nheads >= 0} {\n@@ -6676,8 +6676,8 @@ proc drawnotesign {xt y} {\n \n \tset orad [expr {$linespc / 3}]\n \tset t [$canv create rectangle [expr {$xt - $orad}] [expr {$y - $orad}] \\\n-\t\t\t [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \\\n-\t\t\t -fill yellow -outline $fgcolor -width 1 -tags circle]\n+\t\t\t[expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \\\n+\t\t\t-fill yellow -outline $fgcolor -width 1 -tags circle]\n \tset xt [expr {$xt + $orad * 3}]\n \treturn $xt\n }\n@@ -6971,8 +6971,8 @@ proc markmatches {canv l str tag matches font row} {\n \t\tset xoff [font measure $font [string range $str 0 [expr {$start-1}]]]\n \t\tset xlen [font measure $font [string range $str 0 [expr {$end}]]]\n \t\tset t [$canv create rect [expr {$x0+$xoff}] $y0 \\\n-\t\t\t\t [expr {$x0+$xlen+2}] $y1 \\\n-\t\t\t\t -outline {} -tags [list match$l matches] -fill yellow]\n+\t\t\t\t[expr {$x0+$xlen+2}] $y1 \\\n+\t\t\t\t-outline {} -tags [list match$l matches] -fill yellow]\n \t\t$canv lower $t\n \t\tif {$row == $selectedline} {\n \t\t\t$canv raise $t secsel\n@@ -7040,7 +7040,7 @@ proc appendwithlinks {text tags} {\n \t\tincr linknum\n \t}\n \tset wlinks [regexp -indices -all -inline -line \\\n-\t\t\t\t\t{https?://[^[:space:]]+} $text]\n+\t\t\t{https?://[^[:space:]]+} $text]\n \tforeach l $wlinks {\n \t\tset s2 [lindex $l 0]\n \t\tset e2 [lindex $l 1]\n@@ -7058,7 +7058,7 @@ proc setlink {id lk} {\n \tglobal linkfgcolor\n \n \tif {[string range $id 0 1] eq \"-g\"} {\n-\t set id [string range $id 2 end]\n+\t\tset id [string range $id 2 end]\n \t}\n \n \tset known 0\n@@ -7277,15 +7277,15 @@ proc make_secsel {id} {\n \tif {![info exists linehtag($id)]} return\n \t$canv delete secsel\n \tset t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \\\n-\t\t\t -tags secsel -fill [$canv cget -selectbackground]]\n+\t\t\t-tags secsel -fill [$canv cget -selectbackground]]\n \t$canv lower $t\n \t$canv2 delete secsel\n \tset t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \\\n-\t\t\t -tags secsel -fill [$canv2 cget -selectbackground]]\n+\t\t\t-tags secsel -fill [$canv2 cget -selectbackground]]\n \t$canv2 lower $t\n \t$canv3 delete secsel\n \tset t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \\\n-\t\t\t -tags secsel -fill [$canv3 cget -selectbackground]]\n+\t\t\t-tags secsel -fill [$canv3 cget -selectbackground]]\n \t$canv3 lower $t\n }\n \n@@ -7295,7 +7295,7 @@ proc make_idmark {id} {\n \tif {![info exists linehtag($id)]} return\n \t$canv delete markid\n \tset t [eval $canv create rect [$canv bbox $linehtag($id)] \\\n-\t\t\t -tags markid -outline $fgcolor]\n+\t\t\t-tags markid -outline $fgcolor]\n \t$canv raise $t\n }\n \n@@ -7751,7 +7751,7 @@ proc getblobline {bf id} {\n \t\tif {$jump_to_here ne {} &&\n \t\t\t[lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {\n \t\t\tset lnum [expr {[lindex $jump_to_here 1] +\n-\t\t\t\t\t\t\t[lindex [split $commentend .] 0]}]\n+\t\t\t\t\t[lindex [split $commentend .] 0]}]\n \t\t\tmark_ctext_line $lnum\n \t\t}\n \t\t$ctext config -state disabled\n@@ -7905,7 +7905,7 @@ proc gettreediffs {ids} {\n \n \tset cmd [diffcmd $ids {--no-commit-id}]\n \tif {$limitdiffs && $vfilelimit($curview) ne {}} {\n-\t\t\tset cmd [concat $cmd -- $vfilelimit($curview)]\n+\t\tset cmd [concat $cmd -- $vfilelimit($curview)]\n \t}\n \tif {[catch {set gdtf [open $cmd r]}]} return\n \n@@ -8058,7 +8058,7 @@ proc maybe_scroll_ctext {ateof} {\n \tif {![info exists target_scrollpos]} return\n \tif {!$ateof} {\n \t\tset nlines [expr {[winfo height $ctext]\n-\t\t\t\t\t\t / [font metrics textfont -linespace]}]\n+\t\t\t\t/ [font metrics textfont -linespace]}]\n \t\tif {[$ctext compare \"$target_scrollpos + $nlines lines\" <= end]} return\n \t}\n \t$ctext yview $target_scrollpos\n@@ -8179,8 +8179,8 @@ proc parseblobdiffline {ids line} {\n \t\t\tset l [string length $line]\n \t\t\tset i [expr {$l / 2}]\n \t\t\tif {!(($l & 1) && [string index $line $i] eq \" \" &&\n-\t\t\t\t [string range $line 2 [expr {$i - 1}]] eq \\\n-\t\t\t\t\t [string range $line [expr {$i + 3}] end])} {\n+\t\t\t\t\t[string range $line 2 [expr {$i - 1}]] eq \\\n+\t\t\t\t\t[string range $line [expr {$i + 3}] end])} {\n \t\t\t\treturn\n \t\t\t}\n \t\t\t# unescape if quoted and chop off the a/ from the front\n@@ -8252,7 +8252,7 @@ proc parseblobdiffline {ids line} {\n \t\t\t\tsetinlist difffilestart $i $curdiffstart\n \t\t\t}\n \t\t} elseif {![string compare -length 10 $line \"rename to \"] ||\n-\t\t\t\t ![string compare -length 8 $line \"copy to \"]} {\n+\t\t\t ![string compare -length 8 $line \"copy to \"]} {\n \t\t\tset fname [string range $line [expr 4 + [string first \" to \" $line] ] end]\n \t\t\tif {[string index $fname 0] eq \"\\\"\"} {\n \t\t\t\tset fname [lindex $fname 0]\n@@ -8269,7 +8269,7 @@ proc parseblobdiffline {ids line} {\n \n \t} else {\n \t\tset line [string map {\\x1A ^Z} \\\n-\t\t\t\t\t [encoding convertfrom $diffencoding $line]]\n+\t\t\t\t[encoding convertfrom $diffencoding $line]]\n \t\t# parse the prefix - one ' ', '-' or '+' for each parent\n \t\tset prefix [string range $line 0 [expr {$diffnparents - 1}]]\n \t\tset tag [expr {$diffnparents > 1? \"m\": \"d\"}]\n@@ -8429,7 +8429,7 @@ proc settabs {{firstab {}}} {\n \tset w [font measure textfont \"0\"]\n \tif {$firsttabstop != 0} {\n \t\t$ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \\\n-\t\t\t\t\t\t\t [expr {($firsttabstop + 2 * $tabstop) * $w}]]\n+\t\t\t\t[expr {($firsttabstop + 2 * $tabstop) * $w}]]\n \t} elseif {$have_tk85 || $tabstop != 8} {\n \t\t$ctext conf -tabs [expr {$tabstop * $w}]\n \t} else {\n@@ -8655,8 +8655,8 @@ proc fontflags {f {isbold 0}} {\n \tglobal fontattr\n \n \treturn [list -family $fontattr($f,family) -size $fontattr($f,size) \\\n-\t\t\t\t-weight [expr {$isbold? \"bold\": $fontattr($f,weight)}] \\\n-\t\t\t\t-slant $fontattr($f,slant)]\n+\t\t\t-weight [expr {$isbold? \"bold\": $fontattr($f,weight)}] \\\n+\t\t\t-slant $fontattr($f,slant)]\n }\n \n proc fontname {f} {\n@@ -8821,11 +8821,11 @@ proc linehover {} {\n \tset x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]\n \tset y1 [expr {$y + $linespc + 2 * $lthickness}]\n \tset t [$canv create rectangle $x0 $y0 $x1 $y1 \\\n-\t\t\t -fill $linehoverbgcolor -outline $linehoveroutlinecolor \\\n-\t\t\t -width 1 -tags hover]\n+\t\t\t-fill $linehoverbgcolor -outline $linehoveroutlinecolor \\\n+\t\t\t-width 1 -tags hover]\n \t$canv raise $t\n \tset t [$canv create text $x $y -anchor nw -text $text -tags hover \\\n-\t\t\t -font mainfont -fill $linehoverfgcolor]\n+\t\t\t-font mainfont -fill $linehoverfgcolor]\n \t$canv raise $t\n }\n \n@@ -9281,7 +9281,7 @@ proc mkpatchrev {} {\n \tset newid [$patchtop.tosha1 get]\n \tset newhead [$patchtop.tohead get]\n \tforeach e [list fromsha1 fromhead tosha1 tohead] \\\n-\t\t\tv [list $newid $newhead $oldid $oldhead] {\n+\t\tv [list $newid $newhead $oldid $oldhead] {\n \t\t$patchtop.$e conf -state normal\n \t\t$patchtop.$e delete 0 end\n \t\t$patchtop.$e insert 0 $v\n@@ -9666,7 +9666,7 @@ proc exec_citool {tool_args {baseid {}}} {\n \t\tset author [lindex $commitinfo($baseid) 1]\n \t\tset date [lindex $commitinfo($baseid) 2]\n \t\tif {[regexp {^\\s*(\\S.*\\S|\\S)\\s*<(.*)>\\s*$} \\\n-\t\t\t\t\t$author author name email]\n+\t\t\t\t$author author name email]\n \t\t\t&& $date ne {}} {\n \t\t\tset env(GIT_AUTHOR_NAME) $name\n \t\t\tset env(GIT_AUTHOR_EMAIL) $email\n@@ -9689,8 +9689,8 @@ proc cherrypick {} {\n \tset dheads [descheads $rowmenuid]\n \tif {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {\n \t\tset ok [confirm_popup [mc \"Commit %s is already\\\n-\t\t\t\tincluded in branch %s -- really re-apply it?\" \\\n-\t\t\t\t\t\t\t\t [string range $rowmenuid 0 7] $mainhead]]\n+\t\t\tincluded in branch %s -- really re-apply it?\" \\\n+\t\t\t\t[string range $rowmenuid 0 7] $mainhead]]\n \t\tif {!$ok} return\n \t}\n \tnowbusy cherrypick [mc \"Cherry-picking\"]\n@@ -9700,14 +9700,14 @@ proc cherrypick {} {\n \tif {[catch {exec sh -c \"git cherry-pick -r $rowmenuid 2>&1\"} err]} {\n \t\tnotbusy cherrypick\n \t\tif {[regexp -line \\\n-\t\t\t\t {Entry '(.*)' (would be overwritten by merge|not uptodate)} \\\n-\t\t\t\t $err msg fname]} {\n+\t\t\t\t{Entry '(.*)' (would be overwritten by merge|not uptodate)} \\\n+\t\t\t\t$err msg fname]} {\n \t\t\terror_popup [mc \"Cherry-pick failed because of local changes\\\n-\t\t\t\t\t\tto file '%s'.\\nPlease commit, reset or stash\\\n-\t\t\t\t\t\tyour changes and try again.\" $fname]\n+\t\t\t\t\tto file '%s'.\\nPlease commit, reset or stash\\\n+\t\t\t\t\tyour changes and try again.\" $fname]\n \t\t} elseif {[regexp -line \\\n-\t\t\t\t\t {^(CONFLICT \\(.*\\):|Automatic cherry-pick failed|error: could not apply)} \\\n-\t\t\t\t\t $err]} {\n+\t\t\t\t{^(CONFLICT \\(.*\\):|Automatic cherry-pick failed|error: could not apply)} \\\n+\t\t\t\t$err]} {\n \t\t\tif {[confirm_popup [mc \"Cherry-pick failed because of merge\\\n \t\t\t\t\t\tconflict.\\nDo you wish to run git citool to\\\n \t\t\t\t\t\tresolve it?\"]]} {\n@@ -9752,9 +9752,9 @@ proc revert {} {\n \tset dheads [descheads $rowmenuid]\n \tif { $dheads eq {} || [lsearch -exact $dheads $oldhead] == -1 } {\n \t set ok [confirm_popup [mc \"Commit %s is not\\\n-\t\t included in branch %s -- really revert it?\" \\\n-\t\t\t\t\t [string range $rowmenuid 0 7] $mainhead]]\n-\t if {!$ok} return\n+\t\tincluded in branch %s -- really revert it?\" \\\n+\t\t\t[string range $rowmenuid 0 7] $mainhead]]\n+\t\tif {!$ok} return\n \t}\n \tnowbusy revert [mc \"Reverting\"]\n \tupdate\n@@ -9988,7 +9988,7 @@ proc rmbranch {} {\n \tif {[llength $dheads] == 1 && $idheads($dheads) eq $head} {\n \t\t# the stuff on this branch isn't on any other branch\n \t\tif {![confirm_popup [mc \"The commits on branch %s aren't on any other\\\n-\t\t\t\t\t\tbranch.\\nReally delete branch %s?\" $head $head]]} return\n+\t\t\t\tbranch.\\nReally delete branch %s?\" $head $head]]} return\n \t}\n \tnowbusy rmbranch\n \tupdate\n@@ -10134,10 +10134,10 @@ proc refill_reflist {} {\n \t\tif {$i < [llength $reflist]} {\n \t\t\tif {$j < [llength $refs]} {\n \t\t\t\tset cmp [string compare [lindex $reflist $i 0] \\\n-\t\t\t\t\t\t\t [lindex $refs $j 0]]\n+\t\t\t\t\t\t[lindex $refs $j 0]]\n \t\t\t\tif {$cmp == 0} {\n \t\t\t\t\tset cmp [string compare [lindex $reflist $i 1] \\\n-\t\t\t\t\t\t\t\t [lindex $refs $j 1]]\n+\t\t\t\t\t\t\t[lindex $refs $j 1]]\n \t\t\t\t}\n \t\t\t} else {\n \t\t\t\tset cmp -1\n@@ -10198,7 +10198,7 @@ proc getallcommits {} {\n \t\tset ids \"--all\"\n \t} else {\n \t\tset refs [concat [array names idheads] [array names idtags] \\\n-\t\t\t\t\t [array names idotherrefs]]\n+\t\t\t\t[array names idotherrefs]]\n \t\tset ids {}\n \t\tset tagobjs {}\n \t\tforeach name [array names tagobjid] {\n@@ -10557,7 +10557,7 @@ proc dropcache {err} {\n \n \t#puts \"dropping cache ($err)\"\n \tforeach v {arcnos arcout arcids arcstart arcend growing \\\n-\t\t\t\t arctags archeads allparents allchildren} {\n+\t\t\t\tarctags archeads allparents allchildren} {\n \t\tglobal $v\n \t\tunset -nocomplain $v\n \t}\n@@ -11263,7 +11263,7 @@ proc rereadrefs {} {\n \tglobal idtags idheads idotherrefs mainheadid\n \n \tset refids [concat [array names idtags] \\\n-\t\t\t\t\t[array names idheads] [array names idotherrefs]]\n+\t\t\t[array names idheads] [array names idotherrefs]]\n \tforeach id $refids {\n \t\tif {![info exists ref($id)]} {\n \t\t\tset ref($id) [listrefs $id]\n@@ -11273,7 +11273,7 @@ proc rereadrefs {} {\n \treadrefs\n \tchangedrefs\n \tset refids [lsort -unique [concat $refids [array names idtags] \\\n-\t\t\t\t\t\t[array names idheads] [array names idotherrefs]]]\n+\t\t\t[array names idheads] [array names idotherrefs]]]\n \tforeach id $refids {\n \t\tset v [listrefs $id]\n \t\tif {![info exists ref($id)] || $ref($id) != $v} {\n@@ -11544,7 +11544,7 @@ proc prefspage_general {notebook} {\n \t${NS}::label $page.maxwidthl -text [mc \"Maximum graph width (lines)\"]\n \tspinbox $page.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth\n \tgrid $page.spacer $page.maxwidthl $page.maxwidth -sticky w\n-\t\t\t\t\t\t\t\t\t\t #xgettext:no-tcl-format\n+\t\t\t#xgettext:no-tcl-format\n \t${NS}::label $page.maxpctl -text [mc \"Maximum graph width (% of pane)\"]\n \tspinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct\n \tgrid x $page.maxpctl $page.maxpct -sticky w\n@@ -11614,7 +11614,7 @@ proc prefspage_colors {notebook} {\n \tgrid $page.cdisp - -sticky w -pady 10\n \tlabel $page.ui -padx 40 -relief sunk -background $uicolor\n \t${NS}::button $page.uibut -text [mc \"Interface\"] \\\n-\t -command [list choosecolor uicolor {} $page.ui [mc \"interface\"] setui]\n+\t\t-command [list choosecolor uicolor {} $page.ui [mc \"interface\"] setui]\n \tgrid x $page.uibut $page.ui -sticky w\n \tlabel $page.bg -padx 40 -relief sunk -background $bgcolor\n \t${NS}::button $page.bgbut -text [mc \"Background\"] \\\n@@ -11627,24 +11627,24 @@ proc prefspage_colors {notebook} {\n \tlabel $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]\n \t${NS}::button $page.diffoldbut -text [mc \"Diff: old lines\"] \\\n \t\t-command [list choosecolor diffcolors 0 $page.diffold [mc \"diff old lines\"] \\\n-\t\t\t\t\t [list $ctext tag conf d0 -foreground]]\n+\t\t\t\t[list $ctext tag conf d0 -foreground]]\n \tgrid x $page.diffoldbut $page.diffold -sticky w\n \tlabel $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]\n \t${NS}::button $page.diffnewbut -text [mc \"Diff: new lines\"] \\\n \t\t-command [list choosecolor diffcolors 1 $page.diffnew [mc \"diff new lines\"] \\\n-\t\t\t\t\t [list $ctext tag conf dresult -foreground]]\n+\t\t\t\t[list $ctext tag conf dresult -foreground]]\n \tgrid x $page.diffnewbut $page.diffnew -sticky w\n \tlabel $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]\n \t${NS}::button $page.hunksepbut -text [mc \"Diff: hunk header\"] \\\n \t\t-command [list choosecolor diffcolors 2 $page.hunksep \\\n-\t\t\t\t\t [mc \"diff hunk header\"] \\\n-\t\t\t\t\t [list $ctext tag conf hunksep -foreground]]\n+\t\t\t\t[mc \"diff hunk header\"] \\\n+\t\t\t\t[list $ctext tag conf hunksep -foreground]]\n \tgrid x $page.hunksepbut $page.hunksep -sticky w\n \tlabel $page.markbgsep -padx 40 -relief sunk -background $markbgcolor\n \t${NS}::button $page.markbgbut -text [mc \"Marked line bg\"] \\\n \t\t-command [list choosecolor markbgcolor {} $page.markbgsep \\\n-\t\t\t\t\t [mc \"marked line background\"] \\\n-\t\t\t\t\t [list $ctext tag conf omark -background]]\n+\t\t\t\t[mc \"marked line background\"] \\\n+\t\t\t\t[list $ctext tag conf omark -background]]\n \tgrid x $page.markbgbut $page.markbgsep -sticky w\n \tlabel $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor\n \t${NS}::button $page.selbgbut -text [mc \"Select bg\"] \\\n@@ -11678,7 +11678,7 @@ proc doprefs {} {\n \t\treturn\n \t}\n \tforeach v {maxwidth maxgraphpct showneartags showlocalchanges \\\n-\t\t\t\t limitdiffs tabstop perfile_attrs hideremotes want_ttk} {\n+\t\t\tlimitdiffs tabstop perfile_attrs hideremotes want_ttk} {\n \t\tset oldprefs($v) [set $v]\n \t}\n \tttk_toplevel $top\n@@ -11700,7 +11700,7 @@ proc doprefs {} {\n \t\t\t$notebook add $page -text $title\n \t\t} else {\n \t\t\tset btn [${NS}::button $notebook.b_[string map {. X} $page] \\\n-\t\t\t\t\t\t -text $title -command [list raise $page]]\n+\t\t\t\t\t-text $title -command [list raise $page]]\n \t\t\t$page configure -text $title\n \t\t\tgrid $btn -row 0 -column [incr col] -sticky w\n \t\t\tgrid $page -row 1 -column 0 -sticky news -columnspan 100\n@@ -11743,7 +11743,7 @@ proc choosecolor {v vi w x cmd} {\n \tglobal $v\n \n \tset c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \\\n-\t\t\t -title [mc \"Gitk: choose color for %s\" $x]]\n+\t\t\t-title [mc \"Gitk: choose color for %s\" $x]]\n \tif {$c eq {}} return\n \t$w conf -background $c\n \tlset $v $vi $c\n@@ -11804,7 +11804,7 @@ proc prefscan {} {\n \tglobal oldprefs prefstop\n \n \tforeach v {maxwidth maxgraphpct showneartags showlocalchanges \\\n-\t\t\t\t limitdiffs tabstop perfile_attrs hideremotes want_ttk} {\n+\t\t\tlimitdiffs tabstop perfile_attrs hideremotes want_ttk} {\n \t\tglobal $v\n \t\tset $v $oldprefs($v)\n \t}\n@@ -12257,7 +12257,7 @@ namespace import ::msgcat::mc\n # First check that Tcl/Tk is recent enough\n if {[catch {package require Tk 8.4} err]} {\n \tshow_error {} . [mc \"Sorry, gitk cannot run with this version of Tcl/Tk.\\n\\\n-\t\t\t\t\t\t Gitk requires at least Tcl/Tk 8.4.\"]\n+\t\t\t Gitk requires at least Tcl/Tk 8.4.\"]\n \texit 1\n }\n \n@@ -12521,7 +12521,7 @@ if {$i >= [llength $argv] && $revtreeargs ne {}} {\n \t\tforeach arg $revtreeargs {\n \t\t\tif {[file exists $arg]} {\n \t\t\t\tshow_error {} . [mc \"Ambiguous argument '%s': both revision\\\n-\t\t\t\t\t\t\t\t and filename\" $arg]\n+\t\t\t\t\t\t and filename\" $arg]\n \t\t\t\texit 1\n \t\t\t}\n \t\t}\n-- \n2.28.0.618.gf4bc123cb7\n\n"},{"id":"405352","messageId":"c59cec1c669b26fc2271067f4970d0ecbf816a89.1599726439.git.liu.denton@gmail.com","threadId":"54220","inReplyTo":"cover.1599726439.git.liu.denton@gmail.com","subject":"[PATCH 1/2] gitk: replace spaces with tabs","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2020-09-10T08:27:41Z","receivedAt":"2020-09-10T08:30:21Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"The source code is a mix of tabs and spaces. The indentation style\ncurrently is four spaces per indent level but uses tabs every other\nlevel (at eight spaces). Fix this inconsistent spacing and tabbing by\njust using a tab-indent for everything.\n\nThis was done mechanically using the following vim commands:\n\n\t:set tabstop=8\n\t:set expandtab\n\t:retab\n\t:set tabstop=4\n\t:set noexpandtab\n\t:retab!\n\t:set tabstop=8\n\nA future commit will manually clean up the code style errors introduced\nby this patch.\n\nThis patch should be empty with `--ignore-all-space`.\n\nSigned-off-by: Denton Liu \n---\n gitk | 20408 ++++++++++++++++++++++++++++-----------------------------\n 1 file changed, 10204 insertions(+), 10204 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex da84e22dd4..7efb106e52 100755\n--- a/gitk\n+++ b/gitk\n@@ -10,37 +10,37 @@ exec wish \"$0\" -- \"$@\"\n package require Tk\n \n proc hasworktree {} {\n- return [expr {[exec git rev-parse --is-bare-repository] == \"false\" &&\n-\t\t [exec git rev-parse --is-inside-git-dir] == \"false\"}]\n+\treturn [expr {[exec git rev-parse --is-bare-repository] == \"false\" &&\n+\t\t\t\t [exec git rev-parse --is-inside-git-dir] == \"false\"}]\n }\n \n proc reponame {} {\n- global gitdir\n- set n [file normalize $gitdir]\n- if {[string match \"*/.git\" $n]} {\n-\tset n [string range $n 0 end-5]\n- }\n- return [file tail $n]\n+\tglobal gitdir\n+\tset n [file normalize $gitdir]\n+\tif {[string match \"*/.git\" $n]} {\n+\t\tset n [string range $n 0 end-5]\n+\t}\n+\treturn [file tail $n]\n }\n \n proc gitworktree {} {\n- variable _gitworktree\n- if {[info exists _gitworktree]} {\n+\tvariable _gitworktree\n+\tif {[info exists _gitworktree]} {\n+\t\treturn $_gitworktree\n+\t}\n+\t# v1.7.0 introduced --show-toplevel to return the canonical work-tree\n+\tif {[catch {set _gitworktree [exec git rev-parse --show-toplevel]}]} {\n+\t\t# try to set work tree from environment, core.worktree or use\n+\t\t# cdup to obtain a relative path to the top of the worktree. If\n+\t\t# run from the top, the ./ prefix ensures normalize expands pwd.\n+\t\tif {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {\n+\t\t\tcatch {set _gitworktree [exec git config --get core.worktree]}\n+\t\t\tif {$_gitworktree eq \"\"} {\n+\t\t\t\tset _gitworktree [file normalize ./[exec git rev-parse --show-cdup]]\n+\t\t\t}\n+\t\t}\n+\t}\n \treturn $_gitworktree\n- }\n- # v1.7.0 introduced --show-toplevel to return the canonical work-tree\n- if {[catch {set _gitworktree [exec git rev-parse --show-toplevel]}]} {\n- # try to set work tree from environment, core.worktree or use\n- # cdup to obtain a relative path to the top of the worktree. If\n- # run from the top, the ./ prefix ensures normalize expands pwd.\n- if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {\n-\t catch {set _gitworktree [exec git config --get core.worktree]}\n-\t if {$_gitworktree eq \"\"} {\n-\t\tset _gitworktree [file normalize ./[exec git rev-parse --show-cdup]]\n-\t }\n- }\n- }\n- return $_gitworktree\n }\n \n # A simple scheduler for compute-intensive stuff.\n@@ -49,1942 +49,1942 @@ proc gitworktree {} {\n # run before X event handlers, so reading from a fast source can\n # make the GUI completely unresponsive.\n proc run args {\n- global isonrunq runq currunq\n+\tglobal isonrunq runq currunq\n \n- set script $args\n- if {[info exists isonrunq($script)]} return\n- if {$runq eq {} && ![info exists currunq]} {\n-\tafter idle dorunq\n- }\n- lappend runq [list {} $script]\n- set isonrunq($script) 1\n+\tset script $args\n+\tif {[info exists isonrunq($script)]} return\n+\tif {$runq eq {} && ![info exists currunq]} {\n+\t\tafter idle dorunq\n+\t}\n+\tlappend runq [list {} $script]\n+\tset isonrunq($script) 1\n }\n \n proc filerun {fd script} {\n- fileevent $fd readable [list filereadable $fd $script]\n+\tfileevent $fd readable [list filereadable $fd $script]\n }\n \n proc filereadable {fd script} {\n- global runq currunq\n+\tglobal runq currunq\n \n- fileevent $fd readable {}\n- if {$runq eq {} && ![info exists currunq]} {\n-\tafter idle dorunq\n- }\n- lappend runq [list $fd $script]\n+\tfileevent $fd readable {}\n+\tif {$runq eq {} && ![info exists currunq]} {\n+\t\tafter idle dorunq\n+\t}\n+\tlappend runq [list $fd $script]\n }\n \n proc nukefile {fd} {\n- global runq\n+\tglobal runq\n \n- for {set i 0} {$i < [llength $runq]} {} {\n-\tif {[lindex $runq $i 0] eq $fd} {\n-\t set runq [lreplace $runq $i $i]\n-\t} else {\n-\t incr i\n+\tfor {set i 0} {$i < [llength $runq]} {} {\n+\t\tif {[lindex $runq $i 0] eq $fd} {\n+\t\t\tset runq [lreplace $runq $i $i]\n+\t\t} else {\n+\t\t\tincr i\n+\t\t}\n \t}\n- }\n }\n \n proc dorunq {} {\n- global isonrunq runq currunq\n+\tglobal isonrunq runq currunq\n \n- set tstart [clock clicks -milliseconds]\n- set t0 $tstart\n- while {[llength $runq] > 0} {\n-\tset fd [lindex $runq 0 0]\n-\tset script [lindex $runq 0 1]\n-\tset currunq [lindex $runq 0]\n-\tset runq [lrange $runq 1 end]\n-\tset repeat [eval $script]\n-\tunset currunq\n-\tset t1 [clock clicks -milliseconds]\n-\tset t [expr {$t1 - $t0}]\n-\tif {$repeat ne {} && $repeat} {\n-\t if {$fd eq {} || $repeat == 2} {\n-\t\t# script returns 1 if it wants to be readded\n-\t\t# file readers return 2 if they could do more straight away\n-\t\tlappend runq [list $fd $script]\n-\t } else {\n-\t\tfileevent $fd readable [list filereadable $fd $script]\n-\t }\n-\t} elseif {$fd eq {}} {\n-\t unset isonrunq($script)\n+\tset tstart [clock clicks -milliseconds]\n+\tset t0 $tstart\n+\twhile {[llength $runq] > 0} {\n+\t\tset fd [lindex $runq 0 0]\n+\t\tset script [lindex $runq 0 1]\n+\t\tset currunq [lindex $runq 0]\n+\t\tset runq [lrange $runq 1 end]\n+\t\tset repeat [eval $script]\n+\t\tunset currunq\n+\t\tset t1 [clock clicks -milliseconds]\n+\t\tset t [expr {$t1 - $t0}]\n+\t\tif {$repeat ne {} && $repeat} {\n+\t\t\tif {$fd eq {} || $repeat == 2} {\n+\t\t\t\t# script returns 1 if it wants to be readded\n+\t\t\t\t# file readers return 2 if they could do more straight away\n+\t\t\t\tlappend runq [list $fd $script]\n+\t\t\t} else {\n+\t\t\t\tfileevent $fd readable [list filereadable $fd $script]\n+\t\t\t}\n+\t\t} elseif {$fd eq {}} {\n+\t\t\tunset isonrunq($script)\n+\t\t}\n+\t\tset t0 $t1\n+\t\tif {$t1 - $tstart >= 80} break\n+\t}\n+\tif {$runq ne {}} {\n+\t\tafter idle dorunq\n \t}\n-\tset t0 $t1\n-\tif {$t1 - $tstart >= 80} break\n- }\n- if {$runq ne {}} {\n-\tafter idle dorunq\n- }\n }\n \n proc reg_instance {fd} {\n- global commfd leftover loginstance\n+\tglobal commfd leftover loginstance\n \n- set i [incr loginstance]\n- set commfd($i) $fd\n- set leftover($i) {}\n- return $i\n+\tset i [incr loginstance]\n+\tset commfd($i) $fd\n+\tset leftover($i) {}\n+\treturn $i\n }\n \n proc unmerged_files {files} {\n- global nr_unmerged\n+\tglobal nr_unmerged\n \n- # find the list of unmerged files\n- set mlist {}\n- set nr_unmerged 0\n- if {[catch {\n-\tset fd [open \"| git ls-files -u\" r]\n- } err]} {\n-\tshow_error {} . \"[mc \"Couldn't get list of unmerged files:\"] $err\"\n-\texit 1\n- }\n- while {[gets $fd line] >= 0} {\n-\tset i [string first \"\\t\" $line]\n-\tif {$i < 0} continue\n-\tset fname [string range $line [expr {$i+1}] end]\n-\tif {[lsearch -exact $mlist $fname] >= 0} continue\n-\tincr nr_unmerged\n-\tif {$files eq {} || [path_filter $files $fname]} {\n-\t lappend mlist $fname\n+\t# find the list of unmerged files\n+\tset mlist {}\n+\tset nr_unmerged 0\n+\tif {[catch {\n+\t\tset fd [open \"| git ls-files -u\" r]\n+\t} err]} {\n+\t\tshow_error {} . \"[mc \"Couldn't get list of unmerged files:\"] $err\"\n+\t\texit 1\n \t}\n- }\n- catch {close $fd}\n- return $mlist\n+\twhile {[gets $fd line] >= 0} {\n+\t\tset i [string first \"\\t\" $line]\n+\t\tif {$i < 0} continue\n+\t\tset fname [string range $line [expr {$i+1}] end]\n+\t\tif {[lsearch -exact $mlist $fname] >= 0} continue\n+\t\tincr nr_unmerged\n+\t\tif {$files eq {} || [path_filter $files $fname]} {\n+\t\t\tlappend mlist $fname\n+\t\t}\n+\t}\n+\tcatch {close $fd}\n+\treturn $mlist\n }\n \n proc parseviewargs {n arglist} {\n- global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env\n- global vinlinediff\n- global worddiff git_version\n+\tglobal vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env\n+\tglobal vinlinediff\n+\tglobal worddiff git_version\n \n- set vdatemode($n) 0\n- set vmergeonly($n) 0\n- set vinlinediff($n) 0\n- set glflags {}\n- set diffargs {}\n- set nextisval 0\n- set revargs {}\n- set origargs $arglist\n- set allknown 1\n- set filtered 0\n- set i -1\n- foreach arg $arglist {\n-\tincr i\n-\tif {$nextisval} {\n-\t lappend glflags $arg\n-\t set nextisval 0\n-\t continue\n+\tset vdatemode($n) 0\n+\tset vmergeonly($n) 0\n+\tset vinlinediff($n) 0\n+\tset glflags {}\n+\tset diffargs {}\n+\tset nextisval 0\n+\tset revargs {}\n+\tset origargs $arglist\n+\tset allknown 1\n+\tset filtered 0\n+\tset i -1\n+\tforeach arg $arglist {\n+\t\tincr i\n+\t\tif {$nextisval} {\n+\t\t\tlappend glflags $arg\n+\t\t\tset nextisval 0\n+\t\t\tcontinue\n+\t\t}\n+\t\tswitch -glob -- $arg {\n+\t\t\t\"-d\" -\n+\t\t\t\"--date-order\" {\n+\t\t\t\tset vdatemode($n) 1\n+\t\t\t\t# remove from origargs in case we hit an unknown option\n+\t\t\t\tset origargs [lreplace $origargs $i $i]\n+\t\t\t\tincr i -1\n+\t\t\t}\n+\t\t\t\"-[puabwcrRBMC]\" -\n+\t\t\t\"--no-renames\" - \"--full-index\" - \"--binary\" - \"--abbrev=*\" -\n+\t\t\t\"--find-copies-harder\" - \"-l*\" - \"--ext-diff\" - \"--no-ext-diff\" -\n+\t\t\t\"--src-prefix=*\" - \"--dst-prefix=*\" - \"--no-prefix\" -\n+\t\t\t\"-O*\" - \"--text\" - \"--full-diff\" - \"--ignore-space-at-eol\" -\n+\t\t\t\"--ignore-space-change\" - \"-U*\" - \"--unified=*\" {\n+\t\t\t\t# These request or affect diff output, which we don't want.\n+\t\t\t\t# Some could be used to set our defaults for diff display.\n+\t\t\t\tlappend diffargs $arg\n+\t\t\t}\n+\t\t\t\"--raw\" - \"--patch-with-raw\" - \"--patch-with-stat\" -\n+\t\t\t\"--name-only\" - \"--name-status\" - \"--color\" -\n+\t\t\t\"--log-size\" - \"--pretty=*\" - \"--decorate\" - \"--abbrev-commit\" -\n+\t\t\t\"--cc\" - \"-z\" - \"--header\" - \"--parents\" - \"--boundary\" -\n+\t\t\t\"--no-color\" - \"-g\" - \"--walk-reflogs\" - \"--no-walk\" -\n+\t\t\t\"--timestamp\" - \"relative-date\" - \"--date=*\" - \"--stdin\" -\n+\t\t\t\"--objects\" - \"--objects-edge\" - \"--reverse\" {\n+\t\t\t\t# These cause our parsing of git log's output to fail, or else\n+\t\t\t\t# they're options we want to set ourselves, so ignore them.\n+\t\t\t}\n+\t\t\t\"--color-words*\" - \"--word-diff=color\" {\n+\t\t\t\t# These trigger a word diff in the console interface,\n+\t\t\t\t# so help the user by enabling our own support\n+\t\t\t\tif {[package vcompare $git_version \"1.7.2\"] >= 0} {\n+\t\t\t\t\tset worddiff [mc \"Color words\"]\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\t\"--word-diff*\" {\n+\t\t\t\tif {[package vcompare $git_version \"1.7.2\"] >= 0} {\n+\t\t\t\t\tset worddiff [mc \"Markup words\"]\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\t\"--stat=*\" - \"--numstat\" - \"--shortstat\" - \"--summary\" -\n+\t\t\t\"--check\" - \"--exit-code\" - \"--quiet\" - \"--topo-order\" -\n+\t\t\t\"--full-history\" - \"--dense\" - \"--sparse\" -\n+\t\t\t\"--follow\" - \"--left-right\" - \"--encoding=*\" {\n+\t\t\t\t# These are harmless, and some are even useful\n+\t\t\t\tlappend glflags $arg\n+\t\t\t}\n+\t\t\t\"--diff-filter=*\" - \"--no-merges\" - \"--unpacked\" -\n+\t\t\t\"--max-count=*\" - \"--skip=*\" - \"--since=*\" - \"--after=*\" -\n+\t\t\t\"--until=*\" - \"--before=*\" - \"--max-age=*\" - \"--min-age=*\" -\n+\t\t\t\"--author=*\" - \"--committer=*\" - \"--grep=*\" - \"-[iE]\" -\n+\t\t\t\"--remove-empty\" - \"--first-parent\" - \"--cherry-pick\" -\n+\t\t\t\"-S*\" - \"-G*\" - \"--pickaxe-all\" - \"--pickaxe-regex\" -\n+\t\t\t\"--simplify-by-decoration\" {\n+\t\t\t\t# These mean that we get a subset of the commits\n+\t\t\t\tset filtered 1\n+\t\t\t\tlappend glflags $arg\n+\t\t\t}\n+\t\t\t\"-L*\" {\n+\t\t\t\t# Line-log with 'stuck' argument (unstuck form is\n+\t\t\t\t# not supported)\n+\t\t\t\tset filtered 1\n+\t\t\t\tset vinlinediff($n) 1\n+\t\t\t\tset allknown 0\n+\t\t\t\tlappend glflags $arg\n+\t\t\t}\n+\t\t\t\"-n\" {\n+\t\t\t\t# This appears to be the only one that has a value as a\n+\t\t\t\t# separate word following it\n+\t\t\t\tset filtered 1\n+\t\t\t\tset nextisval 1\n+\t\t\t\tlappend glflags $arg\n+\t\t\t}\n+\t\t\t\"--not\" - \"--all\" {\n+\t\t\t\tlappend revargs $arg\n+\t\t\t}\n+\t\t\t\"--merge\" {\n+\t\t\t\tset vmergeonly($n) 1\n+\t\t\t\t# git rev-parse doesn't understand --merge\n+\t\t\t\tlappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD\n+\t\t\t}\n+\t\t\t\"--no-replace-objects\" {\n+\t\t\t\tset env(GIT_NO_REPLACE_OBJECTS) \"1\"\n+\t\t\t}\n+\t\t\t\"-*\" {\n+\t\t\t\t# Other flag arguments including -\n+\t\t\t\tif {[string is digit -strict [string range $arg 1 end]]} {\n+\t\t\t\t\tset filtered 1\n+\t\t\t\t} else {\n+\t\t\t\t\t# a flag argument that we don't recognize;\n+\t\t\t\t\t# that means we can't optimize\n+\t\t\t\t\tset allknown 0\n+\t\t\t\t}\n+\t\t\t\tlappend glflags $arg\n+\t\t\t}\n+\t\t\tdefault {\n+\t\t\t\t# Non-flag arguments specify commits or ranges of commits\n+\t\t\t\tif {[string match \"*...*\" $arg]} {\n+\t\t\t\t\tlappend revargs --gitk-symmetric-diff-marker\n+\t\t\t\t}\n+\t\t\t\tlappend revargs $arg\n+\t\t\t}\n+\t\t}\n \t}\n-\tswitch -glob -- $arg {\n-\t \"-d\" -\n-\t \"--date-order\" {\n-\t\tset vdatemode($n) 1\n-\t\t# remove from origargs in case we hit an unknown option\n-\t\tset origargs [lreplace $origargs $i $i]\n-\t\tincr i -1\n-\t }\n-\t \"-[puabwcrRBMC]\" -\n-\t \"--no-renames\" - \"--full-index\" - \"--binary\" - \"--abbrev=*\" -\n-\t \"--find-copies-harder\" - \"-l*\" - \"--ext-diff\" - \"--no-ext-diff\" -\n-\t \"--src-prefix=*\" - \"--dst-prefix=*\" - \"--no-prefix\" -\n-\t \"-O*\" - \"--text\" - \"--full-diff\" - \"--ignore-space-at-eol\" -\n-\t \"--ignore-space-change\" - \"-U*\" - \"--unified=*\" {\n-\t\t# These request or affect diff output, which we don't want.\n-\t\t# Some could be used to set our defaults for diff display.\n-\t\tlappend diffargs $arg\n-\t }\n-\t \"--raw\" - \"--patch-with-raw\" - \"--patch-with-stat\" -\n-\t \"--name-only\" - \"--name-status\" - \"--color\" -\n-\t \"--log-size\" - \"--pretty=*\" - \"--decorate\" - \"--abbrev-commit\" -\n-\t \"--cc\" - \"-z\" - \"--header\" - \"--parents\" - \"--boundary\" -\n-\t \"--no-color\" - \"-g\" - \"--walk-reflogs\" - \"--no-walk\" -\n-\t \"--timestamp\" - \"relative-date\" - \"--date=*\" - \"--stdin\" -\n-\t \"--objects\" - \"--objects-edge\" - \"--reverse\" {\n-\t\t# These cause our parsing of git log's output to fail, or else\n-\t\t# they're options we want to set ourselves, so ignore them.\n-\t }\n-\t \"--color-words*\" - \"--word-diff=color\" {\n-\t\t# These trigger a word diff in the console interface,\n-\t\t# so help the user by enabling our own support\n-\t\tif {[package vcompare $git_version \"1.7.2\"] >= 0} {\n-\t\t set worddiff [mc \"Color words\"]\n-\t\t}\n-\t }\n-\t \"--word-diff*\" {\n-\t\tif {[package vcompare $git_version \"1.7.2\"] >= 0} {\n-\t\t set worddiff [mc \"Markup words\"]\n-\t\t}\n-\t }\n-\t \"--stat=*\" - \"--numstat\" - \"--shortstat\" - \"--summary\" -\n-\t \"--check\" - \"--exit-code\" - \"--quiet\" - \"--topo-order\" -\n-\t \"--full-history\" - \"--dense\" - \"--sparse\" -\n-\t \"--follow\" - \"--left-right\" - \"--encoding=*\" {\n-\t\t# These are harmless, and some are even useful\n-\t\tlappend glflags $arg\n-\t }\n-\t \"--diff-filter=*\" - \"--no-merges\" - \"--unpacked\" -\n-\t \"--max-count=*\" - \"--skip=*\" - \"--since=*\" - \"--after=*\" -\n-\t \"--until=*\" - \"--before=*\" - \"--max-age=*\" - \"--min-age=*\" -\n-\t \"--author=*\" - \"--committer=*\" - \"--grep=*\" - \"-[iE]\" -\n-\t \"--remove-empty\" - \"--first-parent\" - \"--cherry-pick\" -\n-\t \"-S*\" - \"-G*\" - \"--pickaxe-all\" - \"--pickaxe-regex\" -\n-\t \"--simplify-by-decoration\" {\n-\t\t# These mean that we get a subset of the commits\n-\t\tset filtered 1\n-\t\tlappend glflags $arg\n-\t }\n-\t \"-L*\" {\n-\t\t# Line-log with 'stuck' argument (unstuck form is\n-\t\t# not supported)\n-\t\tset filtered 1\n-\t\tset vinlinediff($n) 1\n-\t\tset allknown 0\n-\t\tlappend glflags $arg\n-\t }\n-\t \"-n\" {\n-\t\t# This appears to be the only one that has a value as a\n-\t\t# separate word following it\n-\t\tset filtered 1\n-\t\tset nextisval 1\n-\t\tlappend glflags $arg\n-\t }\n-\t \"--not\" - \"--all\" {\n-\t\tlappend revargs $arg\n-\t }\n-\t \"--merge\" {\n-\t\tset vmergeonly($n) 1\n-\t\t# git rev-parse doesn't understand --merge\n-\t\tlappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD\n-\t }\n-\t \"--no-replace-objects\" {\n-\t\tset env(GIT_NO_REPLACE_OBJECTS) \"1\"\n-\t }\n-\t \"-*\" {\n-\t\t# Other flag arguments including -\n-\t\tif {[string is digit -strict [string range $arg 1 end]]} {\n-\t\t set filtered 1\n-\t\t} else {\n-\t\t # a flag argument that we don't recognize;\n-\t\t # that means we can't optimize\n-\t\t set allknown 0\n-\t\t}\n-\t\tlappend glflags $arg\n-\t }\n-\t default {\n-\t\t# Non-flag arguments specify commits or ranges of commits\n-\t\tif {[string match \"*...*\" $arg]} {\n-\t\t lappend revargs --gitk-symmetric-diff-marker\n-\t\t}\n-\t\tlappend revargs $arg\n-\t }\n-\t}\n- }\n- set vdflags($n) $diffargs\n- set vflags($n) $glflags\n- set vrevs($n) $revargs\n- set vfiltered($n) $filtered\n- set vorigargs($n) $origargs\n- return $allknown\n+\tset vdflags($n) $diffargs\n+\tset vflags($n) $glflags\n+\tset vrevs($n) $revargs\n+\tset vfiltered($n) $filtered\n+\tset vorigargs($n) $origargs\n+\treturn $allknown\n }\n \n proc parseviewrevs {view revs} {\n- global vposids vnegids\n+\tglobal vposids vnegids\n \n- if {$revs eq {}} {\n-\tset revs HEAD\n- } elseif {[lsearch -exact $revs --all] >= 0} {\n-\tlappend revs HEAD\n- }\n- if {[catch {set ids [eval exec git rev-parse $revs]} err]} {\n-\t# we get stdout followed by stderr in $err\n-\t# for an unknown rev, git rev-parse echoes it and then errors out\n-\tset errlines [split $err \"\\n\"]\n-\tset badrev {}\n-\tfor {set l 0} {$l < [llength $errlines]} {incr l} {\n-\t set line [lindex $errlines $l]\n-\t if {!([string length $line] == 40 && [string is xdigit $line])} {\n-\t\tif {[string match \"fatal:*\" $line]} {\n-\t\t if {[string match \"fatal: ambiguous argument*\" $line]\n-\t\t\t&& $badrev ne {}} {\n-\t\t\tif {[llength $badrev] == 1} {\n-\t\t\t set err \"unknown revision $badrev\"\n-\t\t\t} else {\n-\t\t\t set err \"unknown revisions: [join $badrev \", \"]\"\n+\tif {$revs eq {}} {\n+\t\tset revs HEAD\n+\t} elseif {[lsearch -exact $revs --all] >= 0} {\n+\t\tlappend revs HEAD\n+\t}\n+\tif {[catch {set ids [eval exec git rev-parse $revs]} err]} {\n+\t\t# we get stdout followed by stderr in $err\n+\t\t# for an unknown rev, git rev-parse echoes it and then errors out\n+\t\tset errlines [split $err \"\\n\"]\n+\t\tset badrev {}\n+\t\tfor {set l 0} {$l < [llength $errlines]} {incr l} {\n+\t\t\tset line [lindex $errlines $l]\n+\t\t\tif {!([string length $line] == 40 && [string is xdigit $line])} {\n+\t\t\t\tif {[string match \"fatal:*\" $line]} {\n+\t\t\t\t\tif {[string match \"fatal: ambiguous argument*\" $line]\n+\t\t\t\t\t\t&& $badrev ne {}} {\n+\t\t\t\t\t\tif {[llength $badrev] == 1} {\n+\t\t\t\t\t\t\tset err \"unknown revision $badrev\"\n+\t\t\t\t\t\t} else {\n+\t\t\t\t\t\t\tset err \"unknown revisions: [join $badrev \", \"]\"\n+\t\t\t\t\t\t}\n+\t\t\t\t\t} else {\n+\t\t\t\t\t\tset err [join [lrange $errlines $l end] \"\\n\"]\n+\t\t\t\t\t}\n+\t\t\t\t\tbreak\n+\t\t\t\t}\n+\t\t\t\tlappend badrev $line\n \t\t\t}\n-\t\t } else {\n-\t\t\tset err [join [lrange $errlines $l end] \"\\n\"]\n-\t\t }\n-\t\t break\n \t\t}\n-\t\tlappend badrev $line\n-\t }\n+\t\terror_popup \"[mc \"Error parsing revisions:\"] $err\"\n+\t\treturn {}\n \t}\n-\terror_popup \"[mc \"Error parsing revisions:\"] $err\"\n-\treturn {}\n- }\n- set ret {}\n- set pos {}\n- set neg {}\n- set sdm 0\n- foreach id [split $ids \"\\n\"] {\n-\tif {$id eq \"--gitk-symmetric-diff-marker\"} {\n-\t set sdm 4\n-\t} elseif {[string match \"^*\" $id]} {\n-\t if {$sdm != 1} {\n-\t\tlappend ret $id\n-\t\tif {$sdm == 3} {\n-\t\t set sdm 0\n+\tset ret {}\n+\tset pos {}\n+\tset neg {}\n+\tset sdm 0\n+\tforeach id [split $ids \"\\n\"] {\n+\t\tif {$id eq \"--gitk-symmetric-diff-marker\"} {\n+\t\t\tset sdm 4\n+\t\t} elseif {[string match \"^*\" $id]} {\n+\t\t\tif {$sdm != 1} {\n+\t\t\t\tlappend ret $id\n+\t\t\t\tif {$sdm == 3} {\n+\t\t\t\t\tset sdm 0\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tlappend neg [string range $id 1 end]\n+\t\t} else {\n+\t\t\tif {$sdm != 2} {\n+\t\t\t\tlappend ret $id\n+\t\t\t} else {\n+\t\t\t\tlset ret end $id...[lindex $ret end]\n+\t\t\t}\n+\t\t\tlappend pos $id\n \t\t}\n-\t }\n-\t lappend neg [string range $id 1 end]\n-\t} else {\n-\t if {$sdm != 2} {\n-\t\tlappend ret $id\n-\t } else {\n-\t\tlset ret end $id...[lindex $ret end]\n-\t }\n-\t lappend pos $id\n+\t\tincr sdm -1\n \t}\n-\tincr sdm -1\n- }\n- set vposids($view) $pos\n- set vnegids($view) $neg\n- return $ret\n+\tset vposids($view) $pos\n+\tset vnegids($view) $neg\n+\treturn $ret\n }\n \n # Start off a git log process and arrange to read its output\n proc start_rev_list {view} {\n- global startmsecs commitidx viewcomplete curview\n- global tclencoding\n- global viewargs viewargscmd viewfiles vfilelimit\n- global showlocalchanges\n- global viewactive viewinstances vmergeonly\n- global mainheadid viewmainheadid viewmainheadid_orig\n- global vcanopt vflags vrevs vorigargs\n- global show_notes\n+\tglobal startmsecs commitidx viewcomplete curview\n+\tglobal tclencoding\n+\tglobal viewargs viewargscmd viewfiles vfilelimit\n+\tglobal showlocalchanges\n+\tglobal viewactive viewinstances vmergeonly\n+\tglobal mainheadid viewmainheadid viewmainheadid_orig\n+\tglobal vcanopt vflags vrevs vorigargs\n+\tglobal show_notes\n \n- set startmsecs [clock clicks -milliseconds]\n- set commitidx($view) 0\n- # these are set this way for the error exits\n- set viewcomplete($view) 1\n- set viewactive($view) 0\n- varcinit $view\n+\tset startmsecs [clock clicks -milliseconds]\n+\tset commitidx($view) 0\n+\t# these are set this way for the error exits\n+\tset viewcomplete($view) 1\n+\tset viewactive($view) 0\n+\tvarcinit $view\n+\n+\tset args $viewargs($view)\n+\tif {$viewargscmd($view) ne {}} {\n+\t\tif {[catch {\n+\t\t\tset str [exec sh -c $viewargscmd($view)]\n+\t\t} err]} {\n+\t\t\terror_popup \"[mc \"Error executing --argscmd command:\"] $err\"\n+\t\t\treturn 0\n+\t\t}\n+\t\tset args [concat $args [split $str \"\\n\"]]\n+\t}\n+\tset vcanopt($view) [parseviewargs $view $args]\n+\n+\tset files $viewfiles($view)\n+\tif {$vmergeonly($view)} {\n+\t\tset files [unmerged_files $files]\n+\t\tif {$files eq {}} {\n+\t\t\tglobal nr_unmerged\n+\t\t\tif {$nr_unmerged == 0} {\n+\t\t\t\terror_popup [mc \"No files selected: --merge specified but\\\n+\t\t\t\t\t\t\t no files are unmerged.\"]\n+\t\t\t} else {\n+\t\t\t\terror_popup [mc \"No files selected: --merge specified but\\\n+\t\t\t\t\t\t\t no unmerged files are within file limit.\"]\n+\t\t\t}\n+\t\t\treturn 0\n+\t\t}\n+\t}\n+\tset vfilelimit($view) $files\n+\n+\tif {$vcanopt($view)} {\n+\t\tset revs [parseviewrevs $view $vrevs($view)]\n+\t\tif {$revs eq {}} {\n+\t\t\treturn 0\n+\t\t}\n+\t\tset args [concat $vflags($view) $revs]\n+\t} else {\n+\t\tset args $vorigargs($view)\n+\t}\n \n- set args $viewargs($view)\n- if {$viewargscmd($view) ne {}} {\n \tif {[catch {\n-\t set str [exec sh -c $viewargscmd($view)]\n+\t\tset fd [open [concat | git log --no-color -z --pretty=raw $show_notes \\\n+\t\t\t\t\t\t--parents --boundary $args \"--\" $files] r]\n \t} err]} {\n-\t error_popup \"[mc \"Error executing --argscmd command:\"] $err\"\n-\t return 0\n+\t\terror_popup \"[mc \"Error executing git log:\"] $err\"\n+\t\treturn 0\n \t}\n-\tset args [concat $args [split $str \"\\n\"]]\n- }\n- set vcanopt($view) [parseviewargs $view $args]\n-\n- set files $viewfiles($view)\n- if {$vmergeonly($view)} {\n-\tset files [unmerged_files $files]\n-\tif {$files eq {}} {\n-\t global nr_unmerged\n-\t if {$nr_unmerged == 0} {\n-\t\terror_popup [mc \"No files selected: --merge specified but\\\n-\t\t\t no files are unmerged.\"]\n-\t } else {\n-\t\terror_popup [mc \"No files selected: --merge specified but\\\n-\t\t\t no unmerged files are within file limit.\"]\n-\t }\n-\t return 0\n+\tset i [reg_instance $fd]\n+\tset viewinstances($view) [list $i]\n+\tset viewmainheadid($view) $mainheadid\n+\tset viewmainheadid_orig($view) $mainheadid\n+\tif {$files ne {} && $mainheadid ne {}} {\n+\t\tget_viewmainhead $view\n \t}\n- }\n- set vfilelimit($view) $files\n-\n- if {$vcanopt($view)} {\n-\tset revs [parseviewrevs $view $vrevs($view)]\n-\tif {$revs eq {}} {\n-\t return 0\n+\tif {$showlocalchanges && $viewmainheadid($view) ne {}} {\n+\t\tinterestedin $viewmainheadid($view) dodiffindex\n \t}\n-\tset args [concat $vflags($view) $revs]\n- } else {\n-\tset args $vorigargs($view)\n- }\n-\n- if {[catch {\n-\tset fd [open [concat | git log --no-color -z --pretty=raw $show_notes \\\n-\t\t\t--parents --boundary $args \"--\" $files] r]\n- } err]} {\n-\terror_popup \"[mc \"Error executing git log:\"] $err\"\n-\treturn 0\n- }\n- set i [reg_instance $fd]\n- set viewinstances($view) [list $i]\n- set viewmainheadid($view) $mainheadid\n- set viewmainheadid_orig($view) $mainheadid\n- if {$files ne {} && $mainheadid ne {}} {\n-\tget_viewmainhead $view\n- }\n- if {$showlocalchanges && $viewmainheadid($view) ne {}} {\n-\tinterestedin $viewmainheadid($view) dodiffindex\n- }\n- fconfigure $fd -blocking 0 -translation lf -eofchar {}\n- if {$tclencoding != {}} {\n-\tfconfigure $fd -encoding $tclencoding\n- }\n- filerun $fd [list getcommitlines $fd $i $view 0]\n- nowbusy $view [mc \"Reading\"]\n- set viewcomplete($view) 0\n- set viewactive($view) 1\n- return 1\n+\tfconfigure $fd -blocking 0 -translation lf -eofchar {}\n+\tif {$tclencoding != {}} {\n+\t\tfconfigure $fd -encoding $tclencoding\n+\t}\n+\tfilerun $fd [list getcommitlines $fd $i $view 0]\n+\tnowbusy $view [mc \"Reading\"]\n+\tset viewcomplete($view) 0\n+\tset viewactive($view) 1\n+\treturn 1\n }\n \n proc stop_instance {inst} {\n- global commfd leftover\n+\tglobal commfd leftover\n \n- set fd $commfd($inst)\n- catch {\n-\tset pid [pid $fd]\n+\tset fd $commfd($inst)\n+\tcatch {\n+\t\tset pid [pid $fd]\n \n-\tif {$::tcl_platform(platform) eq {windows}} {\n-\t exec taskkill /pid $pid\n-\t} else {\n-\t exec kill $pid\n+\t\tif {$::tcl_platform(platform) eq {windows}} {\n+\t\t\texec taskkill /pid $pid\n+\t\t} else {\n+\t\t\texec kill $pid\n+\t\t}\n \t}\n- }\n- catch {close $fd}\n- nukefile $fd\n- unset commfd($inst)\n- unset leftover($inst)\n+\tcatch {close $fd}\n+\tnukefile $fd\n+\tunset commfd($inst)\n+\tunset leftover($inst)\n }\n \n proc stop_backends {} {\n- global commfd\n+\tglobal commfd\n \n- foreach inst [array names commfd] {\n-\tstop_instance $inst\n- }\n+\tforeach inst [array names commfd] {\n+\t\tstop_instance $inst\n+\t}\n }\n \n proc stop_rev_list {view} {\n- global viewinstances\n+\tglobal viewinstances\n \n- foreach inst $viewinstances($view) {\n-\tstop_instance $inst\n- }\n- set viewinstances($view) {}\n+\tforeach inst $viewinstances($view) {\n+\t\tstop_instance $inst\n+\t}\n+\tset viewinstances($view) {}\n }\n \n proc reset_pending_select {selid} {\n- global pending_select mainheadid selectheadid\n+\tglobal pending_select mainheadid selectheadid\n \n- if {$selid ne {}} {\n-\tset pending_select $selid\n- } elseif {$selectheadid ne {}} {\n-\tset pending_select $selectheadid\n- } else {\n-\tset pending_select $mainheadid\n- }\n+\tif {$selid ne {}} {\n+\t\tset pending_select $selid\n+\t} elseif {$selectheadid ne {}} {\n+\t\tset pending_select $selectheadid\n+\t} else {\n+\t\tset pending_select $mainheadid\n+\t}\n }\n \n proc getcommits {selid} {\n- global canv curview need_redisplay viewactive\n+\tglobal canv curview need_redisplay viewactive\n \n- initlayout\n- if {[start_rev_list $curview]} {\n-\treset_pending_select $selid\n-\tshow_status [mc \"Reading commits...\"]\n-\tset need_redisplay 1\n- } else {\n-\tshow_status [mc \"No commits selected\"]\n- }\n+\tinitlayout\n+\tif {[start_rev_list $curview]} {\n+\t\treset_pending_select $selid\n+\t\tshow_status [mc \"Reading commits...\"]\n+\t\tset need_redisplay 1\n+\t} else {\n+\t\tshow_status [mc \"No commits selected\"]\n+\t}\n }\n \n proc updatecommits {} {\n- global curview vcanopt vorigargs vfilelimit viewinstances\n- global viewactive viewcomplete tclencoding\n- global startmsecs showneartags showlocalchanges\n- global mainheadid viewmainheadid viewmainheadid_orig pending_select\n- global hasworktree\n- global varcid vposids vnegids vflags vrevs\n- global show_notes\n+\tglobal curview vcanopt vorigargs vfilelimit viewinstances\n+\tglobal viewactive viewcomplete tclencoding\n+\tglobal startmsecs showneartags showlocalchanges\n+\tglobal mainheadid viewmainheadid viewmainheadid_orig pending_select\n+\tglobal hasworktree\n+\tglobal varcid vposids vnegids vflags vrevs\n+\tglobal show_notes\n \n- set hasworktree [hasworktree]\n- rereadrefs\n- set view $curview\n- if {$mainheadid ne $viewmainheadid_orig($view)} {\n-\tif {$showlocalchanges} {\n-\t dohidelocalchanges\n-\t}\n-\tset viewmainheadid($view) $mainheadid\n-\tset viewmainheadid_orig($view) $mainheadid\n-\tif {$vfilelimit($view) ne {}} {\n-\t get_viewmainhead $view\n-\t}\n- }\n- if {$showlocalchanges} {\n-\tdoshowlocalchanges\n- }\n- if {$vcanopt($view)} {\n-\tset oldpos $vposids($view)\n-\tset oldneg $vnegids($view)\n-\tset revs [parseviewrevs $view $vrevs($view)]\n-\tif {$revs eq {}} {\n-\t return\n-\t}\n-\t# note: getting the delta when negative refs change is hard,\n-\t# and could require multiple git log invocations, so in that\n-\t# case we ask git log for all the commits (not just the delta)\n-\tif {$oldneg eq $vnegids($view)} {\n-\t set newrevs {}\n-\t set npos 0\n-\t # take out positive refs that we asked for before or\n-\t # that we have already seen\n-\t foreach rev $revs {\n-\t\tif {[string length $rev] == 40} {\n-\t\t if {[lsearch -exact $oldpos $rev] < 0\n-\t\t\t&& ![info exists varcid($view,$rev)]} {\n-\t\t\tlappend newrevs $rev\n-\t\t\tincr npos\n-\t\t }\n-\t\t} else {\n-\t\t lappend $newrevs $rev\n+\tset hasworktree [hasworktree]\n+\trereadrefs\n+\tset view $curview\n+\tif {$mainheadid ne $viewmainheadid_orig($view)} {\n+\t\tif {$showlocalchanges} {\n+\t\t\tdohidelocalchanges\n+\t\t}\n+\t\tset viewmainheadid($view) $mainheadid\n+\t\tset viewmainheadid_orig($view) $mainheadid\n+\t\tif {$vfilelimit($view) ne {}} {\n+\t\t\tget_viewmainhead $view\n \t\t}\n-\t }\n-\t if {$npos == 0} return\n-\t set revs $newrevs\n-\t set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]]\n \t}\n-\tset args [concat $vflags($view) $revs --not $oldpos]\n- } else {\n-\tset args $vorigargs($view)\n- }\n- if {[catch {\n-\tset fd [open [concat | git log --no-color -z --pretty=raw $show_notes \\\n-\t\t\t--parents --boundary $args \"--\" $vfilelimit($view)] r]\n- } err]} {\n-\terror_popup \"[mc \"Error executing git log:\"] $err\"\n-\treturn\n- }\n- if {$viewactive($view) == 0} {\n-\tset startmsecs [clock clicks -milliseconds]\n- }\n- set i [reg_instance $fd]\n- lappend viewinstances($view) $i\n- fconfigure $fd -blocking 0 -translation lf -eofchar {}\n- if {$tclencoding != {}} {\n-\tfconfigure $fd -encoding $tclencoding\n- }\n- filerun $fd [list getcommitlines $fd $i $view 1]\n- incr viewactive($view)\n- set viewcomplete($view) 0\n- reset_pending_select {}\n- nowbusy $view [mc \"Reading\"]\n- if {$showneartags} {\n-\tgetallcommits\n- }\n+\tif {$showlocalchanges} {\n+\t\tdoshowlocalchanges\n+\t}\n+\tif {$vcanopt($view)} {\n+\t\tset oldpos $vposids($view)\n+\t\tset oldneg $vnegids($view)\n+\t\tset revs [parseviewrevs $view $vrevs($view)]\n+\t\tif {$revs eq {}} {\n+\t\t\treturn\n+\t\t}\n+\t\t# note: getting the delta when negative refs change is hard,\n+\t\t# and could require multiple git log invocations, so in that\n+\t\t# case we ask git log for all the commits (not just the delta)\n+\t\tif {$oldneg eq $vnegids($view)} {\n+\t\t\tset newrevs {}\n+\t\t\tset npos 0\n+\t\t\t# take out positive refs that we asked for before or\n+\t\t\t# that we have already seen\n+\t\t\tforeach rev $revs {\n+\t\t\t\tif {[string length $rev] == 40} {\n+\t\t\t\t\tif {[lsearch -exact $oldpos $rev] < 0\n+\t\t\t\t\t\t&& ![info exists varcid($view,$rev)]} {\n+\t\t\t\t\t\tlappend newrevs $rev\n+\t\t\t\t\t\tincr npos\n+\t\t\t\t\t}\n+\t\t\t\t} else {\n+\t\t\t\t\tlappend $newrevs $rev\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif {$npos == 0} return\n+\t\t\tset revs $newrevs\n+\t\t\tset vposids($view) [lsort -unique [concat $oldpos $vposids($view)]]\n+\t\t}\n+\t\tset args [concat $vflags($view) $revs --not $oldpos]\n+\t} else {\n+\t\tset args $vorigargs($view)\n+\t}\n+\tif {[catch {\n+\t\tset fd [open [concat | git log --no-color -z --pretty=raw $show_notes \\\n+\t\t\t\t\t\t--parents --boundary $args \"--\" $vfilelimit($view)] r]\n+\t} err]} {\n+\t\terror_popup \"[mc \"Error executing git log:\"] $err\"\n+\t\treturn\n+\t}\n+\tif {$viewactive($view) == 0} {\n+\t\tset startmsecs [clock clicks -milliseconds]\n+\t}\n+\tset i [reg_instance $fd]\n+\tlappend viewinstances($view) $i\n+\tfconfigure $fd -blocking 0 -translation lf -eofchar {}\n+\tif {$tclencoding != {}} {\n+\t\tfconfigure $fd -encoding $tclencoding\n+\t}\n+\tfilerun $fd [list getcommitlines $fd $i $view 1]\n+\tincr viewactive($view)\n+\tset viewcomplete($view) 0\n+\treset_pending_select {}\n+\tnowbusy $view [mc \"Reading\"]\n+\tif {$showneartags} {\n+\t\tgetallcommits\n+\t}\n }\n \n proc reloadcommits {} {\n- global curview viewcomplete selectedline currentid thickerline\n- global showneartags treediffs commitinterest cached_commitrow\n- global targetid commitinfo\n+\tglobal curview viewcomplete selectedline currentid thickerline\n+\tglobal showneartags treediffs commitinterest cached_commitrow\n+\tglobal targetid commitinfo\n \n- set selid {}\n- if {$selectedline ne {}} {\n-\tset selid $currentid\n- }\n+\tset selid {}\n+\tif {$selectedline ne {}} {\n+\t\tset selid $currentid\n+\t}\n \n- if {!$viewcomplete($curview)} {\n-\tstop_rev_list $curview\n- }\n- resetvarcs $curview\n- set selectedline {}\n- unset -nocomplain currentid\n- unset -nocomplain thickerline\n- unset -nocomplain treediffs\n- readrefs\n- changedrefs\n- if {$showneartags} {\n-\tgetallcommits\n- }\n- clear_display\n- unset -nocomplain commitinfo\n- unset -nocomplain commitinterest\n- unset -nocomplain cached_commitrow\n- unset -nocomplain targetid\n- setcanvscroll\n- getcommits $selid\n- return 0\n+\tif {!$viewcomplete($curview)} {\n+\t\tstop_rev_list $curview\n+\t}\n+\tresetvarcs $curview\n+\tset selectedline {}\n+\tunset -nocomplain currentid\n+\tunset -nocomplain thickerline\n+\tunset -nocomplain treediffs\n+\treadrefs\n+\tchangedrefs\n+\tif {$showneartags} {\n+\t\tgetallcommits\n+\t}\n+\tclear_display\n+\tunset -nocomplain commitinfo\n+\tunset -nocomplain commitinterest\n+\tunset -nocomplain cached_commitrow\n+\tunset -nocomplain targetid\n+\tsetcanvscroll\n+\tgetcommits $selid\n+\treturn 0\n }\n \n # This makes a string representation of a positive integer which\n # sorts as a string in numerical order\n proc strrep {n} {\n- if {$n < 16} {\n-\treturn [format \"%x\" $n]\n- } elseif {$n < 256} {\n-\treturn [format \"x%.2x\" $n]\n- } elseif {$n < 65536} {\n-\treturn [format \"y%.4x\" $n]\n- }\n- return [format \"z%.8x\" $n]\n+\tif {$n < 16} {\n+\t\treturn [format \"%x\" $n]\n+\t} elseif {$n < 256} {\n+\t\treturn [format \"x%.2x\" $n]\n+\t} elseif {$n < 65536} {\n+\t\treturn [format \"y%.4x\" $n]\n+\t}\n+\treturn [format \"z%.8x\" $n]\n }\n \n # Procedures used in reordering commits from git log (without\n # --topo-order) into the order for display.\n \n proc varcinit {view} {\n- global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow\n- global vtokmod varcmod vrowmod varcix vlastins\n+\tglobal varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow\n+\tglobal vtokmod varcmod vrowmod varcix vlastins\n \n- set varcstart($view) {{}}\n- set vupptr($view) {0}\n- set vdownptr($view) {0}\n- set vleftptr($view) {0}\n- set vbackptr($view) {0}\n- set varctok($view) {{}}\n- set varcrow($view) {{}}\n- set vtokmod($view) {}\n- set varcmod($view) 0\n- set vrowmod($view) 0\n- set varcix($view) {{}}\n- set vlastins($view) {0}\n+\tset varcstart($view) {{}}\n+\tset vupptr($view) {0}\n+\tset vdownptr($view) {0}\n+\tset vleftptr($view) {0}\n+\tset vbackptr($view) {0}\n+\tset varctok($view) {{}}\n+\tset varcrow($view) {{}}\n+\tset vtokmod($view) {}\n+\tset varcmod($view) 0\n+\tset vrowmod($view) 0\n+\tset varcix($view) {{}}\n+\tset vlastins($view) {0}\n }\n \n proc resetvarcs {view} {\n- global varcid varccommits parents children vseedcount ordertok\n- global vshortids\n+\tglobal varcid varccommits parents children vseedcount ordertok\n+\tglobal vshortids\n \n- foreach vid [array names varcid $view,*] {\n-\tunset varcid($vid)\n-\tunset children($vid)\n-\tunset parents($vid)\n- }\n- foreach vid [array names vshortids $view,*] {\n-\tunset vshortids($vid)\n- }\n- # some commits might have children but haven't been seen yet\n- foreach vid [array names children $view,*] {\n-\tunset children($vid)\n- }\n- foreach va [array names varccommits $view,*] {\n-\tunset varccommits($va)\n- }\n- foreach vd [array names vseedcount $view,*] {\n-\tunset vseedcount($vd)\n- }\n- unset -nocomplain ordertok\n+\tforeach vid [array names varcid $view,*] {\n+\t\tunset varcid($vid)\n+\t\tunset children($vid)\n+\t\tunset parents($vid)\n+\t}\n+\tforeach vid [array names vshortids $view,*] {\n+\t\tunset vshortids($vid)\n+\t}\n+\t# some commits might have children but haven't been seen yet\n+\tforeach vid [array names children $view,*] {\n+\t\tunset children($vid)\n+\t}\n+\tforeach va [array names varccommits $view,*] {\n+\t\tunset varccommits($va)\n+\t}\n+\tforeach vd [array names vseedcount $view,*] {\n+\t\tunset vseedcount($vd)\n+\t}\n+\tunset -nocomplain ordertok\n }\n \n # returns a list of the commits with no children\n proc seeds {v} {\n- global vdownptr vleftptr varcstart\n+\tglobal vdownptr vleftptr varcstart\n \n- set ret {}\n- set a [lindex $vdownptr($v) 0]\n- while {$a != 0} {\n-\tlappend ret [lindex $varcstart($v) $a]\n-\tset a [lindex $vleftptr($v) $a]\n- }\n- return $ret\n+\tset ret {}\n+\tset a [lindex $vdownptr($v) 0]\n+\twhile {$a != 0} {\n+\t\tlappend ret [lindex $varcstart($v) $a]\n+\t\tset a [lindex $vleftptr($v) $a]\n+\t}\n+\treturn $ret\n }\n \n proc newvarc {view id} {\n- global varcid varctok parents children vdatemode\n- global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart\n- global commitdata commitinfo vseedcount varccommits vlastins\n+\tglobal varcid varctok parents children vdatemode\n+\tglobal vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart\n+\tglobal commitdata commitinfo vseedcount varccommits vlastins\n \n- set a [llength $varctok($view)]\n- set vid $view,$id\n- if {[llength $children($vid)] == 0 || $vdatemode($view)} {\n-\tif {![info exists commitinfo($id)]} {\n-\t parsecommit $id $commitdata($id) 1\n+\tset a [llength $varctok($view)]\n+\tset vid $view,$id\n+\tif {[llength $children($vid)] == 0 || $vdatemode($view)} {\n+\t\tif {![info exists commitinfo($id)]} {\n+\t\t\tparsecommit $id $commitdata($id) 1\n+\t\t}\n+\t\tset cdate [lindex [lindex $commitinfo($id) 4] 0]\n+\t\tif {![string is integer -strict $cdate]} {\n+\t\t\tset cdate 0\n+\t\t}\n+\t\tif {![info exists vseedcount($view,$cdate)]} {\n+\t\t\tset vseedcount($view,$cdate) -1\n+\t\t}\n+\t\tset c [incr vseedcount($view,$cdate)]\n+\t\tset cdate [expr {$cdate ^ 0xffffffff}]\n+\t\tset tok \"s[strrep $cdate][strrep $c]\"\n+\t} else {\n+\t\tset tok {}\n \t}\n-\tset cdate [lindex [lindex $commitinfo($id) 4] 0]\n-\tif {![string is integer -strict $cdate]} {\n-\t set cdate 0\n+\tset ka 0\n+\tif {[llength $children($vid)] > 0} {\n+\t\tset kid [lindex $children($vid) end]\n+\t\tset k $varcid($view,$kid)\n+\t\tif {[string compare [lindex $varctok($view) $k] $tok] > 0} {\n+\t\t\tset ki $kid\n+\t\t\tset ka $k\n+\t\t\tset tok [lindex $varctok($view) $k]\n+\t\t}\n \t}\n-\tif {![info exists vseedcount($view,$cdate)]} {\n-\t set vseedcount($view,$cdate) -1\n+\tif {$ka != 0} {\n+\t\tset i [lsearch -exact $parents($view,$ki) $id]\n+\t\tset j [expr {[llength $parents($view,$ki)] - 1 - $i}]\n+\t\tappend tok [strrep $j]\n \t}\n-\tset c [incr vseedcount($view,$cdate)]\n-\tset cdate [expr {$cdate ^ 0xffffffff}]\n-\tset tok \"s[strrep $cdate][strrep $c]\"\n- } else {\n-\tset tok {}\n- }\n- set ka 0\n- if {[llength $children($vid)] > 0} {\n-\tset kid [lindex $children($vid) end]\n-\tset k $varcid($view,$kid)\n-\tif {[string compare [lindex $varctok($view) $k] $tok] > 0} {\n-\t set ki $kid\n-\t set ka $k\n-\t set tok [lindex $varctok($view) $k]\n+\tset c [lindex $vlastins($view) $ka]\n+\tif {$c == 0 || [string compare $tok [lindex $varctok($view) $c]] < 0} {\n+\t\tset c $ka\n+\t\tset b [lindex $vdownptr($view) $ka]\n+\t} else {\n+\t\tset b [lindex $vleftptr($view) $c]\n \t}\n- }\n- if {$ka != 0} {\n-\tset i [lsearch -exact $parents($view,$ki) $id]\n-\tset j [expr {[llength $parents($view,$ki)] - 1 - $i}]\n-\tappend tok [strrep $j]\n- }\n- set c [lindex $vlastins($view) $ka]\n- if {$c == 0 || [string compare $tok [lindex $varctok($view) $c]] < 0} {\n-\tset c $ka\n-\tset b [lindex $vdownptr($view) $ka]\n- } else {\n-\tset b [lindex $vleftptr($view) $c]\n- }\n- while {$b != 0 && [string compare $tok [lindex $varctok($view) $b]] >= 0} {\n-\tset c $b\n-\tset b [lindex $vleftptr($view) $c]\n- }\n- if {$c == $ka} {\n-\tlset vdownptr($view) $ka $a\n-\tlappend vbackptr($view) 0\n- } else {\n-\tlset vleftptr($view) $c $a\n-\tlappend vbackptr($view) $c\n- }\n- lset vlastins($view) $ka $a\n- lappend vupptr($view) $ka\n- lappend vleftptr($view) $b\n- if {$b != 0} {\n-\tlset vbackptr($view) $b $a\n- }\n- lappend varctok($view) $tok\n- lappend varcstart($view) $id\n- lappend vdownptr($view) 0\n- lappend varcrow($view) {}\n- lappend varcix($view) {}\n- set varccommits($view,$a) {}\n- lappend vlastins($view) 0\n- return $a\n+\twhile {$b != 0 && [string compare $tok [lindex $varctok($view) $b]] >= 0} {\n+\t\tset c $b\n+\t\tset b [lindex $vleftptr($view) $c]\n+\t}\n+\tif {$c == $ka} {\n+\t\tlset vdownptr($view) $ka $a\n+\t\tlappend vbackptr($view) 0\n+\t} else {\n+\t\tlset vleftptr($view) $c $a\n+\t\tlappend vbackptr($view) $c\n+\t}\n+\tlset vlastins($view) $ka $a\n+\tlappend vupptr($view) $ka\n+\tlappend vleftptr($view) $b\n+\tif {$b != 0} {\n+\t\tlset vbackptr($view) $b $a\n+\t}\n+\tlappend varctok($view) $tok\n+\tlappend varcstart($view) $id\n+\tlappend vdownptr($view) 0\n+\tlappend varcrow($view) {}\n+\tlappend varcix($view) {}\n+\tset varccommits($view,$a) {}\n+\tlappend vlastins($view) 0\n+\treturn $a\n }\n \n proc splitvarc {p v} {\n- global varcid varcstart varccommits varctok vtokmod\n- global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins\n+\tglobal varcid varcstart varccommits varctok vtokmod\n+\tglobal vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins\n \n- set oa $varcid($v,$p)\n- set otok [lindex $varctok($v) $oa]\n- set ac $varccommits($v,$oa)\n- set i [lsearch -exact $varccommits($v,$oa) $p]\n- if {$i <= 0} return\n- set na [llength $varctok($v)]\n- # \"%\" sorts before \"0\"...\n- set tok \"$otok%[strrep $i]\"\n- lappend varctok($v) $tok\n- lappend varcrow($v) {}\n- lappend varcix($v) {}\n- set varccommits($v,$oa) [lrange $ac 0 [expr {$i - 1}]]\n- set varccommits($v,$na) [lrange $ac $i end]\n- lappend varcstart($v) $p\n- foreach id $varccommits($v,$na) {\n-\tset varcid($v,$id) $na\n- }\n- lappend vdownptr($v) [lindex $vdownptr($v) $oa]\n- lappend vlastins($v) [lindex $vlastins($v) $oa]\n- lset vdownptr($v) $oa $na\n- lset vlastins($v) $oa 0\n- lappend vupptr($v) $oa\n- lappend vleftptr($v) 0\n- lappend vbackptr($v) 0\n- for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} {\n-\tlset vupptr($v) $b $na\n- }\n- if {[string compare $otok $vtokmod($v)] <= 0} {\n-\tmodify_arc $v $oa\n- }\n+\tset oa $varcid($v,$p)\n+\tset otok [lindex $varctok($v) $oa]\n+\tset ac $varccommits($v,$oa)\n+\tset i [lsearch -exact $varccommits($v,$oa) $p]\n+\tif {$i <= 0} return\n+\tset na [llength $varctok($v)]\n+\t# \"%\" sorts before \"0\"...\n+\tset tok \"$otok%[strrep $i]\"\n+\tlappend varctok($v) $tok\n+\tlappend varcrow($v) {}\n+\tlappend varcix($v) {}\n+\tset varccommits($v,$oa) [lrange $ac 0 [expr {$i - 1}]]\n+\tset varccommits($v,$na) [lrange $ac $i end]\n+\tlappend varcstart($v) $p\n+\tforeach id $varccommits($v,$na) {\n+\t\tset varcid($v,$id) $na\n+\t}\n+\tlappend vdownptr($v) [lindex $vdownptr($v) $oa]\n+\tlappend vlastins($v) [lindex $vlastins($v) $oa]\n+\tlset vdownptr($v) $oa $na\n+\tlset vlastins($v) $oa 0\n+\tlappend vupptr($v) $oa\n+\tlappend vleftptr($v) 0\n+\tlappend vbackptr($v) 0\n+\tfor {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} {\n+\t\tlset vupptr($v) $b $na\n+\t}\n+\tif {[string compare $otok $vtokmod($v)] <= 0} {\n+\t\tmodify_arc $v $oa\n+\t}\n }\n \n proc renumbervarc {a v} {\n- global parents children varctok varcstart varccommits\n- global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode\n+\tglobal parents children varctok varcstart varccommits\n+\tglobal vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode\n \n- set t1 [clock clicks -milliseconds]\n- set todo {}\n- set isrelated($a) 1\n- set kidchanged($a) 1\n- set ntot 0\n- while {$a != 0} {\n-\tif {[info exists isrelated($a)]} {\n-\t lappend todo $a\n-\t set id [lindex $varccommits($v,$a) end]\n-\t foreach p $parents($v,$id) {\n-\t\tif {[info exists varcid($v,$p)]} {\n-\t\t set isrelated($varcid($v,$p)) 1\n+\tset t1 [clock clicks -milliseconds]\n+\tset todo {}\n+\tset isrelated($a) 1\n+\tset kidchanged($a) 1\n+\tset ntot 0\n+\twhile {$a != 0} {\n+\t\tif {[info exists isrelated($a)]} {\n+\t\t\tlappend todo $a\n+\t\t\tset id [lindex $varccommits($v,$a) end]\n+\t\t\tforeach p $parents($v,$id) {\n+\t\t\t\tif {[info exists varcid($v,$p)]} {\n+\t\t\t\t\tset isrelated($varcid($v,$p)) 1\n+\t\t\t\t}\n+\t\t\t}\n \t\t}\n-\t }\n+\t\tincr ntot\n+\t\tset b [lindex $vdownptr($v) $a]\n+\t\tif {$b == 0} {\n+\t\t\twhile {$a != 0} {\n+\t\t\t\tset b [lindex $vleftptr($v) $a]\n+\t\t\t\tif {$b != 0} break\n+\t\t\t\tset a [lindex $vupptr($v) $a]\n+\t\t\t}\n+\t\t}\n+\t\tset a $b\n \t}\n-\tincr ntot\n-\tset b [lindex $vdownptr($v) $a]\n-\tif {$b == 0} {\n-\t while {$a != 0} {\n-\t\tset b [lindex $vleftptr($v) $a]\n-\t\tif {$b != 0} break\n-\t\tset a [lindex $vupptr($v) $a]\n-\t }\n+\tforeach a $todo {\n+\t\tif {![info exists kidchanged($a)]} continue\n+\t\tset id [lindex $varcstart($v) $a]\n+\t\tif {[llength $children($v,$id)] > 1} {\n+\t\t\tset children($v,$id) [lsort -command [list vtokcmp $v] \\\n+\t\t\t\t\t\t\t\t\t $children($v,$id)]\n+\t\t}\n+\t\tset oldtok [lindex $varctok($v) $a]\n+\t\tif {!$vdatemode($v)} {\n+\t\t\tset tok {}\n+\t\t} else {\n+\t\t\tset tok $oldtok\n+\t\t}\n+\t\tset ka 0\n+\t\tset kid [last_real_child $v,$id]\n+\t\tif {$kid ne {}} {\n+\t\t\tset k $varcid($v,$kid)\n+\t\t\tif {[string compare [lindex $varctok($v) $k] $tok] > 0} {\n+\t\t\t\tset ki $kid\n+\t\t\t\tset ka $k\n+\t\t\t\tset tok [lindex $varctok($v) $k]\n+\t\t\t}\n+\t\t}\n+\t\tif {$ka != 0} {\n+\t\t\tset i [lsearch -exact $parents($v,$ki) $id]\n+\t\t\tset j [expr {[llength $parents($v,$ki)] - 1 - $i}]\n+\t\t\tappend tok [strrep $j]\n+\t\t}\n+\t\tif {$tok eq $oldtok} {\n+\t\t\tcontinue\n+\t\t}\n+\t\tset id [lindex $varccommits($v,$a) end]\n+\t\tforeach p $parents($v,$id) {\n+\t\t\tif {[info exists varcid($v,$p)]} {\n+\t\t\t\tset kidchanged($varcid($v,$p)) 1\n+\t\t\t} else {\n+\t\t\t\tset sortkids($p) 1\n+\t\t\t}\n+\t\t}\n+\t\tlset varctok($v) $a $tok\n+\t\tset b [lindex $vupptr($v) $a]\n+\t\tif {$b != $ka} {\n+\t\t\tif {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} {\n+\t\t\t\tmodify_arc $v $ka\n+\t\t\t}\n+\t\t\tif {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {\n+\t\t\t\tmodify_arc $v $b\n+\t\t\t}\n+\t\t\tset c [lindex $vbackptr($v) $a]\n+\t\t\tset d [lindex $vleftptr($v) $a]\n+\t\t\tif {$c == 0} {\n+\t\t\t\tlset vdownptr($v) $b $d\n+\t\t\t} else {\n+\t\t\t\tlset vleftptr($v) $c $d\n+\t\t\t}\n+\t\t\tif {$d != 0} {\n+\t\t\t\tlset vbackptr($v) $d $c\n+\t\t\t}\n+\t\t\tif {[lindex $vlastins($v) $b] == $a} {\n+\t\t\t\tlset vlastins($v) $b $c\n+\t\t\t}\n+\t\t\tlset vupptr($v) $a $ka\n+\t\t\tset c [lindex $vlastins($v) $ka]\n+\t\t\tif {$c == 0 || \\\n+\t\t\t\t\t[string compare $tok [lindex $varctok($v) $c]] < 0} {\n+\t\t\t\tset c $ka\n+\t\t\t\tset b [lindex $vdownptr($v) $ka]\n+\t\t\t} else {\n+\t\t\t\tset b [lindex $vleftptr($v) $c]\n+\t\t\t}\n+\t\t\twhile {$b != 0 && \\\n+\t\t\t\t\t [string compare $tok [lindex $varctok($v) $b]] >= 0} {\n+\t\t\t\tset c $b\n+\t\t\t\tset b [lindex $vleftptr($v) $c]\n+\t\t\t}\n+\t\t\tif {$c == $ka} {\n+\t\t\t\tlset vdownptr($v) $ka $a\n+\t\t\t\tlset vbackptr($v) $a 0\n+\t\t\t} else {\n+\t\t\t\tlset vleftptr($v) $c $a\n+\t\t\t\tlset vbackptr($v) $a $c\n+\t\t\t}\n+\t\t\tlset vleftptr($v) $a $b\n+\t\t\tif {$b != 0} {\n+\t\t\t\tlset vbackptr($v) $b $a\n+\t\t\t}\n+\t\t\tlset vlastins($v) $ka $a\n+\t\t}\n \t}\n-\tset a $b\n- }\n- foreach a $todo {\n-\tif {![info exists kidchanged($a)]} continue\n-\tset id [lindex $varcstart($v) $a]\n-\tif {[llength $children($v,$id)] > 1} {\n-\t set children($v,$id) [lsort -command [list vtokcmp $v] \\\n-\t\t\t\t $children($v,$id)]\n+\tforeach id [array names sortkids] {\n+\t\tif {[llength $children($v,$id)] > 1} {\n+\t\t\tset children($v,$id) [lsort -command [list vtokcmp $v] \\\n+\t\t\t\t\t\t\t\t\t $children($v,$id)]\n+\t\t}\n \t}\n-\tset oldtok [lindex $varctok($v) $a]\n-\tif {!$vdatemode($v)} {\n-\t set tok {}\n-\t} else {\n-\t set tok $oldtok\n-\t}\n-\tset ka 0\n-\tset kid [last_real_child $v,$id]\n-\tif {$kid ne {}} {\n-\t set k $varcid($v,$kid)\n-\t if {[string compare [lindex $varctok($v) $k] $tok] > 0} {\n-\t\tset ki $kid\n-\t\tset ka $k\n-\t\tset tok [lindex $varctok($v) $k]\n-\t }\n-\t}\n-\tif {$ka != 0} {\n-\t set i [lsearch -exact $parents($v,$ki) $id]\n-\t set j [expr {[llength $parents($v,$ki)] - 1 - $i}]\n-\t append tok [strrep $j]\n-\t}\n-\tif {$tok eq $oldtok} {\n-\t continue\n-\t}\n-\tset id [lindex $varccommits($v,$a) end]\n-\tforeach p $parents($v,$id) {\n-\t if {[info exists varcid($v,$p)]} {\n-\t\tset kidchanged($varcid($v,$p)) 1\n-\t } else {\n-\t\tset sortkids($p) 1\n-\t }\n-\t}\n-\tlset varctok($v) $a $tok\n-\tset b [lindex $vupptr($v) $a]\n-\tif {$b != $ka} {\n-\t if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} {\n-\t\tmodify_arc $v $ka\n-\t }\n-\t if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {\n-\t\tmodify_arc $v $b\n-\t }\n-\t set c [lindex $vbackptr($v) $a]\n-\t set d [lindex $vleftptr($v) $a]\n-\t if {$c == 0} {\n-\t\tlset vdownptr($v) $b $d\n-\t } else {\n-\t\tlset vleftptr($v) $c $d\n-\t }\n-\t if {$d != 0} {\n-\t\tlset vbackptr($v) $d $c\n-\t }\n-\t if {[lindex $vlastins($v) $b] == $a} {\n-\t\tlset vlastins($v) $b $c\n-\t }\n-\t lset vupptr($v) $a $ka\n-\t set c [lindex $vlastins($v) $ka]\n-\t if {$c == 0 || \\\n-\t\t [string compare $tok [lindex $varctok($v) $c]] < 0} {\n-\t\tset c $ka\n-\t\tset b [lindex $vdownptr($v) $ka]\n-\t } else {\n-\t\tset b [lindex $vleftptr($v) $c]\n-\t }\n-\t while {$b != 0 && \\\n-\t\t [string compare $tok [lindex $varctok($v) $b]] >= 0} {\n-\t\tset c $b\n-\t\tset b [lindex $vleftptr($v) $c]\n-\t }\n-\t if {$c == $ka} {\n- \t\tlset vdownptr($v) $ka $a\n-\t\tlset vbackptr($v) $a 0\n-\t } else {\n-\t\tlset vleftptr($v) $c $a\n-\t\tlset vbackptr($v) $a $c\n-\t }\n-\t lset vleftptr($v) $a $b\n-\t if {$b != 0} {\n-\t\tlset vbackptr($v) $b $a\n-\t }\n-\t lset vlastins($v) $ka $a\n-\t}\n- }\n- foreach id [array names sortkids] {\n-\tif {[llength $children($v,$id)] > 1} {\n-\t set children($v,$id) [lsort -command [list vtokcmp $v] \\\n-\t\t\t\t $children($v,$id)]\n-\t}\n- }\n- set t2 [clock clicks -milliseconds]\n- #puts \"renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms\"\n+\tset t2 [clock clicks -milliseconds]\n+\t#puts \"renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms\"\n }\n \n # Fix up the graph after we have found out that in view $v,\n # $p (a commit that we have already seen) is actually the parent\n # of the last commit in arc $a.\n proc fix_reversal {p a v} {\n- global varcid varcstart varctok vupptr\n+\tglobal varcid varcstart varctok vupptr\n \n- set pa $varcid($v,$p)\n- if {$p ne [lindex $varcstart($v) $pa]} {\n-\tsplitvarc $p $v\n \tset pa $varcid($v,$p)\n- }\n- # seeds always need to be renumbered\n- if {[lindex $vupptr($v) $pa] == 0 ||\n-\t[string compare [lindex $varctok($v) $a] \\\n-\t [lindex $varctok($v) $pa]] > 0} {\n-\trenumbervarc $pa $v\n- }\n+\tif {$p ne [lindex $varcstart($v) $pa]} {\n+\t\tsplitvarc $p $v\n+\t\tset pa $varcid($v,$p)\n+\t}\n+\t# seeds always need to be renumbered\n+\tif {[lindex $vupptr($v) $pa] == 0 ||\n+\t\t[string compare [lindex $varctok($v) $a] \\\n+\t\t\t [lindex $varctok($v) $pa]] > 0} {\n+\t\trenumbervarc $pa $v\n+\t}\n }\n \n proc insertrow {id p v} {\n- global cmitlisted children parents varcid varctok vtokmod\n- global varccommits ordertok commitidx numcommits curview\n- global targetid targetrow vshortids\n+\tglobal cmitlisted children parents varcid varctok vtokmod\n+\tglobal varccommits ordertok commitidx numcommits curview\n+\tglobal targetid targetrow vshortids\n \n- readcommit $id\n- set vid $v,$id\n- set cmitlisted($vid) 1\n- set children($vid) {}\n- set parents($vid) [list $p]\n- set a [newvarc $v $id]\n- set varcid($vid) $a\n- lappend vshortids($v,[string range $id 0 3]) $id\n- if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] < 0} {\n-\tmodify_arc $v $a\n- }\n- lappend varccommits($v,$a) $id\n- set vp $v,$p\n- if {[llength [lappend children($vp) $id]] > 1} {\n-\tset children($vp) [lsort -command [list vtokcmp $v] $children($vp)]\n-\tunset -nocomplain ordertok\n- }\n- fix_reversal $p $a $v\n- incr commitidx($v)\n- if {$v == $curview} {\n-\tset numcommits $commitidx($v)\n-\tsetcanvscroll\n-\tif {[info exists targetid]} {\n-\t if {![comes_before $targetid $p]} {\n-\t\tincr targetrow\n-\t }\n+\treadcommit $id\n+\tset vid $v,$id\n+\tset cmitlisted($vid) 1\n+\tset children($vid) {}\n+\tset parents($vid) [list $p]\n+\tset a [newvarc $v $id]\n+\tset varcid($vid) $a\n+\tlappend vshortids($v,[string range $id 0 3]) $id\n+\tif {[string compare [lindex $varctok($v) $a] $vtokmod($v)] < 0} {\n+\t\tmodify_arc $v $a\n+\t}\n+\tlappend varccommits($v,$a) $id\n+\tset vp $v,$p\n+\tif {[llength [lappend children($vp) $id]] > 1} {\n+\t\tset children($vp) [lsort -command [list vtokcmp $v] $children($vp)]\n+\t\tunset -nocomplain ordertok\n+\t}\n+\tfix_reversal $p $a $v\n+\tincr commitidx($v)\n+\tif {$v == $curview} {\n+\t\tset numcommits $commitidx($v)\n+\t\tsetcanvscroll\n+\t\tif {[info exists targetid]} {\n+\t\t\tif {![comes_before $targetid $p]} {\n+\t\t\t\tincr targetrow\n+\t\t\t}\n+\t\t}\n \t}\n- }\n }\n \n proc insertfakerow {id p} {\n- global varcid varccommits parents children cmitlisted\n- global commitidx varctok vtokmod targetid targetrow curview numcommits\n+\tglobal varcid varccommits parents children cmitlisted\n+\tglobal commitidx varctok vtokmod targetid targetrow curview numcommits\n \n- set v $curview\n- set a $varcid($v,$p)\n- set i [lsearch -exact $varccommits($v,$a) $p]\n- if {$i < 0} {\n-\tputs \"oops: insertfakerow can't find [shortids $p] on arc $a\"\n-\treturn\n- }\n- set children($v,$id) {}\n- set parents($v,$id) [list $p]\n- set varcid($v,$id) $a\n- lappend children($v,$p) $id\n- set cmitlisted($v,$id) 1\n- set numcommits [incr commitidx($v)]\n- # note we deliberately don't update varcstart($v) even if $i == 0\n- set varccommits($v,$a) [linsert $varccommits($v,$a) $i $id]\n- modify_arc $v $a $i\n- if {[info exists targetid]} {\n-\tif {![comes_before $targetid $p]} {\n-\t incr targetrow\n+\tset v $curview\n+\tset a $varcid($v,$p)\n+\tset i [lsearch -exact $varccommits($v,$a) $p]\n+\tif {$i < 0} {\n+\t\tputs \"oops: insertfakerow can't find [shortids $p] on arc $a\"\n+\t\treturn\n \t}\n- }\n- setcanvscroll\n- drawvisible\n+\tset children($v,$id) {}\n+\tset parents($v,$id) [list $p]\n+\tset varcid($v,$id) $a\n+\tlappend children($v,$p) $id\n+\tset cmitlisted($v,$id) 1\n+\tset numcommits [incr commitidx($v)]\n+\t# note we deliberately don't update varcstart($v) even if $i == 0\n+\tset varccommits($v,$a) [linsert $varccommits($v,$a) $i $id]\n+\tmodify_arc $v $a $i\n+\tif {[info exists targetid]} {\n+\t\tif {![comes_before $targetid $p]} {\n+\t\t\tincr targetrow\n+\t\t}\n+\t}\n+\tsetcanvscroll\n+\tdrawvisible\n }\n \n proc removefakerow {id} {\n- global varcid varccommits parents children commitidx\n- global varctok vtokmod cmitlisted currentid selectedline\n- global targetid curview numcommits\n+\tglobal varcid varccommits parents children commitidx\n+\tglobal varctok vtokmod cmitlisted currentid selectedline\n+\tglobal targetid curview numcommits\n \n- set v $curview\n- if {[llength $parents($v,$id)] != 1} {\n-\tputs \"oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents\"\n-\treturn\n- }\n- set p [lindex $parents($v,$id) 0]\n- set a $varcid($v,$id)\n- set i [lsearch -exact $varccommits($v,$a) $id]\n- if {$i < 0} {\n-\tputs \"oops: removefakerow can't find [shortids $id] on arc $a\"\n-\treturn\n- }\n- unset varcid($v,$id)\n- set varccommits($v,$a) [lreplace $varccommits($v,$a) $i $i]\n- unset parents($v,$id)\n- unset children($v,$id)\n- unset cmitlisted($v,$id)\n- set numcommits [incr commitidx($v) -1]\n- set j [lsearch -exact $children($v,$p) $id]\n- if {$j >= 0} {\n-\tset children($v,$p) [lreplace $children($v,$p) $j $j]\n- }\n- modify_arc $v $a $i\n- if {[info exist currentid] && $id eq $currentid} {\n-\tunset currentid\n-\tset selectedline {}\n- }\n- if {[info exists targetid] && $targetid eq $id} {\n-\tset targetid $p\n- }\n- setcanvscroll\n- drawvisible\n+\tset v $curview\n+\tif {[llength $parents($v,$id)] != 1} {\n+\t\tputs \"oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents\"\n+\t\treturn\n+\t}\n+\tset p [lindex $parents($v,$id) 0]\n+\tset a $varcid($v,$id)\n+\tset i [lsearch -exact $varccommits($v,$a) $id]\n+\tif {$i < 0} {\n+\t\tputs \"oops: removefakerow can't find [shortids $id] on arc $a\"\n+\t\treturn\n+\t}\n+\tunset varcid($v,$id)\n+\tset varccommits($v,$a) [lreplace $varccommits($v,$a) $i $i]\n+\tunset parents($v,$id)\n+\tunset children($v,$id)\n+\tunset cmitlisted($v,$id)\n+\tset numcommits [incr commitidx($v) -1]\n+\tset j [lsearch -exact $children($v,$p) $id]\n+\tif {$j >= 0} {\n+\t\tset children($v,$p) [lreplace $children($v,$p) $j $j]\n+\t}\n+\tmodify_arc $v $a $i\n+\tif {[info exist currentid] && $id eq $currentid} {\n+\t\tunset currentid\n+\t\tset selectedline {}\n+\t}\n+\tif {[info exists targetid] && $targetid eq $id} {\n+\t\tset targetid $p\n+\t}\n+\tsetcanvscroll\n+\tdrawvisible\n }\n \n proc real_children {vp} {\n- global children nullid nullid2\n+\tglobal children nullid nullid2\n \n- set kids {}\n- foreach id $children($vp) {\n-\tif {$id ne $nullid && $id ne $nullid2} {\n-\t lappend kids $id\n+\tset kids {}\n+\tforeach id $children($vp) {\n+\t\tif {$id ne $nullid && $id ne $nullid2} {\n+\t\t\tlappend kids $id\n+\t\t}\n \t}\n- }\n- return $kids\n+\treturn $kids\n }\n \n proc first_real_child {vp} {\n- global children nullid nullid2\n+\tglobal children nullid nullid2\n \n- foreach id $children($vp) {\n-\tif {$id ne $nullid && $id ne $nullid2} {\n-\t return $id\n+\tforeach id $children($vp) {\n+\t\tif {$id ne $nullid && $id ne $nullid2} {\n+\t\t\treturn $id\n+\t\t}\n \t}\n- }\n- return {}\n+\treturn {}\n }\n \n proc last_real_child {vp} {\n- global children nullid nullid2\n+\tglobal children nullid nullid2\n \n- set kids $children($vp)\n- for {set i [llength $kids]} {[incr i -1] >= 0} {} {\n-\tset id [lindex $kids $i]\n-\tif {$id ne $nullid && $id ne $nullid2} {\n-\t return $id\n+\tset kids $children($vp)\n+\tfor {set i [llength $kids]} {[incr i -1] >= 0} {} {\n+\t\tset id [lindex $kids $i]\n+\t\tif {$id ne $nullid && $id ne $nullid2} {\n+\t\t\treturn $id\n+\t\t}\n \t}\n- }\n- return {}\n+\treturn {}\n }\n \n proc vtokcmp {v a b} {\n- global varctok varcid\n+\tglobal varctok varcid\n \n- return [string compare [lindex $varctok($v) $varcid($v,$a)] \\\n-\t\t[lindex $varctok($v) $varcid($v,$b)]]\n+\treturn [string compare [lindex $varctok($v) $varcid($v,$a)] \\\n+\t\t\t\t[lindex $varctok($v) $varcid($v,$b)]]\n }\n \n # This assumes that if lim is not given, the caller has checked that\n # arc a's token is less than $vtokmod($v)\n proc modify_arc {v a {lim {}}} {\n- global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits\n+\tglobal varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits\n \n- if {$lim ne {}} {\n-\tset c [string compare [lindex $varctok($v) $a] $vtokmod($v)]\n-\tif {$c > 0} return\n-\tif {$c == 0} {\n-\t set r [lindex $varcrow($v) $a]\n-\t if {$r ne {} && $vrowmod($v) <= $r + $lim} return\n+\tif {$lim ne {}} {\n+\t\tset c [string compare [lindex $varctok($v) $a] $vtokmod($v)]\n+\t\tif {$c > 0} return\n+\t\tif {$c == 0} {\n+\t\t\tset r [lindex $varcrow($v) $a]\n+\t\t\tif {$r ne {} && $vrowmod($v) <= $r + $lim} return\n+\t\t}\n \t}\n- }\n- set vtokmod($v) [lindex $varctok($v) $a]\n- set varcmod($v) $a\n- if {$v == $curview} {\n-\twhile {$a != 0 && [lindex $varcrow($v) $a] eq {}} {\n-\t set a [lindex $vupptr($v) $a]\n-\t set lim {}\n+\tset vtokmod($v) [lindex $varctok($v) $a]\n+\tset varcmod($v) $a\n+\tif {$v == $curview} {\n+\t\twhile {$a != 0 && [lindex $varcrow($v) $a] eq {}} {\n+\t\t\tset a [lindex $vupptr($v) $a]\n+\t\t\tset lim {}\n+\t\t}\n+\t\tset r 0\n+\t\tif {$a != 0} {\n+\t\t\tif {$lim eq {}} {\n+\t\t\t\tset lim [llength $varccommits($v,$a)]\n+\t\t\t}\n+\t\t\tset r [expr {[lindex $varcrow($v) $a] + $lim}]\n+\t\t}\n+\t\tset vrowmod($v) $r\n+\t\tundolayout $r\n \t}\n-\tset r 0\n-\tif {$a != 0} {\n-\t if {$lim eq {}} {\n-\t\tset lim [llength $varccommits($v,$a)]\n-\t }\n-\t set r [expr {[lindex $varcrow($v) $a] + $lim}]\n-\t}\n-\tset vrowmod($v) $r\n-\tundolayout $r\n- }\n }\n \n proc update_arcrows {v} {\n- global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline\n- global varcid vrownum varcorder varcix varccommits\n- global vupptr vdownptr vleftptr varctok\n- global displayorder parentlist curview cached_commitrow\n+\tglobal vtokmod varcmod vrowmod varcrow commitidx currentid selectedline\n+\tglobal varcid vrownum varcorder varcix varccommits\n+\tglobal vupptr vdownptr vleftptr varctok\n+\tglobal displayorder parentlist curview cached_commitrow\n \n- if {$vrowmod($v) == $commitidx($v)} return\n- if {$v == $curview} {\n-\tif {[llength $displayorder] > $vrowmod($v)} {\n-\t set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]]\n-\t set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]]\n+\tif {$vrowmod($v) == $commitidx($v)} return\n+\tif {$v == $curview} {\n+\t\tif {[llength $displayorder] > $vrowmod($v)} {\n+\t\t\tset displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]]\n+\t\t\tset parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]]\n+\t\t}\n+\t\tunset -nocomplain cached_commitrow\n \t}\n-\tunset -nocomplain cached_commitrow\n- }\n- set narctot [expr {[llength $varctok($v)] - 1}]\n- set a $varcmod($v)\n- while {$a != 0 && [lindex $varcix($v) $a] eq {}} {\n-\t# go up the tree until we find something that has a row number,\n-\t# or we get to a seed\n-\tset a [lindex $vupptr($v) $a]\n- }\n- if {$a == 0} {\n-\tset a [lindex $vdownptr($v) 0]\n-\tif {$a == 0} return\n-\tset vrownum($v) {0}\n-\tset varcorder($v) [list $a]\n-\tlset varcix($v) $a 0\n-\tlset varcrow($v) $a 0\n-\tset arcn 0\n-\tset row 0\n- } else {\n-\tset arcn [lindex $varcix($v) $a]\n-\tif {[llength $vrownum($v)] > $arcn + 1} {\n-\t set vrownum($v) [lrange $vrownum($v) 0 $arcn]\n-\t set varcorder($v) [lrange $varcorder($v) 0 $arcn]\n-\t}\n-\tset row [lindex $varcrow($v) $a]\n- }\n- while {1} {\n-\tset p $a\n-\tincr row [llength $varccommits($v,$a)]\n-\t# go down if possible\n-\tset b [lindex $vdownptr($v) $a]\n-\tif {$b == 0} {\n-\t # if not, go left, or go up until we can go left\n-\t while {$a != 0} {\n-\t\tset b [lindex $vleftptr($v) $a]\n-\t\tif {$b != 0} break\n+\tset narctot [expr {[llength $varctok($v)] - 1}]\n+\tset a $varcmod($v)\n+\twhile {$a != 0 && [lindex $varcix($v) $a] eq {}} {\n+\t\t# go up the tree until we find something that has a row number,\n+\t\t# or we get to a seed\n \t\tset a [lindex $vupptr($v) $a]\n-\t }\n-\t if {$a == 0} break\n \t}\n-\tset a $b\n-\tincr arcn\n-\tlappend vrownum($v) $row\n-\tlappend varcorder($v) $a\n-\tlset varcix($v) $a $arcn\n-\tlset varcrow($v) $a $row\n- }\n- set vtokmod($v) [lindex $varctok($v) $p]\n- set varcmod($v) $p\n- set vrowmod($v) $row\n- if {[info exists currentid]} {\n-\tset selectedline [rowofcommit $currentid]\n- }\n+\tif {$a == 0} {\n+\t\tset a [lindex $vdownptr($v) 0]\n+\t\tif {$a == 0} return\n+\t\tset vrownum($v) {0}\n+\t\tset varcorder($v) [list $a]\n+\t\tlset varcix($v) $a 0\n+\t\tlset varcrow($v) $a 0\n+\t\tset arcn 0\n+\t\tset row 0\n+\t} else {\n+\t\tset arcn [lindex $varcix($v) $a]\n+\t\tif {[llength $vrownum($v)] > $arcn + 1} {\n+\t\t\tset vrownum($v) [lrange $vrownum($v) 0 $arcn]\n+\t\t\tset varcorder($v) [lrange $varcorder($v) 0 $arcn]\n+\t\t}\n+\t\tset row [lindex $varcrow($v) $a]\n+\t}\n+\twhile {1} {\n+\t\tset p $a\n+\t\tincr row [llength $varccommits($v,$a)]\n+\t\t# go down if possible\n+\t\tset b [lindex $vdownptr($v) $a]\n+\t\tif {$b == 0} {\n+\t\t\t# if not, go left, or go up until we can go left\n+\t\t\twhile {$a != 0} {\n+\t\t\t\tset b [lindex $vleftptr($v) $a]\n+\t\t\t\tif {$b != 0} break\n+\t\t\t\tset a [lindex $vupptr($v) $a]\n+\t\t\t}\n+\t\t\tif {$a == 0} break\n+\t\t}\n+\t\tset a $b\n+\t\tincr arcn\n+\t\tlappend vrownum($v) $row\n+\t\tlappend varcorder($v) $a\n+\t\tlset varcix($v) $a $arcn\n+\t\tlset varcrow($v) $a $row\n+\t}\n+\tset vtokmod($v) [lindex $varctok($v) $p]\n+\tset varcmod($v) $p\n+\tset vrowmod($v) $row\n+\tif {[info exists currentid]} {\n+\t\tset selectedline [rowofcommit $currentid]\n+\t}\n }\n \n # Test whether view $v contains commit $id\n proc commitinview {id v} {\n- global varcid\n+\tglobal varcid\n \n- return [info exists varcid($v,$id)]\n+\treturn [info exists varcid($v,$id)]\n }\n \n # Return the row number for commit $id in the current view\n proc rowofcommit {id} {\n- global varcid varccommits varcrow curview cached_commitrow\n- global varctok vtokmod\n+\tglobal varcid varccommits varcrow curview cached_commitrow\n+\tglobal varctok vtokmod\n \n- set v $curview\n- if {![info exists varcid($v,$id)]} {\n-\tputs \"oops rowofcommit no arc for [shortids $id]\"\n-\treturn {}\n- }\n- set a $varcid($v,$id)\n- if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} {\n-\tupdate_arcrows $v\n- }\n- if {[info exists cached_commitrow($id)]} {\n-\treturn $cached_commitrow($id)\n- }\n- set i [lsearch -exact $varccommits($v,$a) $id]\n- if {$i < 0} {\n-\tputs \"oops didn't find commit [shortids $id] in arc $a\"\n-\treturn {}\n- }\n- incr i [lindex $varcrow($v) $a]\n- set cached_commitrow($id) $i\n- return $i\n+\tset v $curview\n+\tif {![info exists varcid($v,$id)]} {\n+\t\tputs \"oops rowofcommit no arc for [shortids $id]\"\n+\t\treturn {}\n+\t}\n+\tset a $varcid($v,$id)\n+\tif {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} {\n+\t\tupdate_arcrows $v\n+\t}\n+\tif {[info exists cached_commitrow($id)]} {\n+\t\treturn $cached_commitrow($id)\n+\t}\n+\tset i [lsearch -exact $varccommits($v,$a) $id]\n+\tif {$i < 0} {\n+\t\tputs \"oops didn't find commit [shortids $id] in arc $a\"\n+\t\treturn {}\n+\t}\n+\tincr i [lindex $varcrow($v) $a]\n+\tset cached_commitrow($id) $i\n+\treturn $i\n }\n \n # Returns 1 if a is on an earlier row than b, otherwise 0\n proc comes_before {a b} {\n- global varcid varctok curview\n+\tglobal varcid varctok curview\n \n- set v $curview\n- if {$a eq $b || ![info exists varcid($v,$a)] || \\\n-\t ![info exists varcid($v,$b)]} {\n-\treturn 0\n- }\n- if {$varcid($v,$a) != $varcid($v,$b)} {\n-\treturn [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \\\n-\t\t\t [lindex $varctok($v) $varcid($v,$b)]] < 0}]\n- }\n- return [expr {[rowofcommit $a] < [rowofcommit $b]}]\n+\tset v $curview\n+\tif {$a eq $b || ![info exists varcid($v,$a)] || \\\n+\t\t\t![info exists varcid($v,$b)]} {\n+\t\treturn 0\n+\t}\n+\tif {$varcid($v,$a) != $varcid($v,$b)} {\n+\t\treturn [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \\\n+\t\t\t\t\t\t [lindex $varctok($v) $varcid($v,$b)]] < 0}]\n+\t}\n+\treturn [expr {[rowofcommit $a] < [rowofcommit $b]}]\n }\n \n proc bsearch {l elt} {\n- if {[llength $l] == 0 || $elt <= [lindex $l 0]} {\n-\treturn 0\n- }\n- set lo 0\n- set hi [llength $l]\n- while {$hi - $lo > 1} {\n-\tset mid [expr {int(($lo + $hi) / 2)}]\n-\tset t [lindex $l $mid]\n-\tif {$elt < $t} {\n-\t set hi $mid\n-\t} elseif {$elt > $t} {\n-\t set lo $mid\n-\t} else {\n-\t return $mid\n+\tif {[llength $l] == 0 || $elt <= [lindex $l 0]} {\n+\t\treturn 0\n \t}\n- }\n- return $lo\n+\tset lo 0\n+\tset hi [llength $l]\n+\twhile {$hi - $lo > 1} {\n+\t\tset mid [expr {int(($lo + $hi) / 2)}]\n+\t\tset t [lindex $l $mid]\n+\t\tif {$elt < $t} {\n+\t\t\tset hi $mid\n+\t\t} elseif {$elt > $t} {\n+\t\t\tset lo $mid\n+\t\t} else {\n+\t\t\treturn $mid\n+\t\t}\n+\t}\n+\treturn $lo\n }\n \n # Make sure rows $start..$end-1 are valid in displayorder and parentlist\n proc make_disporder {start end} {\n- global vrownum curview commitidx displayorder parentlist\n- global varccommits varcorder parents vrowmod varcrow\n- global d_valid_start d_valid_end\n+\tglobal vrownum curview commitidx displayorder parentlist\n+\tglobal varccommits varcorder parents vrowmod varcrow\n+\tglobal d_valid_start d_valid_end\n \n- if {$end > $vrowmod($curview)} {\n-\tupdate_arcrows $curview\n- }\n- set ai [bsearch $vrownum($curview) $start]\n- set start [lindex $vrownum($curview) $ai]\n- set narc [llength $vrownum($curview)]\n- for {set r $start} {$ai < $narc && $r < $end} {incr ai} {\n-\tset a [lindex $varcorder($curview) $ai]\n-\tset l [llength $displayorder]\n-\tset al [llength $varccommits($curview,$a)]\n-\tif {$l < $r + $al} {\n-\t if {$l < $r} {\n-\t\tset pad [ntimes [expr {$r - $l}] {}]\n-\t\tset displayorder [concat $displayorder $pad]\n-\t\tset parentlist [concat $parentlist $pad]\n-\t } elseif {$l > $r} {\n-\t\tset displayorder [lrange $displayorder 0 [expr {$r - 1}]]\n-\t\tset parentlist [lrange $parentlist 0 [expr {$r - 1}]]\n-\t }\n-\t foreach id $varccommits($curview,$a) {\n-\t\tlappend displayorder $id\n-\t\tlappend parentlist $parents($curview,$id)\n-\t }\n-\t} elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {\n-\t set i $r\n-\t foreach id $varccommits($curview,$a) {\n-\t\tlset displayorder $i $id\n-\t\tlset parentlist $i $parents($curview,$id)\n-\t\tincr i\n-\t }\n+\tif {$end > $vrowmod($curview)} {\n+\t\tupdate_arcrows $curview\n+\t}\n+\tset ai [bsearch $vrownum($curview) $start]\n+\tset start [lindex $vrownum($curview) $ai]\n+\tset narc [llength $vrownum($curview)]\n+\tfor {set r $start} {$ai < $narc && $r < $end} {incr ai} {\n+\t\tset a [lindex $varcorder($curview) $ai]\n+\t\tset l [llength $displayorder]\n+\t\tset al [llength $varccommits($curview,$a)]\n+\t\tif {$l < $r + $al} {\n+\t\t\tif {$l < $r} {\n+\t\t\t\tset pad [ntimes [expr {$r - $l}] {}]\n+\t\t\t\tset displayorder [concat $displayorder $pad]\n+\t\t\t\tset parentlist [concat $parentlist $pad]\n+\t\t\t} elseif {$l > $r} {\n+\t\t\t\tset displayorder [lrange $displayorder 0 [expr {$r - 1}]]\n+\t\t\t\tset parentlist [lrange $parentlist 0 [expr {$r - 1}]]\n+\t\t\t}\n+\t\t\tforeach id $varccommits($curview,$a) {\n+\t\t\t\tlappend displayorder $id\n+\t\t\t\tlappend parentlist $parents($curview,$id)\n+\t\t\t}\n+\t\t} elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {\n+\t\t\tset i $r\n+\t\t\tforeach id $varccommits($curview,$a) {\n+\t\t\t\tlset displayorder $i $id\n+\t\t\t\tlset parentlist $i $parents($curview,$id)\n+\t\t\t\tincr i\n+\t\t\t}\n+\t\t}\n+\t\tincr r $al\n \t}\n-\tincr r $al\n- }\n }\n \n proc commitonrow {row} {\n- global displayorder\n+\tglobal displayorder\n \n- set id [lindex $displayorder $row]\n- if {$id eq {}} {\n-\tmake_disporder $row [expr {$row + 1}]\n \tset id [lindex $displayorder $row]\n- }\n- return $id\n+\tif {$id eq {}} {\n+\t\tmake_disporder $row [expr {$row + 1}]\n+\t\tset id [lindex $displayorder $row]\n+\t}\n+\treturn $id\n }\n \n proc closevarcs {v} {\n- global varctok varccommits varcid parents children\n- global cmitlisted commitidx vtokmod curview numcommits\n+\tglobal varctok varccommits varcid parents children\n+\tglobal cmitlisted commitidx vtokmod curview numcommits\n \n- set missing_parents 0\n- set scripts {}\n- set narcs [llength $varctok($v)]\n- for {set a 1} {$a < $narcs} {incr a} {\n-\tset id [lindex $varccommits($v,$a) end]\n-\tforeach p $parents($v,$id) {\n-\t if {[info exists varcid($v,$p)]} continue\n-\t # add p as a new commit\n-\t incr missing_parents\n-\t set cmitlisted($v,$p) 0\n-\t set parents($v,$p) {}\n-\t if {[llength $children($v,$p)] == 1 &&\n-\t\t[llength $parents($v,$id)] == 1} {\n-\t\tset b $a\n-\t } else {\n-\t\tset b [newvarc $v $p]\n-\t }\n-\t set varcid($v,$p) $b\n-\t if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {\n-\t\tmodify_arc $v $b\n-\t }\n-\t lappend varccommits($v,$b) $p\n-\t incr commitidx($v)\n-\t if {$v == $curview} {\n-\t\tset numcommits $commitidx($v)\n-\t }\n-\t set scripts [check_interest $p $scripts]\n+\tset missing_parents 0\n+\tset scripts {}\n+\tset narcs [llength $varctok($v)]\n+\tfor {set a 1} {$a < $narcs} {incr a} {\n+\t\tset id [lindex $varccommits($v,$a) end]\n+\t\tforeach p $parents($v,$id) {\n+\t\t\tif {[info exists varcid($v,$p)]} continue\n+\t\t\t# add p as a new commit\n+\t\t\tincr missing_parents\n+\t\t\tset cmitlisted($v,$p) 0\n+\t\t\tset parents($v,$p) {}\n+\t\t\tif {[llength $children($v,$p)] == 1 &&\n+\t\t\t\t[llength $parents($v,$id)] == 1} {\n+\t\t\t\tset b $a\n+\t\t\t} else {\n+\t\t\t\tset b [newvarc $v $p]\n+\t\t\t}\n+\t\t\tset varcid($v,$p) $b\n+\t\t\tif {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {\n+\t\t\t\tmodify_arc $v $b\n+\t\t\t}\n+\t\t\tlappend varccommits($v,$b) $p\n+\t\t\tincr commitidx($v)\n+\t\t\tif {$v == $curview} {\n+\t\t\t\tset numcommits $commitidx($v)\n+\t\t\t}\n+\t\t\tset scripts [check_interest $p $scripts]\n+\t\t}\n \t}\n- }\n- if {$missing_parents > 0} {\n-\tforeach s $scripts {\n-\t eval $s\n+\tif {$missing_parents > 0} {\n+\t\tforeach s $scripts {\n+\t\t\teval $s\n+\t\t}\n \t}\n- }\n }\n \n # Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid\n # Assumes we already have an arc for $rwid.\n proc rewrite_commit {v id rwid} {\n- global children parents varcid varctok vtokmod varccommits\n+\tglobal children parents varcid varctok vtokmod varccommits\n \n- foreach ch $children($v,$id) {\n-\t# make $rwid be $ch's parent in place of $id\n-\tset i [lsearch -exact $parents($v,$ch) $id]\n-\tif {$i < 0} {\n-\t puts \"oops rewrite_commit didn't find $id in parent list for $ch\"\n+\tforeach ch $children($v,$id) {\n+\t\t# make $rwid be $ch's parent in place of $id\n+\t\tset i [lsearch -exact $parents($v,$ch) $id]\n+\t\tif {$i < 0} {\n+\t\t\tputs \"oops rewrite_commit didn't find $id in parent list for $ch\"\n+\t\t}\n+\t\tset parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid]\n+\t\t# add $ch to $rwid's children and sort the list if necessary\n+\t\tif {[llength [lappend children($v,$rwid) $ch]] > 1} {\n+\t\t\tset children($v,$rwid) [lsort -command [list vtokcmp $v] \\\n+\t\t\t\t\t\t\t\t\t\t$children($v,$rwid)]\n+\t\t}\n+\t\t# fix the graph after joining $id to $rwid\n+\t\tset a $varcid($v,$ch)\n+\t\tfix_reversal $rwid $a $v\n+\t\t# parentlist is wrong for the last element of arc $a\n+\t\t# even if displayorder is right, hence the 3rd arg here\n+\t\tmodify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}]\n \t}\n-\tset parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid]\n-\t# add $ch to $rwid's children and sort the list if necessary\n-\tif {[llength [lappend children($v,$rwid) $ch]] > 1} {\n-\t set children($v,$rwid) [lsort -command [list vtokcmp $v] \\\n-\t\t\t\t\t$children($v,$rwid)]\n-\t}\n-\t# fix the graph after joining $id to $rwid\n-\tset a $varcid($v,$ch)\n-\tfix_reversal $rwid $a $v\n-\t# parentlist is wrong for the last element of arc $a\n-\t# even if displayorder is right, hence the 3rd arg here\n-\tmodify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}]\n- }\n }\n \n # Mechanism for registering a command to be executed when we come\n # across a particular commit. To handle the case when only the\n # prefix of the commit is known, the commitinterest array is now\n-# indexed by the first 4 characters of the ID. Each element is a\n+# indexed by the first 4 characters of the ID.\tEach element is a\n # list of id, cmd pairs.\n proc interestedin {id cmd} {\n- global commitinterest\n+\tglobal commitinterest\n \n- lappend commitinterest([string range $id 0 3]) $id $cmd\n+\tlappend commitinterest([string range $id 0 3]) $id $cmd\n }\n \n proc check_interest {id scripts} {\n- global commitinterest\n+\tglobal commitinterest\n \n- set prefix [string range $id 0 3]\n- if {[info exists commitinterest($prefix)]} {\n-\tset newlist {}\n-\tforeach {i script} $commitinterest($prefix) {\n-\t if {[string match \"$i*\" $id]} {\n-\t\tlappend scripts [string map [list \"%I\" $id \"%P\" $i] $script]\n-\t } else {\n-\t\tlappend newlist $i $script\n-\t }\n+\tset prefix [string range $id 0 3]\n+\tif {[info exists commitinterest($prefix)]} {\n+\t\tset newlist {}\n+\t\tforeach {i script} $commitinterest($prefix) {\n+\t\t\tif {[string match \"$i*\" $id]} {\n+\t\t\t\tlappend scripts [string map [list \"%I\" $id \"%P\" $i] $script]\n+\t\t\t} else {\n+\t\t\t\tlappend newlist $i $script\n+\t\t\t}\n+\t\t}\n+\t\tif {$newlist ne {}} {\n+\t\t\tset commitinterest($prefix) $newlist\n+\t\t} else {\n+\t\t\tunset commitinterest($prefix)\n+\t\t}\n \t}\n-\tif {$newlist ne {}} {\n-\t set commitinterest($prefix) $newlist\n-\t} else {\n-\t unset commitinterest($prefix)\n-\t}\n- }\n- return $scripts\n+\treturn $scripts\n }\n \n proc getcommitlines {fd inst view updating} {\n- global cmitlisted leftover\n- global commitidx commitdata vdatemode\n- global parents children curview hlview\n- global idpending ordertok\n- global varccommits varcid varctok vtokmod vfilelimit vshortids\n+\tglobal cmitlisted leftover\n+\tglobal commitidx commitdata vdatemode\n+\tglobal parents children curview hlview\n+\tglobal idpending ordertok\n+\tglobal varccommits varcid varctok vtokmod vfilelimit vshortids\n \n- set stuff [read $fd 500000]\n- # git log doesn't terminate the last commit with a null...\n- if {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} {\n-\tset stuff \"\\0\"\n- }\n- if {$stuff == {}} {\n-\tif {![eof $fd]} {\n-\t return 1\n+\tset stuff [read $fd 500000]\n+\t# git log doesn't terminate the last commit with a null...\n+\tif {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} {\n+\t\tset stuff \"\\0\"\n \t}\n-\tglobal commfd viewcomplete viewactive viewname\n-\tglobal viewinstances\n-\tunset commfd($inst)\n-\tset i [lsearch -exact $viewinstances($view) $inst]\n-\tif {$i >= 0} {\n-\t set viewinstances($view) [lreplace $viewinstances($view) $i $i]\n-\t}\n-\t# set it blocking so we wait for the process to terminate\n-\tfconfigure $fd -blocking 1\n-\tif {[catch {close $fd} err]} {\n-\t set fv {}\n-\t if {$view != $curview} {\n-\t\tset fv \" for the \\\"$viewname($view)\\\" view\"\n-\t }\n-\t if {[string range $err 0 4] == \"usage\"} {\n-\t\tset err \"Gitk: error reading commits$fv:\\\n-\t\t\tbad arguments to git log.\"\n-\t\tif {$viewname($view) eq [mc \"Command line\"]} {\n-\t\t append err \\\n-\t\t\t\" (Note: arguments to gitk are passed to git log\\\n-\t\t\t to allow selection of commits to be displayed.)\"\n+\tif {$stuff == {}} {\n+\t\tif {![eof $fd]} {\n+\t\t\treturn 1\n \t\t}\n-\t } else {\n-\t\tset err \"Error reading commits$fv: $err\"\n-\t }\n-\t error_popup $err\n-\t}\n-\tif {[incr viewactive($view) -1] <= 0} {\n-\t set viewcomplete($view) 1\n-\t # Check if we have seen any ids listed as parents that haven't\n-\t # appeared in the list\n-\t closevarcs $view\n-\t notbusy $view\n-\t}\n-\tif {$view == $curview} {\n-\t run chewcommits\n-\t}\n-\treturn 0\n- }\n- set start 0\n- set gotsome 0\n- set scripts {}\n- while 1 {\n-\tset i [string first \"\\0\" $stuff $start]\n-\tif {$i < 0} {\n-\t append leftover($inst) [string range $stuff $start end]\n-\t break\n-\t}\n-\tif {$start == 0} {\n-\t set cmit $leftover($inst)\n-\t append cmit [string range $stuff 0 [expr {$i - 1}]]\n-\t set leftover($inst) {}\n-\t} else {\n-\t set cmit [string range $stuff $start [expr {$i - 1}]]\n-\t}\n-\tset start [expr {$i + 1}]\n-\tset j [string first \"\\n\" $cmit]\n-\tset ok 0\n-\tset listed 1\n-\tif {$j >= 0 && [string match \"commit *\" $cmit]} {\n-\t set ids [string range $cmit 7 [expr {$j - 1}]]\n-\t if {[string match {[-^<>]*} $ids]} {\n-\t\tswitch -- [string index $ids 0] {\n-\t\t \"-\" {set listed 0}\n-\t\t \"^\" {set listed 2}\n-\t\t \"<\" {set listed 3}\n-\t\t \">\" {set listed 4}\n+\t\tglobal commfd viewcomplete viewactive viewname\n+\t\tglobal viewinstances\n+\t\tunset commfd($inst)\n+\t\tset i [lsearch -exact $viewinstances($view) $inst]\n+\t\tif {$i >= 0} {\n+\t\t\tset viewinstances($view) [lreplace $viewinstances($view) $i $i]\n \t\t}\n-\t\tset ids [string range $ids 1 end]\n-\t }\n-\t set ok 1\n-\t foreach id $ids {\n-\t\tif {[string length $id] != 40} {\n-\t\t set ok 0\n-\t\t break\n+\t\t# set it blocking so we wait for the process to terminate\n+\t\tfconfigure $fd -blocking 1\n+\t\tif {[catch {close $fd} err]} {\n+\t\t\tset fv {}\n+\t\t\tif {$view != $curview} {\n+\t\t\t\tset fv \" for the \\\"$viewname($view)\\\" view\"\n+\t\t\t}\n+\t\t\tif {[string range $err 0 4] == \"usage\"} {\n+\t\t\t\tset err \"Gitk: error reading commits$fv:\\\n+\t\t\t\t\t\tbad arguments to git log.\"\n+\t\t\t\tif {$viewname($view) eq [mc \"Command line\"]} {\n+\t\t\t\t\tappend err \\\n+\t\t\t\t\t\t\" (Note: arguments to gitk are passed to git log\\\n+\t\t\t\t\t\t to allow selection of commits to be displayed.)\"\n+\t\t\t\t}\n+\t\t\t} else {\n+\t\t\t\tset err \"Error reading commits$fv: $err\"\n+\t\t\t}\n+\t\t\terror_popup $err\n \t\t}\n-\t }\n-\t}\n-\tif {!$ok} {\n-\t set shortcmit $cmit\n-\t if {[string length $shortcmit] > 80} {\n-\t\tset shortcmit \"[string range $shortcmit 0 80]...\"\n-\t }\n-\t error_popup \"[mc \"Can't parse git log output:\"] {$shortcmit}\"\n-\t exit 1\n-\t}\n-\tset id [lindex $ids 0]\n-\tset vid $view,$id\n-\n-\tlappend vshortids($view,[string range $id 0 3]) $id\n-\n-\tif {!$listed && $updating && ![info exists varcid($vid)] &&\n-\t $vfilelimit($view) ne {}} {\n-\t # git log doesn't rewrite parents for unlisted commits\n-\t # when doing path limiting, so work around that here\n-\t # by working out the rewritten parent with git rev-list\n-\t # and if we already know about it, using the rewritten\n-\t # parent as a substitute parent for $id's children.\n-\t if {![catch {\n-\t\tset rwid [exec git rev-list --first-parent --max-count=1 \\\n-\t\t\t $id -- $vfilelimit($view)]\n-\t }]} {\n-\t\tif {$rwid ne {} && [info exists varcid($view,$rwid)]} {\n-\t\t # use $rwid in place of $id\n-\t\t rewrite_commit $view $id $rwid\n-\t\t continue\n+\t\tif {[incr viewactive($view) -1] <= 0} {\n+\t\t\tset viewcomplete($view) 1\n+\t\t\t# Check if we have seen any ids listed as parents that haven't\n+\t\t\t# appeared in the list\n+\t\t\tclosevarcs $view\n+\t\t\tnotbusy $view\n \t\t}\n-\t }\n-\t}\n-\n-\tset a 0\n-\tif {[info exists varcid($vid)]} {\n-\t if {$cmitlisted($vid) || !$listed} continue\n-\t set a $varcid($vid)\n-\t}\n-\tif {$listed} {\n-\t set olds [lrange $ids 1 end]\n-\t} else {\n-\t set olds {}\n-\t}\n-\tset commitdata($id) [string range $cmit [expr {$j + 1}] end]\n-\tset cmitlisted($vid) $listed\n-\tset parents($vid) $olds\n-\tif {![info exists children($vid)]} {\n-\t set children($vid) {}\n-\t} elseif {$a == 0 && [llength $children($vid)] == 1} {\n-\t set k [lindex $children($vid) 0]\n-\t if {[llength $parents($view,$k)] == 1 &&\n-\t\t(!$vdatemode($view) ||\n-\t\t $varcid($view,$k) == [llength $varctok($view)] - 1)} {\n-\t\tset a $varcid($view,$k)\n-\t }\n-\t}\n-\tif {$a == 0} {\n-\t # new arc\n-\t set a [newvarc $view $id]\n-\t}\n-\tif {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} {\n-\t modify_arc $view $a\n-\t}\n-\tif {![info exists varcid($vid)]} {\n-\t set varcid($vid) $a\n-\t lappend varccommits($view,$a) $id\n-\t incr commitidx($view)\n-\t}\n-\n-\tset i 0\n-\tforeach p $olds {\n-\t if {$i == 0 || [lsearch -exact $olds $p] >= $i} {\n-\t\tset vp $view,$p\n-\t\tif {[llength [lappend children($vp) $id]] > 1 &&\n-\t\t [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} {\n-\t\t set children($vp) [lsort -command [list vtokcmp $view] \\\n-\t\t\t\t\t $children($vp)]\n-\t\t unset -nocomplain ordertok\n+\t\tif {$view == $curview} {\n+\t\t\trun chewcommits\n \t\t}\n-\t\tif {[info exists varcid($view,$p)]} {\n-\t\t fix_reversal $p $a $view\n+\t\treturn 0\n+\t}\n+\tset start 0\n+\tset gotsome 0\n+\tset scripts {}\n+\twhile 1 {\n+\t\tset i [string first \"\\0\" $stuff $start]\n+\t\tif {$i < 0} {\n+\t\t\tappend leftover($inst) [string range $stuff $start end]\n+\t\t\tbreak\n \t\t}\n-\t }\n-\t incr i\n-\t}\n+\t\tif {$start == 0} {\n+\t\t\tset cmit $leftover($inst)\n+\t\t\tappend cmit [string range $stuff 0 [expr {$i - 1}]]\n+\t\t\tset leftover($inst) {}\n+\t\t} else {\n+\t\t\tset cmit [string range $stuff $start [expr {$i - 1}]]\n+\t\t}\n+\t\tset start [expr {$i + 1}]\n+\t\tset j [string first \"\\n\" $cmit]\n+\t\tset ok 0\n+\t\tset listed 1\n+\t\tif {$j >= 0 && [string match \"commit *\" $cmit]} {\n+\t\t\tset ids [string range $cmit 7 [expr {$j - 1}]]\n+\t\t\tif {[string match {[-^<>]*} $ids]} {\n+\t\t\t\tswitch -- [string index $ids 0] {\n+\t\t\t\t\t\"-\" {set listed 0}\n+\t\t\t\t\t\"^\" {set listed 2}\n+\t\t\t\t\t\"<\" {set listed 3}\n+\t\t\t\t\t\">\" {set listed 4}\n+\t\t\t\t}\n+\t\t\t\tset ids [string range $ids 1 end]\n+\t\t\t}\n+\t\t\tset ok 1\n+\t\t\tforeach id $ids {\n+\t\t\t\tif {[string length $id] != 40} {\n+\t\t\t\t\tset ok 0\n+\t\t\t\t\tbreak\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\tif {!$ok} {\n+\t\t\tset shortcmit $cmit\n+\t\t\tif {[string length $shortcmit] > 80} {\n+\t\t\t\tset shortcmit \"[string range $shortcmit 0 80]...\"\n+\t\t\t}\n+\t\t\terror_popup \"[mc \"Can't parse git log output:\"] {$shortcmit}\"\n+\t\t\texit 1\n+\t\t}\n+\t\tset id [lindex $ids 0]\n+\t\tset vid $view,$id\n \n-\tset scripts [check_interest $id $scripts]\n-\tset gotsome 1\n- }\n- if {$gotsome} {\n-\tglobal numcommits hlview\n+\t\tlappend vshortids($view,[string range $id 0 3]) $id\n \n-\tif {$view == $curview} {\n-\t set numcommits $commitidx($view)\n-\t run chewcommits\n+\t\tif {!$listed && $updating && ![info exists varcid($vid)] &&\n+\t\t\t$vfilelimit($view) ne {}} {\n+\t\t\t# git log doesn't rewrite parents for unlisted commits\n+\t\t\t# when doing path limiting, so work around that here\n+\t\t\t# by working out the rewritten parent with git rev-list\n+\t\t\t# and if we already know about it, using the rewritten\n+\t\t\t# parent as a substitute parent for $id's children.\n+\t\t\tif {![catch {\n+\t\t\t\tset rwid [exec git rev-list --first-parent --max-count=1 \\\n+\t\t\t\t\t\t\t $id -- $vfilelimit($view)]\n+\t\t\t}]} {\n+\t\t\t\tif {$rwid ne {} && [info exists varcid($view,$rwid)]} {\n+\t\t\t\t\t# use $rwid in place of $id\n+\t\t\t\t\trewrite_commit $view $id $rwid\n+\t\t\t\t\tcontinue\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\n+\t\tset a 0\n+\t\tif {[info exists varcid($vid)]} {\n+\t\t\tif {$cmitlisted($vid) || !$listed} continue\n+\t\t\tset a $varcid($vid)\n+\t\t}\n+\t\tif {$listed} {\n+\t\t\tset olds [lrange $ids 1 end]\n+\t\t} else {\n+\t\t\tset olds {}\n+\t\t}\n+\t\tset commitdata($id) [string range $cmit [expr {$j + 1}] end]\n+\t\tset cmitlisted($vid) $listed\n+\t\tset parents($vid) $olds\n+\t\tif {![info exists children($vid)]} {\n+\t\t\tset children($vid) {}\n+\t\t} elseif {$a == 0 && [llength $children($vid)] == 1} {\n+\t\t\tset k [lindex $children($vid) 0]\n+\t\t\tif {[llength $parents($view,$k)] == 1 &&\n+\t\t\t\t(!$vdatemode($view) ||\n+\t\t\t\t $varcid($view,$k) == [llength $varctok($view)] - 1)} {\n+\t\t\t\tset a $varcid($view,$k)\n+\t\t\t}\n+\t\t}\n+\t\tif {$a == 0} {\n+\t\t\t# new arc\n+\t\t\tset a [newvarc $view $id]\n+\t\t}\n+\t\tif {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} {\n+\t\t\tmodify_arc $view $a\n+\t\t}\n+\t\tif {![info exists varcid($vid)]} {\n+\t\t\tset varcid($vid) $a\n+\t\t\tlappend varccommits($view,$a) $id\n+\t\t\tincr commitidx($view)\n+\t\t}\n+\n+\t\tset i 0\n+\t\tforeach p $olds {\n+\t\t\tif {$i == 0 || [lsearch -exact $olds $p] >= $i} {\n+\t\t\t\tset vp $view,$p\n+\t\t\t\tif {[llength [lappend children($vp) $id]] > 1 &&\n+\t\t\t\t\t[vtokcmp $view [lindex $children($vp) end-1] $id] > 0} {\n+\t\t\t\t\tset children($vp) [lsort -command [list vtokcmp $view] \\\n+\t\t\t\t\t\t\t\t\t\t $children($vp)]\n+\t\t\t\t\tunset -nocomplain ordertok\n+\t\t\t\t}\n+\t\t\t\tif {[info exists varcid($view,$p)]} {\n+\t\t\t\t\tfix_reversal $p $a $view\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tincr i\n+\t\t}\n+\n+\t\tset scripts [check_interest $id $scripts]\n+\t\tset gotsome 1\n \t}\n-\tif {[info exists hlview] && $view == $hlview} {\n-\t # we never actually get here...\n-\t run vhighlightmore\n+\tif {$gotsome} {\n+\t\tglobal numcommits hlview\n+\n+\t\tif {$view == $curview} {\n+\t\t\tset numcommits $commitidx($view)\n+\t\t\trun chewcommits\n+\t\t}\n+\t\tif {[info exists hlview] && $view == $hlview} {\n+\t\t\t# we never actually get here...\n+\t\t\trun vhighlightmore\n+\t\t}\n+\t\tforeach s $scripts {\n+\t\t\teval $s\n+\t\t}\n \t}\n-\tforeach s $scripts {\n-\t eval $s\n-\t}\n- }\n- return 2\n+\treturn 2\n }\n \n proc chewcommits {} {\n- global curview hlview viewcomplete\n- global pending_select\n+\tglobal curview hlview viewcomplete\n+\tglobal pending_select\n \n- layoutmore\n- if {$viewcomplete($curview)} {\n-\tglobal commitidx varctok\n-\tglobal numcommits startmsecs\n+\tlayoutmore\n+\tif {$viewcomplete($curview)} {\n+\t\tglobal commitidx varctok\n+\t\tglobal numcommits startmsecs\n \n-\tif {[info exists pending_select]} {\n-\t update\n-\t reset_pending_select {}\n+\t\tif {[info exists pending_select]} {\n+\t\t\tupdate\n+\t\t\treset_pending_select {}\n \n-\t if {[commitinview $pending_select $curview]} {\n-\t\tselectline [rowofcommit $pending_select] 1\n-\t } else {\n-\t\tset row [first_real_row]\n-\t\tselectline $row 1\n-\t }\n+\t\t\tif {[commitinview $pending_select $curview]} {\n+\t\t\t\tselectline [rowofcommit $pending_select] 1\n+\t\t\t} else {\n+\t\t\t\tset row [first_real_row]\n+\t\t\t\tselectline $row 1\n+\t\t\t}\n+\t\t}\n+\t\tif {$commitidx($curview) > 0} {\n+\t\t\t#set ms [expr {[clock clicks -milliseconds] - $startmsecs}]\n+\t\t\t#puts \"overall $ms ms for $numcommits commits\"\n+\t\t\t#puts \"[llength $varctok($view)] arcs, $commitidx($view) commits\"\n+\t\t} else {\n+\t\t\tshow_status [mc \"No commits selected\"]\n+\t\t}\n+\t\tnotbusy layout\n \t}\n-\tif {$commitidx($curview) > 0} {\n-\t #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]\n-\t #puts \"overall $ms ms for $numcommits commits\"\n-\t #puts \"[llength $varctok($view)] arcs, $commitidx($view) commits\"\n-\t} else {\n-\t show_status [mc \"No commits selected\"]\n-\t}\n-\tnotbusy layout\n- }\n- return 0\n+\treturn 0\n }\n \n proc do_readcommit {id} {\n- global tclencoding\n+\tglobal tclencoding\n \n- # Invoke git-log to handle automatic encoding conversion\n- set fd [open [concat | git log --no-color --pretty=raw -1 $id] r]\n- # Read the results using i18n.logoutputencoding\n- fconfigure $fd -translation lf -eofchar {}\n- if {$tclencoding != {}} {\n-\tfconfigure $fd -encoding $tclencoding\n- }\n- set contents [read $fd]\n- close $fd\n- # Remove the heading line\n- regsub {^commit [0-9a-f]+\\n} $contents {} contents\n+\t# Invoke git-log to handle automatic encoding conversion\n+\tset fd [open [concat | git log --no-color --pretty=raw -1 $id] r]\n+\t# Read the results using i18n.logoutputencoding\n+\tfconfigure $fd -translation lf -eofchar {}\n+\tif {$tclencoding != {}} {\n+\t\tfconfigure $fd -encoding $tclencoding\n+\t}\n+\tset contents [read $fd]\n+\tclose $fd\n+\t# Remove the heading line\n+\tregsub {^commit [0-9a-f]+\\n} $contents {} contents\n \n- return $contents\n+\treturn $contents\n }\n \n proc readcommit {id} {\n- if {[catch {set contents [do_readcommit $id]}]} return\n- parsecommit $id $contents 1\n+\tif {[catch {set contents [do_readcommit $id]}]} return\n+\tparsecommit $id $contents 1\n }\n \n proc parsecommit {id contents listed} {\n- global commitinfo\n+\tglobal commitinfo\n \n- set inhdr 1\n- set comment {}\n- set headline {}\n- set auname {}\n- set audate {}\n- set comname {}\n- set comdate {}\n- set hdrend [string first \"\\n\\n\" $contents]\n- if {$hdrend < 0} {\n-\t# should never happen...\n-\tset hdrend [string length $contents]\n- }\n- set header [string range $contents 0 [expr {$hdrend - 1}]]\n- set comment [string range $contents [expr {$hdrend + 2}] end]\n- foreach line [split $header \"\\n\"] {\n-\tset line [split $line \" \"]\n-\tset tag [lindex $line 0]\n-\tif {$tag == \"author\"} {\n-\t set audate [lrange $line end-1 end]\n-\t set auname [join [lrange $line 1 end-2] \" \"]\n-\t} elseif {$tag == \"committer\"} {\n-\t set comdate [lrange $line end-1 end]\n-\t set comname [join [lrange $line 1 end-2] \" \"]\n+\tset inhdr 1\n+\tset comment {}\n+\tset headline {}\n+\tset auname {}\n+\tset audate {}\n+\tset comname {}\n+\tset comdate {}\n+\tset hdrend [string first \"\\n\\n\" $contents]\n+\tif {$hdrend < 0} {\n+\t\t# should never happen...\n+\t\tset hdrend [string length $contents]\n \t}\n- }\n- set headline {}\n- # take the first non-blank line of the comment as the headline\n- set headline [string trimleft $comment]\n- set i [string first \"\\n\" $headline]\n- if {$i >= 0} {\n-\tset headline [string range $headline 0 $i]\n- }\n- set headline [string trimright $headline]\n- set i [string first \"\\r\" $headline]\n- if {$i >= 0} {\n-\tset headline [string trimright [string range $headline 0 $i]]\n- }\n- if {!$listed} {\n-\t# git log indents the comment by 4 spaces;\n-\t# if we got this via git cat-file, add the indentation\n-\tset newcomment {}\n-\tforeach line [split $comment \"\\n\"] {\n-\t append newcomment \" \"\n-\t append newcomment $line\n-\t append newcomment \"\\n\"\n+\tset header [string range $contents 0 [expr {$hdrend - 1}]]\n+\tset comment [string range $contents [expr {$hdrend + 2}] end]\n+\tforeach line [split $header \"\\n\"] {\n+\t\tset line [split $line \" \"]\n+\t\tset tag [lindex $line 0]\n+\t\tif {$tag == \"author\"} {\n+\t\t\tset audate [lrange $line end-1 end]\n+\t\t\tset auname [join [lrange $line 1 end-2] \" \"]\n+\t\t} elseif {$tag == \"committer\"} {\n+\t\t\tset comdate [lrange $line end-1 end]\n+\t\t\tset comname [join [lrange $line 1 end-2] \" \"]\n+\t\t}\n \t}\n-\tset comment $newcomment\n- }\n- set hasnote [string first \"\\nNotes:\\n\" $contents]\n- set diff \"\"\n- # If there is diff output shown in the git-log stream, split it\n- # out. But get rid of the empty line that always precedes the\n- # diff.\n- set i [string first \"\\n\\ndiff\" $comment]\n- if {$i >= 0} {\n-\tset diff [string range $comment $i+1 end]\n-\tset comment [string range $comment 0 $i-1]\n- }\n- set commitinfo($id) [list $headline $auname $audate \\\n-\t\t\t $comname $comdate $comment $hasnote $diff]\n+\tset headline {}\n+\t# take the first non-blank line of the comment as the headline\n+\tset headline [string trimleft $comment]\n+\tset i [string first \"\\n\" $headline]\n+\tif {$i >= 0} {\n+\t\tset headline [string range $headline 0 $i]\n+\t}\n+\tset headline [string trimright $headline]\n+\tset i [string first \"\\r\" $headline]\n+\tif {$i >= 0} {\n+\t\tset headline [string trimright [string range $headline 0 $i]]\n+\t}\n+\tif {!$listed} {\n+\t\t# git log indents the comment by 4 spaces;\n+\t\t# if we got this via git cat-file, add the indentation\n+\t\tset newcomment {}\n+\t\tforeach line [split $comment \"\\n\"] {\n+\t\t\tappend newcomment \" \"\n+\t\t\tappend newcomment $line\n+\t\t\tappend newcomment \"\\n\"\n+\t\t}\n+\t\tset comment $newcomment\n+\t}\n+\tset hasnote [string first \"\\nNotes:\\n\" $contents]\n+\tset diff \"\"\n+\t# If there is diff output shown in the git-log stream, split it\n+\t# out.\tBut get rid of the empty line that always precedes the\n+\t# diff.\n+\tset i [string first \"\\n\\ndiff\" $comment]\n+\tif {$i >= 0} {\n+\t\tset diff [string range $comment $i+1 end]\n+\t\tset comment [string range $comment 0 $i-1]\n+\t}\n+\tset commitinfo($id) [list $headline $auname $audate \\\n+\t\t\t\t\t\t\t $comname $comdate $comment $hasnote $diff]\n }\n \n proc getcommit {id} {\n- global commitdata commitinfo\n+\tglobal commitdata commitinfo\n \n- if {[info exists commitdata($id)]} {\n-\tparsecommit $id $commitdata($id) 1\n- } else {\n-\treadcommit $id\n-\tif {![info exists commitinfo($id)]} {\n-\t set commitinfo($id) [list [mc \"No commit information available\"]]\n+\tif {[info exists commitdata($id)]} {\n+\t\tparsecommit $id $commitdata($id) 1\n+\t} else {\n+\t\treadcommit $id\n+\t\tif {![info exists commitinfo($id)]} {\n+\t\t\tset commitinfo($id) [list [mc \"No commit information available\"]]\n+\t\t}\n \t}\n- }\n- return 1\n+\treturn 1\n }\n \n # Expand an abbreviated commit ID to a list of full 40-char IDs that match\n # and are present in the current view.\n # This is fairly slow...\n proc longid {prefix} {\n- global varcid curview vshortids\n+\tglobal varcid curview vshortids\n \n- set ids {}\n- if {[string length $prefix] >= 4} {\n-\tset vshortid $curview,[string range $prefix 0 3]\n-\tif {[info exists vshortids($vshortid)]} {\n-\t foreach id $vshortids($vshortid) {\n-\t\tif {[string match \"$prefix*\" $id]} {\n-\t\t if {[lsearch -exact $ids $id] < 0} {\n-\t\t\tlappend ids $id\n-\t\t\tif {[llength $ids] >= 2} break\n-\t\t }\n+\tset ids {}\n+\tif {[string length $prefix] >= 4} {\n+\t\tset vshortid $curview,[string range $prefix 0 3]\n+\t\tif {[info exists vshortids($vshortid)]} {\n+\t\t\tforeach id $vshortids($vshortid) {\n+\t\t\t\tif {[string match \"$prefix*\" $id]} {\n+\t\t\t\t\tif {[lsearch -exact $ids $id] < 0} {\n+\t\t\t\t\t\tlappend ids $id\n+\t\t\t\t\t\tif {[llength $ids] >= 2} break\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t} else {\n+\t\tforeach match [array names varcid \"$curview,$prefix*\"] {\n+\t\t\tlappend ids [lindex [split $match \",\"] 1]\n+\t\t\tif {[llength $ids] >= 2} break\n \t\t}\n-\t }\n \t}\n- } else {\n-\tforeach match [array names varcid \"$curview,$prefix*\"] {\n-\t lappend ids [lindex [split $match \",\"] 1]\n-\t if {[llength $ids] >= 2} break\n-\t}\n- }\n- return $ids\n+\treturn $ids\n }\n \n proc readrefs {} {\n- global tagids idtags headids idheads tagobjid\n- global otherrefids idotherrefs mainhead mainheadid\n- global selecthead selectheadid\n- global hideremotes\n- global tclencoding\n+\tglobal tagids idtags headids idheads tagobjid\n+\tglobal otherrefids idotherrefs mainhead mainheadid\n+\tglobal selecthead selectheadid\n+\tglobal hideremotes\n+\tglobal tclencoding\n \n- foreach v {tagids idtags headids idheads otherrefids idotherrefs} {\n-\tunset -nocomplain $v\n- }\n- set refd [open [list | git show-ref -d] r]\n- if {$tclencoding != {}} {\n-\tfconfigure $refd -encoding $tclencoding\n- }\n- while {[gets $refd line] >= 0} {\n-\tif {[string index $line 40] ne \" \"} continue\n-\tset id [string range $line 0 39]\n-\tset ref [string range $line 41 end]\n-\tif {![string match \"refs/*\" $ref]} continue\n-\tset name [string range $ref 5 end]\n-\tif {[string match \"remotes/*\" $name]} {\n-\t if {![string match \"*/HEAD\" $name] && !$hideremotes} {\n-\t\tset headids($name) $id\n-\t\tlappend idheads($id) $name\n-\t }\n-\t} elseif {[string match \"heads/*\" $name]} {\n-\t set name [string range $name 6 end]\n-\t set headids($name) $id\n-\t lappend idheads($id) $name\n-\t} elseif {[string match \"tags/*\" $name]} {\n-\t # this lets refs/tags/foo^{} overwrite refs/tags/foo,\n-\t # which is what we want since the former is the commit ID\n-\t set name [string range $name 5 end]\n-\t if {[string match \"*^{}\" $name]} {\n-\t\tset name [string range $name 0 end-3]\n-\t } else {\n-\t\tset tagobjid($name) $id\n-\t }\n-\t set tagids($name) $id\n-\t lappend idtags($id) $name\n-\t} else {\n-\t set otherrefids($name) $id\n-\t lappend idotherrefs($id) $name\n+\tforeach v {tagids idtags headids idheads otherrefids idotherrefs} {\n+\t\tunset -nocomplain $v\n \t}\n- }\n- catch {close $refd}\n- set mainhead {}\n- set mainheadid {}\n- catch {\n-\tset mainheadid [exec git rev-parse HEAD]\n-\tset thehead [exec git symbolic-ref HEAD]\n-\tif {[string match \"refs/heads/*\" $thehead]} {\n-\t set mainhead [string range $thehead 11 end]\n+\tset refd [open [list | git show-ref -d] r]\n+\tif {$tclencoding != {}} {\n+\t\tfconfigure $refd -encoding $tclencoding\n \t}\n- }\n- set selectheadid {}\n- if {$selecthead ne {}} {\n+\twhile {[gets $refd line] >= 0} {\n+\t\tif {[string index $line 40] ne \" \"} continue\n+\t\tset id [string range $line 0 39]\n+\t\tset ref [string range $line 41 end]\n+\t\tif {![string match \"refs/*\" $ref]} continue\n+\t\tset name [string range $ref 5 end]\n+\t\tif {[string match \"remotes/*\" $name]} {\n+\t\t\tif {![string match \"*/HEAD\" $name] && !$hideremotes} {\n+\t\t\t\tset headids($name) $id\n+\t\t\t\tlappend idheads($id) $name\n+\t\t\t}\n+\t\t} elseif {[string match \"heads/*\" $name]} {\n+\t\t\tset name [string range $name 6 end]\n+\t\t\tset headids($name) $id\n+\t\t\tlappend idheads($id) $name\n+\t\t} elseif {[string match \"tags/*\" $name]} {\n+\t\t\t# this lets refs/tags/foo^{} overwrite refs/tags/foo,\n+\t\t\t# which is what we want since the former is the commit ID\n+\t\t\tset name [string range $name 5 end]\n+\t\t\tif {[string match \"*^{}\" $name]} {\n+\t\t\t\tset name [string range $name 0 end-3]\n+\t\t\t} else {\n+\t\t\t\tset tagobjid($name) $id\n+\t\t\t}\n+\t\t\tset tagids($name) $id\n+\t\t\tlappend idtags($id) $name\n+\t\t} else {\n+\t\t\tset otherrefids($name) $id\n+\t\t\tlappend idotherrefs($id) $name\n+\t\t}\n+\t}\n+\tcatch {close $refd}\n+\tset mainhead {}\n+\tset mainheadid {}\n \tcatch {\n-\t set selectheadid [exec git rev-parse --verify $selecthead]\n+\t\tset mainheadid [exec git rev-parse HEAD]\n+\t\tset thehead [exec git symbolic-ref HEAD]\n+\t\tif {[string match \"refs/heads/*\" $thehead]} {\n+\t\t\tset mainhead [string range $thehead 11 end]\n+\t\t}\n+\t}\n+\tset selectheadid {}\n+\tif {$selecthead ne {}} {\n+\t\tcatch {\n+\t\t\tset selectheadid [exec git rev-parse --verify $selecthead]\n+\t\t}\n \t}\n- }\n }\n \n # skip over fake commits\n proc first_real_row {} {\n- global nullid nullid2 numcommits\n+\tglobal nullid nullid2 numcommits\n \n- for {set row 0} {$row < $numcommits} {incr row} {\n-\tset id [commitonrow $row]\n-\tif {$id ne $nullid && $id ne $nullid2} {\n-\t break\n+\tfor {set row 0} {$row < $numcommits} {incr row} {\n+\t\tset id [commitonrow $row]\n+\t\tif {$id ne $nullid && $id ne $nullid2} {\n+\t\t\tbreak\n+\t\t}\n \t}\n- }\n- return $row\n+\treturn $row\n }\n \n # update things for a head moved to a child of its previous location\n proc movehead {id name} {\n- global headids idheads\n+\tglobal headids idheads\n \n- removehead $headids($name) $name\n- set headids($name) $id\n- lappend idheads($id) $name\n+\tremovehead $headids($name) $name\n+\tset headids($name) $id\n+\tlappend idheads($id) $name\n }\n \n # update things when a head has been removed\n proc removehead {id name} {\n- global headids idheads\n+\tglobal headids idheads\n \n- if {$idheads($id) eq $name} {\n-\tunset idheads($id)\n- } else {\n-\tset i [lsearch -exact $idheads($id) $name]\n-\tif {$i >= 0} {\n-\t set idheads($id) [lreplace $idheads($id) $i $i]\n+\tif {$idheads($id) eq $name} {\n+\t\tunset idheads($id)\n+\t} else {\n+\t\tset i [lsearch -exact $idheads($id) $name]\n+\t\tif {$i >= 0} {\n+\t\t\tset idheads($id) [lreplace $idheads($id) $i $i]\n+\t\t}\n \t}\n- }\n- unset headids($name)\n+\tunset headids($name)\n }\n \n proc ttk_toplevel {w args} {\n- global use_ttk\n- eval [linsert $args 0 ::toplevel $w]\n- if {$use_ttk} {\n- place [ttk::frame $w._toplevel_background] -x 0 -y 0 -relwidth 1 -relheight 1\n- }\n- return $w\n+\tglobal use_ttk\n+\teval [linsert $args 0 ::toplevel $w]\n+\tif {$use_ttk} {\n+\t\tplace [ttk::frame $w._toplevel_background] -x 0 -y 0 -relwidth 1 -relheight 1\n+\t}\n+\treturn $w\n }\n \n proc make_transient {window origin} {\n- global have_tk85\n+\tglobal have_tk85\n \n- # In MacOS Tk 8.4 transient appears to work by setting\n- # overrideredirect, which is utterly useless, since the\n- # windows get no border, and are not even kept above\n- # the parent.\n- if {!$have_tk85 && [tk windowingsystem] eq {aqua}} return\n+\t# In MacOS Tk 8.4 transient appears to work by setting\n+\t# overrideredirect, which is utterly useless, since the\n+\t# windows get no border, and are not even kept above\n+\t# the parent.\n+\tif {!$have_tk85 && [tk windowingsystem] eq {aqua}} return\n \n- wm transient $window $origin\n+\twm transient $window $origin\n \n- # Windows fails to place transient windows normally, so\n- # schedule a callback to center them on the parent.\n- if {[tk windowingsystem] eq {win32}} {\n-\tafter idle [list tk::PlaceWindow $window widget $origin]\n- }\n+\t# Windows fails to place transient windows normally, so\n+\t# schedule a callback to center them on the parent.\n+\tif {[tk windowingsystem] eq {win32}} {\n+\t\tafter idle [list tk::PlaceWindow $window widget $origin]\n+\t}\n }\n \n proc show_error {w top msg} {\n- global NS\n- if {![info exists NS]} {set NS \"\"}\n- if {[wm state $top] eq \"withdrawn\"} { wm deiconify $top }\n- message $w.m -text $msg -justify center -aspect 400\n- pack $w.m -side top -fill x -padx 20 -pady 20\n- ${NS}::button $w.ok -default active -text [mc OK] -command \"destroy $top\"\n- pack $w.ok -side bottom -fill x\n- bind $top \"grab $top; focus $top\"\n- bind $top \"destroy $top\"\n- bind $top \"destroy $top\"\n- bind $top \"destroy $top\"\n- tkwait window $top\n+\tglobal NS\n+\tif {![info exists NS]} {set NS \"\"}\n+\tif {[wm state $top] eq \"withdrawn\"} { wm deiconify $top }\n+\tmessage $w.m -text $msg -justify center -aspect 400\n+\tpack $w.m -side top -fill x -padx 20 -pady 20\n+\t${NS}::button $w.ok -default active -text [mc OK] -command \"destroy $top\"\n+\tpack $w.ok -side bottom -fill x\n+\tbind $top \"grab $top; focus $top\"\n+\tbind $top \"destroy $top\"\n+\tbind $top \"destroy $top\"\n+\tbind $top \"destroy $top\"\n+\ttkwait window $top\n }\n \n proc error_popup {msg {owner .}} {\n- if {[tk windowingsystem] eq \"win32\"} {\n- tk_messageBox -icon error -type ok -title [wm title .] \\\n- -parent $owner -message $msg\n- } else {\n- set w .error\n- ttk_toplevel $w\n- make_transient $w $owner\n- show_error $w $w $msg\n- }\n+\tif {[tk windowingsystem] eq \"win32\"} {\n+\t\ttk_messageBox -icon error -type ok -title [wm title .] \\\n+\t\t\t-parent $owner -message $msg\n+\t} else {\n+\t\tset w .error\n+\t\tttk_toplevel $w\n+\t\tmake_transient $w $owner\n+\t\tshow_error $w $w $msg\n+\t}\n }\n \n proc confirm_popup {msg {owner .}} {\n- global confirm_ok NS\n- set confirm_ok 0\n- set w .confirm\n- ttk_toplevel $w\n- make_transient $w $owner\n- message $w.m -text $msg -justify center -aspect 400\n- pack $w.m -side top -fill x -padx 20 -pady 20\n- ${NS}::button $w.ok -text [mc OK] -command \"set confirm_ok 1; destroy $w\"\n- pack $w.ok -side left -fill x\n- ${NS}::button $w.cancel -text [mc Cancel] -command \"destroy $w\"\n- pack $w.cancel -side right -fill x\n- bind $w \"grab $w; focus $w\"\n- bind $w \"set confirm_ok 1; destroy $w\"\n- bind $w \"set confirm_ok 1; destroy $w\"\n- bind $w \"destroy $w\"\n- tk::PlaceWindow $w widget $owner\n- tkwait window $w\n- return $confirm_ok\n+\tglobal confirm_ok NS\n+\tset confirm_ok 0\n+\tset w .confirm\n+\tttk_toplevel $w\n+\tmake_transient $w $owner\n+\tmessage $w.m -text $msg -justify center -aspect 400\n+\tpack $w.m -side top -fill x -padx 20 -pady 20\n+\t${NS}::button $w.ok -text [mc OK] -command \"set confirm_ok 1; destroy $w\"\n+\tpack $w.ok -side left -fill x\n+\t${NS}::button $w.cancel -text [mc Cancel] -command \"destroy $w\"\n+\tpack $w.cancel -side right -fill x\n+\tbind $w \"grab $w; focus $w\"\n+\tbind $w \"set confirm_ok 1; destroy $w\"\n+\tbind $w \"set confirm_ok 1; destroy $w\"\n+\tbind $w \"destroy $w\"\n+\ttk::PlaceWindow $w widget $owner\n+\ttkwait window $w\n+\treturn $confirm_ok\n }\n \n proc setoptions {} {\n- global use_ttk\n+\tglobal use_ttk\n \n- if {[tk windowingsystem] ne \"win32\"} {\n- option add *Panedwindow.showHandle 1 startupFile\n- option add *Panedwindow.sashRelief raised startupFile\n- if {[tk windowingsystem] ne \"aqua\"} {\n- option add *Menu.font uifont startupFile\n- }\n- } else {\n- option add *Menu.TearOff 0 startupFile\n- }\n- option add *Button.font uifont startupFile\n- option add *Checkbutton.font uifont startupFile\n- option add *Radiobutton.font uifont startupFile\n- option add *Menubutton.font uifont startupFile\n- option add *Label.font uifont startupFile\n- option add *Message.font uifont startupFile\n- option add *Entry.font textfont startupFile\n- option add *Text.font textfont startupFile\n- option add *Labelframe.font uifont startupFile\n- option add *Spinbox.font textfont startupFile\n- option add *Listbox.font mainfont startupFile\n+\tif {[tk windowingsystem] ne \"win32\"} {\n+\t\toption add *Panedwindow.showHandle 1 startupFile\n+\t\toption add *Panedwindow.sashRelief raised startupFile\n+\t\tif {[tk windowingsystem] ne \"aqua\"} {\n+\t\t\toption add *Menu.font uifont startupFile\n+\t\t}\n+\t} else {\n+\t\toption add *Menu.TearOff 0 startupFile\n+\t}\n+\toption add *Button.font uifont startupFile\n+\toption add *Checkbutton.font uifont startupFile\n+\toption add *Radiobutton.font uifont startupFile\n+\toption add *Menubutton.font uifont startupFile\n+\toption add *Label.font uifont startupFile\n+\toption add *Message.font uifont startupFile\n+\toption add *Entry.font textfont startupFile\n+\toption add *Text.font textfont startupFile\n+\toption add *Labelframe.font uifont startupFile\n+\toption add *Spinbox.font textfont startupFile\n+\toption add *Listbox.font mainfont startupFile\n }\n \n proc setttkstyle {} {\n- eval font configure TkDefaultFont [fontflags mainfont]\n- eval font configure TkTextFont [fontflags textfont]\n- eval font configure TkHeadingFont [fontflags mainfont]\n- eval font configure TkCaptionFont [fontflags mainfont] -weight bold\n- eval font configure TkTooltipFont [fontflags uifont]\n- eval font configure TkFixedFont [fontflags textfont]\n- eval font configure TkIconFont [fontflags uifont]\n- eval font configure TkMenuFont [fontflags uifont]\n- eval font configure TkSmallCaptionFont [fontflags uifont]\n+\teval font configure TkDefaultFont [fontflags mainfont]\n+\teval font configure TkTextFont [fontflags textfont]\n+\teval font configure TkHeadingFont [fontflags mainfont]\n+\teval font configure TkCaptionFont [fontflags mainfont] -weight bold\n+\teval font configure TkTooltipFont [fontflags uifont]\n+\teval font configure TkFixedFont [fontflags textfont]\n+\teval font configure TkIconFont\t [fontflags uifont]\n+\teval font configure TkMenuFont\t [fontflags uifont]\n+\teval font configure TkSmallCaptionFont [fontflags uifont]\n }\n \n # Make a menu and submenus.\n@@ -1996,8235 +1996,8235 @@ proc setttkstyle {} {\n # description depends on type; it's the sublist for cascade, the\n # command to invoke for command, or {variable value} for radiobutton\n proc makemenu {m items} {\n- menu $m\n- if {[tk windowingsystem] eq {aqua}} {\n-\tset Meta1 Cmd\n- } else {\n-\tset Meta1 Ctrl\n- }\n- foreach i $items {\n-\tset name [mc [lindex $i 1]]\n-\tset type [lindex $i 2]\n-\tset thing [lindex $i 3]\n-\tset params [list $type]\n-\tif {$name ne {}} {\n-\t set u [string first \"&\" [string map {&& x} $name]]\n-\t lappend params -label [string map {&& & & {}} $name]\n-\t if {$u >= 0} {\n-\t\tlappend params -underline $u\n-\t }\n+\tmenu $m\n+\tif {[tk windowingsystem] eq {aqua}} {\n+\t\tset Meta1 Cmd\n+\t} else {\n+\t\tset Meta1 Ctrl\n \t}\n-\tswitch -- $type {\n-\t \"cascade\" {\n-\t\tset submenu [string tolower [string map {& \"\"} [lindex $i 1]]]\n-\t\tlappend params -menu $m.$submenu\n-\t }\n-\t \"command\" {\n-\t\tlappend params -command $thing\n-\t }\n-\t \"radiobutton\" {\n-\t\tlappend params -variable [lindex $thing 0] \\\n-\t\t -value [lindex $thing 1]\n-\t }\n+\tforeach i $items {\n+\t\tset name [mc [lindex $i 1]]\n+\t\tset type [lindex $i 2]\n+\t\tset thing [lindex $i 3]\n+\t\tset params [list $type]\n+\t\tif {$name ne {}} {\n+\t\t\tset u [string first \"&\" [string map {&& x} $name]]\n+\t\t\tlappend params -label [string map {&& & & {}} $name]\n+\t\t\tif {$u >= 0} {\n+\t\t\t\tlappend params -underline $u\n+\t\t\t}\n+\t\t}\n+\t\tswitch -- $type {\n+\t\t\t\"cascade\" {\n+\t\t\t\tset submenu [string tolower [string map {& \"\"} [lindex $i 1]]]\n+\t\t\t\tlappend params -menu $m.$submenu\n+\t\t\t}\n+\t\t\t\"command\" {\n+\t\t\t\tlappend params -command $thing\n+\t\t\t}\n+\t\t\t\"radiobutton\" {\n+\t\t\t\tlappend params -variable [lindex $thing 0] \\\n+\t\t\t\t\t-value [lindex $thing 1]\n+\t\t\t}\n+\t\t}\n+\t\tset tail [lrange $i 4 end]\n+\t\tregsub -all {\\yMeta1\\y} $tail $Meta1 tail\n+\t\teval $m add $params $tail\n+\t\tif {$type eq \"cascade\"} {\n+\t\t\tmakemenu $m.$submenu $thing\n+\t\t}\n \t}\n-\tset tail [lrange $i 4 end]\n-\tregsub -all {\\yMeta1\\y} $tail $Meta1 tail\n-\teval $m add $params $tail\n-\tif {$type eq \"cascade\"} {\n-\t makemenu $m.$submenu $thing\n-\t}\n- }\n }\n \n # translate string and remove ampersands\n proc mca {str} {\n- return [string map {&& & & {}} [mc $str]]\n+\treturn [string map {&& & & {}} [mc $str]]\n }\n \n proc cleardropsel {w} {\n- $w selection clear\n+\t$w selection clear\n }\n proc makedroplist {w varname args} {\n- global use_ttk\n- if {$use_ttk} {\n- set width 0\n- foreach label $args {\n- set cx [string length $label]\n- if {$cx > $width} {set width $cx}\n- }\n-\tset gm [ttk::combobox $w -width $width -state readonly\\\n-\t\t -textvariable $varname -values $args \\\n-\t\t -exportselection false]\n-\tbind $gm <> [list $gm selection clear]\n- } else {\n-\tset gm [eval [linsert $args 0 tk_optionMenu $w $varname]]\n- }\n- return $gm\n+\tglobal use_ttk\n+\tif {$use_ttk} {\n+\t\tset width 0\n+\t\tforeach label $args {\n+\t\t\tset cx [string length $label]\n+\t\t\tif {$cx > $width} {set width $cx}\n+\t\t}\n+\t\tset gm [ttk::combobox $w -width $width -state readonly\\\n+\t\t\t\t\t-textvariable $varname -values $args \\\n+\t\t\t\t\t-exportselection false]\n+\t\tbind $gm <> [list $gm selection clear]\n+\t} else {\n+\t\tset gm [eval [linsert $args 0 tk_optionMenu $w $varname]]\n+\t}\n+\treturn $gm\n }\n \n proc makewindow {} {\n- global canv canv2 canv3 linespc charspc ctext cflist cscroll\n- global tabstop\n- global findtype findtypemenu findloc findstring fstring geometry\n- global entries sha1entry sha1string sha1but\n- global diffcontextstring diffcontext\n- global ignorespace\n- global maincursor textcursor curtextcursor\n- global rowctxmenu fakerowmenu mergemax wrapcomment\n- global highlight_files gdttype\n- global searchstring sstring\n- global bgcolor fgcolor bglist fglist diffcolors selectbgcolor\n- global uifgcolor uifgdisabledcolor\n- global filesepbgcolor filesepfgcolor\n- global mergecolors foundbgcolor currentsearchhitbgcolor\n- global headctxmenu progresscanv progressitem progresscoords statusw\n- global fprogitem fprogcoord lastprogupdate progupdatepending\n- global rprogitem rprogcoord rownumsel numcommits\n- global have_tk85 use_ttk NS\n- global git_version\n- global worddiff\n+\tglobal canv canv2 canv3 linespc charspc ctext cflist cscroll\n+\tglobal tabstop\n+\tglobal findtype findtypemenu findloc findstring fstring geometry\n+\tglobal entries sha1entry sha1string sha1but\n+\tglobal diffcontextstring diffcontext\n+\tglobal ignorespace\n+\tglobal maincursor textcursor curtextcursor\n+\tglobal rowctxmenu fakerowmenu mergemax wrapcomment\n+\tglobal highlight_files gdttype\n+\tglobal searchstring sstring\n+\tglobal bgcolor fgcolor bglist fglist diffcolors selectbgcolor\n+\tglobal uifgcolor uifgdisabledcolor\n+\tglobal filesepbgcolor filesepfgcolor\n+\tglobal mergecolors foundbgcolor currentsearchhitbgcolor\n+\tglobal headctxmenu progresscanv progressitem progresscoords statusw\n+\tglobal fprogitem fprogcoord lastprogupdate progupdatepending\n+\tglobal rprogitem rprogcoord rownumsel numcommits\n+\tglobal have_tk85 use_ttk NS\n+\tglobal git_version\n+\tglobal worddiff\n \n- # The \"mc\" arguments here are purely so that xgettext\n- # sees the following string as needing to be translated\n- set file {\n-\tmc \"&File\" cascade {\n-\t {mc \"&Update\" command updatecommits -accelerator F5}\n-\t {mc \"&Reload\" command reloadcommits -accelerator Shift-F5}\n-\t {mc \"Reread re&ferences\" command rereadrefs}\n-\t {mc \"&List references\" command showrefs -accelerator F2}\n-\t {xx \"\" separator}\n-\t {mc \"Start git &gui\" command {exec git gui &}}\n-\t {xx \"\" separator}\n-\t {mc \"&Quit\" command doquit -accelerator Meta1-Q}\n-\t}}\n- set edit {\n-\tmc \"&Edit\" cascade {\n-\t {mc \"&Preferences\" command doprefs}\n-\t}}\n- set view {\n-\tmc \"&View\" cascade {\n-\t {mc \"&New view...\" command {newview 0} -accelerator Shift-F4}\n-\t {mc \"&Edit view...\" command editview -state disabled -accelerator F4}\n-\t {mc \"&Delete view\" command delview -state disabled}\n-\t {xx \"\" separator}\n-\t {mc \"&All files\" radiobutton {selectedview 0} -command {showview 0}}\n-\t}}\n- if {[tk windowingsystem] ne \"aqua\"} {\n-\tset help {\n-\tmc \"&Help\" cascade {\n-\t {mc \"&About gitk\" command about}\n-\t {mc \"&Key bindings\" command keys}\n-\t}}\n-\tset bar [list $file $edit $view $help]\n- } else {\n-\tproc ::tk::mac::ShowPreferences {} {doprefs}\n-\tproc ::tk::mac::Quit {} {doquit}\n-\tlset file end [lreplace [lindex $file end] end-1 end]\n-\tset apple {\n-\txx \"&Apple\" cascade {\n-\t {mc \"&About gitk\" command about}\n-\t {xx \"\" separator}\n-\t}}\n-\tset help {\n-\tmc \"&Help\" cascade {\n-\t {mc \"&Key bindings\" command keys}\n-\t}}\n-\tset bar [list $apple $file $view $help]\n- }\n- makemenu .bar $bar\n- . configure -menu .bar\n-\n- if {$use_ttk} {\n- # cover the non-themed toplevel with a themed frame.\n- place [ttk::frame ._main_background] -x 0 -y 0 -relwidth 1 -relheight 1\n- }\n-\n- # the gui has upper and lower half, parts of a paned window.\n- ${NS}::panedwindow .ctop -orient vertical\n-\n- # possibly use assumed geometry\n- if {![info exists geometry(pwsash0)]} {\n- set geometry(topheight) [expr {15 * $linespc}]\n- set geometry(topwidth) [expr {80 * $charspc}]\n- set geometry(botheight) [expr {15 * $linespc}]\n- set geometry(botwidth) [expr {50 * $charspc}]\n- set geometry(pwsash0) [list [expr {40 * $charspc}] 2]\n- set geometry(pwsash1) [list [expr {60 * $charspc}] 2]\n- }\n-\n- # the upper half will have a paned window, a scroll bar to the right, and some stuff below\n- ${NS}::frame .tf -height $geometry(topheight) -width $geometry(topwidth)\n- ${NS}::frame .tf.histframe\n- ${NS}::panedwindow .tf.histframe.pwclist -orient horizontal\n- if {!$use_ttk} {\n-\t.tf.histframe.pwclist configure -sashpad 0 -handlesize 4\n- }\n-\n- # create three canvases\n- set cscroll .tf.histframe.csb\n- set canv .tf.histframe.pwclist.canv\n- canvas $canv \\\n-\t-selectbackground $selectbgcolor \\\n-\t-background $bgcolor -bd 0 \\\n-\t-yscrollincr $linespc -yscrollcommand \"scrollcanv $cscroll\"\n- .tf.histframe.pwclist add $canv\n- set canv2 .tf.histframe.pwclist.canv2\n- canvas $canv2 \\\n-\t-selectbackground $selectbgcolor \\\n-\t-background $bgcolor -bd 0 -yscrollincr $linespc\n- .tf.histframe.pwclist add $canv2\n- set canv3 .tf.histframe.pwclist.canv3\n- canvas $canv3 \\\n-\t-selectbackground $selectbgcolor \\\n-\t-background $bgcolor -bd 0 -yscrollincr $linespc\n- .tf.histframe.pwclist add $canv3\n- if {$use_ttk} {\n-\tbind .tf.histframe.pwclist {\n-\t bind %W {}\n-\t .tf.histframe.pwclist sashpos 1 [lindex $::geometry(pwsash1) 0]\n-\t .tf.histframe.pwclist sashpos 0 [lindex $::geometry(pwsash0) 0]\n+\t# The \"mc\" arguments here are purely so that xgettext\n+\t# sees the following string as needing to be translated\n+\tset file {\n+\t\tmc \"&File\" cascade {\n+\t\t\t{mc \"&Update\" command updatecommits -accelerator F5}\n+\t\t\t{mc \"&Reload\" command reloadcommits -accelerator Shift-F5}\n+\t\t\t{mc \"Reread re&ferences\" command rereadrefs}\n+\t\t\t{mc \"&List references\" command showrefs -accelerator F2}\n+\t\t\t{xx \"\" separator}\n+\t\t\t{mc \"Start git &gui\" command {exec git gui &}}\n+\t\t\t{xx \"\" separator}\n+\t\t\t{mc \"&Quit\" command doquit -accelerator Meta1-Q}\n+\t\t}}\n+\tset edit {\n+\t\tmc \"&Edit\" cascade {\n+\t\t\t{mc \"&Preferences\" command doprefs}\n+\t\t}}\n+\tset view {\n+\t\tmc \"&View\" cascade {\n+\t\t\t{mc \"&New view...\" command {newview 0} -accelerator Shift-F4}\n+\t\t\t{mc \"&Edit view...\" command editview -state disabled -accelerator F4}\n+\t\t\t{mc \"&Delete view\" command delview -state disabled}\n+\t\t\t{xx \"\" separator}\n+\t\t\t{mc \"&All files\" radiobutton {selectedview 0} -command {showview 0}}\n+\t\t}}\n+\tif {[tk windowingsystem] ne \"aqua\"} {\n+\t\tset help {\n+\t\tmc \"&Help\" cascade {\n+\t\t\t{mc \"&About gitk\" command about}\n+\t\t\t{mc \"&Key bindings\" command keys}\n+\t\t}}\n+\t\tset bar [list $file $edit $view $help]\n+\t} else {\n+\t\tproc ::tk::mac::ShowPreferences {} {doprefs}\n+\t\tproc ::tk::mac::Quit {} {doquit}\n+\t\tlset file end [lreplace [lindex $file end] end-1 end]\n+\t\tset apple {\n+\t\txx \"&Apple\" cascade {\n+\t\t\t{mc \"&About gitk\" command about}\n+\t\t\t{xx \"\" separator}\n+\t\t}}\n+\t\tset help {\n+\t\tmc \"&Help\" cascade {\n+\t\t\t{mc \"&Key bindings\" command keys}\n+\t\t}}\n+\t\tset bar [list $apple $file $view $help]\n \t}\n- } else {\n-\teval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)\n-\teval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)\n- }\n+\tmakemenu .bar $bar\n+\t. configure -menu .bar\n \n- # a scroll bar to rule them\n- ${NS}::scrollbar $cscroll -command {allcanvs yview}\n- if {!$use_ttk} {$cscroll configure -highlightthickness 0}\n- pack $cscroll -side right -fill y\n- bind .tf.histframe.pwclist {resizeclistpanes %W %w}\n- lappend bglist $canv $canv2 $canv3\n- pack .tf.histframe.pwclist -fill both -expand 1 -side left\n-\n- # we have two button bars at bottom of top frame. Bar 1\n- ${NS}::frame .tf.bar\n- ${NS}::frame .tf.lbar -height 15\n-\n- set sha1entry .tf.bar.sha1\n- set entries $sha1entry\n- set sha1but .tf.bar.sha1label\n- button $sha1but -text \"[mc \"SHA1 ID:\"] \" -state disabled -relief flat \\\n-\t-command gotocommit -width 8\n- $sha1but conf -disabledforeground [$sha1but cget -foreground]\n- pack .tf.bar.sha1label -side left\n- ${NS}::entry $sha1entry -width 40 -font textfont -textvariable sha1string\n- trace add variable sha1string write sha1change\n- pack $sha1entry -side left -pady 2\n-\n- set bm_left_data {\n-\t#define left_width 16\n-\t#define left_height 16\n-\tstatic unsigned char left_bits[] = {\n-\t0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,\n-\t0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,\n-\t0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};\n- }\n- set bm_right_data {\n-\t#define right_width 16\n-\t#define right_height 16\n-\tstatic unsigned char right_bits[] = {\n-\t0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,\n-\t0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,\n-\t0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};\n- }\n- image create bitmap bm-left -data $bm_left_data -foreground $uifgcolor\n- image create bitmap bm-left-gray -data $bm_left_data -foreground $uifgdisabledcolor\n- image create bitmap bm-right -data $bm_right_data -foreground $uifgcolor\n- image create bitmap bm-right-gray -data $bm_right_data -foreground $uifgdisabledcolor\n-\n- ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26\n- if {$use_ttk} {\n-\t.tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray]\n- } else {\n-\t.tf.bar.leftbut configure -image bm-left\n- }\n- pack .tf.bar.leftbut -side left -fill y\n- ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26\n- if {$use_ttk} {\n-\t.tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray]\n- } else {\n-\t.tf.bar.rightbut configure -image bm-right\n- }\n- pack .tf.bar.rightbut -side left -fill y\n-\n- ${NS}::label .tf.bar.rowlabel -text [mc \"Row\"]\n- set rownumsel {}\n- ${NS}::label .tf.bar.rownum -width 7 -textvariable rownumsel \\\n-\t-relief sunken -anchor e\n- ${NS}::label .tf.bar.rowlabel2 -text \"/\"\n- ${NS}::label .tf.bar.numcommits -width 7 -textvariable numcommits \\\n-\t-relief sunken -anchor e\n- pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \\\n-\t-side left\n- if {!$use_ttk} {\n- foreach w {rownum numcommits} {.tf.bar.$w configure -font textfont}\n- }\n- global selectedline\n- trace add variable selectedline write selectedline_change\n-\n- # Status label and progress bar\n- set statusw .tf.bar.status\n- ${NS}::label $statusw -width 15 -relief sunken\n- pack $statusw -side left -padx 5\n- if {$use_ttk} {\n-\tset progresscanv [ttk::progressbar .tf.bar.progress]\n- } else {\n-\tset h [expr {[font metrics uifont -linespace] + 2}]\n-\tset progresscanv .tf.bar.progress\n-\tcanvas $progresscanv -relief sunken -height $h -borderwidth 2\n-\tset progressitem [$progresscanv create rect -1 0 0 $h -fill \"#00ff00\"]\n-\tset fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]\n-\tset rprogitem [$progresscanv create rect -1 0 0 $h -fill red]\n- }\n- pack $progresscanv -side right -expand 1 -fill x -padx {0 2}\n- set progresscoords {0 0}\n- set fprogcoord 0\n- set rprogcoord 0\n- bind $progresscanv adjustprogress\n- set lastprogupdate [clock clicks -milliseconds]\n- set progupdatepending 0\n-\n- # build up the bottom bar of upper window\n- ${NS}::label .tf.lbar.flabel -text \"[mc \"Find\"] \"\n-\n- set bm_down_data {\n-\t#define down_width 16\n-\t#define down_height 16\n-\tstatic unsigned char down_bits[] = {\n-\t0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,\n-\t0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,\n-\t0x87, 0xe1, 0x8e, 0x71, 0x9c, 0x39, 0xb8, 0x1d,\n-\t0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01};\n- }\n- image create bitmap bm-down -data $bm_down_data -foreground $uifgcolor\n- ${NS}::button .tf.lbar.fnext -width 26 -command {dofind 1 1}\n- .tf.lbar.fnext configure -image bm-down\n-\n- set bm_up_data {\n-\t#define up_width 16\n-\t#define up_height 16\n-\tstatic unsigned char up_bits[] = {\n-\t0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,\n-\t0xb8, 0x1d, 0x9c, 0x39, 0x8e, 0x71, 0x87, 0xe1,\n-\t0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,\n-\t0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01};\n- }\n- image create bitmap bm-up -data $bm_up_data -foreground $uifgcolor\n- ${NS}::button .tf.lbar.fprev -width 26 -command {dofind -1 1}\n- .tf.lbar.fprev configure -image bm-up\n-\n- ${NS}::label .tf.lbar.flab2 -text \" [mc \"commit\"] \"\n-\n- pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \\\n-\t-side left -fill y\n- set gdttype [mc \"containing:\"]\n- set gm [makedroplist .tf.lbar.gdttype gdttype \\\n-\t\t[mc \"containing:\"] \\\n-\t\t[mc \"touching paths:\"] \\\n-\t\t[mc \"adding/removing string:\"] \\\n-\t\t[mc \"changing lines matching:\"]]\n- trace add variable gdttype write gdttype_change\n- pack .tf.lbar.gdttype -side left -fill y\n-\n- set findstring {}\n- set fstring .tf.lbar.findstring\n- lappend entries $fstring\n- ${NS}::entry $fstring -width 30 -textvariable findstring\n- trace add variable findstring write find_change\n- set findtype [mc \"Exact\"]\n- set findtypemenu [makedroplist .tf.lbar.findtype \\\n-\t\t\t findtype [mc \"Exact\"] [mc \"IgnCase\"] [mc \"Regexp\"]]\n- trace add variable findtype write findcom_change\n- set findloc [mc \"All fields\"]\n- makedroplist .tf.lbar.findloc findloc [mc \"All fields\"] [mc \"Headline\"] \\\n-\t[mc \"Comments\"] [mc \"Author\"] [mc \"Committer\"]\n- trace add variable findloc write find_change\n- pack .tf.lbar.findloc -side right\n- pack .tf.lbar.findtype -side right\n- pack $fstring -side left -expand 1 -fill x\n-\n- # Finish putting the upper half of the viewer together\n- pack .tf.lbar -in .tf -side bottom -fill x\n- pack .tf.bar -in .tf -side bottom -fill x\n- pack .tf.histframe -fill both -side top -expand 1\n- .ctop add .tf\n- if {!$use_ttk} {\n-\t.ctop paneconfigure .tf -height $geometry(topheight)\n-\t.ctop paneconfigure .tf -width $geometry(topwidth)\n- }\n-\n- # now build up the bottom\n- ${NS}::panedwindow .pwbottom -orient horizontal\n-\n- # lower left, a text box over search bar, scroll bar to the right\n- # if we know window height, then that will set the lower text height, otherwise\n- # we set lower text height which will drive window height\n- if {[info exists geometry(main)]} {\n-\t${NS}::frame .bleft -width $geometry(botwidth)\n- } else {\n-\t${NS}::frame .bleft -width $geometry(botwidth) -height $geometry(botheight)\n- }\n- ${NS}::frame .bleft.top\n- ${NS}::frame .bleft.mid\n- ${NS}::frame .bleft.bottom\n-\n- # gap between sub-widgets\n- set wgap [font measure uifont \"i\"]\n-\n- ${NS}::button .bleft.top.search -text [mc \"Search\"] -command dosearch\n- pack .bleft.top.search -side left -padx 5\n- set sstring .bleft.top.sstring\n- set searchstring \"\"\n- ${NS}::entry $sstring -width 20 -textvariable searchstring\n- lappend entries $sstring\n- trace add variable searchstring write incrsearch\n- pack $sstring -side left -expand 1 -fill x\n- ${NS}::radiobutton .bleft.mid.diff -text [mc \"Diff\"] \\\n-\t-command changediffdisp -variable diffelide -value {0 0}\n- ${NS}::radiobutton .bleft.mid.old -text [mc \"Old version\"] \\\n-\t-command changediffdisp -variable diffelide -value {0 1}\n- ${NS}::radiobutton .bleft.mid.new -text [mc \"New version\"] \\\n-\t-command changediffdisp -variable diffelide -value {1 0}\n-\n- ${NS}::label .bleft.mid.labeldiffcontext -text \" [mc \"Lines of context\"]: \"\n- pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left -ipadx $wgap\n- spinbox .bleft.mid.diffcontext -width 5 \\\n-\t-from 0 -increment 1 -to 10000000 \\\n-\t-validate all -validatecommand \"diffcontextvalidate %P\" \\\n-\t-textvariable diffcontextstring\n- .bleft.mid.diffcontext set $diffcontext\n- trace add variable diffcontextstring write diffcontextchange\n- lappend entries .bleft.mid.diffcontext\n- pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left -ipadx $wgap\n- ${NS}::checkbutton .bleft.mid.ignspace -text [mc \"Ignore space change\"] \\\n-\t-command changeignorespace -variable ignorespace\n- pack .bleft.mid.ignspace -side left -padx 5\n-\n- set worddiff [mc \"Line diff\"]\n- if {[package vcompare $git_version \"1.7.2\"] >= 0} {\n-\tmakedroplist .bleft.mid.worddiff worddiff [mc \"Line diff\"] \\\n-\t [mc \"Markup words\"] [mc \"Color words\"]\n-\ttrace add variable worddiff write changeworddiff\n-\tpack .bleft.mid.worddiff -side left -padx 5\n- }\n-\n- set ctext .bleft.bottom.ctext\n- text $ctext -background $bgcolor -foreground $fgcolor \\\n-\t-state disabled -undo 0 -font textfont \\\n-\t-yscrollcommand scrolltext -wrap none \\\n-\t-xscrollcommand \".bleft.bottom.sbhorizontal set\"\n- if {$have_tk85} {\n-\t$ctext conf -tabstyle wordprocessor\n- }\n- ${NS}::scrollbar .bleft.bottom.sb -command \"$ctext yview\"\n- ${NS}::scrollbar .bleft.bottom.sbhorizontal -command \"$ctext xview\" -orient h\n- pack .bleft.top -side top -fill x\n- pack .bleft.mid -side top -fill x\n- grid $ctext .bleft.bottom.sb -sticky nsew\n- grid .bleft.bottom.sbhorizontal -sticky ew\n- grid columnconfigure .bleft.bottom 0 -weight 1\n- grid rowconfigure .bleft.bottom 0 -weight 1\n- grid rowconfigure .bleft.bottom 1 -weight 0\n- pack .bleft.bottom -side top -fill both -expand 1\n- lappend bglist $ctext\n- lappend fglist $ctext\n-\n- $ctext tag conf comment -wrap $wrapcomment\n- $ctext tag conf filesep -font textfontbold -fore $filesepfgcolor -back $filesepbgcolor\n- $ctext tag conf hunksep -fore [lindex $diffcolors 2]\n- $ctext tag conf d0 -fore [lindex $diffcolors 0]\n- $ctext tag conf dresult -fore [lindex $diffcolors 1]\n- $ctext tag conf m0 -fore [lindex $mergecolors 0]\n- $ctext tag conf m1 -fore [lindex $mergecolors 1]\n- $ctext tag conf m2 -fore [lindex $mergecolors 2]\n- $ctext tag conf m3 -fore [lindex $mergecolors 3]\n- $ctext tag conf m4 -fore [lindex $mergecolors 4]\n- $ctext tag conf m5 -fore [lindex $mergecolors 5]\n- $ctext tag conf m6 -fore [lindex $mergecolors 6]\n- $ctext tag conf m7 -fore [lindex $mergecolors 7]\n- $ctext tag conf m8 -fore [lindex $mergecolors 8]\n- $ctext tag conf m9 -fore [lindex $mergecolors 9]\n- $ctext tag conf m10 -fore [lindex $mergecolors 10]\n- $ctext tag conf m11 -fore [lindex $mergecolors 11]\n- $ctext tag conf m12 -fore [lindex $mergecolors 12]\n- $ctext tag conf m13 -fore [lindex $mergecolors 13]\n- $ctext tag conf m14 -fore [lindex $mergecolors 14]\n- $ctext tag conf m15 -fore [lindex $mergecolors 15]\n- $ctext tag conf mmax -fore darkgrey\n- set mergemax 16\n- $ctext tag conf mresult -font textfontbold\n- $ctext tag conf msep -font textfontbold\n- $ctext tag conf found -back $foundbgcolor\n- $ctext tag conf currentsearchhit -back $currentsearchhitbgcolor\n- $ctext tag conf wwrap -wrap word -lmargin2 1c\n- $ctext tag conf bold -font textfontbold\n-\n- .pwbottom add .bleft\n- if {!$use_ttk} {\n-\t.pwbottom paneconfigure .bleft -width $geometry(botwidth)\n- }\n-\n- # lower right\n- ${NS}::frame .bright\n- ${NS}::frame .bright.mode\n- ${NS}::radiobutton .bright.mode.patch -text [mc \"Patch\"] \\\n-\t-command reselectline -variable cmitmode -value \"patch\"\n- ${NS}::radiobutton .bright.mode.tree -text [mc \"Tree\"] \\\n-\t-command reselectline -variable cmitmode -value \"tree\"\n- grid .bright.mode.patch .bright.mode.tree -sticky ew\n- pack .bright.mode -side top -fill x\n- set cflist .bright.cfiles\n- set indent [font measure mainfont \"nn\"]\n- text $cflist \\\n-\t-selectbackground $selectbgcolor \\\n-\t-background $bgcolor -foreground $fgcolor \\\n-\t-font mainfont \\\n-\t-tabs [list $indent [expr {2 * $indent}]] \\\n-\t-yscrollcommand \".bright.sb set\" \\\n-\t-cursor [. cget -cursor] \\\n-\t-spacing1 1 -spacing3 1\n- lappend bglist $cflist\n- lappend fglist $cflist\n- ${NS}::scrollbar .bright.sb -command \"$cflist yview\"\n- pack .bright.sb -side right -fill y\n- pack $cflist -side left -fill both -expand 1\n- $cflist tag configure highlight \\\n-\t-background [$cflist cget -selectbackground]\n- $cflist tag configure bold -font mainfontbold\n-\n- .pwbottom add .bright\n- .ctop add .pwbottom\n-\n- # restore window width & height if known\n- if {[info exists geometry(main)]} {\n-\tif {[scan $geometry(main) \"%dx%d\" w h] >= 2} {\n-\t if {$w > [winfo screenwidth .]} {\n-\t\tset w [winfo screenwidth .]\n-\t }\n-\t if {$h > [winfo screenheight .]} {\n-\t\tset h [winfo screenheight .]\n-\t }\n-\t wm geometry . \"${w}x$h\"\n+\tif {$use_ttk} {\n+\t\t# cover the non-themed toplevel with a themed frame.\n+\t\tplace [ttk::frame ._main_background] -x 0 -y 0 -relwidth 1 -relheight 1\n \t}\n- }\n \n- if {[info exists geometry(state)] && $geometry(state) eq \"zoomed\"} {\n- wm state . $geometry(state)\n- }\n+\t# the gui has upper and lower half, parts of a paned window.\n+\t${NS}::panedwindow .ctop -orient vertical\n \n- if {[tk windowingsystem] eq {aqua}} {\n- set M1B M1\n- set ::BM \"3\"\n- } else {\n- set M1B Control\n- set ::BM \"2\"\n- }\n-\n- if {$use_ttk} {\n- bind .ctop {\n- bind %W {}\n- %W sashpos 0 $::geometry(topheight)\n- }\n- bind .pwbottom {\n- bind %W {}\n- %W sashpos 0 $::geometry(botwidth)\n- }\n-\tbind .pwbottom {resizecdetpanes %W %w}\n- }\n-\n- pack .ctop -fill both -expand 1\n- bindall <1> {selcanvline %W %x %y}\n- #bindall {selcanvline %W %x %y}\n- if {[tk windowingsystem] == \"win32\"} {\n-\tbind . { windows_mousewheel_redirector %W %X %Y %D }\n-\tbind $ctext { windows_mousewheel_redirector %W %X %Y %D ; break }\n- } else {\n-\tbindall \"allcanvs yview scroll -5 units\"\n-\tbindall \"allcanvs yview scroll 5 units\"\n-\tbind $ctext