mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitk: Replace catch {unset foo} with unset -nocomplain foo

Browse Source 
This generates better bytecode in Tcl 8.6 according to
http://wiki.tcl.tk/1506.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras
2015-05-02 20:53:36 +10:00
parent 157c8e3ddf
commit 009409fe72
1 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
gitk
View File

@ -600,18 +600,18 @@ proc reloadcommits {} {
} }
resetvarcs $curview resetvarcs $curview
set selectedline {} set selectedline {}
catch {unset currentid} unset -nocomplain currentid
catch {unset thickerline} unset -nocomplain thickerline
catch {unset treediffs} unset -nocomplain treediffs
readrefs readrefs
changedrefs changedrefs
if {$showneartags} { if {$showneartags} {
getallcommits getallcommits
} }
clear_display clear_display
catch {unset commitinterest} unset -nocomplain commitinterest
catch {unset cached_commitrow} unset -nocomplain cached_commitrow
catch {unset targetid} unset -nocomplain targetid
setcanvscroll setcanvscroll
getcommits $selid getcommits $selid
return 0 return 0
@ -673,7 +673,7 @@ proc resetvarcs {view} {
foreach vd [array names vseedcount $view,*] { foreach vd [array names vseedcount $view,*] {
unset vseedcount($vd) unset vseedcount($vd)
} }
catch {unset ordertok} unset -nocomplain ordertok
} }
# returns a list of the commits with no children # returns a list of the commits with no children
@ -966,7 +966,7 @@ proc insertrow {id p v} {
set vp $v,$p set vp $v,$p
if {[llength [lappend children($vp) $id]] > 1} { if {[llength [lappend children($vp) $id]] > 1} {
set children($vp) [lsort -command [list vtokcmp $v] $children($vp)] set children($vp) [lsort -command [list vtokcmp $v] $children($vp)]
catch {unset ordertok} unset -nocomplain ordertok
} }
fix_reversal $p $a $v fix_reversal $p $a $v
incr commitidx($v) incr commitidx($v)
@ -1136,7 +1136,7 @@ proc update_arcrows {v} {
set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]] set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]]
set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]] set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]]
} }
catch {unset cached_commitrow} unset -nocomplain cached_commitrow
} }
set narctot [expr {[llength $varctok($v)] - 1}] set narctot [expr {[llength $varctok($v)] - 1}]
set a $varcmod($v) set a $varcmod($v)
@ -1579,7 +1579,7 @@ proc getcommitlines {fd inst view updating} {
[vtokcmp $view [lindex $children($vp) end-1] $id] > 0} { [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} {
set children($vp) [lsort -command [list vtokcmp $view] \ set children($vp) [lsort -command [list vtokcmp $view] \
$children($vp)] $children($vp)]
catch {unset ordertok} unset -nocomplain ordertok
} }
if {[info exists varcid($view,$p)]} { if {[info exists varcid($view,$p)]} {
fix_reversal $p $a $view fix_reversal $p $a $view
@ -1778,7 +1778,7 @@ proc readrefs {} {
global hideremotes global hideremotes
foreach v {tagids idtags headids idheads otherrefids idotherrefs} { foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
catch {unset $v} unset -nocomplain $v
} }
set refd [open [list | git show-ref -d] r] set refd [open [list | git show-ref -d] r]
while {[gets $refd line] >= 0} { while {[gets $refd line] >= 0} {
@ -3389,7 +3389,7 @@ proc init_flist {first} {
set cflist_top 1 set cflist_top 1
$cflist tag add highlight 1.0 "1.0 lineend" $cflist tag add highlight 1.0 "1.0 lineend"
} else { } else {
catch {unset cflist_top} unset -nocomplain cflist_top
} }
$cflist conf -state disabled $cflist conf -state disabled
set difffilestart {} set difffilestart {}
@ -4438,15 +4438,15 @@ proc showview {n} {
} }
unselectline unselectline
normalline normalline
catch {unset treediffs} unset -nocomplain treediffs
clear_display clear_display
if {[info exists hlview] && $hlview == $n} { if {[info exists hlview] && $hlview == $n} {
unset hlview unset hlview
set selectedhlview [mc "None"] set selectedhlview [mc "None"]
} }
catch {unset commitinterest} unset -nocomplain commitinterest
catch {unset cached_commitrow} unset -nocomplain cached_commitrow
catch {unset ordertok} unset -nocomplain ordertok
set curview $n set curview $n
set selectedview $n set selectedview $n
@ -4466,8 +4466,8 @@ proc showview {n} {
set rowfinal {} set rowfinal {}
set numcommits $commitidx($n) set numcommits $commitidx($n)
catch {unset colormap} unset -nocomplain colormap
catch {unset rowtextx} unset -nocomplain rowtextx
set nextcolor 0 set nextcolor 0
set canvxmax [$canv cget -width] set canvxmax [$canv cget -width]
set curview $n set curview $n
@ -4601,7 +4601,7 @@ proc delvhighlight {} {
if {![info exists hlview]} return if {![info exists hlview]} return
unset hlview unset hlview
catch {unset vhighlights} unset -nocomplain vhighlights
unbolden unbolden
} }
@ -4649,7 +4649,7 @@ proc hfiles_change {} {
# delete previous highlights # delete previous highlights
catch {close $filehighlight} catch {close $filehighlight}
unset filehighlight unset filehighlight
catch {unset fhighlights} unset -nocomplain fhighlights
unbolden unbolden
unhighlight_filelist unhighlight_filelist
} }
@ -4710,7 +4710,7 @@ proc findcom_change args {
bolden_name $id mainfont bolden_name $id mainfont
} }
set boldnameids {} set boldnameids {}
catch {unset nhighlights} unset -nocomplain nhighlights
unbolden unbolden
unmarkmatches unmarkmatches
if {$gdttype ne [mc "containing:"] || $findstring eq {}} { if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
@ -4913,9 +4913,9 @@ proc rhighlight_sel {a} {
global descendent desc_todo ancestor anc_todo global descendent desc_todo ancestor anc_todo
global highlight_related global highlight_related
catch {unset descendent} unset -nocomplain descendent
set desc_todo [list $a] set desc_todo [list $a]
catch {unset ancestor} unset -nocomplain ancestor
set anc_todo [list $a] set anc_todo [list $a]
if {$highlight_related ne [mc "None"]} { if {$highlight_related ne [mc "None"]} {
rhighlight_none rhighlight_none
@ -4926,7 +4926,7 @@ proc rhighlight_sel {a} {
proc rhighlight_none {} { proc rhighlight_none {} {
global rhighlights global rhighlights
catch {unset rhighlights} unset -nocomplain rhighlights
unbolden unbolden
} }
@ -5134,8 +5134,8 @@ proc initlayout {} {
set rowisopt {} set rowisopt {}
set rowfinal {} set rowfinal {}
set canvxmax [$canv cget -width] set canvxmax [$canv cget -width]
catch {unset colormap} unset -nocomplain colormap
catch {unset rowtextx} unset -nocomplain rowtextx
setcanvscroll setcanvscroll
} }
@ -6368,17 +6368,17 @@ proc clear_display {} {
global linehtag linentag linedtag boldids boldnameids global linehtag linentag linedtag boldids boldnameids
allcanvs delete all allcanvs delete all
catch {unset iddrawn} unset -nocomplain iddrawn
catch {unset linesegs} unset -nocomplain linesegs
catch {unset linehtag} unset -nocomplain linehtag
catch {unset linentag} unset -nocomplain linentag
catch {unset linedtag} unset -nocomplain linedtag
set boldids {} set boldids {}
set boldnameids {} set boldnameids {}
catch {unset vhighlights} unset -nocomplain vhighlights
catch {unset fhighlights} unset -nocomplain fhighlights
catch {unset nhighlights} unset -nocomplain nhighlights
catch {unset rhighlights} unset -nocomplain rhighlights
set need_redisplay 0 set need_redisplay 0
set nrows_drawn 0 set nrows_drawn 0
} }
@ -7226,7 +7226,7 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
global autoselect autosellen jump_to_here global autoselect autosellen jump_to_here
global vinlinediff global vinlinediff
catch {unset pending_select} unset -nocomplain pending_select
$canv delete hover $canv delete hover
normalline normalline
unsel_reflist unsel_reflist
@ -7424,7 +7424,7 @@ proc unselectline {} {
global selectedline currentid global selectedline currentid
set selectedline {} set selectedline {}
catch {unset currentid} unset -nocomplain currentid
allcanvs delete secsel allcanvs delete secsel
rhighlight_none rhighlight_none
} }
@ -7480,7 +7480,7 @@ proc unset_posvars {} {
if {[info exists last_posvars]} { if {[info exists last_posvars]} {
foreach {var val} $last_posvars { foreach {var val} $last_posvars {
global $var global $var
catch {unset $var} unset -nocomplain $var
} }
unset last_posvars unset last_posvars
} }
@ -7548,7 +7548,7 @@ proc gettree {id} {
global nullid nullid2 global nullid nullid2
set diffids $id set diffids $id
catch {unset diffmergeid} unset -nocomplain diffmergeid
if {![info exists treefilelist($id)]} { if {![info exists treefilelist($id)]} {
if {![info exists treepending]} { if {![info exists treepending]} {
if {$id eq $nullid} { if {$id eq $nullid} {
@ -7704,7 +7704,7 @@ proc startdiff {ids} {
settabs 1 settabs 1
set diffids $ids set diffids $ids
catch {unset diffmergeid} unset -nocomplain diffmergeid
if {![info exists treediffs($ids)] || if {![info exists treediffs($ids)] ||
[lsearch -exact $ids $nullid] >= 0 || [lsearch -exact $ids $nullid] >= 0 ||
[lsearch -exact $ids $nullid2] >= 0} { [lsearch -exact $ids $nullid2] >= 0} {
@ -8325,7 +8325,7 @@ proc clear_ctext {{first 1.0}} {
} }
$ctext delete $first end $ctext delete $first end
if {$first eq "1.0"} { if {$first eq "1.0"} {
catch {unset pendinglinks} unset -nocomplain pendinglinks
} }
set ctext_file_names {} set ctext_file_names {}
set ctext_file_lines {} set ctext_file_lines {}
@ -8501,7 +8501,7 @@ proc scrolltext {f0 f1} {
highlightfile_for_scrollpos $topidx highlightfile_for_scrollpos $topidx
} }
catch {unset suppress_highlighting_file_for_this_scrollpos} unset -nocomplain suppress_highlighting_file_for_this_scrollpos
.bleft.bottom.sb set $f0 $f1 .bleft.bottom.sb set $f0 $f1
if {$searchstring ne {}} { if {$searchstring ne {}} {
@ -10103,9 +10103,9 @@ proc getallclines {fd} {
} }
if {$nid > 0} { if {$nid > 0} {
global cached_dheads cached_dtags cached_atags global cached_dheads cached_dtags cached_atags
catch {unset cached_dheads} unset -nocomplain cached_dheads
catch {unset cached_dtags} unset -nocomplain cached_dtags
catch {unset cached_atags} unset -nocomplain cached_atags
} }
if {![eof $fd]} { if {![eof $fd]} {
return [expr {$nid >= 1000? 2: 1}] return [expr {$nid >= 1000? 2: 1}]
@ -10345,7 +10345,7 @@ proc dropcache {err} {
foreach v {arcnos arcout arcids arcstart arcend growing \ foreach v {arcnos arcout arcids arcstart arcend growing \
arctags archeads allparents allchildren} { arctags archeads allparents allchildren} {
global $v global $v
catch {unset $v} unset -nocomplain $v
} }
set allcwait 0 set allcwait 0
set nextarc 0 set nextarc 0
@ -10996,8 +10996,8 @@ proc addedtag {id} {
if {![info exists arcout($id)]} { if {![info exists arcout($id)]} {
recalcarc [lindex $arcnos($id) 0] recalcarc [lindex $arcnos($id) 0]
} }
catch {unset cached_dtags} unset -nocomplain cached_dtags
catch {unset cached_atags} unset -nocomplain cached_atags
} }
proc addedhead {hid head} { proc addedhead {hid head} {
@ -11007,13 +11007,13 @@ proc addedhead {hid head} {
if {![info exists arcout($hid)]} { if {![info exists arcout($hid)]} {
recalcarc [lindex $arcnos($hid) 0] recalcarc [lindex $arcnos($hid) 0]
} }
catch {unset cached_dheads} unset -nocomplain cached_dheads
} }
proc removedhead {hid head} { proc removedhead {hid head} {
global cached_dheads global cached_dheads
catch {unset cached_dheads} unset -nocomplain cached_dheads
} }
proc movedhead {hid head} { proc movedhead {hid head} {
@ -11023,7 +11023,7 @@ proc movedhead {hid head} {
if {![info exists arcout($hid)]} { if {![info exists arcout($hid)]} {
recalcarc [lindex $arcnos($hid) 0] recalcarc [lindex $arcnos($hid) 0]
} }
catch {unset cached_dheads} unset -nocomplain cached_dheads
} }
proc changedrefs {} { proc changedrefs {} {
@ -11039,10 +11039,10 @@ proc changedrefs {} {
} }
} }
} }
catch {unset cached_tagcontent} unset -nocomplain cached_tagcontent
catch {unset cached_dtags} unset -nocomplain cached_dtags
catch {unset cached_atags} unset -nocomplain cached_atags
catch {unset cached_dheads} unset -nocomplain cached_dheads
} }
proc rereadrefs {} { proc rereadrefs {} {
@ -11628,7 +11628,7 @@ proc prefsok {} {
($perfile_attrs && !$oldprefs(perfile_attrs))} { ($perfile_attrs && !$oldprefs(perfile_attrs))} {
# treediffs elements are limited by path; # treediffs elements are limited by path;
# won't have encodings cached if perfile_attrs was just turned on # won't have encodings cached if perfile_attrs was just turned on
catch {unset treediffs} unset -nocomplain treediffs
} }
if {$fontchanged || $maxwidth != $oldprefs(maxwidth) if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
|| $maxgraphpct != $oldprefs(maxgraphpct)} { || $maxgraphpct != $oldprefs(maxgraphpct)} {