blob: 5f7f08e239038e47da7bb0383fd840276d9caf59 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
|
# git-gui Tools menu dialogs
class tools_add {
field w ; # widget path
field w_name ; # new remote name widget
field w_cmd ; # new remote location widget
field name {}; # name of the tool
field command {}; # command to execute
field add_global 0; # add to the --global config
field no_console 0; # disable using the console
field needs_file 0; # ensure filename is set
field confirm 0; # ask for confirmation
field ask_branch 0; # ask for a revision
field ask_args 0; # ask for additional args
constructor dialog {} {
global repo_config
make_toplevel top w
wm title $top [append "[appname] ([reponame]): " [mc "Add Tool"]]
if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
wm transient $top .
}
label $w.header -text [mc "Add New Tool Command"] -font font_uibold
pack $w.header -side top -fill x
frame $w.buttons
checkbutton $w.buttons.global \
-text [mc "Add globally"] \
-variable @add_global
pack $w.buttons.global -side left -padx 5
button $w.buttons.create -text [mc Add] \
-default active \
-command [cb _add]
pack $w.buttons.create -side right
button $w.buttons.cancel -text [mc Cancel] \
-command [list destroy $w]
pack $w.buttons.cancel -side right -padx 5
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
labelframe $w.desc -text [mc "Tool Details"]
label $w.desc.name_cmnt -anchor w\
-text [mc "Use '/' separators to create a submenu tree:"]
grid x $w.desc.name_cmnt -sticky we -padx {0 5} -pady {0 2}
label $w.desc.name_l -text [mc "Name:"]
set w_name $w.desc.name_t
entry $w_name \
-borderwidth 1 \
-relief sunken \
-width 40 \
-textvariable @name \
-validate key \
-validatecommand [cb _validate_name %d %S]
grid $w.desc.name_l $w_name -sticky we -padx {0 5}
label $w.desc.cmd_l -text [mc "Command:"]
set w_cmd $w.desc.cmd_t
entry $w_cmd \
-borderwidth 1 \
-relief sunken \
-width 40 \
-textvariable @command
grid $w.desc.cmd_l $w_cmd -sticky we -padx {0 5} -pady {0 3}
grid columnconfigure $w.desc 1 -weight 1
pack $w.desc -anchor nw -fill x -pady 5 -padx 5
checkbutton $w.confirm \
-text [mc "Show a dialog before running"] \
-variable @confirm -command [cb _check_enable_dlg]
labelframe $w.dlg -labelwidget $w.confirm
checkbutton $w.dlg.askbranch \
-text [mc "Ask the user to select a revision (sets \$REVISION)"] \
-variable @ask_branch -state disabled
pack $w.dlg.askbranch -anchor w -padx 15
checkbutton $w.dlg.askargs \
-text [mc "Ask the user for additional arguments (sets \$ARGS)"] \
-variable @ask_args -state disabled
pack $w.dlg.askargs -anchor w -padx 15
pack $w.dlg -anchor nw -fill x -pady {0 8} -padx 5
checkbutton $w.noconsole \
-text [mc "Don't show the command output window"] \
-variable @no_console
pack $w.noconsole -anchor w -padx 5
checkbutton $w.needsfile \
-text [mc "Run only if a diff is selected (\$FILENAME not empty)"] \
-variable @needs_file
pack $w.needsfile -anchor w -padx 5
bind $w <Visibility> [cb _visible]
bind $w <Key-Escape> [list destroy $w]
bind $w <Key-Return> [cb _add]\;break
tkwait window $w
}
method _check_enable_dlg {} {
if {$confirm} {
$w.dlg.askbranch configure -state normal
$w.dlg.askargs configure -state normal
} else {
$w.dlg.askbranch configure -state disabled
$w.dlg.askargs configure -state disabled
}
}
method _add {} {
global repo_config
if {$name eq {}} {
error_popup [mc "Please supply a name for the tool."]
focus $w_name
return
}
set item "guitool.$name.cmd"
if {[info exists repo_config($item)]} {
error_popup [mc "Tool '%s' already exists." $name]
focus $w_name
return
}
set cmd [list git config]
if {$add_global} { lappend cmd --global }
set items {}
if {$no_console} { lappend items "guitool.$name.noconsole" }
if {$needs_file} { lappend items "guitool.$name.needsfile" }
if {$confirm} {
if {$ask_args} { lappend items "guitool.$name.argprompt" }
if {$ask_branch} { lappend items "guitool.$name.revprompt" }
if {!$ask_args && !$ask_branch} {
lappend items "guitool.$name.confirm"
}
}
if {[catch {
eval $cmd [list $item $command]
foreach citem $items { eval $cmd [list $citem yes] }
} err]} {
error_popup [mc "Could not add tool:\n%s" $err]
} else {
set repo_config($item) $command
foreach citem $items { set repo_config($citem) yes }
tools_populate_all
}
destroy $w
}
method _validate_name {d S} {
if {$d == 1} {
if {[regexp {[~?*&\[\0\"\\\{]} $S]} {
return 0
}
}
return 1
}
method _visible {} {
grab $w
$w_name icursor end
focus $w_name
}
}
class tools_remove {
field w ; # widget path
field w_names ; # name list
constructor dialog {} {
global repo_config global_config system_config
load_config 1
make_toplevel top w
wm title $top [append "[appname] ([reponame]): " [mc "Remove Tool"]]
if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
wm transient $top .
}
label $w.header -text [mc "Remove Tool Commands"] -font font_uibold
pack $w.header -side top -fill x
frame $w.buttons
button $w.buttons.create -text [mc Remove] \
-default active \
-command [cb _remove]
pack $w.buttons.create -side right
button $w.buttons.cancel -text [mc Cancel] \
-command [list destroy $w]
pack $w.buttons.cancel -side right -padx 5
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
frame $w.list
set w_names $w.list.l
listbox $w_names \
-height 10 \
-width 30 \
-selectmode extended \
-exportselection false \
-yscrollcommand [list $w.list.sby set]
scrollbar $w.list.sby -command [list $w.list.l yview]
pack $w.list.sby -side right -fill y
pack $w.list.l -side left -fill both -expand 1
pack $w.list -fill both -expand 1 -pady 5 -padx 5
set local_cnt 0
foreach fullname [tools_list] {
# Cannot delete system tools
if {[info exists system_config(guitool.$fullname.cmd)]} continue
$w_names insert end $fullname
if {![info exists global_config(guitool.$fullname.cmd)]} {
$w_names itemconfigure end -foreground blue
incr local_cnt
}
}
if {$local_cnt > 0} {
label $w.colorlbl -foreground blue \
-text [mc "(Blue denotes repository-local tools)"]
pack $w.colorlbl -fill x -pady 5 -padx 5
}
bind $w <Visibility> [cb _visible]
bind $w <Key-Escape> [list destroy $w]
bind $w <Key-Return> [cb _remove]\;break
tkwait window $w
}
method _remove {} {
foreach i [$w_names curselection] {
set name [$w_names get $i]
catch { git config --remove-section guitool.$name }
catch { git config --global --remove-section guitool.$name }
}
load_config 0
tools_populate_all
destroy $w
}
method _visible {} {
grab $w
focus $w_names
}
}
class tools_askdlg {
field w ; # widget path
field w_rev {}; # revision browser
field w_args {}; # arguments
field is_ask_args 0; # has arguments field
field is_ask_revs 0; # has revision browser
field is_ok 0; # ok to start
field argstr {}; # arguments
constructor dialog {fullname} {
global M1B
set title [get_config "guitool.$fullname.title"]
if {$title eq {}} {
regsub {/} $fullname { / } title
}
make_toplevel top w -autodelete 0
wm title $top [append "[appname] ([reponame]): " $title]
if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
wm transient $top .
}
set prompt [get_config "guitool.$fullname.prompt"]
if {$prompt eq {}} {
set command [get_config "guitool.$fullname.cmd"]
set prompt [mc "Run Command: %s" $command]
}
label $w.header -text $prompt -font font_uibold
pack $w.header -side top -fill x
set argprompt [get_config "guitool.$fullname.argprompt"]
set revprompt [get_config "guitool.$fullname.revprompt"]
set is_ask_args [expr {$argprompt ne {}}]
set is_ask_revs [expr {$revprompt ne {}}]
if {$is_ask_args} {
if {$argprompt eq {yes} || $argprompt eq {true} || $argprompt eq {1}} {
set argprompt [mc "Arguments"]
}
labelframe $w.arg -text $argprompt
set w_args $w.arg.txt
entry $w_args \
-borderwidth 1 \
-relief sunken \
-width 40 \
-textvariable @argstr
pack $w_args -padx 5 -pady 5 -fill both
pack $w.arg -anchor nw -fill both -pady 5 -padx 5
}
if {$is_ask_revs} {
if {$revprompt eq {yes} || $revprompt eq {true} || $revprompt eq {1}} {
set revprompt [mc "Revision"]
}
if {[is_config_true "guitool.$fullname.revunmerged"]} {
set w_rev [::choose_rev::new_unmerged $w.rev $revprompt]
} else {
set w_rev [::choose_rev::new $w.rev $revprompt]
}
pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
}
frame $w.buttons
if {$is_ask_revs} {
button $w.buttons.visualize \
-text [mc Visualize] \
-command [cb _visualize]
pack $w.buttons.visualize -side left
}
button $w.buttons.ok \
-text [mc OK] \
-command [cb _start]
pack $w.buttons.ok -side right
button $w.buttons.cancel \
-text [mc "Cancel"] \
-command [cb _cancel]
pack $w.buttons.cancel -side right -padx 5
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
bind $w <$M1B-Key-Return> [cb _start]
bind $w <Key-Return> [cb _start]
bind $w <Key-Escape> [cb _cancel]
wm protocol $w WM_DELETE_WINDOW [cb _cancel]
bind $w <Visibility> [cb _visible]
return $this
}
method execute {} {
tkwait window $w
set rv $is_ok
delete_this
return $rv
}
method _visible {} {
grab $w
if {$is_ask_args} {
focus $w_args
} elseif {$is_ask_revs} {
$w_rev focus_filter
}
}
method _cancel {} {
wm protocol $w WM_DELETE_WINDOW {}
destroy $w
}
method _rev {} {
if {[catch {$w_rev commit_or_die}]} {
return {}
}
return [$w_rev get]
}
method _visualize {} {
global current_branch
set rev [_rev $this]
if {$rev ne {}} {
do_gitk [list --left-right "$current_branch...$rev"]
}
}
method _start {} {
global env
if {$is_ask_revs} {
set name [_rev $this]
if {$name eq {}} {
return
}
set env(REVISION) $name
}
if {$is_ask_args} {
set env(ARGS) $argstr
}
set is_ok 1
_cancel $this
}
}
|