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