gitk: Add braces around if expressions

Apparently this simplifies things for the parser/compiler and makes
it go slightly faster (since without the braces, it potentially has
to do two levels of substitutions rather than one).

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2006-02-07 09:10:18 +11:00
parent fd8ccbec4f
commit 418c4c7bce

20
gitk
View File

@ -19,10 +19,10 @@ proc gitdir {} {
proc parse_args {rargs} { proc parse_args {rargs} {
global parsed_args global parsed_args
if [catch { if {[catch {
set parse_args [concat --default HEAD $rargs] set parse_args [concat --default HEAD $rargs]
set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"] set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
}] { }]} {
# if git-rev-parse failed for some reason... # if git-rev-parse failed for some reason...
if {$rargs == {}} { if {$rargs == {}} {
set rargs HEAD set rargs HEAD
@ -39,10 +39,10 @@ proc start_rev_list {rlargs} {
set startmsecs [clock clicks -milliseconds] set startmsecs [clock clicks -milliseconds]
set nextupdate [expr {$startmsecs + 100}] set nextupdate [expr {$startmsecs + 100}]
set ncmupdate 1 set ncmupdate 1
if [catch { if {[catch {
set commfd [open [concat | git-rev-list --header --topo-order \ set commfd [open [concat | git-rev-list --header --topo-order \
--parents $rlargs] r] --parents $rlargs] r]
} err] { } err]} {
puts stderr "Error executing git-rev-list: $err" puts stderr "Error executing git-rev-list: $err"
exit 1 exit 1
} }
@ -181,7 +181,7 @@ proc doupdate {reading} {
} }
proc readcommit {id} { proc readcommit {id} {
if [catch {set contents [exec git-cat-file commit $id]}] return if {[catch {set contents [exec git-cat-file commit $id]}]} return
parsecommit $id $contents 0 {} parsecommit $id $contents 0 {}
} }
@ -679,7 +679,7 @@ proc savestuff {w} {
proc resizeclistpanes {win w} { proc resizeclistpanes {win w} {
global oldwidth global oldwidth
if [info exists oldwidth($win)] { if {[info exists oldwidth($win)]} {
set s0 [$win sash coord 0] set s0 [$win sash coord 0]
set s1 [$win sash coord 1] set s1 [$win sash coord 1]
if {$w < 60} { if {$w < 60} {
@ -710,7 +710,7 @@ proc resizeclistpanes {win w} {
proc resizecdetpanes {win w} { proc resizecdetpanes {win w} {
global oldwidth global oldwidth
if [info exists oldwidth($win)] { if {[info exists oldwidth($win)]} {
set s0 [$win sash coord 0] set s0 [$win sash coord 0]
if {$w < 60} { if {$w < 60} {
set sash0 [expr {int($w*3/4 - 2)}] set sash0 [expr {int($w*3/4 - 2)}]
@ -768,7 +768,7 @@ proc assigncolor {id} {
global parents nparents children nchildren global parents nparents children nchildren
global cornercrossings crossings global cornercrossings crossings
if [info exists colormap($id)] return if {[info exists colormap($id)]} return
set ncolors [llength $colors] set ncolors [llength $colors]
if {$nparents($id) <= 1 && $nchildren($id) == 1} { if {$nparents($id) <= 1 && $nchildren($id) == 1} {
set child [lindex $children($id) 0] set child [lindex $children($id) 0]
@ -2912,7 +2912,9 @@ proc gettreediffs {ids} {
global treediff parents treepending global treediff parents treepending
set treepending $ids set treepending $ids
set treediff {} set treediff {}
if [catch {set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]}] return if {[catch \
{set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]} \
]} return
fconfigure $gdtf -blocking 0 fconfigure $gdtf -blocking 0
fileevent $gdtf readable [list gettreediffline $gdtf $ids] fileevent $gdtf readable [list gettreediffline $gdtf $ids]
} }