ilyagr.bsky.social
Testing tangled. Original: https://github.com/j6t/gitk
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 <j6t@kdbg.org>
+96
-96
+96
-96
gitk
+96
-96
gitk
···
14
14
## Enabling platform-specific code paths
15
15
16
16
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
21
21
}
22
22
23
23
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
28
28
}
29
29
30
30
set _iscygwin {}
31
31
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
41
41
}
42
42
43
43
######################################################################
···
46
46
47
47
set _search_path {}
48
48
proc _which {what args} {
49
-
global env _search_exe _search_path
49
+
global env _search_exe _search_path
50
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
-
}
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
73
74
-
if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
75
-
set suffix {}
76
-
} else {
77
-
set suffix $_search_exe
78
-
}
74
+
if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
75
+
set suffix {}
76
+
} else {
77
+
set suffix $_search_exe
78
+
}
79
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 {}
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 {}
87
87
}
88
88
89
89
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
-
}
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
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
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
110
110
}
111
111
112
112
# Override `exec` to avoid unsafe PATH lookup
···
114
114
rename exec real_exec
115
115
116
116
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
130
130
}
131
131
132
132
# Override `open` to avoid unsafe PATH lookup
···
134
134
rename open real_open
135
135
136
136
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
143
143
}
144
144
145
145
# End of safe PATH lookup stuff
···
491
491
# Escapes a list of filter paths to be passed to git log via stdin. Note that
492
492
# paths must not be quoted.
493
493
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
499
499
}
500
500
501
501
# Start off a git log process and arrange to read its output
···
4632
4632
.bar.view add radiobutton -label $viewname($n) \
4633
4633
-command [list showview $n] -variable selectedview -value $n
4634
4634
#$viewhlmenu add radiobutton -label $viewname($n) \
4635
-
# -command [list addvhighlight $n] -variable selectedhlview
4635
+
# -command [list addvhighlight $n] -variable selectedhlview
4636
4636
}
4637
4637
4638
4638
proc showview {n} {