]>
Commit | Line | Data |
---|---|---|
bd11b82d | 1 | #!/bin/sh |
cb07fc2a | 2 | # Tcl ignores the next line -*- tcl -*- \ |
4e817d1a SP |
3 | if test "z$*" = zversion \ |
4 | || test "z$*" = z--version; \ | |
5 | then \ | |
6 | echo 'git-gui version @@GITGUI_VERSION@@'; \ | |
7 | exit; \ | |
8 | fi; \ | |
2f7c9a7f SP |
9 | argv0=$0; \ |
10 | exec wish "$argv0" -- "$@" | |
cb07fc2a | 11 | |
7e81d4ee | 12 | set appvers {@@GITGUI_VERSION@@} |
d6db1ad5 | 13 | set copyright [encoding convertfrom utf-8 { |
a9813cb5 | 14 | Copyright © 2006, 2007 Shawn Pearce, et. al. |
bdc9ea20 | 15 | |
0499b24a SP |
16 | This program is free software; you can redistribute it and/or modify |
17 | it under the terms of the GNU General Public License as published by | |
18 | the Free Software Foundation; either version 2 of the License, or | |
19 | (at your option) any later version. | |
20 | ||
21 | This program is distributed in the hope that it will be useful, | |
22 | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
23 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
24 | GNU General Public License for more details. | |
25 | ||
26 | You should have received a copy of the GNU General Public License | |
27 | along with this program; if not, write to the Free Software | |
d6db1ad5 | 28 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}] |
cb07fc2a | 29 | |
f522c9b5 | 30 | ###################################################################### |
cfb07cca SP |
31 | ## |
32 | ## Tcl/Tk sanity check | |
33 | ||
34 | if {[catch {package require Tcl 8.4} err] | |
35 | || [catch {package require Tk 8.4} err] | |
36 | } { | |
37 | catch {wm withdraw .} | |
38 | tk_messageBox \ | |
39 | -icon error \ | |
40 | -type ok \ | |
c8c4854b | 41 | -title [mc "git-gui: fatal error"] \ |
cfb07cca SP |
42 | -message $err |
43 | exit 1 | |
44 | } | |
45 | ||
63c4024f | 46 | catch {rename send {}} ; # What an evil concept... |
cff93397 | 47 | |
fc703c20 SP |
48 | ###################################################################### |
49 | ## | |
50 | ## locate our library | |
51 | ||
52 | set oguilib {@@GITGUI_LIBDIR@@} | |
53 | set oguirel {@@GITGUI_RELATIVE@@} | |
54 | if {$oguirel eq {1}} { | |
55 | set oguilib [file dirname [file dirname [file normalize $argv0]]] | |
56 | set oguilib [file join $oguilib share git-gui lib] | |
d4b0ccd9 | 57 | set oguimsg [file join $oguilib msgs] |
fc703c20 SP |
58 | } elseif {[string match @@* $oguirel]} { |
59 | set oguilib [file join [file dirname [file normalize $argv0]] lib] | |
d4b0ccd9 SP |
60 | set oguimsg [file join [file dirname [file normalize $argv0]] po] |
61 | } else { | |
62 | set oguimsg [file join $oguilib msgs] | |
fc703c20 SP |
63 | } |
64 | unset oguirel | |
65 | ||
cd12901b SP |
66 | ###################################################################### |
67 | ## | |
68 | ## enable verbose loading? | |
69 | ||
70 | if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} { | |
71 | unset _verbose | |
72 | rename auto_load real__auto_load | |
73 | proc auto_load {name args} { | |
74 | puts stderr "auto_load $name" | |
75 | return [uplevel 1 real__auto_load $name $args] | |
76 | } | |
77 | rename source real__source | |
78 | proc source {name} { | |
79 | puts stderr "source $name" | |
80 | uplevel 1 real__source $name | |
81 | } | |
82 | } | |
83 | ||
c950c66e | 84 | ###################################################################### |
d4b0ccd9 SP |
85 | ## |
86 | ## Internationalization (i18n) through msgcat and gettext. See | |
87 | ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html | |
88 | ||
89 | package require msgcat | |
146d73a3 | 90 | |
ab0d33c4 | 91 | proc _mc_trim {fmt} { |
146d73a3 SP |
92 | set cmk [string first @@ $fmt] |
93 | if {$cmk > 0} { | |
ab0d33c4 | 94 | return [string range $fmt 0 [expr {$cmk - 1}]] |
146d73a3 | 95 | } |
ab0d33c4 SP |
96 | return $fmt |
97 | } | |
98 | ||
99 | proc mc {en_fmt args} { | |
100 | set fmt [_mc_trim [::msgcat::mc $en_fmt]] | |
101 | if {[catch {set msg [eval [list format $fmt] $args]} err]} { | |
102 | set msg [eval [list format [_mc_trim $en_fmt]] $args] | |
103 | } | |
104 | return $msg | |
146d73a3 SP |
105 | } |
106 | ||
31bb1d1b SP |
107 | proc strcat {args} { |
108 | return [join $args {}] | |
109 | } | |
110 | ||
d4b0ccd9 SP |
111 | ::msgcat::mcload $oguimsg |
112 | unset oguimsg | |
113 | ||
114 | ###################################################################### | |
c950c66e SP |
115 | ## |
116 | ## read only globals | |
117 | ||
0b2bc460 | 118 | set _appname {Git Gui} |
c950c66e | 119 | set _gitdir {} |
20ddfcaa | 120 | set _gitexec {} |
c950c66e | 121 | set _reponame {} |
20ddfcaa | 122 | set _iscygwin {} |
0b812616 | 123 | set _search_path {} |
c950c66e | 124 | |
16dd62ac SP |
125 | set _trace [lsearch -exact $argv --trace] |
126 | if {$_trace >= 0} { | |
127 | set argv [lreplace $argv $_trace $_trace] | |
128 | set _trace 1 | |
129 | } else { | |
130 | set _trace 0 | |
131 | } | |
132 | ||
c950c66e SP |
133 | proc appname {} { |
134 | global _appname | |
135 | return $_appname | |
136 | } | |
137 | ||
c2758a17 | 138 | proc gitdir {args} { |
c950c66e | 139 | global _gitdir |
c2758a17 SP |
140 | if {$args eq {}} { |
141 | return $_gitdir | |
142 | } | |
0b812616 | 143 | return [eval [list file join $_gitdir] $args] |
c950c66e SP |
144 | } |
145 | ||
20ddfcaa SP |
146 | proc gitexec {args} { |
147 | global _gitexec | |
148 | if {$_gitexec eq {}} { | |
81347223 | 149 | if {[catch {set _gitexec [git --exec-path]} err]} { |
20ddfcaa SP |
150 | error "Git not installed?\n\n$err" |
151 | } | |
0b812616 SP |
152 | if {[is_Cygwin]} { |
153 | set _gitexec [exec cygpath \ | |
154 | --windows \ | |
155 | --absolute \ | |
156 | $_gitexec] | |
157 | } else { | |
158 | set _gitexec [file normalize $_gitexec] | |
159 | } | |
20ddfcaa SP |
160 | } |
161 | if {$args eq {}} { | |
162 | return $_gitexec | |
163 | } | |
0b812616 | 164 | return [eval [list file join $_gitexec] $args] |
20ddfcaa SP |
165 | } |
166 | ||
c950c66e | 167 | proc reponame {} { |
d36cd968 | 168 | return $::_reponame |
c950c66e | 169 | } |
da5239dc | 170 | |
20ddfcaa | 171 | proc is_MacOSX {} { |
20ddfcaa SP |
172 | if {[tk windowingsystem] eq {aqua}} { |
173 | return 1 | |
174 | } | |
175 | return 0 | |
176 | } | |
177 | ||
178 | proc is_Windows {} { | |
d36cd968 | 179 | if {$::tcl_platform(platform) eq {windows}} { |
20ddfcaa SP |
180 | return 1 |
181 | } | |
182 | return 0 | |
183 | } | |
184 | ||
185 | proc is_Cygwin {} { | |
d36cd968 | 186 | global _iscygwin |
20ddfcaa | 187 | if {$_iscygwin eq {}} { |
d36cd968 | 188 | if {$::tcl_platform(platform) eq {windows}} { |
20ddfcaa SP |
189 | if {[catch {set p [exec cygpath --windir]} err]} { |
190 | set _iscygwin 0 | |
191 | } else { | |
192 | set _iscygwin 1 | |
193 | } | |
194 | } else { | |
195 | set _iscygwin 0 | |
196 | } | |
197 | } | |
198 | return $_iscygwin | |
199 | } | |
200 | ||
cf25ddc8 SP |
201 | proc is_enabled {option} { |
202 | global enabled_options | |
203 | if {[catch {set on $enabled_options($option)}]} {return 0} | |
204 | return $on | |
205 | } | |
206 | ||
207 | proc enable_option {option} { | |
208 | global enabled_options | |
209 | set enabled_options($option) 1 | |
210 | } | |
211 | ||
212 | proc disable_option {option} { | |
213 | global enabled_options | |
214 | set enabled_options($option) 0 | |
215 | } | |
216 | ||
2d19516d SP |
217 | ###################################################################### |
218 | ## | |
219 | ## config | |
220 | ||
51f4d16b SP |
221 | proc is_many_config {name} { |
222 | switch -glob -- $name { | |
24f7c64b | 223 | gui.recentrepo - |
51f4d16b SP |
224 | remote.*.fetch - |
225 | remote.*.push | |
226 | {return 1} | |
227 | * | |
228 | {return 0} | |
229 | } | |
230 | } | |
2d19516d | 231 | |
c539449b SP |
232 | proc is_config_true {name} { |
233 | global repo_config | |
234 | if {[catch {set v $repo_config($name)}]} { | |
235 | return 0 | |
236 | } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} { | |
237 | return 1 | |
238 | } else { | |
239 | return 0 | |
240 | } | |
241 | } | |
242 | ||
61f82ce7 SP |
243 | proc get_config {name} { |
244 | global repo_config | |
245 | if {[catch {set v $repo_config($name)}]} { | |
246 | return {} | |
247 | } else { | |
248 | return $v | |
249 | } | |
250 | } | |
251 | ||
81347223 SP |
252 | ###################################################################### |
253 | ## | |
254 | ## handy utils | |
255 | ||
16dd62ac SP |
256 | proc _trace_exec {cmd} { |
257 | if {!$::_trace} return | |
258 | set d {} | |
259 | foreach v $cmd { | |
260 | if {$d ne {}} { | |
261 | append d { } | |
262 | } | |
263 | if {[regexp {[ \t\r\n'"$?*]} $v]} { | |
264 | set v [sq $v] | |
265 | } | |
266 | append d $v | |
267 | } | |
268 | puts stderr $d | |
269 | } | |
270 | ||
0b812616 SP |
271 | proc _git_cmd {name} { |
272 | global _git_cmd_path | |
273 | ||
274 | if {[catch {set v $_git_cmd_path($name)}]} { | |
275 | switch -- $name { | |
70a7595c | 276 | version - |
0b812616 SP |
277 | --version - |
278 | --exec-path { return [list $::_git $name] } | |
279 | } | |
280 | ||
281 | set p [gitexec git-$name$::_search_exe] | |
282 | if {[file exists $p]} { | |
283 | set v [list $p] | |
c136f2b8 SP |
284 | } elseif {[is_Windows] && [file exists [gitexec git-$name]]} { |
285 | # Try to determine what sort of magic will make | |
286 | # git-$name go and do its thing, because native | |
287 | # Tcl on Windows doesn't know it. | |
0b812616 | 288 | # |
c136f2b8 SP |
289 | set p [gitexec git-$name] |
290 | set f [open $p r] | |
291 | set s [gets $f] | |
292 | close $f | |
293 | ||
6e4ba05c | 294 | switch -glob -- [lindex $s 0] { |
c136f2b8 SP |
295 | #!*sh { set i sh } |
296 | #!*perl { set i perl } | |
297 | #!*python { set i python } | |
298 | default { error "git-$name is not supported: $s" } | |
299 | } | |
300 | ||
301 | upvar #0 _$i interp | |
302 | if {![info exists interp]} { | |
303 | set interp [_which $i] | |
304 | } | |
305 | if {$interp eq {}} { | |
306 | error "git-$name requires $i (not in PATH)" | |
307 | } | |
6e4ba05c | 308 | set v [concat [list $interp] [lrange $s 1 end] [list $p]] |
0b812616 | 309 | } else { |
c6729890 SP |
310 | # Assume it is builtin to git somehow and we |
311 | # aren't actually able to see a file for it. | |
312 | # | |
313 | set v [list $::_git $name] | |
0b812616 SP |
314 | } |
315 | set _git_cmd_path($name) $v | |
316 | } | |
317 | return $v | |
318 | } | |
319 | ||
320 | proc _which {what} { | |
321 | global env _search_exe _search_path | |
322 | ||
323 | if {$_search_path eq {}} { | |
299077fb | 324 | if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} { |
0b812616 SP |
325 | set _search_path [split [exec cygpath \ |
326 | --windows \ | |
327 | --path \ | |
328 | --absolute \ | |
329 | $env(PATH)] {;}] | |
330 | set _search_exe .exe | |
331 | } elseif {[is_Windows]} { | |
be700fe3 SP |
332 | set gitguidir [file dirname [info script]] |
333 | regsub -all ";" $gitguidir "\\;" gitguidir | |
334 | set env(PATH) "$gitguidir;$env(PATH)" | |
0b812616 SP |
335 | set _search_path [split $env(PATH) {;}] |
336 | set _search_exe .exe | |
337 | } else { | |
338 | set _search_path [split $env(PATH) :] | |
339 | set _search_exe {} | |
340 | } | |
341 | } | |
342 | ||
343 | foreach p $_search_path { | |
344 | set p [file join $p $what$_search_exe] | |
345 | if {[file exists $p]} { | |
346 | return [file normalize $p] | |
347 | } | |
348 | } | |
349 | return {} | |
350 | } | |
351 | ||
6f62b4f7 SP |
352 | proc _lappend_nice {cmd_var} { |
353 | global _nice | |
354 | upvar $cmd_var cmd | |
355 | ||
356 | if {![info exists _nice]} { | |
357 | set _nice [_which nice] | |
358 | } | |
359 | if {$_nice ne {}} { | |
360 | lappend cmd $_nice | |
361 | } | |
362 | } | |
363 | ||
81347223 | 364 | proc git {args} { |
16dd62ac | 365 | set opt [list] |
0b812616 SP |
366 | |
367 | while {1} { | |
368 | switch -- [lindex $args 0] { | |
369 | --nice { | |
6f62b4f7 | 370 | _lappend_nice opt |
0b812616 SP |
371 | } |
372 | ||
373 | default { | |
374 | break | |
375 | } | |
376 | ||
377 | } | |
378 | ||
379 | set args [lrange $args 1 end] | |
380 | } | |
381 | ||
382 | set cmdp [_git_cmd [lindex $args 0]] | |
383 | set args [lrange $args 1 end] | |
384 | ||
16dd62ac SP |
385 | _trace_exec [concat $opt $cmdp $args] |
386 | set result [eval exec $opt $cmdp $args] | |
387 | if {$::_trace} { | |
388 | puts stderr "< $result" | |
389 | } | |
390 | return $result | |
0b812616 SP |
391 | } |
392 | ||
74c4763c | 393 | proc _open_stdout_stderr {cmd} { |
16dd62ac | 394 | _trace_exec $cmd |
74c4763c | 395 | if {[catch { |
16dd62ac | 396 | set fd [open [concat [list | ] $cmd] r] |
74c4763c SP |
397 | } err]} { |
398 | if { [lindex $cmd end] eq {2>@1} | |
399 | && $err eq {can not find channel named "1"} | |
400 | } { | |
401 | # Older versions of Tcl 8.4 don't have this 2>@1 IO | |
402 | # redirect operator. Fallback to |& cat for those. | |
403 | # The command was not actually started, so its safe | |
404 | # to try to start it a second time. | |
405 | # | |
406 | set fd [open [concat \ | |
16dd62ac | 407 | [list | ] \ |
74c4763c SP |
408 | [lrange $cmd 0 end-1] \ |
409 | [list |& cat] \ | |
410 | ] r] | |
411 | } else { | |
412 | error $err | |
413 | } | |
414 | } | |
6eb420ef | 415 | fconfigure $fd -eofchar {} |
74c4763c SP |
416 | return $fd |
417 | } | |
418 | ||
0b812616 | 419 | proc git_read {args} { |
16dd62ac | 420 | set opt [list] |
0b812616 SP |
421 | |
422 | while {1} { | |
423 | switch -- [lindex $args 0] { | |
424 | --nice { | |
6f62b4f7 | 425 | _lappend_nice opt |
0b812616 SP |
426 | } |
427 | ||
428 | --stderr { | |
429 | lappend args 2>@1 | |
430 | } | |
431 | ||
432 | default { | |
433 | break | |
434 | } | |
435 | ||
436 | } | |
437 | ||
438 | set args [lrange $args 1 end] | |
439 | } | |
440 | ||
441 | set cmdp [_git_cmd [lindex $args 0]] | |
442 | set args [lrange $args 1 end] | |
443 | ||
74c4763c | 444 | return [_open_stdout_stderr [concat $opt $cmdp $args]] |
0b812616 SP |
445 | } |
446 | ||
447 | proc git_write {args} { | |
16dd62ac | 448 | set opt [list] |
0b812616 SP |
449 | |
450 | while {1} { | |
451 | switch -- [lindex $args 0] { | |
452 | --nice { | |
6f62b4f7 | 453 | _lappend_nice opt |
0b812616 SP |
454 | } |
455 | ||
456 | default { | |
457 | break | |
458 | } | |
459 | ||
460 | } | |
461 | ||
462 | set args [lrange $args 1 end] | |
463 | } | |
464 | ||
465 | set cmdp [_git_cmd [lindex $args 0]] | |
466 | set args [lrange $args 1 end] | |
467 | ||
16dd62ac SP |
468 | _trace_exec [concat $opt $cmdp $args] |
469 | return [open [concat [list | ] $opt $cmdp $args] w] | |
81347223 SP |
470 | } |
471 | ||
ed76cb70 SP |
472 | proc githook_read {hook_name args} { |
473 | set pchook [gitdir hooks $hook_name] | |
474 | lappend args 2>@1 | |
475 | ||
476 | # On Cygwin [file executable] might lie so we need to ask | |
477 | # the shell if the hook is executable. Yes that's annoying. | |
478 | # | |
479 | if {[is_Cygwin]} { | |
480 | upvar #0 _sh interp | |
481 | if {![info exists interp]} { | |
482 | set interp [_which sh] | |
483 | } | |
484 | if {$interp eq {}} { | |
485 | error "hook execution requires sh (not in PATH)" | |
486 | } | |
487 | ||
488 | set scr {if test -x "$1";then exec "$@";fi} | |
16dd62ac | 489 | set sh_c [list $interp -c $scr $interp $pchook] |
ed76cb70 SP |
490 | return [_open_stdout_stderr [concat $sh_c $args]] |
491 | } | |
492 | ||
493 | if {[file executable $pchook]} { | |
16dd62ac | 494 | return [_open_stdout_stderr [concat [list $pchook] $args]] |
ed76cb70 SP |
495 | } |
496 | ||
497 | return {} | |
498 | } | |
499 | ||
7eafa2f1 SP |
500 | proc sq {value} { |
501 | regsub -all ' $value "'\\''" value | |
502 | return "'$value'" | |
503 | } | |
504 | ||
d41b43eb SP |
505 | proc load_current_branch {} { |
506 | global current_branch is_detached | |
507 | ||
fc4e8da7 | 508 | set fd [open [gitdir HEAD] r] |
311e02a4 | 509 | if {[gets $fd ref] < 1} { |
fc4e8da7 SP |
510 | set ref {} |
511 | } | |
512 | close $fd | |
311e02a4 SP |
513 | |
514 | set pfx {ref: refs/heads/} | |
515 | set len [string length $pfx] | |
516 | if {[string equal -length $len $pfx $ref]} { | |
517 | # We're on a branch. It might not exist. But | |
518 | # HEAD looks good enough to be a branch. | |
519 | # | |
d41b43eb SP |
520 | set current_branch [string range $ref $len end] |
521 | set is_detached 0 | |
311e02a4 SP |
522 | } else { |
523 | # Assume this is a detached head. | |
524 | # | |
d41b43eb SP |
525 | set current_branch HEAD |
526 | set is_detached 1 | |
311e02a4 | 527 | } |
fc4e8da7 SP |
528 | } |
529 | ||
2739291b SP |
530 | auto_load tk_optionMenu |
531 | rename tk_optionMenu real__tkOptionMenu | |
532 | proc tk_optionMenu {w varName args} { | |
533 | set m [eval real__tkOptionMenu $w $varName $args] | |
534 | $m configure -font font_ui | |
535 | $w configure -font font_ui | |
536 | return $m | |
537 | } | |
538 | ||
3849bfba SP |
539 | proc rmsel_tag {text} { |
540 | $text tag conf sel \ | |
541 | -background [$text cget -background] \ | |
542 | -foreground [$text cget -foreground] \ | |
543 | -borderwidth 0 | |
544 | $text tag conf in_sel -background lightgray | |
545 | bind $text <Motion> break | |
546 | return $text | |
547 | } | |
548 | ||
a4bee597 SP |
549 | set root_exists 0 |
550 | bind . <Visibility> { | |
551 | bind . <Visibility> {} | |
552 | set root_exists 1 | |
553 | } | |
554 | ||
1bdd8a15 SP |
555 | if {[is_Windows]} { |
556 | wm iconbitmap . -default $oguilib/git-gui.ico | |
557 | } | |
558 | ||
a4bee597 SP |
559 | ###################################################################### |
560 | ## | |
561 | ## config defaults | |
562 | ||
563 | set cursor_ptr arrow | |
564 | font create font_diff -family Courier -size 10 | |
565 | font create font_ui | |
566 | catch { | |
567 | label .dummy | |
568 | eval font configure font_ui [font actual [.dummy cget -font]] | |
569 | destroy .dummy | |
570 | } | |
571 | ||
572 | font create font_uiitalic | |
573 | font create font_uibold | |
574 | font create font_diffbold | |
575 | font create font_diffitalic | |
576 | ||
577 | foreach class {Button Checkbutton Entry Label | |
578 | Labelframe Listbox Menu Message | |
579 | Radiobutton Spinbox Text} { | |
580 | option add *$class.font font_ui | |
581 | } | |
582 | unset class | |
583 | ||
584 | if {[is_Windows] || [is_MacOSX]} { | |
585 | option add *Menu.tearOff 0 | |
586 | } | |
587 | ||
588 | if {[is_MacOSX]} { | |
589 | set M1B M1 | |
590 | set M1T Cmd | |
591 | } else { | |
592 | set M1B Control | |
593 | set M1T Ctrl | |
594 | } | |
595 | ||
596 | proc bind_button3 {w cmd} { | |
597 | bind $w <Any-Button-3> $cmd | |
598 | if {[is_MacOSX]} { | |
599 | # Mac OS X sends Button-2 on right click through three-button mouse, | |
600 | # or through trackpad right-clicking (two-finger touch + click). | |
601 | bind $w <Any-Button-2> $cmd | |
602 | bind $w <Control-Button-1> $cmd | |
603 | } | |
604 | } | |
605 | ||
606 | proc apply_config {} { | |
607 | global repo_config font_descs | |
608 | ||
609 | foreach option $font_descs { | |
610 | set name [lindex $option 0] | |
611 | set font [lindex $option 1] | |
612 | if {[catch { | |
48b8d2b3 | 613 | set need_weight 1 |
a4bee597 | 614 | foreach {cn cv} $repo_config(gui.$name) { |
48b8d2b3 SP |
615 | if {$cn eq {-weight}} { |
616 | set need_weight 0 | |
617 | } | |
618 | font configure $font $cn $cv | |
619 | } | |
620 | if {$need_weight} { | |
621 | font configure $font -weight normal | |
a4bee597 SP |
622 | } |
623 | } err]} { | |
624 | error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"] | |
625 | } | |
626 | foreach {cn cv} [font configure $font] { | |
627 | font configure ${font}bold $cn $cv | |
628 | font configure ${font}italic $cn $cv | |
629 | } | |
630 | font configure ${font}bold -weight bold | |
631 | font configure ${font}italic -slant italic | |
632 | } | |
633 | } | |
634 | ||
fe70225d | 635 | set default_config(branch.autosetupmerge) true |
a4bee597 SP |
636 | set default_config(merge.diffstat) true |
637 | set default_config(merge.summary) false | |
638 | set default_config(merge.verbosity) 2 | |
639 | set default_config(user.name) {} | |
640 | set default_config(user.email) {} | |
641 | ||
642 | set default_config(gui.matchtrackingbranch) false | |
643 | set default_config(gui.pruneduringfetch) false | |
644 | set default_config(gui.trustmtime) false | |
645 | set default_config(gui.diffcontext) 5 | |
11027d54 | 646 | set default_config(gui.commitmsgwidth) 75 |
a4bee597 | 647 | set default_config(gui.newbranchtemplate) {} |
95b002ee | 648 | set default_config(gui.spellingdictionary) {} |
a4bee597 SP |
649 | set default_config(gui.fontui) [font configure font_ui] |
650 | set default_config(gui.fontdiff) [font configure font_diff] | |
651 | set font_descs { | |
652 | {fontui font_ui {mc "Main Font"}} | |
653 | {fontdiff font_diff {mc "Diff/Console Font"}} | |
654 | } | |
655 | ||
0b812616 SP |
656 | ###################################################################### |
657 | ## | |
658 | ## find git | |
659 | ||
660 | set _git [_which git] | |
661 | if {$_git eq {}} { | |
662 | catch {wm withdraw .} | |
183a1d14 SP |
663 | tk_messageBox \ |
664 | -icon error \ | |
665 | -type ok \ | |
666 | -title [mc "git-gui: fatal error"] \ | |
667 | -message [mc "Cannot find git in PATH."] | |
0b812616 SP |
668 | exit 1 |
669 | } | |
0b812616 | 670 | |
54acdd95 SP |
671 | ###################################################################### |
672 | ## | |
673 | ## version check | |
674 | ||
d6967022 | 675 | if {[catch {set _git_version [git --version]} err]} { |
54acdd95 | 676 | catch {wm withdraw .} |
875b7c93 SP |
677 | tk_messageBox \ |
678 | -icon error \ | |
679 | -type ok \ | |
c8c4854b | 680 | -title [mc "git-gui: fatal error"] \ |
875b7c93 | 681 | -message "Cannot determine Git version: |
54acdd95 SP |
682 | |
683 | $err | |
684 | ||
d6967022 SP |
685 | [appname] requires Git 1.5.0 or later." |
686 | exit 1 | |
687 | } | |
688 | if {![regsub {^git version } $_git_version {} _git_version]} { | |
689 | catch {wm withdraw .} | |
875b7c93 SP |
690 | tk_messageBox \ |
691 | -icon error \ | |
692 | -type ok \ | |
c8c4854b | 693 | -title [mc "git-gui: fatal error"] \ |
31bb1d1b | 694 | -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"] |
54acdd95 SP |
695 | exit 1 |
696 | } | |
301dfaa9 SP |
697 | |
698 | set _real_git_version $_git_version | |
2c2a3782 | 699 | regsub -- {[\-\.]dirty$} $_git_version {} _git_version |
d6967022 SP |
700 | regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version |
701 | regsub {\.rc[0-9]+$} $_git_version {} _git_version | |
91464dfb | 702 | regsub {\.GIT$} $_git_version {} _git_version |
96f11953 | 703 | regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version |
d6967022 | 704 | |
301dfaa9 SP |
705 | if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { |
706 | catch {wm withdraw .} | |
707 | if {[tk_messageBox \ | |
708 | -icon warning \ | |
709 | -type yesno \ | |
710 | -default no \ | |
711 | -title "[appname]: warning" \ | |
1ac17950 | 712 | -message [mc "Git version cannot be determined. |
301dfaa9 | 713 | |
1ac17950 | 714 | %s claims it is version '%s'. |
301dfaa9 | 715 | |
1ac17950 | 716 | %s requires at least Git 1.5.0 or later. |
301dfaa9 | 717 | |
1ac17950 CS |
718 | Assume '%s' is version 1.5.0? |
719 | " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} { | |
301dfaa9 SP |
720 | set _git_version 1.5.0 |
721 | } else { | |
722 | exit 1 | |
723 | } | |
724 | } | |
725 | unset _real_git_version | |
726 | ||
d6967022 SP |
727 | proc git-version {args} { |
728 | global _git_version | |
729 | ||
730 | switch [llength $args] { | |
731 | 0 { | |
732 | return $_git_version | |
54acdd95 | 733 | } |
d6967022 SP |
734 | |
735 | 2 { | |
736 | set op [lindex $args 0] | |
737 | set vr [lindex $args 1] | |
738 | set cm [package vcompare $_git_version $vr] | |
739 | return [expr $cm $op 0] | |
740 | } | |
741 | ||
742 | 4 { | |
743 | set type [lindex $args 0] | |
744 | set name [lindex $args 1] | |
745 | set parm [lindex $args 2] | |
746 | set body [lindex $args 3] | |
747 | ||
748 | if {($type ne {proc} && $type ne {method})} { | |
749 | error "Invalid arguments to git-version" | |
750 | } | |
751 | if {[llength $body] < 2 || [lindex $body end-1] ne {default}} { | |
752 | error "Last arm of $type $name must be default" | |
753 | } | |
754 | ||
755 | foreach {op vr cb} [lrange $body 0 end-2] { | |
756 | if {[git-version $op $vr]} { | |
757 | return [uplevel [list $type $name $parm $cb]] | |
758 | } | |
759 | } | |
760 | ||
761 | return [uplevel [list $type $name $parm [lindex $body end]]] | |
762 | } | |
763 | ||
764 | default { | |
765 | error "git-version >= x" | |
766 | } | |
767 | ||
768 | } | |
769 | } | |
770 | ||
771 | if {[git-version < 1.5]} { | |
54acdd95 | 772 | catch {wm withdraw .} |
875b7c93 SP |
773 | tk_messageBox \ |
774 | -icon error \ | |
775 | -type ok \ | |
c8c4854b | 776 | -title [mc "git-gui: fatal error"] \ |
875b7c93 | 777 | -message "[appname] requires Git 1.5.0 or later. |
d6967022 SP |
778 | |
779 | You are using [git-version]: | |
780 | ||
781 | [git --version]" | |
54acdd95 SP |
782 | exit 1 |
783 | } | |
54acdd95 | 784 | |
875b7c93 SP |
785 | ###################################################################### |
786 | ## | |
787 | ## configure our library | |
788 | ||
875b7c93 SP |
789 | set idx [file join $oguilib tclIndex] |
790 | if {[catch {set fd [open $idx r]} err]} { | |
791 | catch {wm withdraw .} | |
792 | tk_messageBox \ | |
793 | -icon error \ | |
794 | -type ok \ | |
c8c4854b | 795 | -title [mc "git-gui: fatal error"] \ |
875b7c93 SP |
796 | -message $err |
797 | exit 1 | |
798 | } | |
799 | if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} { | |
800 | set idx [list] | |
801 | while {[gets $fd n] >= 0} { | |
802 | if {$n ne {} && ![string match #* $n]} { | |
803 | lappend idx $n | |
804 | } | |
805 | } | |
806 | } else { | |
807 | set idx {} | |
808 | } | |
809 | close $fd | |
810 | ||
811 | if {$idx ne {}} { | |
812 | set loaded [list] | |
813 | foreach p $idx { | |
814 | if {[lsearch -exact $loaded $p] >= 0} continue | |
815 | source [file join $oguilib $p] | |
816 | lappend loaded $p | |
817 | } | |
818 | unset loaded p | |
819 | } else { | |
820 | set auto_path [concat [list $oguilib] $auto_path] | |
821 | } | |
fc703c20 | 822 | unset -nocomplain idx fd |
875b7c93 | 823 | |
ba7cc660 | 824 | ###################################################################### |
69f85ffa SP |
825 | ## |
826 | ## config file parsing | |
827 | ||
f00d504a | 828 | git-version proc _parse_config {arr_name args} { |
85f7a94b SP |
829 | >= 1.5.3 { |
830 | upvar $arr_name arr | |
831 | array unset arr | |
832 | set buf {} | |
833 | catch { | |
a5bb31fb SP |
834 | set fd_rc [eval \ |
835 | [list git_read config] \ | |
836 | $args \ | |
837 | [list --null --list]] | |
85f7a94b SP |
838 | fconfigure $fd_rc -translation binary |
839 | set buf [read $fd_rc] | |
840 | close $fd_rc | |
841 | } | |
842 | foreach line [split $buf "\0"] { | |
843 | if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} { | |
844 | if {[is_many_config $name]} { | |
845 | lappend arr($name) $value | |
846 | } else { | |
847 | set arr($name) $value | |
848 | } | |
849 | } | |
850 | } | |
851 | } | |
f00d504a SP |
852 | default { |
853 | upvar $arr_name arr | |
854 | array unset arr | |
69f85ffa | 855 | catch { |
f00d504a | 856 | set fd_rc [eval [list git_read config --list] $args] |
69f85ffa SP |
857 | while {[gets $fd_rc line] >= 0} { |
858 | if {[regexp {^([^=]+)=(.*)$} $line line name value]} { | |
859 | if {[is_many_config $name]} { | |
f00d504a | 860 | lappend arr($name) $value |
69f85ffa | 861 | } else { |
f00d504a | 862 | set arr($name) $value |
69f85ffa SP |
863 | } |
864 | } | |
865 | } | |
866 | close $fd_rc | |
867 | } | |
868 | } | |
f00d504a | 869 | } |
69f85ffa | 870 | |
f00d504a SP |
871 | proc load_config {include_global} { |
872 | global repo_config global_config default_config | |
873 | ||
874 | if {$include_global} { | |
875 | _parse_config global_config --global | |
69f85ffa | 876 | } |
f00d504a | 877 | _parse_config repo_config |
69f85ffa SP |
878 | |
879 | foreach name [array names default_config] { | |
880 | if {[catch {set v $global_config($name)}]} { | |
881 | set global_config($name) $default_config($name) | |
882 | } | |
883 | if {[catch {set v $repo_config($name)}]} { | |
884 | set repo_config($name) $default_config($name) | |
885 | } | |
886 | } | |
887 | } | |
888 | ||
889 | ###################################################################### | |
ba7cc660 SP |
890 | ## |
891 | ## feature option selection | |
892 | ||
0b2bc460 | 893 | if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} { |
ba7cc660 SP |
894 | unset _junk |
895 | } else { | |
896 | set subcommand gui | |
897 | } | |
898 | if {$subcommand eq {gui.sh}} { | |
899 | set subcommand gui | |
900 | } | |
901 | if {$subcommand eq {gui} && [llength $argv] > 0} { | |
902 | set subcommand [lindex $argv 0] | |
903 | set argv [lrange $argv 1 end] | |
904 | } | |
905 | ||
906 | enable_option multicommit | |
907 | enable_option branch | |
908 | enable_option transport | |
c52c9452 | 909 | disable_option bare |
ba7cc660 SP |
910 | |
911 | switch -- $subcommand { | |
912 | browser - | |
913 | blame { | |
c52c9452 SP |
914 | enable_option bare |
915 | ||
ba7cc660 SP |
916 | disable_option multicommit |
917 | disable_option branch | |
918 | disable_option transport | |
919 | } | |
920 | citool { | |
921 | enable_option singlecommit | |
922 | ||
923 | disable_option multicommit | |
924 | disable_option branch | |
925 | disable_option transport | |
926 | } | |
927 | } | |
928 | ||
2d19516d SP |
929 | ###################################################################### |
930 | ## | |
931 | ## repository setup | |
932 | ||
c6127856 SP |
933 | if {[catch { |
934 | set _gitdir $env(GIT_DIR) | |
935 | set _prefix {} | |
936 | }] | |
937 | && [catch { | |
938 | set _gitdir [git rev-parse --git-dir] | |
939 | set _prefix [git rev-parse --show-prefix] | |
940 | } err]} { | |
ab08b363 SP |
941 | load_config 1 |
942 | apply_config | |
943 | choose_repository::pick | |
2d19516d | 944 | } |
20ddfcaa | 945 | if {![file isdirectory $_gitdir] && [is_Cygwin]} { |
2f7c9a7f | 946 | catch {set _gitdir [exec cygpath --windows $_gitdir]} |
20ddfcaa | 947 | } |
c950c66e | 948 | if {![file isdirectory $_gitdir]} { |
dbccbbda | 949 | catch {wm withdraw .} |
31bb1d1b | 950 | error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"] |
dbccbbda SP |
951 | exit 1 |
952 | } | |
c80d25db SP |
953 | if {$_prefix ne {}} { |
954 | regsub -all {[^/]+/} $_prefix ../ cdup | |
955 | if {[catch {cd $cdup} err]} { | |
956 | catch {wm withdraw .} | |
31bb1d1b | 957 | error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"] |
c80d25db SP |
958 | exit 1 |
959 | } | |
960 | unset cdup | |
961 | } elseif {![is_enabled bare]} { | |
c52c9452 SP |
962 | if {[lindex [file split $_gitdir] end] ne {.git}} { |
963 | catch {wm withdraw .} | |
31bb1d1b | 964 | error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"] |
c52c9452 SP |
965 | exit 1 |
966 | } | |
967 | if {[catch {cd [file dirname $_gitdir]} err]} { | |
968 | catch {wm withdraw .} | |
31bb1d1b | 969 | error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"] |
c52c9452 SP |
970 | exit 1 |
971 | } | |
dbccbbda | 972 | } |
c52c9452 SP |
973 | set _reponame [file split [file normalize $_gitdir]] |
974 | if {[lindex $_reponame end] eq {.git}} { | |
975 | set _reponame [lindex $_reponame end-1] | |
976 | } else { | |
977 | set _reponame [lindex $_reponame end] | |
2d19516d | 978 | } |
2d19516d | 979 | |
372ef954 SP |
980 | ###################################################################### |
981 | ## | |
982 | ## global init | |
983 | ||
984 | set current_diff_path {} | |
985 | set current_diff_side {} | |
986 | set diff_actions [list] | |
372ef954 SP |
987 | |
988 | set HEAD {} | |
989 | set PARENT {} | |
990 | set MERGE_HEAD [list] | |
991 | set commit_type {} | |
992 | set empty_tree {} | |
993 | set current_branch {} | |
d41b43eb | 994 | set is_detached 0 |
372ef954 | 995 | set current_diff_path {} |
9c9f5fa9 | 996 | set is_3way_diff 0 |
372ef954 SP |
997 | set selected_commit_type new |
998 | ||
cb07fc2a SP |
999 | ###################################################################### |
1000 | ## | |
e210e674 | 1001 | ## task management |
cb07fc2a | 1002 | |
8f52548a | 1003 | set rescan_active 0 |
131f503b | 1004 | set diff_active 0 |
24263b77 | 1005 | set last_clicked {} |
131f503b | 1006 | |
e210e674 SP |
1007 | set disable_on_lock [list] |
1008 | set index_lock_type none | |
1009 | ||
1010 | proc lock_index {type} { | |
1011 | global index_lock_type disable_on_lock | |
131f503b | 1012 | |
043f7011 | 1013 | if {$index_lock_type eq {none}} { |
e210e674 SP |
1014 | set index_lock_type $type |
1015 | foreach w $disable_on_lock { | |
1016 | uplevel #0 $w disabled | |
1017 | } | |
1018 | return 1 | |
53716a7b | 1019 | } elseif {$index_lock_type eq "begin-$type"} { |
e210e674 | 1020 | set index_lock_type $type |
131f503b SP |
1021 | return 1 |
1022 | } | |
1023 | return 0 | |
1024 | } | |
cb07fc2a | 1025 | |
e210e674 SP |
1026 | proc unlock_index {} { |
1027 | global index_lock_type disable_on_lock | |
1028 | ||
1029 | set index_lock_type none | |
1030 | foreach w $disable_on_lock { | |
1031 | uplevel #0 $w normal | |
1032 | } | |
1033 | } | |
1034 | ||
1035 | ###################################################################### | |
1036 | ## | |
1037 | ## status | |
1038 | ||
f18e40a1 | 1039 | proc repository_state {ctvar hdvar mhvar} { |
c950c66e | 1040 | global current_branch |
f18e40a1 SP |
1041 | upvar $ctvar ct $hdvar hd $mhvar mh |
1042 | ||
1043 | set mh [list] | |
ec6b424a | 1044 | |
d41b43eb | 1045 | load_current_branch |
81347223 | 1046 | if {[catch {set hd [git rev-parse --verify HEAD]}]} { |
4539eacd | 1047 | set hd {} |
ec6b424a | 1048 | set ct initial |
f18e40a1 SP |
1049 | return |
1050 | } | |
1051 | ||
c2758a17 | 1052 | set merge_head [gitdir MERGE_HEAD] |
f18e40a1 | 1053 | if {[file exists $merge_head]} { |
ec6b424a | 1054 | set ct merge |
f18e40a1 SP |
1055 | set fd_mh [open $merge_head r] |
1056 | while {[gets $fd_mh line] >= 0} { | |
1057 | lappend mh $line | |
1058 | } | |
1059 | close $fd_mh | |
1060 | return | |
ec6b424a | 1061 | } |
f18e40a1 SP |
1062 | |
1063 | set ct normal | |
ec6b424a SP |
1064 | } |
1065 | ||
4539eacd SP |
1066 | proc PARENT {} { |
1067 | global PARENT empty_tree | |
1068 | ||
f18e40a1 SP |
1069 | set p [lindex $PARENT 0] |
1070 | if {$p ne {}} { | |
1071 | return $p | |
4539eacd SP |
1072 | } |
1073 | if {$empty_tree eq {}} { | |
81347223 | 1074 | set empty_tree [git mktree << {}] |
4539eacd SP |
1075 | } |
1076 | return $empty_tree | |
1077 | } | |
1078 | ||
46aaf90b | 1079 | proc rescan {after {honor_trustmtime 1}} { |
f18e40a1 | 1080 | global HEAD PARENT MERGE_HEAD commit_type |
699d5601 | 1081 | global ui_index ui_workdir ui_comm |
8f52548a | 1082 | global rescan_active file_states |
cf25ddc8 | 1083 | global repo_config |
cb07fc2a | 1084 | |
8f52548a | 1085 | if {$rescan_active > 0 || ![lock_index read]} return |
cb07fc2a | 1086 | |
f18e40a1 | 1087 | repository_state newType newHEAD newMERGE_HEAD |
4539eacd | 1088 | if {[string match amend* $commit_type] |
f18e40a1 SP |
1089 | && $newType eq {normal} |
1090 | && $newHEAD eq $HEAD} { | |
e57ca85e | 1091 | } else { |
f18e40a1 SP |
1092 | set HEAD $newHEAD |
1093 | set PARENT $newHEAD | |
1094 | set MERGE_HEAD $newMERGE_HEAD | |
1095 | set commit_type $newType | |
e57ca85e SP |
1096 | } |
1097 | ||
cb07fc2a | 1098 | array unset file_states |
cb07fc2a | 1099 | |
1e0a92fd SP |
1100 | if {!$::GITGUI_BCK_exists && |
1101 | (![$ui_comm edit modified] | |
1102 | || [string trim [$ui_comm get 0.0 end]] eq {})} { | |
b2f3bb1b SP |
1103 | if {[string match amend* $commit_type]} { |
1104 | } elseif {[load_message GITGUI_MSG]} { | |
131f503b SP |
1105 | } elseif {[load_message MERGE_MSG]} { |
1106 | } elseif {[load_message SQUASH_MSG]} { | |
1107 | } | |
b2c6fcf1 | 1108 | $ui_comm edit reset |
21d7744f | 1109 | $ui_comm edit modified false |
131f503b SP |
1110 | } |
1111 | ||
46aaf90b | 1112 | if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} { |
8f52548a | 1113 | rescan_stage2 {} $after |
e534f3a8 | 1114 | } else { |
8f52548a | 1115 | set rescan_active 1 |
1ac17950 | 1116 | ui_status [mc "Refreshing file status..."] |
0b812616 SP |
1117 | set fd_rf [git_read update-index \ |
1118 | -q \ | |
1119 | --unmerged \ | |
1120 | --ignore-missing \ | |
1121 | --refresh \ | |
1122 | ] | |
e534f3a8 | 1123 | fconfigure $fd_rf -blocking 0 -translation binary |
390adaea | 1124 | fileevent $fd_rf readable \ |
8f52548a | 1125 | [list rescan_stage2 $fd_rf $after] |
e534f3a8 | 1126 | } |
131f503b SP |
1127 | } |
1128 | ||
2fe167b6 | 1129 | if {[is_Cygwin]} { |
2fe167b6 SP |
1130 | set is_git_info_exclude {} |
1131 | proc have_info_exclude {} { | |
7f83aa2d | 1132 | global is_git_info_exclude |
2fe167b6 | 1133 | |
7f83aa2d SP |
1134 | if {$is_git_info_exclude eq {}} { |
1135 | if {[catch {exec test -f [gitdir info exclude]}]} { | |
1136 | set is_git_info_exclude 0 | |
1137 | } else { | |
1138 | set is_git_info_exclude 1 | |
2fe167b6 | 1139 | } |
2fe167b6 | 1140 | } |
7f83aa2d | 1141 | return $is_git_info_exclude |
2fe167b6 SP |
1142 | } |
1143 | } else { | |
1144 | proc have_info_exclude {} { | |
1145 | return [file readable [gitdir info exclude]] | |
1146 | } | |
1147 | } | |
1148 | ||
8f52548a | 1149 | proc rescan_stage2 {fd after} { |
4539eacd | 1150 | global rescan_active buf_rdi buf_rdf buf_rlo |
131f503b | 1151 | |
043f7011 | 1152 | if {$fd ne {}} { |
e534f3a8 SP |
1153 | read $fd |
1154 | if {![eof $fd]} return | |
1155 | close $fd | |
1156 | } | |
131f503b | 1157 | |
0b812616 | 1158 | set ls_others [list --exclude-per-directory=.gitignore] |
2fe167b6 SP |
1159 | if {[have_info_exclude]} { |
1160 | lappend ls_others "--exclude-from=[gitdir info exclude]" | |
cb07fc2a | 1161 | } |
94a4dd9b SP |
1162 | set user_exclude [get_config core.excludesfile] |
1163 | if {$user_exclude ne {} && [file readable $user_exclude]} { | |
1164 | lappend ls_others "--exclude-from=$user_exclude" | |
1165 | } | |
cb07fc2a | 1166 | |
868c8752 SP |
1167 | set buf_rdi {} |
1168 | set buf_rdf {} | |
1169 | set buf_rlo {} | |
1170 | ||
8f52548a | 1171 | set rescan_active 3 |
1ac17950 | 1172 | ui_status [mc "Scanning for modified files ..."] |
0b812616 SP |
1173 | set fd_di [git_read diff-index --cached -z [PARENT]] |
1174 | set fd_df [git_read diff-files -z] | |
1175 | set fd_lo [eval git_read ls-files --others -z $ls_others] | |
cb07fc2a | 1176 | |
51a989ba SP |
1177 | fconfigure $fd_di -blocking 0 -translation binary -encoding binary |
1178 | fconfigure $fd_df -blocking 0 -translation binary -encoding binary | |
1179 | fconfigure $fd_lo -blocking 0 -translation binary -encoding binary | |
8f52548a SP |
1180 | fileevent $fd_di readable [list read_diff_index $fd_di $after] |
1181 | fileevent $fd_df readable [list read_diff_files $fd_df $after] | |
1182 | fileevent $fd_lo readable [list read_ls_others $fd_lo $after] | |
cb07fc2a SP |
1183 | } |
1184 | ||
131f503b | 1185 | proc load_message {file} { |
c950c66e | 1186 | global ui_comm |
131f503b | 1187 | |
c2758a17 | 1188 | set f [gitdir $file] |
e57ca85e | 1189 | if {[file isfile $f]} { |
131f503b SP |
1190 | if {[catch {set fd [open $f r]}]} { |
1191 | return 0 | |
1192 | } | |
6eb420ef | 1193 | fconfigure $fd -eofchar {} |
e57ca85e | 1194 | set content [string trim [read $fd]] |
131f503b | 1195 | close $fd |
4e55d19a | 1196 | regsub -all -line {[ \r\t]+$} $content {} content |
131f503b SP |
1197 | $ui_comm delete 0.0 end |
1198 | $ui_comm insert end $content | |
1199 | return 1 | |
1200 | } | |
1201 | return 0 | |
1202 | } | |
1203 | ||
8f52548a | 1204 | proc read_diff_index {fd after} { |
cb07fc2a SP |
1205 | global buf_rdi |
1206 | ||
1207 | append buf_rdi [read $fd] | |
868c8752 SP |
1208 | set c 0 |
1209 | set n [string length $buf_rdi] | |
1210 | while {$c < $n} { | |
1211 | set z1 [string first "\0" $buf_rdi $c] | |
1212 | if {$z1 == -1} break | |
1213 | incr z1 | |
1214 | set z2 [string first "\0" $buf_rdi $z1] | |
1215 | if {$z2 == -1} break | |
1216 | ||
868c8752 | 1217 | incr c |
86291555 | 1218 | set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }] |
51a989ba | 1219 | set p [string range $buf_rdi $z1 [expr {$z2 - 1}]] |
1461c5f3 | 1220 | merge_state \ |
51a989ba | 1221 | [encoding convertfrom $p] \ |
86291555 SP |
1222 | [lindex $i 4]? \ |
1223 | [list [lindex $i 0] [lindex $i 2]] \ | |
1461c5f3 SP |
1224 | [list] |
1225 | set c $z2 | |
86291555 | 1226 | incr c |
cb07fc2a | 1227 | } |
868c8752 SP |
1228 | if {$c < $n} { |
1229 | set buf_rdi [string range $buf_rdi $c end] | |
1230 | } else { | |
1231 | set buf_rdi {} | |
1232 | } | |
1233 | ||
8f52548a | 1234 | rescan_done $fd buf_rdi $after |
cb07fc2a SP |
1235 | } |
1236 | ||
8f52548a | 1237 | proc read_diff_files {fd after} { |
cb07fc2a SP |
1238 | global buf_rdf |
1239 | ||
1240 | append buf_rdf [read $fd] | |
868c8752 SP |
1241 | set c 0 |
1242 | set n [string length $buf_rdf] | |
1243 | while {$c < $n} { | |
1244 | set z1 [string first "\0" $buf_rdf $c] | |
1245 | if {$z1 == -1} break | |
1246 | incr z1 | |
1247 | set z2 [string first "\0" $buf_rdf $z1] | |
1248 | if {$z2 == -1} break | |
1249 | ||
868c8752 | 1250 | incr c |
86291555 | 1251 | set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }] |
51a989ba | 1252 | set p [string range $buf_rdf $z1 [expr {$z2 - 1}]] |
1461c5f3 | 1253 | merge_state \ |
51a989ba | 1254 | [encoding convertfrom $p] \ |
86291555 | 1255 | ?[lindex $i 4] \ |
1461c5f3 | 1256 | [list] \ |
86291555 | 1257 | [list [lindex $i 0] [lindex $i 2]] |
1461c5f3 | 1258 | set c $z2 |
86291555 | 1259 | incr c |
868c8752 SP |
1260 | } |
1261 | if {$c < $n} { | |
1262 | set buf_rdf [string range $buf_rdf $c end] | |
1263 | } else { | |
1264 | set buf_rdf {} | |
cb07fc2a | 1265 | } |
868c8752 | 1266 | |
8f52548a | 1267 | rescan_done $fd buf_rdf $after |
cb07fc2a SP |
1268 | } |
1269 | ||
8f52548a | 1270 | proc read_ls_others {fd after} { |
cb07fc2a SP |
1271 | global buf_rlo |
1272 | ||
1273 | append buf_rlo [read $fd] | |
1274 | set pck [split $buf_rlo "\0"] | |
1275 | set buf_rlo [lindex $pck end] | |
1276 | foreach p [lrange $pck 0 end-1] { | |
89384101 SP |
1277 | set p [encoding convertfrom $p] |
1278 | if {[string index $p end] eq {/}} { | |
1279 | set p [string range $p 0 end-1] | |
1280 | } | |
1281 | merge_state $p ?O | |
cb07fc2a | 1282 | } |
8f52548a | 1283 | rescan_done $fd buf_rlo $after |
cb07fc2a SP |
1284 | } |
1285 | ||
8f52548a | 1286 | proc rescan_done {fd buf after} { |
f522c9b5 | 1287 | global rescan_active current_diff_path |
f7f8d322 | 1288 | global file_states repo_config |
7f1df79b | 1289 | upvar $buf to_clear |
cb07fc2a | 1290 | |
f7f8d322 SP |
1291 | if {![eof $fd]} return |
1292 | set to_clear {} | |
1293 | close $fd | |
8f52548a | 1294 | if {[incr rescan_active -1] > 0} return |
93f654df | 1295 | |
24263b77 | 1296 | prune_selection |
f7f8d322 SP |
1297 | unlock_index |
1298 | display_all_files | |
f522c9b5 | 1299 | if {$current_diff_path ne {}} reshow_diff |
8f52548a | 1300 | uplevel #0 $after |
cb07fc2a SP |
1301 | } |
1302 | ||
24263b77 SP |
1303 | proc prune_selection {} { |
1304 | global file_states selected_paths | |
1305 | ||
1306 | foreach path [array names selected_paths] { | |
1307 | if {[catch {set still_here $file_states($path)}]} { | |
1308 | unset selected_paths($path) | |
1309 | } | |
1310 | } | |
1311 | } | |
1312 | ||
cb07fc2a SP |
1313 | ###################################################################### |
1314 | ## | |
f522c9b5 | 1315 | ## ui helpers |
cb07fc2a | 1316 | |
f522c9b5 SP |
1317 | proc mapicon {w state path} { |
1318 | global all_icons | |
1319 | ||
1320 | if {[catch {set r $all_icons($state$w)}]} { | |
1321 | puts "error: no icon for $w state={$state} $path" | |
1322 | return file_plain | |
1323 | } | |
1324 | return $r | |
1325 | } | |
cb07fc2a | 1326 | |
f522c9b5 SP |
1327 | proc mapdesc {state path} { |
1328 | global all_descs | |
03e4ec53 | 1329 | |
f522c9b5 SP |
1330 | if {[catch {set r $all_descs($state)}]} { |
1331 | puts "error: no desc for state={$state} $path" | |
1332 | return $state | |
1333 | } | |
1334 | return $r | |
1335 | } | |
03e4ec53 | 1336 | |
699d5601 | 1337 | proc ui_status {msg} { |
906ab7f6 SP |
1338 | global main_status |
1339 | if {[info exists main_status]} { | |
1340 | $main_status show $msg | |
1341 | } | |
699d5601 SP |
1342 | } |
1343 | ||
1344 | proc ui_ready {{test {}}} { | |
906ab7f6 SP |
1345 | global main_status |
1346 | if {[info exists main_status]} { | |
1347 | $main_status show [mc "Ready."] $test | |
1348 | } | |
699d5601 SP |
1349 | } |
1350 | ||
f522c9b5 SP |
1351 | proc escape_path {path} { |
1352 | regsub -all {\\} $path "\\\\" path | |
1353 | regsub -all "\n" $path "\\n" path | |
1354 | return $path | |
cb07fc2a SP |
1355 | } |
1356 | ||
f522c9b5 SP |
1357 | proc short_path {path} { |
1358 | return [escape_path [lindex [file split $path] end]] | |
7f1df79b SP |
1359 | } |
1360 | ||
f522c9b5 SP |
1361 | set next_icon_id 0 |
1362 | set null_sha1 [string repeat 0 40] | |
16403d0b | 1363 | |
f522c9b5 SP |
1364 | proc merge_state {path new_state {head_info {}} {index_info {}}} { |
1365 | global file_states next_icon_id null_sha1 | |
16403d0b | 1366 | |
f522c9b5 SP |
1367 | set s0 [string index $new_state 0] |
1368 | set s1 [string index $new_state 1] | |
16403d0b | 1369 | |
f522c9b5 SP |
1370 | if {[catch {set info $file_states($path)}]} { |
1371 | set state __ | |
1372 | set icon n[incr next_icon_id] | |
1373 | } else { | |
1374 | set state [lindex $info 0] | |
1375 | set icon [lindex $info 1] | |
1376 | if {$head_info eq {}} {set head_info [lindex $info 2]} | |
1377 | if {$index_info eq {}} {set index_info [lindex $info 3]} | |
1378 | } | |
16403d0b | 1379 | |
f522c9b5 SP |
1380 | if {$s0 eq {?}} {set s0 [string index $state 0]} \ |
1381 | elseif {$s0 eq {_}} {set s0 _} | |
124355d3 | 1382 | |
f522c9b5 SP |
1383 | if {$s1 eq {?}} {set s1 [string index $state 1]} \ |
1384 | elseif {$s1 eq {_}} {set s1 _} | |
16403d0b | 1385 | |
f522c9b5 SP |
1386 | if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} { |
1387 | set head_info [list 0 $null_sha1] | |
1388 | } elseif {$s0 ne {_} && [string index $state 0] eq {_} | |
1389 | && $head_info eq {}} { | |
1390 | set head_info $index_info | |
1391 | } | |
16403d0b | 1392 | |
f522c9b5 SP |
1393 | set file_states($path) [list $s0$s1 $icon \ |
1394 | $head_info $index_info \ | |
1395 | ] | |
1396 | return $state | |
1397 | } | |
cb07fc2a | 1398 | |
f522c9b5 SP |
1399 | proc display_file_helper {w path icon_name old_m new_m} { |
1400 | global file_lists | |
cb07fc2a | 1401 | |
f522c9b5 | 1402 | if {$new_m eq {_}} { |
156b2921 | 1403 | set lno [lsearch -sorted -exact $file_lists($w) $path] |
5f8b70b1 | 1404 | if {$lno >= 0} { |
f522c9b5 | 1405 | set file_lists($w) [lreplace $file_lists($w) $lno $lno] |
5f8b70b1 | 1406 | incr lno |
f522c9b5 SP |
1407 | $w conf -state normal |
1408 | $w delete $lno.0 [expr {$lno + 1}].0 | |
1409 | $w conf -state disabled | |
03e4ec53 | 1410 | } |
f522c9b5 SP |
1411 | } elseif {$old_m eq {_} && $new_m ne {_}} { |
1412 | lappend file_lists($w) $path | |
1413 | set file_lists($w) [lsort -unique $file_lists($w)] | |
1414 | set lno [lsearch -sorted -exact $file_lists($w) $path] | |
1415 | incr lno | |
1416 | $w conf -state normal | |
1417 | $w image create $lno.0 \ | |
1418 | -align center -padx 5 -pady 1 \ | |
1419 | -name $icon_name \ | |
1420 | -image [mapicon $w $new_m $path] | |
1421 | $w insert $lno.1 "[escape_path $path]\n" | |
1422 | $w conf -state disabled | |
1423 | } elseif {$old_m ne $new_m} { | |
1424 | $w conf -state normal | |
1425 | $w image conf $icon_name -image [mapicon $w $new_m $path] | |
1426 | $w conf -state disabled | |
03e4ec53 | 1427 | } |
f522c9b5 SP |
1428 | } |
1429 | ||
1430 | proc display_file {path state} { | |
1431 | global file_states selected_paths | |
1432 | global ui_index ui_workdir | |
03e4ec53 | 1433 | |
f522c9b5 | 1434 | set old_m [merge_state $path $state] |
cb07fc2a | 1435 | set s $file_states($path) |
f522c9b5 SP |
1436 | set new_m [lindex $s 0] |
1437 | set icon_name [lindex $s 1] | |
82cb8706 | 1438 | |
f522c9b5 SP |
1439 | set o [string index $old_m 0] |
1440 | set n [string index $new_m 0] | |
1441 | if {$o eq {U}} { | |
1442 | set o _ | |
1443 | } | |
1444 | if {$n eq {U}} { | |
1445 | set n _ | |
cb07fc2a | 1446 | } |
f522c9b5 | 1447 | display_file_helper $ui_index $path $icon_name $o $n |
cb07fc2a | 1448 | |
f522c9b5 SP |
1449 | if {[string index $old_m 0] eq {U}} { |
1450 | set o U | |
1451 | } else { | |
1452 | set o [string index $old_m 1] | |
82cb8706 | 1453 | } |
f522c9b5 SP |
1454 | if {[string index $new_m 0] eq {U}} { |
1455 | set n U | |
1456 | } else { | |
1457 | set n [string index $new_m 1] | |
82cb8706 | 1458 | } |
f522c9b5 SP |
1459 | display_file_helper $ui_workdir $path $icon_name $o $n |
1460 | ||
1461 | if {$new_m eq {__}} { | |
1462 | unset file_states($path) | |
1463 | catch {unset selected_paths($path)} | |
cb07fc2a | 1464 | } |
f522c9b5 | 1465 | } |
cb07fc2a | 1466 | |
f522c9b5 SP |
1467 | proc display_all_files_helper {w path icon_name m} { |
1468 | global file_lists | |
1469 | ||
1470 | lappend file_lists($w) $path | |
1471 | set lno [expr {[lindex [split [$w index end] .] 0] - 1}] | |
1472 | $w image create end \ | |
1473 | -align center -padx 5 -pady 1 \ | |
1474 | -name $icon_name \ | |
1475 | -image [mapicon $w $m $path] | |
1476 | $w insert end "[escape_path $path]\n" | |
cb07fc2a SP |
1477 | } |
1478 | ||
f522c9b5 SP |
1479 | proc display_all_files {} { |
1480 | global ui_index ui_workdir | |
1481 | global file_states file_lists | |
1482 | global last_clicked | |
cb07fc2a | 1483 | |
f522c9b5 SP |
1484 | $ui_index conf -state normal |
1485 | $ui_workdir conf -state normal | |
cb07fc2a | 1486 | |
f522c9b5 SP |
1487 | $ui_index delete 0.0 end |
1488 | $ui_workdir delete 0.0 end | |
1489 | set last_clicked {} | |
cb07fc2a | 1490 | |
f522c9b5 SP |
1491 | set file_lists($ui_index) [list] |
1492 | set file_lists($ui_workdir) [list] | |
16403d0b | 1493 | |
f522c9b5 SP |
1494 | foreach path [lsort [array names file_states]] { |
1495 | set s $file_states($path) | |
1496 | set m [lindex $s 0] | |
1497 | set icon_name [lindex $s 1] | |
1498 | ||
1499 | set s [string index $m 0] | |
1500 | if {$s ne {U} && $s ne {_}} { | |
1501 | display_all_files_helper $ui_index $path \ | |
1502 | $icon_name $s | |
16403d0b | 1503 | } |
cb07fc2a | 1504 | |
f522c9b5 SP |
1505 | if {[string index $m 0] eq {U}} { |
1506 | set s U | |
1507 | } else { | |
1508 | set s [string index $m 1] | |
a25c5189 | 1509 | } |
f522c9b5 SP |
1510 | if {$s ne {_}} { |
1511 | display_all_files_helper $ui_workdir $path \ | |
1512 | $icon_name $s | |
a25c5189 SP |
1513 | } |
1514 | } | |
1515 | ||
f522c9b5 SP |
1516 | $ui_index conf -state disabled |
1517 | $ui_workdir conf -state disabled | |
a25c5189 SP |
1518 | } |
1519 | ||
ec6b424a SP |
1520 | ###################################################################### |
1521 | ## | |
f522c9b5 | 1522 | ## icons |
ec6b424a | 1523 | |
f522c9b5 SP |
1524 | set filemask { |
1525 | #define mask_width 14 | |
1526 | #define mask_height 15 | |
1527 | static unsigned char mask_bits[] = { | |
1528 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, | |
1529 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, | |
1530 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f}; | |
1531 | } | |
cb07fc2a SP |
1532 | |
1533 | image create bitmap file_plain -background white -foreground black -data { | |
1534 | #define plain_width 14 | |
1535 | #define plain_height 15 | |
1536 | static unsigned char plain_bits[] = { | |
1537 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, | |
1538 | 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, | |
1539 | 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1540 | } -maskdata $filemask | |
1541 | ||
1542 | image create bitmap file_mod -background white -foreground blue -data { | |
1543 | #define mod_width 14 | |
1544 | #define mod_height 15 | |
1545 | static unsigned char mod_bits[] = { | |
1546 | 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, | |
1547 | 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, | |
1548 | 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; | |
1549 | } -maskdata $filemask | |
1550 | ||
131f503b SP |
1551 | image create bitmap file_fulltick -background white -foreground "#007000" -data { |
1552 | #define file_fulltick_width 14 | |
1553 | #define file_fulltick_height 15 | |
1554 | static unsigned char file_fulltick_bits[] = { | |
cb07fc2a SP |
1555 | 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16, |
1556 | 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10, | |
1557 | 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1558 | } -maskdata $filemask | |
1559 | ||
1560 | image create bitmap file_parttick -background white -foreground "#005050" -data { | |
1561 | #define parttick_width 14 | |
1562 | #define parttick_height 15 | |
1563 | static unsigned char parttick_bits[] = { | |
1564 | 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, | |
1565 | 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10, | |
1566 | 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1567 | } -maskdata $filemask | |
1568 | ||
1569 | image create bitmap file_question -background white -foreground black -data { | |
1570 | #define file_question_width 14 | |
1571 | #define file_question_height 15 | |
1572 | static unsigned char file_question_bits[] = { | |
1573 | 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13, | |
1574 | 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10, | |
1575 | 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1576 | } -maskdata $filemask | |
1577 | ||
1578 | image create bitmap file_removed -background white -foreground red -data { | |
1579 | #define file_removed_width 14 | |
1580 | #define file_removed_height 15 | |
1581 | static unsigned char file_removed_bits[] = { | |
1582 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, | |
1583 | 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13, | |
1584 | 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f}; | |
1585 | } -maskdata $filemask | |
1586 | ||
1587 | image create bitmap file_merge -background white -foreground blue -data { | |
1588 | #define file_merge_width 14 | |
1589 | #define file_merge_height 15 | |
1590 | static unsigned char file_merge_bits[] = { | |
1591 | 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10, | |
1592 | 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, | |
1593 | 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; | |
1594 | } -maskdata $filemask | |
1595 | ||
6b292675 | 1596 | set ui_index .vpane.files.index.list |
0812665e | 1597 | set ui_workdir .vpane.files.workdir.list |
21e409ad SP |
1598 | |
1599 | set all_icons(_$ui_index) file_plain | |
1600 | set all_icons(A$ui_index) file_fulltick | |
1601 | set all_icons(M$ui_index) file_fulltick | |
1602 | set all_icons(D$ui_index) file_removed | |
1603 | set all_icons(U$ui_index) file_merge | |
1604 | ||
1605 | set all_icons(_$ui_workdir) file_plain | |
1606 | set all_icons(M$ui_workdir) file_mod | |
1607 | set all_icons(D$ui_workdir) file_question | |
3b4db3c1 | 1608 | set all_icons(U$ui_workdir) file_merge |
21e409ad SP |
1609 | set all_icons(O$ui_workdir) file_plain |
1610 | ||
131f503b | 1611 | set max_status_desc 0 |
cb07fc2a | 1612 | foreach i { |
1ac17950 CS |
1613 | {__ {mc "Unmodified"}} |
1614 | ||
1615 | {_M {mc "Modified, not staged"}} | |
1616 | {M_ {mc "Staged for commit"}} | |
1617 | {MM {mc "Portions staged for commit"}} | |
1618 | {MD {mc "Staged for commit, missing"}} | |
1619 | ||
1620 | {_O {mc "Untracked, not staged"}} | |
1621 | {A_ {mc "Staged for commit"}} | |
1622 | {AM {mc "Portions staged for commit"}} | |
1623 | {AD {mc "Staged for commit, missing"}} | |
1624 | ||
1625 | {_D {mc "Missing"}} | |
1626 | {D_ {mc "Staged for removal"}} | |
1627 | {DO {mc "Staged for removal, still present"}} | |
1628 | ||
1629 | {U_ {mc "Requires merge resolution"}} | |
1630 | {UU {mc "Requires merge resolution"}} | |
1631 | {UM {mc "Requires merge resolution"}} | |
1632 | {UD {mc "Requires merge resolution"}} | |
cb07fc2a | 1633 | } { |
1ac17950 CS |
1634 | set text [eval [lindex $i 1]] |
1635 | if {$max_status_desc < [string length $text]} { | |
1636 | set max_status_desc [string length $text] | |
131f503b | 1637 | } |
1ac17950 | 1638 | set all_descs([lindex $i 0]) $text |
cb07fc2a | 1639 | } |
21e409ad | 1640 | unset i |
cb07fc2a SP |
1641 | |
1642 | ###################################################################### | |
1643 | ## | |
1644 | ## util | |
1645 | ||
35874c16 SP |
1646 | proc scrollbar2many {list mode args} { |
1647 | foreach w $list {eval $w $mode $args} | |
1648 | } | |
1649 | ||
1650 | proc many2scrollbar {list mode sb top bottom} { | |
1651 | $sb set $top $bottom | |
1652 | foreach w $list {$w $mode moveto $top} | |
1653 | } | |
1654 | ||
b4946930 SP |
1655 | proc incr_font_size {font {amt 1}} { |
1656 | set sz [font configure $font -size] | |
1657 | incr sz $amt | |
1658 | font configure $font -size $sz | |
1659 | font configure ${font}bold -size $sz | |
debcd0fd | 1660 | font configure ${font}italic -size $sz |
b4946930 SP |
1661 | } |
1662 | ||
cb07fc2a SP |
1663 | ###################################################################### |
1664 | ## | |
1665 | ## ui commands | |
1666 | ||
1ac17950 | 1667 | set starting_gitk_msg [mc "Starting gitk... please wait..."] |
cc4b1c02 | 1668 | |
d0752429 | 1669 | proc do_gitk {revs} { |
20ddfcaa SP |
1670 | # -- Always start gitk through whatever we were loaded with. This |
1671 | # lets us bypass using shell process on Windows systems. | |
1672 | # | |
02efd48f SP |
1673 | set exe [file join [file dirname $::_git] gitk] |
1674 | set cmd [list [info nameofexecutable] $exe] | |
7aecb128 | 1675 | if {! [file exists $exe]} { |
1ac17950 | 1676 | error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe] |
cb07fc2a | 1677 | } else { |
501e4c6f SP |
1678 | global env |
1679 | ||
1680 | if {[info exists env(GIT_DIR)]} { | |
1681 | set old_GIT_DIR $env(GIT_DIR) | |
1682 | } else { | |
1683 | set old_GIT_DIR {} | |
1684 | } | |
1685 | ||
1686 | set pwd [pwd] | |
1687 | cd [file dirname [gitdir]] | |
1688 | set env(GIT_DIR) [file tail [gitdir]] | |
1689 | ||
02efd48f | 1690 | eval exec $cmd $revs & |
501e4c6f SP |
1691 | |
1692 | if {$old_GIT_DIR eq {}} { | |
1693 | unset env(GIT_DIR) | |
1694 | } else { | |
1695 | set env(GIT_DIR) $old_GIT_DIR | |
1696 | } | |
1697 | cd $pwd | |
1698 | ||
02efd48f | 1699 | ui_status $::starting_gitk_msg |
d0752429 | 1700 | after 10000 { |
699d5601 | 1701 | ui_ready $starting_gitk_msg |
d0752429 | 1702 | } |
cb07fc2a SP |
1703 | } |
1704 | } | |
1705 | ||
b5834d70 | 1706 | set is_quitting 0 |
c4fe7728 | 1707 | |
cb07fc2a | 1708 | proc do_quit {} { |
c950c66e | 1709 | global ui_comm is_quitting repo_config commit_type |
4578c5cb | 1710 | global GITGUI_BCK_exists GITGUI_BCK_i |
95b002ee | 1711 | global ui_comm_spell |
c4fe7728 | 1712 | |
b5834d70 SP |
1713 | if {$is_quitting} return |
1714 | set is_quitting 1 | |
131f503b | 1715 | |
db7f34d4 SP |
1716 | if {[winfo exists $ui_comm]} { |
1717 | # -- Stash our current commit buffer. | |
1718 | # | |
1719 | set save [gitdir GITGUI_MSG] | |
4578c5cb SP |
1720 | if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { |
1721 | file rename -force [gitdir GITGUI_BCK] $save | |
1722 | set GITGUI_BCK_exists 0 | |
db7f34d4 | 1723 | } else { |
4578c5cb SP |
1724 | set msg [string trim [$ui_comm get 0.0 end]] |
1725 | regsub -all -line {[ \r\t]+$} $msg {} msg | |
1726 | if {(![string match amend* $commit_type] | |
1727 | || [$ui_comm edit modified]) | |
1728 | && $msg ne {}} { | |
1729 | catch { | |
1730 | set fd [open $save w] | |
1731 | puts -nonewline $fd $msg | |
1732 | close $fd | |
1733 | } | |
1734 | } else { | |
1735 | catch {file delete $save} | |
1736 | } | |
1737 | } | |
1738 | ||
95b002ee SP |
1739 | # -- Cancel our spellchecker if its running. |
1740 | # | |
1741 | if {[info exists ui_comm_spell]} { | |
1742 | $ui_comm_spell stop | |
1743 | } | |
1744 | ||
4578c5cb SP |
1745 | # -- Remove our editor backup, its not needed. |
1746 | # | |
1747 | after cancel $GITGUI_BCK_i | |
1748 | if {$GITGUI_BCK_exists} { | |
1749 | catch {file delete [gitdir GITGUI_BCK]} | |
131f503b | 1750 | } |
131f503b | 1751 | |
db7f34d4 SP |
1752 | # -- Stash our current window geometry into this repository. |
1753 | # | |
1754 | set cfg_geometry [list] | |
1755 | lappend cfg_geometry [wm geometry .] | |
a0592d3f JS |
1756 | lappend cfg_geometry [lindex [.vpane sash coord 0] 0] |
1757 | lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1] | |
db7f34d4 SP |
1758 | if {[catch {set rc_geometry $repo_config(gui.geometry)}]} { |
1759 | set rc_geometry {} | |
1760 | } | |
1761 | if {$cfg_geometry ne $rc_geometry} { | |
81347223 | 1762 | catch {git config gui.geometry $cfg_geometry} |
db7f34d4 | 1763 | } |
51f4d16b SP |
1764 | } |
1765 | ||
cb07fc2a SP |
1766 | destroy . |
1767 | } | |
1768 | ||
1769 | proc do_rescan {} { | |
699d5601 | 1770 | rescan ui_ready |
cb07fc2a SP |
1771 | } |
1772 | ||
6e27d826 | 1773 | proc do_commit {} { |
ec6b424a | 1774 | commit_tree |
6e27d826 SP |
1775 | } |
1776 | ||
8a965b8e AMS |
1777 | proc next_diff {} { |
1778 | global next_diff_p next_diff_w next_diff_i | |
1779 | show_diff $next_diff_p $next_diff_w $next_diff_i | |
1780 | } | |
1781 | ||
24263b77 | 1782 | proc toggle_or_diff {w x y} { |
20a53c02 | 1783 | global file_states file_lists current_diff_path ui_index ui_workdir |
24263b77 | 1784 | global last_clicked selected_paths |
131f503b | 1785 | |
cb07fc2a SP |
1786 | set pos [split [$w index @$x,$y] .] |
1787 | set lno [lindex $pos 0] | |
1788 | set col [lindex $pos 1] | |
24263b77 SP |
1789 | set path [lindex $file_lists($w) [expr {$lno - 1}]] |
1790 | if {$path eq {}} { | |
1791 | set last_clicked {} | |
1792 | return | |
1793 | } | |
1794 | ||
1795 | set last_clicked [list $w $lno] | |
1796 | array unset selected_paths | |
1797 | $ui_index tag remove in_sel 0.0 end | |
0812665e | 1798 | $ui_workdir tag remove in_sel 0.0 end |
cb07fc2a | 1799 | |
cead78ed | 1800 | if {$col == 0 && $y > 1} { |
8a965b8e AMS |
1801 | set i [expr {$lno-1}] |
1802 | set ll [expr {[llength $file_lists($w)]-1}] | |
1803 | ||
1804 | if {$i == $ll && $i == 0} { | |
32e0bcab SP |
1805 | set after {reshow_diff;} |
1806 | } else { | |
8a965b8e AMS |
1807 | global next_diff_p next_diff_w next_diff_i |
1808 | ||
f531e463 AMS |
1809 | set next_diff_w $w |
1810 | ||
8a965b8e AMS |
1811 | if {$i < $ll} { |
1812 | set i [expr {$i + 1}] | |
f531e463 | 1813 | set next_diff_i $i |
8a965b8e | 1814 | } else { |
f531e463 | 1815 | set next_diff_i $i |
8a965b8e AMS |
1816 | set i [expr {$i - 1}] |
1817 | } | |
1818 | ||
8a965b8e AMS |
1819 | set next_diff_p [lindex $file_lists($w) $i] |
1820 | ||
1821 | if {$next_diff_p ne {} && $current_diff_path ne {}} { | |
1822 | set after {next_diff;} | |
1823 | } else { | |
1824 | set after {} | |
1825 | } | |
32e0bcab | 1826 | } |
8a965b8e | 1827 | |
de5f6d5d | 1828 | if {$w eq $ui_index} { |
74d18d2e | 1829 | update_indexinfo \ |
93e912c5 | 1830 | "Unstaging [short_path $path] from commit" \ |
74d18d2e | 1831 | [list $path] \ |
699d5601 | 1832 | [concat $after [list ui_ready]] |
de5f6d5d | 1833 | } elseif {$w eq $ui_workdir} { |
74d18d2e | 1834 | update_index \ |
4d583c86 | 1835 | "Adding [short_path $path]" \ |
74d18d2e | 1836 | [list $path] \ |
699d5601 | 1837 | [concat $after [list ui_ready]] |
74d18d2e | 1838 | } |
24263b77 | 1839 | } else { |
03e4ec53 | 1840 | show_diff $path $w $lno |
cb07fc2a SP |
1841 | } |
1842 | } | |
1843 | ||
24263b77 | 1844 | proc add_one_to_selection {w x y} { |
833eda73 | 1845 | global file_lists last_clicked selected_paths |
7f1df79b | 1846 | |
833eda73 | 1847 | set lno [lindex [split [$w index @$x,$y] .] 0] |
24263b77 SP |
1848 | set path [lindex $file_lists($w) [expr {$lno - 1}]] |
1849 | if {$path eq {}} { | |
1850 | set last_clicked {} | |
1851 | return | |
1852 | } | |
cb07fc2a | 1853 | |
833eda73 SP |
1854 | if {$last_clicked ne {} |
1855 | && [lindex $last_clicked 0] ne $w} { | |
1856 | array unset selected_paths | |
1857 | [lindex $last_clicked 0] tag remove in_sel 0.0 end | |
1858 | } | |
1859 | ||
24263b77 SP |
1860 | set last_clicked [list $w $lno] |
1861 | if {[catch {set in_sel $selected_paths($path)}]} { | |
1862 | set in_sel 0 | |
1863 | } | |
1864 | if {$in_sel} { | |
1865 | unset selected_paths($path) | |
1866 | $w tag remove in_sel $lno.0 [expr {$lno + 1}].0 | |
1867 | } else { | |
1868 | set selected_paths($path) 1 | |
1869 | $w tag add in_sel $lno.0 [expr {$lno + 1}].0 | |
1870 | } | |
1871 | } | |
1872 | ||
1873 | proc add_range_to_selection {w x y} { | |
833eda73 | 1874 | global file_lists last_clicked selected_paths |
24263b77 SP |
1875 | |
1876 | if {[lindex $last_clicked 0] ne $w} { | |
1877 | toggle_or_diff $w $x $y | |
1878 | return | |
cb07fc2a | 1879 | } |
24263b77 | 1880 | |
833eda73 | 1881 | set lno [lindex [split [$w index @$x,$y] .] 0] |
24263b77 SP |
1882 | set lc [lindex $last_clicked 1] |
1883 | if {$lc < $lno} { | |
1884 | set begin $lc | |
1885 | set end $lno | |
1886 | } else { | |
1887 | set begin $lno | |
1888 | set end $lc | |
1889 | } | |
1890 | ||
1891 | foreach path [lrange $file_lists($w) \ | |
1892 | [expr {$begin - 1}] \ | |
1893 | [expr {$end - 1}]] { | |
1894 | set selected_paths($path) 1 | |
1895 | } | |
1896 | $w tag add in_sel $begin.0 [expr {$end + 1}].0 | |
cb07fc2a SP |
1897 | } |
1898 | ||
c91ee2bd JS |
1899 | proc show_more_context {} { |
1900 | global repo_config | |
1901 | if {$repo_config(gui.diffcontext) < 99} { | |
1902 | incr repo_config(gui.diffcontext) | |
1903 | reshow_diff | |
1904 | } | |
1905 | } | |
1906 | ||
1907 | proc show_less_context {} { | |
1908 | global repo_config | |
1909 | if {$repo_config(gui.diffcontext) >= 1} { | |
1910 | incr repo_config(gui.diffcontext) -1 | |
1911 | reshow_diff | |
1912 | } | |
1913 | } | |
1914 | ||
cb07fc2a SP |
1915 | ###################################################################### |
1916 | ## | |
a4bee597 | 1917 | ## ui construction |
db453781 | 1918 | |
6bbd1cb9 | 1919 | load_config 0 |
92148d80 | 1920 | apply_config |
2ebba528 SP |
1921 | set ui_comm {} |
1922 | ||
cb07fc2a | 1923 | # -- Menu Bar |
a49c67d1 | 1924 | # |
b4946930 | 1925 | menu .mbar -tearoff 0 |
1ac17950 CS |
1926 | .mbar add cascade -label [mc Repository] -menu .mbar.repository |
1927 | .mbar add cascade -label [mc Edit] -menu .mbar.edit | |
64a906f8 | 1928 | if {[is_enabled branch]} { |
1ac17950 | 1929 | .mbar add cascade -label [mc Branch] -menu .mbar.branch |
700a65ce | 1930 | } |
2ebba528 | 1931 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
a9813cb5 | 1932 | .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit |
2ebba528 | 1933 | } |
64a906f8 | 1934 | if {[is_enabled transport]} { |
1ac17950 | 1935 | .mbar add cascade -label [mc Merge] -menu .mbar.merge |
6bdf5e5f | 1936 | .mbar add cascade -label [mc Remote] -menu .mbar.remote |
4ccdab02 | 1937 | } |
cb07fc2a SP |
1938 | . configure -menu .mbar |
1939 | ||
a4abfa62 | 1940 | # -- Repository Menu |
a49c67d1 | 1941 | # |
a4abfa62 | 1942 | menu .mbar.repository |
35874c16 SP |
1943 | |
1944 | .mbar.repository add command \ | |
1ac17950 | 1945 | -label [mc "Browse Current Branch's Files"] \ |
c74b6c66 | 1946 | -command {browser::new $current_branch} |
a8139888 | 1947 | set ui_browse_current [.mbar.repository index last] |
8e891fac | 1948 | .mbar.repository add command \ |
1ac17950 | 1949 | -label [mc "Browse Branch Files..."] \ |
8e891fac | 1950 | -command browser_open::dialog |
35874c16 SP |
1951 | .mbar.repository add separator |
1952 | ||
d0752429 | 1953 | .mbar.repository add command \ |
1ac17950 | 1954 | -label [mc "Visualize Current Branch's History"] \ |
7416bbc6 | 1955 | -command {do_gitk $current_branch} |
a8139888 | 1956 | set ui_visualize_current [.mbar.repository index last] |
5753ef1a | 1957 | .mbar.repository add command \ |
1ac17950 | 1958 | -label [mc "Visualize All Branch History"] \ |
7416bbc6 | 1959 | -command {do_gitk --all} |
d0752429 | 1960 | .mbar.repository add separator |
75e355d6 | 1961 | |
a8139888 SP |
1962 | proc current_branch_write {args} { |
1963 | global current_branch | |
1964 | .mbar.repository entryconf $::ui_browse_current \ | |
1ac17950 | 1965 | -label [mc "Browse %s's Files" $current_branch] |
a8139888 | 1966 | .mbar.repository entryconf $::ui_visualize_current \ |
1ac17950 | 1967 | -label [mc "Visualize %s's History" $current_branch] |
a8139888 SP |
1968 | } |
1969 | trace add variable current_branch write current_branch_write | |
1970 | ||
cf25ddc8 | 1971 | if {[is_enabled multicommit]} { |
1ac17950 | 1972 | .mbar.repository add command -label [mc "Database Statistics"] \ |
7416bbc6 | 1973 | -command do_stats |
0fd49d0a | 1974 | |
1ac17950 | 1975 | .mbar.repository add command -label [mc "Compress Database"] \ |
7416bbc6 | 1976 | -command do_gc |
4aca740b | 1977 | |
1ac17950 | 1978 | .mbar.repository add command -label [mc "Verify Database"] \ |
7416bbc6 | 1979 | -command do_fsck_objects |
444f92d0 | 1980 | |
a4abfa62 | 1981 | .mbar.repository add separator |
75e355d6 | 1982 | |
20ddfcaa SP |
1983 | if {[is_Cygwin]} { |
1984 | .mbar.repository add command \ | |
1ac17950 | 1985 | -label [mc "Create Desktop Icon"] \ |
7416bbc6 | 1986 | -command do_cygwin_shortcut |
20ddfcaa | 1987 | } elseif {[is_Windows]} { |
a4abfa62 | 1988 | .mbar.repository add command \ |
1ac17950 | 1989 | -label [mc "Create Desktop Icon"] \ |
7416bbc6 | 1990 | -command do_windows_shortcut |
06c31115 | 1991 | } elseif {[is_MacOSX]} { |
a4abfa62 | 1992 | .mbar.repository add command \ |
1ac17950 | 1993 | -label [mc "Create Desktop Icon"] \ |
7416bbc6 | 1994 | -command do_macosx_app |
4aca740b | 1995 | } |
4ccdab02 | 1996 | } |
85ab313e | 1997 | |
af894943 SF |
1998 | if {[is_MacOSX]} { |
1999 | proc ::tk::mac::Quit {args} { do_quit } | |
2000 | } else { | |
2001 | .mbar.repository add command -label [mc Quit] \ | |
2002 | -command do_quit \ | |
2003 | -accelerator $M1T-Q | |
2004 | } | |
cb07fc2a | 2005 | |
9861671d SP |
2006 | # -- Edit Menu |
2007 | # | |
2008 | menu .mbar.edit | |
1ac17950 | 2009 | .mbar.edit add command -label [mc Undo] \ |
9861671d | 2010 | -command {catch {[focus] edit undo}} \ |
7416bbc6 | 2011 | -accelerator $M1T-Z |
1ac17950 | 2012 | .mbar.edit add command -label [mc Redo] \ |
9861671d | 2013 | -command {catch {[focus] edit redo}} \ |
7416bbc6 | 2014 | -accelerator $M1T-Y |
9861671d | 2015 | .mbar.edit add separator |
1ac17950 | 2016 | .mbar.edit add command -label [mc Cut] \ |
9861671d | 2017 | -command {catch {tk_textCut [focus]}} \ |
7416bbc6 | 2018 | -accelerator $M1T-X |
1ac17950 | 2019 | .mbar.edit add command -label [mc Copy] \ |
9861671d | 2020 | -command {catch {tk_textCopy [focus]}} \ |
7416bbc6 | 2021 | -accelerator $M1T-C |
1ac17950 | 2022 | .mbar.edit add command -label [mc Paste] \ |
9861671d | 2023 | -command {catch {tk_textPaste [focus]; [focus] see insert}} \ |
7416bbc6 | 2024 | -accelerator $M1T-V |
1ac17950 | 2025 | .mbar.edit add command -label [mc Delete] \ |
9861671d | 2026 | -command {catch {[focus] delete sel.first sel.last}} \ |
7416bbc6 | 2027 | -accelerator Del |
9861671d | 2028 | .mbar.edit add separator |
1ac17950 | 2029 | .mbar.edit add command -label [mc "Select All"] \ |
9861671d | 2030 | -command {catch {[focus] tag add sel 0.0 end}} \ |
7416bbc6 | 2031 | -accelerator $M1T-A |
9861671d | 2032 | |
85ab313e SP |
2033 | # -- Branch Menu |
2034 | # | |
64a906f8 | 2035 | if {[is_enabled branch]} { |
700a65ce SP |
2036 | menu .mbar.branch |
2037 | ||
1ac17950 | 2038 | .mbar.branch add command -label [mc "Create..."] \ |
b1fa2bff | 2039 | -command branch_create::dialog \ |
7416bbc6 | 2040 | -accelerator $M1T-N |
700a65ce SP |
2041 | lappend disable_on_lock [list .mbar.branch entryconf \ |
2042 | [.mbar.branch index last] -state] | |
2043 | ||
1ac17950 | 2044 | .mbar.branch add command -label [mc "Checkout..."] \ |
d41b43eb SP |
2045 | -command branch_checkout::dialog \ |
2046 | -accelerator $M1T-O | |
2047 | lappend disable_on_lock [list .mbar.branch entryconf \ | |
2048 | [.mbar.branch index last] -state] | |
2049 | ||
1ac17950 | 2050 | .mbar.branch add command -label [mc "Rename..."] \ |
61f82ce7 SP |
2051 | -command branch_rename::dialog |
2052 | lappend disable_on_lock [list .mbar.branch entryconf \ | |
2053 | [.mbar.branch index last] -state] | |
2054 | ||
1ac17950 | 2055 | .mbar.branch add command -label [mc "Delete..."] \ |
3206c63d | 2056 | -command branch_delete::dialog |
700a65ce SP |
2057 | lappend disable_on_lock [list .mbar.branch entryconf \ |
2058 | [.mbar.branch index last] -state] | |
fd234dfd | 2059 | |
1ac17950 | 2060 | .mbar.branch add command -label [mc "Reset..."] \ |
a6c9b081 | 2061 | -command merge::reset_hard |
fd234dfd SP |
2062 | lappend disable_on_lock [list .mbar.branch entryconf \ |
2063 | [.mbar.branch index last] -state] | |
700a65ce SP |
2064 | } |
2065 | ||
cb07fc2a | 2066 | # -- Commit Menu |
a49c67d1 | 2067 | # |
2ebba528 SP |
2068 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
2069 | menu .mbar.commit | |
2070 | ||
2071 | .mbar.commit add radiobutton \ | |
1ac17950 | 2072 | -label [mc "New Commit"] \ |
2ebba528 SP |
2073 | -command do_select_commit_type \ |
2074 | -variable selected_commit_type \ | |
7416bbc6 | 2075 | -value new |
2ebba528 SP |
2076 | lappend disable_on_lock \ |
2077 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2078 | |
2ebba528 | 2079 | .mbar.commit add radiobutton \ |
1ac17950 | 2080 | -label [mc "Amend Last Commit"] \ |
2ebba528 SP |
2081 | -command do_select_commit_type \ |
2082 | -variable selected_commit_type \ | |
7416bbc6 | 2083 | -value amend |
2ebba528 SP |
2084 | lappend disable_on_lock \ |
2085 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2086 | |
2ebba528 | 2087 | .mbar.commit add separator |
24ac9b75 | 2088 | |
1ac17950 | 2089 | .mbar.commit add command -label [mc Rescan] \ |
2ebba528 | 2090 | -command do_rescan \ |
7416bbc6 | 2091 | -accelerator F5 |
2ebba528 SP |
2092 | lappend disable_on_lock \ |
2093 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2094 | |
1ac17950 | 2095 | .mbar.commit add command -label [mc "Stage To Commit"] \ |
cd16a6c9 SP |
2096 | -command do_add_selection \ |
2097 | -accelerator $M1T-T | |
2ebba528 SP |
2098 | lappend disable_on_lock \ |
2099 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2100 | |
1ac17950 | 2101 | .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \ |
2ebba528 | 2102 | -command do_add_all \ |
7416bbc6 | 2103 | -accelerator $M1T-I |
2ebba528 SP |
2104 | lappend disable_on_lock \ |
2105 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2106 | |
1ac17950 | 2107 | .mbar.commit add command -label [mc "Unstage From Commit"] \ |
7416bbc6 | 2108 | -command do_unstage_selection |
2ebba528 SP |
2109 | lappend disable_on_lock \ |
2110 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
e734817d | 2111 | |
1ac17950 | 2112 | .mbar.commit add command -label [mc "Revert Changes"] \ |
7416bbc6 | 2113 | -command do_revert_selection |
2ebba528 SP |
2114 | lappend disable_on_lock \ |
2115 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
e734817d | 2116 | |
2ebba528 | 2117 | .mbar.commit add separator |
1461c5f3 | 2118 | |
c91ee2bd JS |
2119 | .mbar.commit add command -label [mc "Show Less Context"] \ |
2120 | -command show_less_context \ | |
729ffa50 | 2121 | -accelerator $M1T-\- |
c91ee2bd JS |
2122 | |
2123 | .mbar.commit add command -label [mc "Show More Context"] \ | |
2124 | -command show_more_context \ | |
729ffa50 | 2125 | -accelerator $M1T-= |
c91ee2bd JS |
2126 | |
2127 | .mbar.commit add separator | |
2128 | ||
1ac17950 | 2129 | .mbar.commit add command -label [mc "Sign Off"] \ |
2ebba528 | 2130 | -command do_signoff \ |
7416bbc6 | 2131 | -accelerator $M1T-S |
24ac9b75 | 2132 | |
a9813cb5 | 2133 | .mbar.commit add command -label [mc Commit@@verb] \ |
2ebba528 | 2134 | -command do_commit \ |
7416bbc6 | 2135 | -accelerator $M1T-Return |
2ebba528 SP |
2136 | lappend disable_on_lock \ |
2137 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
2138 | } | |
cb07fc2a | 2139 | |
9b28a8b9 SP |
2140 | # -- Merge Menu |
2141 | # | |
2142 | if {[is_enabled branch]} { | |
2143 | menu .mbar.merge | |
1ac17950 | 2144 | .mbar.merge add command -label [mc "Local Merge..."] \ |
a870ddc0 SP |
2145 | -command merge::dialog \ |
2146 | -accelerator $M1T-M | |
9b28a8b9 SP |
2147 | lappend disable_on_lock \ |
2148 | [list .mbar.merge entryconf [.mbar.merge index last] -state] | |
1ac17950 | 2149 | .mbar.merge add command -label [mc "Abort Merge..."] \ |
a6c9b081 | 2150 | -command merge::reset_hard |
9b28a8b9 SP |
2151 | lappend disable_on_lock \ |
2152 | [list .mbar.merge entryconf [.mbar.merge index last] -state] | |
9b28a8b9 SP |
2153 | } |
2154 | ||
2155 | # -- Transport Menu | |
2156 | # | |
2157 | if {[is_enabled transport]} { | |
6bdf5e5f | 2158 | menu .mbar.remote |
9b28a8b9 | 2159 | |
6bdf5e5f SP |
2160 | .mbar.remote add command \ |
2161 | -label [mc "Push..."] \ | |
840bcfa7 SP |
2162 | -command do_push_anywhere \ |
2163 | -accelerator $M1T-P | |
6bdf5e5f SP |
2164 | .mbar.remote add command \ |
2165 | -label [mc "Delete..."] \ | |
aa252f19 | 2166 | -command remote_branch_delete::dialog |
9b28a8b9 SP |
2167 | } |
2168 | ||
0c8d7839 SP |
2169 | if {[is_MacOSX]} { |
2170 | # -- Apple Menu (Mac OS X only) | |
2171 | # | |
442b3caa | 2172 | .mbar add cascade -label Apple -menu .mbar.apple |
0c8d7839 SP |
2173 | menu .mbar.apple |
2174 | ||
1ac17950 | 2175 | .mbar.apple add command -label [mc "About %s" [appname]] \ |
7416bbc6 | 2176 | -command do_about |
13824e2d SP |
2177 | .mbar.apple add separator |
2178 | .mbar.apple add command \ | |
2179 | -label [mc "Preferences..."] \ | |
2180 | -command do_options \ | |
2181 | -accelerator $M1T-, | |
2182 | bind . <$M1B-,> do_options | |
0c8d7839 SP |
2183 | } else { |
2184 | # -- Edit Menu | |
2185 | # | |
2186 | .mbar.edit add separator | |
1ac17950 | 2187 | .mbar.edit add command -label [mc "Options..."] \ |
7416bbc6 | 2188 | -command do_options |
273984fc | 2189 | } |
557afe82 | 2190 | |
273984fc SP |
2191 | # -- Help Menu |
2192 | # | |
1ac17950 | 2193 | .mbar add cascade -label [mc Help] -menu .mbar.help |
273984fc | 2194 | menu .mbar.help |
0c8d7839 | 2195 | |
273984fc | 2196 | if {![is_MacOSX]} { |
1ac17950 | 2197 | .mbar.help add command -label [mc "About %s" [appname]] \ |
7416bbc6 | 2198 | -command do_about |
0c8d7839 | 2199 | } |
82aa2354 | 2200 | |
273984fc SP |
2201 | set browser {} |
2202 | catch {set browser $repo_config(instaweb.browser)} | |
20ddfcaa | 2203 | set doc_path [file dirname [gitexec]] |
273984fc SP |
2204 | set doc_path [file join $doc_path Documentation index.html] |
2205 | ||
20ddfcaa | 2206 | if {[is_Cygwin]} { |
ee405993 | 2207 | set doc_path [exec cygpath --mixed $doc_path] |
273984fc SP |
2208 | } |
2209 | ||
2210 | if {$browser eq {}} { | |
2211 | if {[is_MacOSX]} { | |
2212 | set browser open | |
20ddfcaa | 2213 | } elseif {[is_Cygwin]} { |
273984fc SP |
2214 | set program_files [file dirname [exec cygpath --windir]] |
2215 | set program_files [file join $program_files {Program Files}] | |
2216 | set firefox [file join $program_files {Mozilla Firefox} firefox.exe] | |
2217 | set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE] | |
2218 | if {[file exists $firefox]} { | |
2219 | set browser $firefox | |
2220 | } elseif {[file exists $ie]} { | |
2221 | set browser $ie | |
2222 | } | |
2223 | unset program_files firefox ie | |
2224 | } | |
2225 | } | |
2226 | ||
2227 | if {[file isfile $doc_path]} { | |
2228 | set doc_url "file:$doc_path" | |
2229 | } else { | |
2230 | set doc_url {http://www.kernel.org/pub/software/scm/git/docs/} | |
2231 | } | |
2232 | ||
2233 | if {$browser ne {}} { | |
1ac17950 | 2234 | .mbar.help add command -label [mc "Online Documentation"] \ |
7416bbc6 | 2235 | -command [list exec $browser $doc_url &] |
273984fc SP |
2236 | } |
2237 | unset browser doc_path doc_url | |
82aa2354 | 2238 | |
2ebba528 SP |
2239 | # -- Standard bindings |
2240 | # | |
39fa2a98 | 2241 | wm protocol . WM_DELETE_WINDOW do_quit |
2ebba528 SP |
2242 | bind all <$M1B-Key-q> do_quit |
2243 | bind all <$M1B-Key-Q> do_quit | |
2244 | bind all <$M1B-Key-w> {destroy [winfo toplevel %W]} | |
2245 | bind all <$M1B-Key-W> {destroy [winfo toplevel %W]} | |
2246 | ||
3e45ee1e SP |
2247 | set subcommand_args {} |
2248 | proc usage {} { | |
2249 | puts stderr "usage: $::argv0 $::subcommand $::subcommand_args" | |
2250 | exit 1 | |
2251 | } | |
2252 | ||
2ebba528 SP |
2253 | # -- Not a normal commit type invocation? Do that instead! |
2254 | # | |
258871d3 | 2255 | switch -- $subcommand { |
85d2d597 | 2256 | browser - |
2ebba528 | 2257 | blame { |
c52c9452 SP |
2258 | set subcommand_args {rev? path} |
2259 | if {$argv eq {}} usage | |
a0db0d61 | 2260 | set head {} |
3e45ee1e SP |
2261 | set path {} |
2262 | set is_path 0 | |
2263 | foreach a $argv { | |
2264 | if {$is_path || [file exists $_prefix$a]} { | |
2265 | if {$path ne {}} usage | |
6b3d8b97 | 2266 | set path $_prefix$a |
3e45ee1e SP |
2267 | break |
2268 | } elseif {$a eq {--}} { | |
2269 | if {$path ne {}} { | |
a0db0d61 SP |
2270 | if {$head ne {}} usage |
2271 | set head $path | |
3e45ee1e SP |
2272 | set path {} |
2273 | } | |
2274 | set is_path 1 | |
a0db0d61 SP |
2275 | } elseif {$head eq {}} { |
2276 | if {$head ne {}} usage | |
2277 | set head $a | |
c52c9452 | 2278 | set is_path 1 |
3e45ee1e SP |
2279 | } else { |
2280 | usage | |
2281 | } | |
2282 | } | |
2283 | unset is_path | |
2284 | ||
c52c9452 SP |
2285 | if {$head ne {} && $path eq {}} { |
2286 | set path $_prefix$head | |
2287 | set head {} | |
2288 | } | |
2289 | ||
a0db0d61 | 2290 | if {$head eq {}} { |
d41b43eb | 2291 | load_current_branch |
a0db0d61 | 2292 | } else { |
02087abc SP |
2293 | if {[regexp {^[0-9a-f]{1,39}$} $head]} { |
2294 | if {[catch { | |
2295 | set head [git rev-parse --verify $head] | |
2296 | } err]} { | |
2297 | puts stderr $err | |
2298 | exit 1 | |
2299 | } | |
2300 | } | |
a0db0d61 | 2301 | set current_branch $head |
2ebba528 | 2302 | } |
a0db0d61 | 2303 | |
85d2d597 SP |
2304 | switch -- $subcommand { |
2305 | browser { | |
2306 | if {$head eq {}} { | |
2307 | if {$path ne {} && [file isdirectory $path]} { | |
2308 | set head $current_branch | |
2309 | } else { | |
2310 | set head $path | |
2311 | set path {} | |
2312 | } | |
2313 | } | |
2314 | browser::new $head $path | |
2315 | } | |
2316 | blame { | |
2317 | if {$head eq {} && ![file exists $path]} { | |
c8c4854b | 2318 | puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path] |
85d2d597 SP |
2319 | exit 1 |
2320 | } | |
2321 | blame::new $head $path | |
2322 | } | |
c52c9452 | 2323 | } |
258871d3 SP |
2324 | return |
2325 | } | |
2326 | citool - | |
2327 | gui { | |
2328 | if {[llength $argv] != 0} { | |
2329 | puts -nonewline stderr "usage: $argv0" | |
0b2bc460 SP |
2330 | if {$subcommand ne {gui} |
2331 | && [file tail $argv0] ne "git-$subcommand"} { | |
258871d3 SP |
2332 | puts -nonewline stderr " $subcommand" |
2333 | } | |
2334 | puts stderr {} | |
2335 | exit 1 | |
2336 | } | |
2337 | # fall through to setup UI for commits | |
2ebba528 | 2338 | } |
2ebba528 | 2339 | default { |
c0f7a6c3 | 2340 | puts stderr "usage: $argv0 \[{blame|browser|citool}\]" |
2ebba528 SP |
2341 | exit 1 |
2342 | } | |
2343 | } | |
2344 | ||
8553b772 SP |
2345 | # -- Branch Control |
2346 | # | |
2347 | frame .branch \ | |
2348 | -borderwidth 1 \ | |
2349 | -relief sunken | |
2350 | label .branch.l1 \ | |
1ac17950 | 2351 | -text [mc "Current Branch:"] \ |
8553b772 | 2352 | -anchor w \ |
7416bbc6 | 2353 | -justify left |
8553b772 SP |
2354 | label .branch.cb \ |
2355 | -textvariable current_branch \ | |
2356 | -anchor w \ | |
7416bbc6 | 2357 | -justify left |
8553b772 SP |
2358 | pack .branch.l1 -side left |
2359 | pack .branch.cb -side left -fill x | |
2360 | pack .branch -side top -fill x | |
2361 | ||
cb07fc2a | 2362 | # -- Main Window Layout |
a49c67d1 | 2363 | # |
a0592d3f JS |
2364 | panedwindow .vpane -orient horizontal |
2365 | panedwindow .vpane.files -orient vertical | |
c5a1eb88 | 2366 | .vpane add .vpane.files -sticky nsew -height 100 -width 200 |
cb07fc2a SP |
2367 | pack .vpane -anchor n -side top -fill both -expand 1 |
2368 | ||
2369 | # -- Index File List | |
a49c67d1 | 2370 | # |
c5a1eb88 | 2371 | frame .vpane.files.index -height 100 -width 200 |
c73ce762 | 2372 | label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \ |
c382fdd7 PH |
2373 | -background lightgreen -foreground black |
2374 | text $ui_index -background white -foreground black \ | |
2375 | -borderwidth 0 \ | |
c5a1eb88 | 2376 | -width 20 -height 10 \ |
3c236977 | 2377 | -wrap none \ |
6c6dd01a | 2378 | -cursor $cursor_ptr \ |
3c236977 SP |
2379 | -xscrollcommand {.vpane.files.index.sx set} \ |
2380 | -yscrollcommand {.vpane.files.index.sy set} \ | |
cb07fc2a | 2381 | -state disabled |
3c236977 SP |
2382 | scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview] |
2383 | scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview] | |
cb07fc2a | 2384 | pack .vpane.files.index.title -side top -fill x |
3c236977 SP |
2385 | pack .vpane.files.index.sx -side bottom -fill x |
2386 | pack .vpane.files.index.sy -side right -fill y | |
cb07fc2a | 2387 | pack $ui_index -side left -fill both -expand 1 |
cb07fc2a | 2388 | |
0812665e | 2389 | # -- Working Directory File List |
a49c67d1 | 2390 | # |
c5a1eb88 | 2391 | frame .vpane.files.workdir -height 100 -width 200 |
c73ce762 | 2392 | label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \ |
c382fdd7 PH |
2393 | -background lightsalmon -foreground black |
2394 | text $ui_workdir -background white -foreground black \ | |
2395 | -borderwidth 0 \ | |
c5a1eb88 | 2396 | -width 20 -height 10 \ |
3c236977 | 2397 | -wrap none \ |
6c6dd01a | 2398 | -cursor $cursor_ptr \ |
3c236977 SP |
2399 | -xscrollcommand {.vpane.files.workdir.sx set} \ |
2400 | -yscrollcommand {.vpane.files.workdir.sy set} \ | |
cb07fc2a | 2401 | -state disabled |
3c236977 SP |
2402 | scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview] |
2403 | scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview] | |
0812665e | 2404 | pack .vpane.files.workdir.title -side top -fill x |
3c236977 SP |
2405 | pack .vpane.files.workdir.sx -side bottom -fill x |
2406 | pack .vpane.files.workdir.sy -side right -fill y | |
0812665e | 2407 | pack $ui_workdir -side left -fill both -expand 1 |
a0592d3f | 2408 | |
0812665e | 2409 | .vpane.files add .vpane.files.workdir -sticky nsew |
a0592d3f | 2410 | .vpane.files add .vpane.files.index -sticky nsew |
cb07fc2a | 2411 | |
0812665e | 2412 | foreach i [list $ui_index $ui_workdir] { |
3849bfba SP |
2413 | rmsel_tag $i |
2414 | $i tag conf in_diff -background [$i tag cget in_sel -background] | |
24263b77 SP |
2415 | } |
2416 | unset i | |
131f503b | 2417 | |
0fb8f9ce | 2418 | # -- Diff and Commit Area |
a49c67d1 | 2419 | # |
8009dcdc | 2420 | frame .vpane.lower -height 300 -width 400 |
0fb8f9ce SP |
2421 | frame .vpane.lower.commarea |
2422 | frame .vpane.lower.diff -relief sunken -borderwidth 1 | |
a0592d3f JS |
2423 | pack .vpane.lower.diff -fill both -expand 1 |
2424 | pack .vpane.lower.commarea -side bottom -fill x | |
0fd49d0a | 2425 | .vpane add .vpane.lower -sticky nsew |
cb07fc2a SP |
2426 | |
2427 | # -- Commit Area Buttons | |
a49c67d1 | 2428 | # |
0fb8f9ce SP |
2429 | frame .vpane.lower.commarea.buttons |
2430 | label .vpane.lower.commarea.buttons.l -text {} \ | |
cb07fc2a | 2431 | -anchor w \ |
7416bbc6 | 2432 | -justify left |
0fb8f9ce SP |
2433 | pack .vpane.lower.commarea.buttons.l -side top -fill x |
2434 | pack .vpane.lower.commarea.buttons -side left -fill y | |
131f503b | 2435 | |
1ac17950 | 2436 | button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \ |
7416bbc6 | 2437 | -command do_rescan |
0fb8f9ce | 2438 | pack .vpane.lower.commarea.buttons.rescan -side top -fill x |
390adaea SP |
2439 | lappend disable_on_lock \ |
2440 | {.vpane.lower.commarea.buttons.rescan conf -state} | |
131f503b | 2441 | |
1ac17950 | 2442 | button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \ |
7416bbc6 | 2443 | -command do_add_all |
7fe7e733 | 2444 | pack .vpane.lower.commarea.buttons.incall -side top -fill x |
390adaea SP |
2445 | lappend disable_on_lock \ |
2446 | {.vpane.lower.commarea.buttons.incall conf -state} | |
131f503b | 2447 | |
1ac17950 | 2448 | button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \ |
7416bbc6 | 2449 | -command do_signoff |
0fb8f9ce | 2450 | pack .vpane.lower.commarea.buttons.signoff -side top -fill x |
131f503b | 2451 | |
a9813cb5 | 2452 | button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \ |
7416bbc6 | 2453 | -command do_commit |
0fb8f9ce | 2454 | pack .vpane.lower.commarea.buttons.commit -side top -fill x |
390adaea SP |
2455 | lappend disable_on_lock \ |
2456 | {.vpane.lower.commarea.buttons.commit conf -state} | |
cb07fc2a | 2457 | |
1ac17950 | 2458 | button .vpane.lower.commarea.buttons.push -text [mc Push] \ |
87b49a53 SP |
2459 | -command do_push_anywhere |
2460 | pack .vpane.lower.commarea.buttons.push -side top -fill x | |
2461 | ||
cb07fc2a | 2462 | # -- Commit Message Buffer |
a49c67d1 | 2463 | # |
0fb8f9ce | 2464 | frame .vpane.lower.commarea.buffer |
24ac9b75 | 2465 | frame .vpane.lower.commarea.buffer.header |
0fb8f9ce | 2466 | set ui_comm .vpane.lower.commarea.buffer.t |
24ac9b75 SP |
2467 | set ui_coml .vpane.lower.commarea.buffer.header.l |
2468 | radiobutton .vpane.lower.commarea.buffer.header.new \ | |
1ac17950 | 2469 | -text [mc "New Commit"] \ |
24ac9b75 SP |
2470 | -command do_select_commit_type \ |
2471 | -variable selected_commit_type \ | |
7416bbc6 | 2472 | -value new |
24ac9b75 SP |
2473 | lappend disable_on_lock \ |
2474 | [list .vpane.lower.commarea.buffer.header.new conf -state] | |
2475 | radiobutton .vpane.lower.commarea.buffer.header.amend \ | |
1ac17950 | 2476 | -text [mc "Amend Last Commit"] \ |
24ac9b75 SP |
2477 | -command do_select_commit_type \ |
2478 | -variable selected_commit_type \ | |
7416bbc6 | 2479 | -value amend |
24ac9b75 SP |
2480 | lappend disable_on_lock \ |
2481 | [list .vpane.lower.commarea.buffer.header.amend conf -state] | |
a49c67d1 | 2482 | label $ui_coml \ |
cb07fc2a | 2483 | -anchor w \ |
7416bbc6 | 2484 | -justify left |
4539eacd SP |
2485 | proc trace_commit_type {varname args} { |
2486 | global ui_coml commit_type | |
2487 | switch -glob -- $commit_type { | |
1ac17950 CS |
2488 | initial {set txt [mc "Initial Commit Message:"]} |
2489 | amend {set txt [mc "Amended Commit Message:"]} | |
2490 | amend-initial {set txt [mc "Amended Initial Commit Message:"]} | |
2491 | amend-merge {set txt [mc "Amended Merge Commit Message:"]} | |
2492 | merge {set txt [mc "Merge Commit Message:"]} | |
2493 | * {set txt [mc "Commit Message:"]} | |
4539eacd SP |
2494 | } |
2495 | $ui_coml conf -text $txt | |
2496 | } | |
2497 | trace add variable commit_type write trace_commit_type | |
24ac9b75 SP |
2498 | pack $ui_coml -side left -fill x |
2499 | pack .vpane.lower.commarea.buffer.header.amend -side right | |
2500 | pack .vpane.lower.commarea.buffer.header.new -side right | |
2501 | ||
c382fdd7 PH |
2502 | text $ui_comm -background white -foreground black \ |
2503 | -borderwidth 1 \ | |
9861671d | 2504 | -undo true \ |
b2c6fcf1 | 2505 | -maxundo 20 \ |
9861671d | 2506 | -autoseparators true \ |
cb07fc2a | 2507 | -relief sunken \ |
11027d54 | 2508 | -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \ |
b4946930 | 2509 | -font font_diff \ |
6c6dd01a | 2510 | -yscrollcommand {.vpane.lower.commarea.buffer.sby set} |
390adaea SP |
2511 | scrollbar .vpane.lower.commarea.buffer.sby \ |
2512 | -command [list $ui_comm yview] | |
24ac9b75 | 2513 | pack .vpane.lower.commarea.buffer.header -side top -fill x |
0fb8f9ce | 2514 | pack .vpane.lower.commarea.buffer.sby -side right -fill y |
cb07fc2a | 2515 | pack $ui_comm -side left -fill y |
0fb8f9ce SP |
2516 | pack .vpane.lower.commarea.buffer -side left -fill y |
2517 | ||
0e794311 SP |
2518 | # -- Commit Message Buffer Context Menu |
2519 | # | |
e8ab6446 SP |
2520 | set ctxm .vpane.lower.commarea.buffer.ctxm |
2521 | menu $ctxm -tearoff 0 | |
2522 | $ctxm add command \ | |
1ac17950 | 2523 | -label [mc Cut] \ |
e8ab6446 SP |
2524 | -command {tk_textCut $ui_comm} |
2525 | $ctxm add command \ | |
1ac17950 | 2526 | -label [mc Copy] \ |
e8ab6446 SP |
2527 | -command {tk_textCopy $ui_comm} |
2528 | $ctxm add command \ | |
1ac17950 | 2529 | -label [mc Paste] \ |
e8ab6446 SP |
2530 | -command {tk_textPaste $ui_comm} |
2531 | $ctxm add command \ | |
1ac17950 | 2532 | -label [mc Delete] \ |
e8ab6446 SP |
2533 | -command {$ui_comm delete sel.first sel.last} |
2534 | $ctxm add separator | |
2535 | $ctxm add command \ | |
1ac17950 | 2536 | -label [mc "Select All"] \ |
75e78c8a | 2537 | -command {focus $ui_comm;$ui_comm tag add sel 0.0 end} |
e8ab6446 | 2538 | $ctxm add command \ |
1ac17950 | 2539 | -label [mc "Copy All"] \ |
e8ab6446 | 2540 | -command { |
0e794311 SP |
2541 | $ui_comm tag add sel 0.0 end |
2542 | tk_textCopy $ui_comm | |
2543 | $ui_comm tag remove sel 0.0 end | |
e8ab6446 SP |
2544 | } |
2545 | $ctxm add separator | |
2546 | $ctxm add command \ | |
1ac17950 | 2547 | -label [mc "Sign Off"] \ |
0e794311 | 2548 | -command do_signoff |
95b002ee | 2549 | set ui_comm_ctxm $ctxm |
0e794311 | 2550 | |
0fb8f9ce | 2551 | # -- Diff Header |
a49c67d1 | 2552 | # |
20a53c02 SP |
2553 | proc trace_current_diff_path {varname args} { |
2554 | global current_diff_path diff_actions file_states | |
2555 | if {$current_diff_path eq {}} { | |
e8ab6446 SP |
2556 | set s {} |
2557 | set f {} | |
2558 | set p {} | |
2559 | set o disabled | |
2560 | } else { | |
20a53c02 | 2561 | set p $current_diff_path |
e8ab6446 | 2562 | set s [mapdesc [lindex $file_states($p) 0] $p] |
1ac17950 | 2563 | set f [mc "File:"] |
e8ab6446 SP |
2564 | set p [escape_path $p] |
2565 | set o normal | |
2566 | } | |
2567 | ||
2568 | .vpane.lower.diff.header.status configure -text $s | |
2569 | .vpane.lower.diff.header.file configure -text $f | |
2570 | .vpane.lower.diff.header.path configure -text $p | |
2571 | foreach w $diff_actions { | |
2572 | uplevel #0 $w $o | |
2573 | } | |
2574 | } | |
20a53c02 | 2575 | trace add variable current_diff_path write trace_current_diff_path |
e8ab6446 | 2576 | |
9adccb05 | 2577 | frame .vpane.lower.diff.header -background gold |
e8ab6446 | 2578 | label .vpane.lower.diff.header.status \ |
9adccb05 | 2579 | -background gold \ |
c382fdd7 | 2580 | -foreground black \ |
3e7b0e1d SP |
2581 | -width $max_status_desc \ |
2582 | -anchor w \ | |
7416bbc6 | 2583 | -justify left |
e8ab6446 | 2584 | label .vpane.lower.diff.header.file \ |
9adccb05 | 2585 | -background gold \ |
c382fdd7 | 2586 | -foreground black \ |
e8ab6446 | 2587 | -anchor w \ |
7416bbc6 | 2588 | -justify left |
e8ab6446 | 2589 | label .vpane.lower.diff.header.path \ |
9adccb05 | 2590 | -background gold \ |
c382fdd7 | 2591 | -foreground black \ |
fce89e46 | 2592 | -anchor w \ |
7416bbc6 | 2593 | -justify left |
e8ab6446 SP |
2594 | pack .vpane.lower.diff.header.status -side left |
2595 | pack .vpane.lower.diff.header.file -side left | |
2596 | pack .vpane.lower.diff.header.path -fill x | |
2597 | set ctxm .vpane.lower.diff.header.ctxm | |
2598 | menu $ctxm -tearoff 0 | |
2599 | $ctxm add command \ | |
1ac17950 | 2600 | -label [mc Copy] \ |
fce89e46 SP |
2601 | -command { |
2602 | clipboard clear | |
2603 | clipboard append \ | |
2604 | -format STRING \ | |
2605 | -type STRING \ | |
20a53c02 | 2606 | -- $current_diff_path |
fce89e46 | 2607 | } |
e8ab6446 SP |
2608 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
2609 | bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y" | |
0fb8f9ce SP |
2610 | |
2611 | # -- Diff Body | |
a49c67d1 | 2612 | # |
0fb8f9ce SP |
2613 | frame .vpane.lower.diff.body |
2614 | set ui_diff .vpane.lower.diff.body.t | |
c382fdd7 PH |
2615 | text $ui_diff -background white -foreground black \ |
2616 | -borderwidth 0 \ | |
0fb8f9ce | 2617 | -width 80 -height 15 -wrap none \ |
b4946930 | 2618 | -font font_diff \ |
0fb8f9ce SP |
2619 | -xscrollcommand {.vpane.lower.diff.body.sbx set} \ |
2620 | -yscrollcommand {.vpane.lower.diff.body.sby set} \ | |
0fb8f9ce SP |
2621 | -state disabled |
2622 | scrollbar .vpane.lower.diff.body.sbx -orient horizontal \ | |
2623 | -command [list $ui_diff xview] | |
2624 | scrollbar .vpane.lower.diff.body.sby -orient vertical \ | |
2625 | -command [list $ui_diff yview] | |
2626 | pack .vpane.lower.diff.body.sbx -side bottom -fill x | |
2627 | pack .vpane.lower.diff.body.sby -side right -fill y | |
2628 | pack $ui_diff -side left -fill both -expand 1 | |
2629 | pack .vpane.lower.diff.header -side top -fill x | |
2630 | pack .vpane.lower.diff.body -side bottom -fill both -expand 1 | |
2631 | ||
30b14ed3 | 2632 | $ui_diff tag conf d_cr -elide true |
ca521566 SP |
2633 | $ui_diff tag conf d_@ -foreground blue -font font_diffbold |
2634 | $ui_diff tag conf d_+ -foreground {#00a000} | |
fec4a785 SP |
2635 | $ui_diff tag conf d_- -foreground red |
2636 | ||
ca521566 | 2637 | $ui_diff tag conf d_++ -foreground {#00a000} |
fec4a785 SP |
2638 | $ui_diff tag conf d_-- -foreground red |
2639 | $ui_diff tag conf d_+s \ | |
ca521566 SP |
2640 | -foreground {#00a000} \ |
2641 | -background {#e2effa} | |
fec4a785 SP |
2642 | $ui_diff tag conf d_-s \ |
2643 | -foreground red \ | |
ca521566 | 2644 | -background {#e2effa} |
fec4a785 | 2645 | $ui_diff tag conf d_s+ \ |
ca521566 SP |
2646 | -foreground {#00a000} \ |
2647 | -background ivory1 | |
fec4a785 SP |
2648 | $ui_diff tag conf d_s- \ |
2649 | -foreground red \ | |
ca521566 | 2650 | -background ivory1 |
fec4a785 SP |
2651 | |
2652 | $ui_diff tag conf d<<<<<<< \ | |
2653 | -foreground orange \ | |
2654 | -font font_diffbold | |
2655 | $ui_diff tag conf d======= \ | |
2656 | -foreground orange \ | |
2657 | -font font_diffbold | |
2658 | $ui_diff tag conf d>>>>>>> \ | |
2659 | -foreground orange \ | |
2660 | -font font_diffbold | |
cb07fc2a | 2661 | |
ca521566 SP |
2662 | $ui_diff tag raise sel |
2663 | ||
0e794311 SP |
2664 | # -- Diff Body Context Menu |
2665 | # | |
e8ab6446 SP |
2666 | set ctxm .vpane.lower.diff.body.ctxm |
2667 | menu $ctxm -tearoff 0 | |
fba6072e JS |
2668 | $ctxm add command \ |
2669 | -label [mc "Apply/Reverse Hunk"] \ | |
2670 | -command {apply_hunk $cursorX $cursorY} | |
2671 | set ui_diff_applyhunk [$ctxm index last] | |
2672 | lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] | |
5821988f JS |
2673 | $ctxm add command \ |
2674 | -label [mc "Apply/Reverse Line"] \ | |
2675 | -command {apply_line $cursorX $cursorY; do_rescan} | |
2676 | set ui_diff_applyline [$ctxm index last] | |
2677 | lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state] | |
fba6072e JS |
2678 | $ctxm add separator |
2679 | $ctxm add command \ | |
2680 | -label [mc "Show Less Context"] \ | |
c91ee2bd | 2681 | -command show_less_context |
fba6072e JS |
2682 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
2683 | $ctxm add command \ | |
2684 | -label [mc "Show More Context"] \ | |
c91ee2bd | 2685 | -command show_more_context |
fba6072e JS |
2686 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
2687 | $ctxm add separator | |
68c30b4a | 2688 | $ctxm add command \ |
1ac17950 | 2689 | -label [mc Refresh] \ |
68c30b4a | 2690 | -command reshow_diff |
86773d9b | 2691 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
e8ab6446 | 2692 | $ctxm add command \ |
1ac17950 | 2693 | -label [mc Copy] \ |
e8ab6446 SP |
2694 | -command {tk_textCopy $ui_diff} |
2695 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
2696 | $ctxm add command \ | |
1ac17950 | 2697 | -label [mc "Select All"] \ |
75e78c8a | 2698 | -command {focus $ui_diff;$ui_diff tag add sel 0.0 end} |
e8ab6446 SP |
2699 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
2700 | $ctxm add command \ | |
1ac17950 | 2701 | -label [mc "Copy All"] \ |
e8ab6446 | 2702 | -command { |
0e794311 SP |
2703 | $ui_diff tag add sel 0.0 end |
2704 | tk_textCopy $ui_diff | |
2705 | $ui_diff tag remove sel 0.0 end | |
e8ab6446 SP |
2706 | } |
2707 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
2708 | $ctxm add separator | |
2709 | $ctxm add command \ | |
1ac17950 | 2710 | -label [mc "Decrease Font Size"] \ |
b4946930 | 2711 | -command {incr_font_size font_diff -1} |
e8ab6446 SP |
2712 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
2713 | $ctxm add command \ | |
1ac17950 | 2714 | -label [mc "Increase Font Size"] \ |
b4946930 | 2715 | -command {incr_font_size font_diff 1} |
e8ab6446 SP |
2716 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
2717 | $ctxm add separator | |
1ac17950 | 2718 | $ctxm add command -label [mc "Options..."] \ |
8009dcdc | 2719 | -command do_options |
83751fc1 | 2720 | proc popup_diff_menu {ctxm x y X Y} { |
ce015c21 | 2721 | global current_diff_path file_states |
83751fc1 SP |
2722 | set ::cursorX $x |
2723 | set ::cursorY $y | |
2724 | if {$::ui_index eq $::current_diff_side} { | |
1ac17950 | 2725 | set l [mc "Unstage Hunk From Commit"] |
5821988f | 2726 | set t [mc "Unstage Line From Commit"] |
a25c5189 | 2727 | } else { |
1ac17950 | 2728 | set l [mc "Stage Hunk For Commit"] |
5821988f | 2729 | set t [mc "Stage Line For Commit"] |
a25c5189 | 2730 | } |
047d94d5 SP |
2731 | if {$::is_3way_diff |
2732 | || $current_diff_path eq {} | |
2733 | || ![info exists file_states($current_diff_path)] | |
2734 | || {_O} eq [lindex $file_states($current_diff_path) 0]} { | |
9c9f5fa9 | 2735 | set s disabled |
047d94d5 SP |
2736 | } else { |
2737 | set s normal | |
9c9f5fa9 | 2738 | } |
9f4119eb | 2739 | $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l |
5821988f | 2740 | $ctxm entryconf $::ui_diff_applyline -state $s -label $t |
83751fc1 SP |
2741 | tk_popup $ctxm $X $Y |
2742 | } | |
2743 | bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y] | |
0e794311 | 2744 | |
cb07fc2a | 2745 | # -- Status Bar |
e8ab6446 | 2746 | # |
51530d17 | 2747 | set main_status [::status_bar::new .status] |
cb07fc2a | 2748 | pack .status -anchor w -side bottom -fill x |
1ac17950 | 2749 | $main_status show [mc "Initializing..."] |
cb07fc2a | 2750 | |
2d19516d | 2751 | # -- Load geometry |
e8ab6446 | 2752 | # |
2d19516d | 2753 | catch { |
51f4d16b | 2754 | set gm $repo_config(gui.geometry) |
c4fe7728 SP |
2755 | wm geometry . [lindex $gm 0] |
2756 | .vpane sash place 0 \ | |
a0592d3f JS |
2757 | [lindex $gm 1] \ |
2758 | [lindex [.vpane sash coord 0] 1] | |
c4fe7728 | 2759 | .vpane.files sash place 0 \ |
a0592d3f JS |
2760 | [lindex [.vpane.files sash coord 0] 0] \ |
2761 | [lindex $gm 2] | |
c4fe7728 | 2762 | unset gm |
390adaea | 2763 | } |
2d19516d | 2764 | |
cb07fc2a | 2765 | # -- Key Bindings |
e8ab6446 | 2766 | # |
ec6b424a | 2767 | bind $ui_comm <$M1B-Key-Return> {do_commit;break} |
cd16a6c9 SP |
2768 | bind $ui_comm <$M1B-Key-t> {do_add_selection;break} |
2769 | bind $ui_comm <$M1B-Key-T> {do_add_selection;break} | |
93e912c5 SP |
2770 | bind $ui_comm <$M1B-Key-i> {do_add_all;break} |
2771 | bind $ui_comm <$M1B-Key-I> {do_add_all;break} | |
9861671d SP |
2772 | bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break} |
2773 | bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break} | |
2774 | bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break} | |
2775 | bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break} | |
2776 | bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break} | |
2777 | bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break} | |
2778 | bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break} | |
2779 | bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break} | |
729ffa50 MB |
2780 | bind $ui_comm <$M1B-Key-minus> {show_less_context;break} |
2781 | bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} | |
2782 | bind $ui_comm <$M1B-Key-equal> {show_more_context;break} | |
2783 | bind $ui_comm <$M1B-Key-plus> {show_more_context;break} | |
2784 | bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} | |
9861671d SP |
2785 | |
2786 | bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} | |
2787 | bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} | |
2788 | bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break} | |
2789 | bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break} | |
2790 | bind $ui_diff <$M1B-Key-v> {break} | |
2791 | bind $ui_diff <$M1B-Key-V> {break} | |
2792 | bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break} | |
2793 | bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break} | |
b2c6fcf1 SP |
2794 | bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break} |
2795 | bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break} | |
2796 | bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break} | |
2797 | bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break} | |
60aa065f SP |
2798 | bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break} |
2799 | bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break} | |
2800 | bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break} | |
2801 | bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break} | |
2802 | bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break} | |
2803 | bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break} | |
23effa79 | 2804 | bind $ui_diff <Button-1> {focus %W} |
49b86f01 | 2805 | |
64a906f8 | 2806 | if {[is_enabled branch]} { |
b1fa2bff SP |
2807 | bind . <$M1B-Key-n> branch_create::dialog |
2808 | bind . <$M1B-Key-N> branch_create::dialog | |
d41b43eb SP |
2809 | bind . <$M1B-Key-o> branch_checkout::dialog |
2810 | bind . <$M1B-Key-O> branch_checkout::dialog | |
a870ddc0 SP |
2811 | bind . <$M1B-Key-m> merge::dialog |
2812 | bind . <$M1B-Key-M> merge::dialog | |
bd29ebc3 | 2813 | } |
840bcfa7 SP |
2814 | if {[is_enabled transport]} { |
2815 | bind . <$M1B-Key-p> do_push_anywhere | |
2816 | bind . <$M1B-Key-P> do_push_anywhere | |
2817 | } | |
bd29ebc3 | 2818 | |
f1e031bb SP |
2819 | bind . <Key-F5> do_rescan |
2820 | bind . <$M1B-Key-r> do_rescan | |
2821 | bind . <$M1B-Key-R> do_rescan | |
07123f40 SP |
2822 | bind . <$M1B-Key-s> do_signoff |
2823 | bind . <$M1B-Key-S> do_signoff | |
cd16a6c9 SP |
2824 | bind . <$M1B-Key-t> do_add_selection |
2825 | bind . <$M1B-Key-T> do_add_selection | |
93e912c5 SP |
2826 | bind . <$M1B-Key-i> do_add_all |
2827 | bind . <$M1B-Key-I> do_add_all | |
729ffa50 MB |
2828 | bind . <$M1B-Key-minus> {show_less_context;break} |
2829 | bind . <$M1B-Key-KP_Subtract> {show_less_context;break} | |
2830 | bind . <$M1B-Key-equal> {show_more_context;break} | |
2831 | bind . <$M1B-Key-plus> {show_more_context;break} | |
2832 | bind . <$M1B-Key-KP_Add> {show_more_context;break} | |
07123f40 | 2833 | bind . <$M1B-Key-Return> do_commit |
0812665e | 2834 | foreach i [list $ui_index $ui_workdir] { |
24263b77 SP |
2835 | bind $i <Button-1> "toggle_or_diff $i %x %y; break" |
2836 | bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break" | |
2837 | bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break" | |
cb07fc2a | 2838 | } |
62aac80b SP |
2839 | unset i |
2840 | ||
2841 | set file_lists($ui_index) [list] | |
0812665e | 2842 | set file_lists($ui_workdir) [list] |
a49c67d1 | 2843 | |
19c82148 | 2844 | wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]" |
cb07fc2a | 2845 | focus -force $ui_comm |
1d8b3cbf | 2846 | |
85ab313e SP |
2847 | # -- Warn the user about environmental problems. Cygwin's Tcl |
2848 | # does *not* pass its env array onto any processes it spawns. | |
2849 | # This means that git processes get none of our environment. | |
1d8b3cbf | 2850 | # |
20ddfcaa | 2851 | if {[is_Cygwin]} { |
1d8b3cbf SP |
2852 | set ignored_env 0 |
2853 | set suggest_user {} | |
c8c4854b | 2854 | set msg [mc "Possible environment issues exist. |
1d8b3cbf SP |
2855 | |
2856 | The following environment variables are probably | |
2857 | going to be ignored by any Git subprocess run | |
c8c4854b | 2858 | by %s: |
1d8b3cbf | 2859 | |
c8c4854b | 2860 | " [appname]] |
1d8b3cbf SP |
2861 | foreach name [array names env] { |
2862 | switch -regexp -- $name { | |
2863 | {^GIT_INDEX_FILE$} - | |
2864 | {^GIT_OBJECT_DIRECTORY$} - | |
2865 | {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} - | |
2866 | {^GIT_DIFF_OPTS$} - | |
2867 | {^GIT_EXTERNAL_DIFF$} - | |
2868 | {^GIT_PAGER$} - | |
2869 | {^GIT_TRACE$} - | |
2870 | {^GIT_CONFIG$} - | |
2871 | {^GIT_CONFIG_LOCAL$} - | |
2872 | {^GIT_(AUTHOR|COMMITTER)_DATE$} { | |
2873 | append msg " - $name\n" | |
2874 | incr ignored_env | |
2875 | } | |
2876 | {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} { | |
2877 | append msg " - $name\n" | |
2878 | incr ignored_env | |
2879 | set suggest_user $name | |
2880 | } | |
2881 | } | |
2882 | } | |
2883 | if {$ignored_env > 0} { | |
c8c4854b | 2884 | append msg [mc " |
1d8b3cbf | 2885 | This is due to a known issue with the |
c8c4854b | 2886 | Tcl binary distributed by Cygwin."] |
1d8b3cbf SP |
2887 | |
2888 | if {$suggest_user ne {}} { | |
c8c4854b | 2889 | append msg [mc " |
1d8b3cbf | 2890 | |
c8c4854b | 2891 | A good replacement for %s |
1d8b3cbf SP |
2892 | is placing values for the user.name and |
2893 | user.email settings into your personal | |
2894 | ~/.gitconfig file. | |
c8c4854b | 2895 | " $suggest_user] |
1d8b3cbf SP |
2896 | } |
2897 | warn_popup $msg | |
2898 | } | |
2899 | unset ignored_env msg suggest_user name | |
2900 | } | |
2901 | ||
85ab313e SP |
2902 | # -- Only initialize complex UI if we are going to stay running. |
2903 | # | |
64a906f8 | 2904 | if {[is_enabled transport]} { |
4ccdab02 | 2905 | load_all_remotes |
85ab313e | 2906 | |
6bdf5e5f | 2907 | set n [.mbar.remote index end] |
3f7fd924 | 2908 | populate_push_menu |
6bdf5e5f SP |
2909 | populate_fetch_menu |
2910 | set n [expr {[.mbar.remote index end] - $n}] | |
2911 | if {$n > 0} { | |
2912 | .mbar.remote insert $n separator | |
2913 | } | |
2914 | unset n | |
4ccdab02 | 2915 | } |
85ab313e | 2916 | |
4578c5cb SP |
2917 | if {[winfo exists $ui_comm]} { |
2918 | set GITGUI_BCK_exists [load_message GITGUI_BCK] | |
2919 | ||
2920 | # -- If both our backup and message files exist use the | |
2921 | # newer of the two files to initialize the buffer. | |
2922 | # | |
2923 | if {$GITGUI_BCK_exists} { | |
2924 | set m [gitdir GITGUI_MSG] | |
2925 | if {[file isfile $m]} { | |
2926 | if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} { | |
2927 | catch {file delete [gitdir GITGUI_MSG]} | |
2928 | } else { | |
2929 | $ui_comm delete 0.0 end | |
2930 | $ui_comm edit reset | |
2931 | $ui_comm edit modified false | |
2932 | catch {file delete [gitdir GITGUI_BCK]} | |
2933 | set GITGUI_BCK_exists 0 | |
2934 | } | |
2935 | } | |
2936 | unset m | |
2937 | } | |
2938 | ||
2939 | proc backup_commit_buffer {} { | |
2940 | global ui_comm GITGUI_BCK_exists | |
2941 | ||
2942 | set m [$ui_comm edit modified] | |
2943 | if {$m || $GITGUI_BCK_exists} { | |
2944 | set msg [string trim [$ui_comm get 0.0 end]] | |
2945 | regsub -all -line {[ \r\t]+$} $msg {} msg | |
2946 | ||
2947 | if {$msg eq {}} { | |
2948 | if {$GITGUI_BCK_exists} { | |
2949 | catch {file delete [gitdir GITGUI_BCK]} | |
2950 | set GITGUI_BCK_exists 0 | |
2951 | } | |
2952 | } elseif {$m} { | |
2953 | catch { | |
2954 | set fd [open [gitdir GITGUI_BCK] w] | |
2955 | puts -nonewline $fd $msg | |
2956 | close $fd | |
2957 | set GITGUI_BCK_exists 1 | |
2958 | } | |
2959 | } | |
2960 | ||
2961 | $ui_comm edit modified false | |
2962 | } | |
2963 | ||
2964 | set ::GITGUI_BCK_i [after 2000 backup_commit_buffer] | |
2965 | } | |
2966 | ||
2967 | backup_commit_buffer | |
95b002ee SP |
2968 | |
2969 | # -- If the user has aspell available we can drive it | |
2970 | # in pipe mode to spellcheck the commit message. | |
2971 | # | |
2972 | set spell_cmd [list |] | |
2973 | set spell_dict [get_config gui.spellingdictionary] | |
2974 | lappend spell_cmd aspell | |
2975 | if {$spell_dict ne {}} { | |
2976 | lappend spell_cmd --master=$spell_dict | |
2977 | } | |
2978 | lappend spell_cmd --mode=none | |
2979 | lappend spell_cmd --encoding=utf-8 | |
2980 | lappend spell_cmd pipe | |
2981 | if {$spell_dict eq {none} | |
2982 | || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} { | |
2983 | bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y] | |
2984 | } else { | |
2985 | set ui_comm_spell [spellcheck::init \ | |
2986 | $spell_fd \ | |
2987 | $ui_comm \ | |
2988 | $ui_comm_ctxm \ | |
2989 | ] | |
2990 | } | |
2991 | unset -nocomplain spell_cmd spell_fd spell_err spell_dict | |
4578c5cb SP |
2992 | } |
2993 | ||
53716a7b | 2994 | lock_index begin-read |
301dfaa9 SP |
2995 | if {![winfo ismapped .]} { |
2996 | wm deiconify . | |
2997 | } | |
8f52548a | 2998 | after 1 do_rescan |
3972b987 SP |
2999 | if {[is_enabled multicommit]} { |
3000 | after 1000 hint_gc | |
3001 | } |