Skip to content

Commit b55e113

Browse files
j6tj6t
committed
gitk: adjust indentation to match the style used in this script
We do not use tab characters for intentation in general. A recent patch introduced many lines that do use them. Replace them by 4 spaces each. Signed-off-by: Johannes Sixt <[email protected]>
1 parent 4a6cc6a commit b55e113

File tree

1 file changed

+100
-100
lines changed

1 file changed

+100
-100
lines changed

‎gitk

Lines changed: 100 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ package require Tk
1414
## Enabling platform-specific code paths
1515

1616
proc is_MacOSX {} {
17-
if {[tk windowingsystem] eq {aqua}} {
18-
return 1
19-
}
20-
return 0
17+
if {[tk windowingsystem] eq {aqua}} {
18+
return 1
19+
}
20+
return 0
2121
}
2222

2323
proc is_Windows {} {
24-
if {$::tcl_platform(platform) eq {windows}} {
25-
return 1
26-
}
27-
return 0
24+
if {$::tcl_platform(platform) eq {windows}} {
25+
return 1
26+
}
27+
return 0
2828
}
2929

3030
set _iscygwin {}
3131
proc is_Cygwin {} {
32-
global _iscygwin
33-
if {$_iscygwin eq {}} {
34-
if {[string match "CYGWIN_*" $::tcl_platform(os)]} {
35-
set _iscygwin 1
36-
} else {
37-
set _iscygwin 0
38-
}
39-
}
40-
return $_iscygwin
32+
global _iscygwin
33+
if {$_iscygwin eq {}} {
34+
if {[string match "CYGWIN_*" $::tcl_platform(os)]} {
35+
set _iscygwin 1
36+
} else {
37+
set _iscygwin 0
38+
}
39+
}
40+
return $_iscygwin
4141
}
4242

4343
######################################################################
@@ -46,100 +46,100 @@ proc is_Cygwin {} {
4646

4747
set _search_path {}
4848
proc _which {what args} {
49-
global env _search_exe _search_path
50-
51-
if {$_search_path eq {}} {
52-
if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
53-
set _search_path [split [exec cygpath \
54-
--windows \
55-
--path \
56-
--absolute \
57-
$env(PATH)] {;}]
58-
set _search_exe .exe
59-
} elseif {[is_Windows]} {
60-
set gitguidir [file dirname [info script]]
61-
regsub -all ";" $gitguidir "\\;" gitguidir
62-
set env(PATH) "$gitguidir;$env(PATH)"
63-
set _search_path [split $env(PATH) {;}]
64-
# Skip empty `PATH` elements
65-
set _search_path [lsearch -all -inline -not -exact \
66-
$_search_path ""]
67-
set _search_exe .exe
68-
} else {
69-
set _search_path [split $env(PATH) :]
70-
set _search_exe {}
71-
}
72-
}
73-
74-
if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
75-
set suffix {}
76-
} else {
77-
set suffix $_search_exe
78-
}
79-
80-
foreach p $_search_path {
81-
set p [file join $p $what$suffix]
82-
if {[file exists $p]} {
83-
return [file normalize $p]
84-
}
85-
}
86-
return {}
49+
global env _search_exe _search_path
50+
51+
if {$_search_path eq {}} {
52+
if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
53+
set _search_path [split [exec cygpath \
54+
--windows \
55+
--path \
56+
--absolute \
57+
$env(PATH)] {;}]
58+
set _search_exe .exe
59+
} elseif {[is_Windows]} {
60+
set gitguidir [file dirname [info script]]
61+
regsub -all ";" $gitguidir "\\;" gitguidir
62+
set env(PATH) "$gitguidir;$env(PATH)"
63+
set _search_path [split $env(PATH) {;}]
64+
# Skip empty `PATH` elements
65+
set _search_path [lsearch -all -inline -not -exact \
66+
$_search_path ""]
67+
set _search_exe .exe
68+
} else {
69+
set _search_path [split $env(PATH) :]
70+
set _search_exe {}
71+
}
72+
}
73+
74+
if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
75+
set suffix {}
76+
} else {
77+
set suffix $_search_exe
78+
}
79+
80+
foreach p $_search_path {
81+
set p [file join $p $what$suffix]
82+
if {[file exists $p]} {
83+
return [file normalize $p]
84+
}
85+
}
86+
return {}
8787
}
8888
8989
proc sanitize_command_line {command_line from_index} {
90-
set i $from_index
91-
while {$i < [llength $command_line]} {
92-
set cmd [lindex $command_line $i]
93-
if {[file pathtype $cmd] ne "absolute"} {
94-
set fullpath [_which $cmd]
95-
if {$fullpath eq ""} {
96-
throw {NOT-FOUND} "$cmd not found in PATH"
97-
}
98-
lset command_line $i $fullpath
99-
}
100-
101-
# handle piped commands, e.g. `exec A | B`
102-
for {incr i} {$i < [llength $command_line]} {incr i} {
103-
if {[lindex $command_line $i] eq "|"} {
104-
incr i
105-
break
106-
}
107-
}
108-
}
109-
return $command_line
90+
set i $from_index
91+
while {$i < [llength $command_line]} {
92+
set cmd [lindex $command_line $i]
93+
if {[file pathtype $cmd] ne "absolute"} {
94+
set fullpath [_which $cmd]
95+
if {$fullpath eq ""} {
96+
throw {NOT-FOUND} "$cmd not found in PATH"
97+
}
98+
lset command_line $i $fullpath
99+
}
100+
101+
# handle piped commands, e.g. `exec A | B`
102+
for {incr i} {$i < [llength $command_line]} {incr i} {
103+
if {[lindex $command_line $i] eq "|"} {
104+
incr i
105+
break
106+
}
107+
}
108+
}
109+
return $command_line
110110
}
111111
112112
# Override `exec` to avoid unsafe PATH lookup
113113
114114
rename exec real_exec
115115
116116
proc exec {args} {
117-
# skip options
118-
for {set i 0} {$i < [llength $args]} {incr i} {
119-
set arg [lindex $args $i]
120-
if {$arg eq "--"} {
121-
incr i
122-
break
123-
}
124-
if {[string range $arg 0 0] ne "-"} {
125-
break
126-
}
127-
}
128-
set args [sanitize_command_line $args $i]
129-
uplevel 1 real_exec $args
117+
# skip options
118+
for {set i 0} {$i < [llength $args]} {incr i} {
119+
set arg [lindex $args $i]
120+
if {$arg eq "--"} {
121+
incr i
122+
break
123+
}
124+
if {[string range $arg 0 0] ne "-"} {
125+
break
126+
}
127+
}
128+
set args [sanitize_command_line $args $i]
129+
uplevel 1 real_exec $args
130130
}
131131
132132
# Override `open` to avoid unsafe PATH lookup
133133
134134
rename open real_open
135135
136136
proc open {args} {
137-
set arg0 [lindex $args 0]
138-
if {[string range $arg0 0 0] eq "|"} {
139-
set command_line [string trim [string range $arg0 1 end]]
140-
lset args 0 "| [sanitize_command_line $command_line 0]"
141-
}
142-
uplevel 1 real_open $args
137+
set arg0 [lindex $args 0]
138+
if {[string range $arg0 0 0] eq "|"} {
139+
set command_line [string trim [string range $arg0 1 end]]
140+
lset args 0 "| [sanitize_command_line $command_line 0]"
141+
}
142+
uplevel 1 real_open $args
143143
}
144144
145145
# End of safe PATH lookup stuff
@@ -491,11 +491,11 @@ proc parseviewrevs {view revs} {
491491
# Escapes a list of filter paths to be passed to git log via stdin. Note that
492492
# paths must not be quoted.
493493
proc escape_filter_paths {paths} {
494-
set escaped [list]
495-
foreach path $paths {
496-
lappend escaped [string map {\\ \\\\ "\ " "\\\ "} $path]
497-
}
498-
return $escaped
494+
set escaped [list]
495+
foreach path $paths {
496+
lappend escaped [string map {\\ \\\\ "\ " "\\\ "} $path]
497+
}
498+
return $escaped
499499
}
500500
501501
# Start off a git log process and arrange to read its output
@@ -4632,7 +4632,7 @@ proc addviewmenu {n} {
46324632
.bar.view add radiobutton -label $viewname($n) \
46334633
-command [list showview $n] -variable selectedview -value $n
46344634
#$viewhlmenu add radiobutton -label $viewname($n) \
4635-
# -command [list addvhighlight $n] -variable selectedhlview
4635+
# -command [list addvhighlight $n] -variable selectedhlview
46364636
}
46374637
46384638
proc showview {n} {

0 commit comments

Comments
 (0)