]>
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 | ||
1ffca60f SP |
524 | proc gitattr {path attr default} { |
525 | if {[catch {set r [git check-attr $attr -- $path]}]} { | |
526 | set r unspecified | |
527 | } else { | |
528 | set r [join [lrange [split $r :] 2 end] :] | |
529 | regsub {^ } $r {} r | |
530 | } | |
531 | if {$r eq {unspecified}} { | |
532 | return $default | |
533 | } | |
534 | return $r | |
535 | } | |
536 | ||
7eafa2f1 SP |
537 | proc sq {value} { |
538 | regsub -all ' $value "'\\''" value | |
539 | return "'$value'" | |
540 | } | |
541 | ||
d41b43eb SP |
542 | proc load_current_branch {} { |
543 | global current_branch is_detached | |
544 | ||
fc4e8da7 | 545 | set fd [open [gitdir HEAD] r] |
311e02a4 | 546 | if {[gets $fd ref] < 1} { |
fc4e8da7 SP |
547 | set ref {} |
548 | } | |
549 | close $fd | |
311e02a4 SP |
550 | |
551 | set pfx {ref: refs/heads/} | |
552 | set len [string length $pfx] | |
553 | if {[string equal -length $len $pfx $ref]} { | |
554 | # We're on a branch. It might not exist. But | |
555 | # HEAD looks good enough to be a branch. | |
556 | # | |
d41b43eb SP |
557 | set current_branch [string range $ref $len end] |
558 | set is_detached 0 | |
311e02a4 SP |
559 | } else { |
560 | # Assume this is a detached head. | |
561 | # | |
d41b43eb SP |
562 | set current_branch HEAD |
563 | set is_detached 1 | |
311e02a4 | 564 | } |
fc4e8da7 SP |
565 | } |
566 | ||
2739291b SP |
567 | auto_load tk_optionMenu |
568 | rename tk_optionMenu real__tkOptionMenu | |
569 | proc tk_optionMenu {w varName args} { | |
570 | set m [eval real__tkOptionMenu $w $varName $args] | |
571 | $m configure -font font_ui | |
572 | $w configure -font font_ui | |
573 | return $m | |
574 | } | |
575 | ||
3849bfba SP |
576 | proc rmsel_tag {text} { |
577 | $text tag conf sel \ | |
578 | -background [$text cget -background] \ | |
579 | -foreground [$text cget -foreground] \ | |
580 | -borderwidth 0 | |
581 | $text tag conf in_sel -background lightgray | |
582 | bind $text <Motion> break | |
583 | return $text | |
584 | } | |
585 | ||
a4bee597 SP |
586 | set root_exists 0 |
587 | bind . <Visibility> { | |
588 | bind . <Visibility> {} | |
589 | set root_exists 1 | |
590 | } | |
591 | ||
1bdd8a15 SP |
592 | if {[is_Windows]} { |
593 | wm iconbitmap . -default $oguilib/git-gui.ico | |
594 | } | |
595 | ||
a4bee597 SP |
596 | ###################################################################### |
597 | ## | |
598 | ## config defaults | |
599 | ||
600 | set cursor_ptr arrow | |
601 | font create font_diff -family Courier -size 10 | |
602 | font create font_ui | |
603 | catch { | |
604 | label .dummy | |
605 | eval font configure font_ui [font actual [.dummy cget -font]] | |
606 | destroy .dummy | |
607 | } | |
608 | ||
609 | font create font_uiitalic | |
610 | font create font_uibold | |
611 | font create font_diffbold | |
612 | font create font_diffitalic | |
613 | ||
614 | foreach class {Button Checkbutton Entry Label | |
615 | Labelframe Listbox Menu Message | |
616 | Radiobutton Spinbox Text} { | |
617 | option add *$class.font font_ui | |
618 | } | |
619 | unset class | |
620 | ||
621 | if {[is_Windows] || [is_MacOSX]} { | |
622 | option add *Menu.tearOff 0 | |
623 | } | |
624 | ||
625 | if {[is_MacOSX]} { | |
626 | set M1B M1 | |
627 | set M1T Cmd | |
628 | } else { | |
629 | set M1B Control | |
630 | set M1T Ctrl | |
631 | } | |
632 | ||
633 | proc bind_button3 {w cmd} { | |
634 | bind $w <Any-Button-3> $cmd | |
635 | if {[is_MacOSX]} { | |
636 | # Mac OS X sends Button-2 on right click through three-button mouse, | |
637 | # or through trackpad right-clicking (two-finger touch + click). | |
638 | bind $w <Any-Button-2> $cmd | |
639 | bind $w <Control-Button-1> $cmd | |
640 | } | |
641 | } | |
642 | ||
643 | proc apply_config {} { | |
644 | global repo_config font_descs | |
645 | ||
646 | foreach option $font_descs { | |
647 | set name [lindex $option 0] | |
648 | set font [lindex $option 1] | |
649 | if {[catch { | |
48b8d2b3 | 650 | set need_weight 1 |
a4bee597 | 651 | foreach {cn cv} $repo_config(gui.$name) { |
48b8d2b3 SP |
652 | if {$cn eq {-weight}} { |
653 | set need_weight 0 | |
654 | } | |
655 | font configure $font $cn $cv | |
656 | } | |
657 | if {$need_weight} { | |
658 | font configure $font -weight normal | |
a4bee597 SP |
659 | } |
660 | } err]} { | |
661 | error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"] | |
662 | } | |
663 | foreach {cn cv} [font configure $font] { | |
664 | font configure ${font}bold $cn $cv | |
665 | font configure ${font}italic $cn $cv | |
666 | } | |
667 | font configure ${font}bold -weight bold | |
668 | font configure ${font}italic -slant italic | |
669 | } | |
670 | } | |
671 | ||
fe70225d | 672 | set default_config(branch.autosetupmerge) true |
7e30682c AG |
673 | set default_config(merge.tool) {} |
674 | set default_config(merge.keepbackup) true | |
a4bee597 SP |
675 | set default_config(merge.diffstat) true |
676 | set default_config(merge.summary) false | |
677 | set default_config(merge.verbosity) 2 | |
678 | set default_config(user.name) {} | |
679 | set default_config(user.email) {} | |
680 | ||
72e6b002 | 681 | set default_config(gui.encoding) [encoding system] |
a4bee597 SP |
682 | set default_config(gui.matchtrackingbranch) false |
683 | set default_config(gui.pruneduringfetch) false | |
684 | set default_config(gui.trustmtime) false | |
57cae87b AG |
685 | set default_config(gui.fastcopyblame) false |
686 | set default_config(gui.copyblamethreshold) 40 | |
a9c80b83 | 687 | set default_config(gui.blamehistoryctx) 7 |
a4bee597 | 688 | set default_config(gui.diffcontext) 5 |
11027d54 | 689 | set default_config(gui.commitmsgwidth) 75 |
a4bee597 | 690 | set default_config(gui.newbranchtemplate) {} |
95b002ee | 691 | set default_config(gui.spellingdictionary) {} |
a4bee597 SP |
692 | set default_config(gui.fontui) [font configure font_ui] |
693 | set default_config(gui.fontdiff) [font configure font_diff] | |
694 | set font_descs { | |
695 | {fontui font_ui {mc "Main Font"}} | |
696 | {fontdiff font_diff {mc "Diff/Console Font"}} | |
697 | } | |
698 | ||
0b812616 SP |
699 | ###################################################################### |
700 | ## | |
701 | ## find git | |
702 | ||
703 | set _git [_which git] | |
704 | if {$_git eq {}} { | |
705 | catch {wm withdraw .} | |
183a1d14 SP |
706 | tk_messageBox \ |
707 | -icon error \ | |
708 | -type ok \ | |
709 | -title [mc "git-gui: fatal error"] \ | |
710 | -message [mc "Cannot find git in PATH."] | |
0b812616 SP |
711 | exit 1 |
712 | } | |
0b812616 | 713 | |
54acdd95 SP |
714 | ###################################################################### |
715 | ## | |
716 | ## version check | |
717 | ||
d6967022 | 718 | if {[catch {set _git_version [git --version]} err]} { |
54acdd95 | 719 | catch {wm withdraw .} |
875b7c93 SP |
720 | tk_messageBox \ |
721 | -icon error \ | |
722 | -type ok \ | |
c8c4854b | 723 | -title [mc "git-gui: fatal error"] \ |
875b7c93 | 724 | -message "Cannot determine Git version: |
54acdd95 SP |
725 | |
726 | $err | |
727 | ||
d6967022 SP |
728 | [appname] requires Git 1.5.0 or later." |
729 | exit 1 | |
730 | } | |
731 | if {![regsub {^git version } $_git_version {} _git_version]} { | |
732 | catch {wm withdraw .} | |
875b7c93 SP |
733 | tk_messageBox \ |
734 | -icon error \ | |
735 | -type ok \ | |
c8c4854b | 736 | -title [mc "git-gui: fatal error"] \ |
31bb1d1b | 737 | -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"] |
54acdd95 SP |
738 | exit 1 |
739 | } | |
301dfaa9 SP |
740 | |
741 | set _real_git_version $_git_version | |
2c2a3782 | 742 | regsub -- {[\-\.]dirty$} $_git_version {} _git_version |
d6967022 SP |
743 | regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version |
744 | regsub {\.rc[0-9]+$} $_git_version {} _git_version | |
91464dfb | 745 | regsub {\.GIT$} $_git_version {} _git_version |
96f11953 | 746 | regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version |
d6967022 | 747 | |
301dfaa9 SP |
748 | if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { |
749 | catch {wm withdraw .} | |
750 | if {[tk_messageBox \ | |
751 | -icon warning \ | |
752 | -type yesno \ | |
753 | -default no \ | |
754 | -title "[appname]: warning" \ | |
1ac17950 | 755 | -message [mc "Git version cannot be determined. |
301dfaa9 | 756 | |
1ac17950 | 757 | %s claims it is version '%s'. |
301dfaa9 | 758 | |
1ac17950 | 759 | %s requires at least Git 1.5.0 or later. |
301dfaa9 | 760 | |
1ac17950 CS |
761 | Assume '%s' is version 1.5.0? |
762 | " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} { | |
301dfaa9 SP |
763 | set _git_version 1.5.0 |
764 | } else { | |
765 | exit 1 | |
766 | } | |
767 | } | |
768 | unset _real_git_version | |
769 | ||
d6967022 SP |
770 | proc git-version {args} { |
771 | global _git_version | |
772 | ||
773 | switch [llength $args] { | |
774 | 0 { | |
775 | return $_git_version | |
54acdd95 | 776 | } |
d6967022 SP |
777 | |
778 | 2 { | |
779 | set op [lindex $args 0] | |
780 | set vr [lindex $args 1] | |
781 | set cm [package vcompare $_git_version $vr] | |
782 | return [expr $cm $op 0] | |
783 | } | |
784 | ||
785 | 4 { | |
786 | set type [lindex $args 0] | |
787 | set name [lindex $args 1] | |
788 | set parm [lindex $args 2] | |
789 | set body [lindex $args 3] | |
790 | ||
791 | if {($type ne {proc} && $type ne {method})} { | |
792 | error "Invalid arguments to git-version" | |
793 | } | |
794 | if {[llength $body] < 2 || [lindex $body end-1] ne {default}} { | |
795 | error "Last arm of $type $name must be default" | |
796 | } | |
797 | ||
798 | foreach {op vr cb} [lrange $body 0 end-2] { | |
799 | if {[git-version $op $vr]} { | |
800 | return [uplevel [list $type $name $parm $cb]] | |
801 | } | |
802 | } | |
803 | ||
804 | return [uplevel [list $type $name $parm [lindex $body end]]] | |
805 | } | |
806 | ||
807 | default { | |
808 | error "git-version >= x" | |
809 | } | |
810 | ||
811 | } | |
812 | } | |
813 | ||
814 | if {[git-version < 1.5]} { | |
54acdd95 | 815 | catch {wm withdraw .} |
875b7c93 SP |
816 | tk_messageBox \ |
817 | -icon error \ | |
818 | -type ok \ | |
c8c4854b | 819 | -title [mc "git-gui: fatal error"] \ |
875b7c93 | 820 | -message "[appname] requires Git 1.5.0 or later. |
d6967022 SP |
821 | |
822 | You are using [git-version]: | |
823 | ||
824 | [git --version]" | |
54acdd95 SP |
825 | exit 1 |
826 | } | |
54acdd95 | 827 | |
875b7c93 SP |
828 | ###################################################################### |
829 | ## | |
830 | ## configure our library | |
831 | ||
875b7c93 SP |
832 | set idx [file join $oguilib tclIndex] |
833 | if {[catch {set fd [open $idx r]} err]} { | |
834 | catch {wm withdraw .} | |
835 | tk_messageBox \ | |
836 | -icon error \ | |
837 | -type ok \ | |
c8c4854b | 838 | -title [mc "git-gui: fatal error"] \ |
875b7c93 SP |
839 | -message $err |
840 | exit 1 | |
841 | } | |
842 | if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} { | |
843 | set idx [list] | |
844 | while {[gets $fd n] >= 0} { | |
845 | if {$n ne {} && ![string match #* $n]} { | |
846 | lappend idx $n | |
847 | } | |
848 | } | |
849 | } else { | |
850 | set idx {} | |
851 | } | |
852 | close $fd | |
853 | ||
854 | if {$idx ne {}} { | |
855 | set loaded [list] | |
856 | foreach p $idx { | |
857 | if {[lsearch -exact $loaded $p] >= 0} continue | |
858 | source [file join $oguilib $p] | |
859 | lappend loaded $p | |
860 | } | |
861 | unset loaded p | |
862 | } else { | |
863 | set auto_path [concat [list $oguilib] $auto_path] | |
864 | } | |
fc703c20 | 865 | unset -nocomplain idx fd |
875b7c93 | 866 | |
ba7cc660 | 867 | ###################################################################### |
69f85ffa SP |
868 | ## |
869 | ## config file parsing | |
870 | ||
f00d504a | 871 | git-version proc _parse_config {arr_name args} { |
85f7a94b SP |
872 | >= 1.5.3 { |
873 | upvar $arr_name arr | |
874 | array unset arr | |
875 | set buf {} | |
876 | catch { | |
a5bb31fb SP |
877 | set fd_rc [eval \ |
878 | [list git_read config] \ | |
879 | $args \ | |
880 | [list --null --list]] | |
85f7a94b SP |
881 | fconfigure $fd_rc -translation binary |
882 | set buf [read $fd_rc] | |
883 | close $fd_rc | |
884 | } | |
885 | foreach line [split $buf "\0"] { | |
886 | if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} { | |
887 | if {[is_many_config $name]} { | |
888 | lappend arr($name) $value | |
889 | } else { | |
890 | set arr($name) $value | |
891 | } | |
892 | } | |
893 | } | |
894 | } | |
f00d504a SP |
895 | default { |
896 | upvar $arr_name arr | |
897 | array unset arr | |
69f85ffa | 898 | catch { |
f00d504a | 899 | set fd_rc [eval [list git_read config --list] $args] |
69f85ffa SP |
900 | while {[gets $fd_rc line] >= 0} { |
901 | if {[regexp {^([^=]+)=(.*)$} $line line name value]} { | |
902 | if {[is_many_config $name]} { | |
f00d504a | 903 | lappend arr($name) $value |
69f85ffa | 904 | } else { |
f00d504a | 905 | set arr($name) $value |
69f85ffa SP |
906 | } |
907 | } | |
908 | } | |
909 | close $fd_rc | |
910 | } | |
911 | } | |
f00d504a | 912 | } |
69f85ffa | 913 | |
f00d504a SP |
914 | proc load_config {include_global} { |
915 | global repo_config global_config default_config | |
916 | ||
917 | if {$include_global} { | |
918 | _parse_config global_config --global | |
69f85ffa | 919 | } |
f00d504a | 920 | _parse_config repo_config |
69f85ffa SP |
921 | |
922 | foreach name [array names default_config] { | |
923 | if {[catch {set v $global_config($name)}]} { | |
924 | set global_config($name) $default_config($name) | |
925 | } | |
926 | if {[catch {set v $repo_config($name)}]} { | |
927 | set repo_config($name) $default_config($name) | |
928 | } | |
929 | } | |
930 | } | |
931 | ||
932 | ###################################################################### | |
ba7cc660 SP |
933 | ## |
934 | ## feature option selection | |
935 | ||
0b2bc460 | 936 | if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} { |
ba7cc660 SP |
937 | unset _junk |
938 | } else { | |
939 | set subcommand gui | |
940 | } | |
941 | if {$subcommand eq {gui.sh}} { | |
942 | set subcommand gui | |
943 | } | |
944 | if {$subcommand eq {gui} && [llength $argv] > 0} { | |
945 | set subcommand [lindex $argv 0] | |
946 | set argv [lrange $argv 1 end] | |
947 | } | |
948 | ||
949 | enable_option multicommit | |
950 | enable_option branch | |
951 | enable_option transport | |
c52c9452 | 952 | disable_option bare |
ba7cc660 SP |
953 | |
954 | switch -- $subcommand { | |
955 | browser - | |
956 | blame { | |
c52c9452 SP |
957 | enable_option bare |
958 | ||
ba7cc660 SP |
959 | disable_option multicommit |
960 | disable_option branch | |
961 | disable_option transport | |
962 | } | |
963 | citool { | |
964 | enable_option singlecommit | |
1e65c622 | 965 | enable_option retcode |
ba7cc660 SP |
966 | |
967 | disable_option multicommit | |
968 | disable_option branch | |
969 | disable_option transport | |
1e65c622 AG |
970 | |
971 | while {[llength $argv] > 0} { | |
972 | set a [lindex $argv 0] | |
973 | switch -- $a { | |
974 | --amend { | |
975 | enable_option initialamend | |
976 | } | |
977 | --nocommit { | |
978 | enable_option nocommit | |
979 | enable_option nocommitmsg | |
980 | } | |
981 | --commitmsg { | |
982 | disable_option nocommitmsg | |
983 | } | |
984 | default { | |
985 | break | |
986 | } | |
987 | } | |
988 | ||
989 | set argv [lrange $argv 1 end] | |
990 | } | |
ba7cc660 SP |
991 | } |
992 | } | |
993 | ||
2d19516d SP |
994 | ###################################################################### |
995 | ## | |
996 | ## repository setup | |
997 | ||
c6127856 SP |
998 | if {[catch { |
999 | set _gitdir $env(GIT_DIR) | |
1000 | set _prefix {} | |
1001 | }] | |
1002 | && [catch { | |
1003 | set _gitdir [git rev-parse --git-dir] | |
1004 | set _prefix [git rev-parse --show-prefix] | |
1005 | } err]} { | |
ab08b363 SP |
1006 | load_config 1 |
1007 | apply_config | |
1008 | choose_repository::pick | |
2d19516d | 1009 | } |
20ddfcaa | 1010 | if {![file isdirectory $_gitdir] && [is_Cygwin]} { |
2f7c9a7f | 1011 | catch {set _gitdir [exec cygpath --windows $_gitdir]} |
20ddfcaa | 1012 | } |
c950c66e | 1013 | if {![file isdirectory $_gitdir]} { |
dbccbbda | 1014 | catch {wm withdraw .} |
31bb1d1b | 1015 | error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"] |
dbccbbda SP |
1016 | exit 1 |
1017 | } | |
c80d25db SP |
1018 | if {$_prefix ne {}} { |
1019 | regsub -all {[^/]+/} $_prefix ../ cdup | |
1020 | if {[catch {cd $cdup} err]} { | |
1021 | catch {wm withdraw .} | |
31bb1d1b | 1022 | error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"] |
c80d25db SP |
1023 | exit 1 |
1024 | } | |
1025 | unset cdup | |
1026 | } elseif {![is_enabled bare]} { | |
c52c9452 SP |
1027 | if {[lindex [file split $_gitdir] end] ne {.git}} { |
1028 | catch {wm withdraw .} | |
31bb1d1b | 1029 | error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"] |
c52c9452 SP |
1030 | exit 1 |
1031 | } | |
1032 | if {[catch {cd [file dirname $_gitdir]} err]} { | |
1033 | catch {wm withdraw .} | |
31bb1d1b | 1034 | error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"] |
c52c9452 SP |
1035 | exit 1 |
1036 | } | |
dbccbbda | 1037 | } |
c52c9452 SP |
1038 | set _reponame [file split [file normalize $_gitdir]] |
1039 | if {[lindex $_reponame end] eq {.git}} { | |
1040 | set _reponame [lindex $_reponame end-1] | |
1041 | } else { | |
1042 | set _reponame [lindex $_reponame end] | |
2d19516d | 1043 | } |
2d19516d | 1044 | |
372ef954 SP |
1045 | ###################################################################### |
1046 | ## | |
1047 | ## global init | |
1048 | ||
1049 | set current_diff_path {} | |
1050 | set current_diff_side {} | |
1051 | set diff_actions [list] | |
372ef954 SP |
1052 | |
1053 | set HEAD {} | |
1054 | set PARENT {} | |
1055 | set MERGE_HEAD [list] | |
1056 | set commit_type {} | |
1057 | set empty_tree {} | |
1058 | set current_branch {} | |
d41b43eb | 1059 | set is_detached 0 |
372ef954 | 1060 | set current_diff_path {} |
9c9f5fa9 | 1061 | set is_3way_diff 0 |
3e34838c | 1062 | set is_conflict_diff 0 |
372ef954 SP |
1063 | set selected_commit_type new |
1064 | ||
a9786bb4 AG |
1065 | set nullid "0000000000000000000000000000000000000000" |
1066 | set nullid2 "0000000000000000000000000000000000000001" | |
1067 | ||
cb07fc2a SP |
1068 | ###################################################################### |
1069 | ## | |
e210e674 | 1070 | ## task management |
cb07fc2a | 1071 | |
8f52548a | 1072 | set rescan_active 0 |
131f503b | 1073 | set diff_active 0 |
24263b77 | 1074 | set last_clicked {} |
131f503b | 1075 | |
e210e674 SP |
1076 | set disable_on_lock [list] |
1077 | set index_lock_type none | |
1078 | ||
1079 | proc lock_index {type} { | |
1080 | global index_lock_type disable_on_lock | |
131f503b | 1081 | |
043f7011 | 1082 | if {$index_lock_type eq {none}} { |
e210e674 SP |
1083 | set index_lock_type $type |
1084 | foreach w $disable_on_lock { | |
1085 | uplevel #0 $w disabled | |
1086 | } | |
1087 | return 1 | |
53716a7b | 1088 | } elseif {$index_lock_type eq "begin-$type"} { |
e210e674 | 1089 | set index_lock_type $type |
131f503b SP |
1090 | return 1 |
1091 | } | |
1092 | return 0 | |
1093 | } | |
cb07fc2a | 1094 | |
e210e674 SP |
1095 | proc unlock_index {} { |
1096 | global index_lock_type disable_on_lock | |
1097 | ||
1098 | set index_lock_type none | |
1099 | foreach w $disable_on_lock { | |
1100 | uplevel #0 $w normal | |
1101 | } | |
1102 | } | |
1103 | ||
1104 | ###################################################################### | |
1105 | ## | |
1106 | ## status | |
1107 | ||
f18e40a1 | 1108 | proc repository_state {ctvar hdvar mhvar} { |
c950c66e | 1109 | global current_branch |
f18e40a1 SP |
1110 | upvar $ctvar ct $hdvar hd $mhvar mh |
1111 | ||
1112 | set mh [list] | |
ec6b424a | 1113 | |
d41b43eb | 1114 | load_current_branch |
81347223 | 1115 | if {[catch {set hd [git rev-parse --verify HEAD]}]} { |
4539eacd | 1116 | set hd {} |
ec6b424a | 1117 | set ct initial |
f18e40a1 SP |
1118 | return |
1119 | } | |
1120 | ||
c2758a17 | 1121 | set merge_head [gitdir MERGE_HEAD] |
f18e40a1 | 1122 | if {[file exists $merge_head]} { |
ec6b424a | 1123 | set ct merge |
f18e40a1 SP |
1124 | set fd_mh [open $merge_head r] |
1125 | while {[gets $fd_mh line] >= 0} { | |
1126 | lappend mh $line | |
1127 | } | |
1128 | close $fd_mh | |
1129 | return | |
ec6b424a | 1130 | } |
f18e40a1 SP |
1131 | |
1132 | set ct normal | |
ec6b424a SP |
1133 | } |
1134 | ||
4539eacd SP |
1135 | proc PARENT {} { |
1136 | global PARENT empty_tree | |
1137 | ||
f18e40a1 SP |
1138 | set p [lindex $PARENT 0] |
1139 | if {$p ne {}} { | |
1140 | return $p | |
4539eacd SP |
1141 | } |
1142 | if {$empty_tree eq {}} { | |
81347223 | 1143 | set empty_tree [git mktree << {}] |
4539eacd SP |
1144 | } |
1145 | return $empty_tree | |
1146 | } | |
1147 | ||
1e65c622 AG |
1148 | proc force_amend {} { |
1149 | global selected_commit_type | |
1150 | global HEAD PARENT MERGE_HEAD commit_type | |
1151 | ||
1152 | repository_state newType newHEAD newMERGE_HEAD | |
1153 | set HEAD $newHEAD | |
1154 | set PARENT $newHEAD | |
1155 | set MERGE_HEAD $newMERGE_HEAD | |
1156 | set commit_type $newType | |
1157 | ||
1158 | set selected_commit_type amend | |
1159 | do_select_commit_type | |
1160 | } | |
1161 | ||
46aaf90b | 1162 | proc rescan {after {honor_trustmtime 1}} { |
f18e40a1 | 1163 | global HEAD PARENT MERGE_HEAD commit_type |
699d5601 | 1164 | global ui_index ui_workdir ui_comm |
8f52548a | 1165 | global rescan_active file_states |
cf25ddc8 | 1166 | global repo_config |
cb07fc2a | 1167 | |
8f52548a | 1168 | if {$rescan_active > 0 || ![lock_index read]} return |
cb07fc2a | 1169 | |
f18e40a1 | 1170 | repository_state newType newHEAD newMERGE_HEAD |
4539eacd | 1171 | if {[string match amend* $commit_type] |
f18e40a1 SP |
1172 | && $newType eq {normal} |
1173 | && $newHEAD eq $HEAD} { | |
e57ca85e | 1174 | } else { |
f18e40a1 SP |
1175 | set HEAD $newHEAD |
1176 | set PARENT $newHEAD | |
1177 | set MERGE_HEAD $newMERGE_HEAD | |
1178 | set commit_type $newType | |
e57ca85e SP |
1179 | } |
1180 | ||
cb07fc2a | 1181 | array unset file_states |
cb07fc2a | 1182 | |
1e0a92fd SP |
1183 | if {!$::GITGUI_BCK_exists && |
1184 | (![$ui_comm edit modified] | |
1185 | || [string trim [$ui_comm get 0.0 end]] eq {})} { | |
b2f3bb1b SP |
1186 | if {[string match amend* $commit_type]} { |
1187 | } elseif {[load_message GITGUI_MSG]} { | |
2cd1fd1f | 1188 | } elseif {[run_prepare_commit_msg_hook]} { |
131f503b SP |
1189 | } elseif {[load_message MERGE_MSG]} { |
1190 | } elseif {[load_message SQUASH_MSG]} { | |
1191 | } | |
b2c6fcf1 | 1192 | $ui_comm edit reset |
21d7744f | 1193 | $ui_comm edit modified false |
131f503b SP |
1194 | } |
1195 | ||
46aaf90b | 1196 | if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} { |
8f52548a | 1197 | rescan_stage2 {} $after |
e534f3a8 | 1198 | } else { |
8f52548a | 1199 | set rescan_active 1 |
1ac17950 | 1200 | ui_status [mc "Refreshing file status..."] |
0b812616 SP |
1201 | set fd_rf [git_read update-index \ |
1202 | -q \ | |
1203 | --unmerged \ | |
1204 | --ignore-missing \ | |
1205 | --refresh \ | |
1206 | ] | |
e534f3a8 | 1207 | fconfigure $fd_rf -blocking 0 -translation binary |
390adaea | 1208 | fileevent $fd_rf readable \ |
8f52548a | 1209 | [list rescan_stage2 $fd_rf $after] |
e534f3a8 | 1210 | } |
131f503b SP |
1211 | } |
1212 | ||
2fe167b6 | 1213 | if {[is_Cygwin]} { |
2fe167b6 SP |
1214 | set is_git_info_exclude {} |
1215 | proc have_info_exclude {} { | |
7f83aa2d | 1216 | global is_git_info_exclude |
2fe167b6 | 1217 | |
7f83aa2d SP |
1218 | if {$is_git_info_exclude eq {}} { |
1219 | if {[catch {exec test -f [gitdir info exclude]}]} { | |
1220 | set is_git_info_exclude 0 | |
1221 | } else { | |
1222 | set is_git_info_exclude 1 | |
2fe167b6 | 1223 | } |
2fe167b6 | 1224 | } |
7f83aa2d | 1225 | return $is_git_info_exclude |
2fe167b6 SP |
1226 | } |
1227 | } else { | |
1228 | proc have_info_exclude {} { | |
1229 | return [file readable [gitdir info exclude]] | |
1230 | } | |
1231 | } | |
1232 | ||
8f52548a | 1233 | proc rescan_stage2 {fd after} { |
4539eacd | 1234 | global rescan_active buf_rdi buf_rdf buf_rlo |
131f503b | 1235 | |
043f7011 | 1236 | if {$fd ne {}} { |
e534f3a8 SP |
1237 | read $fd |
1238 | if {![eof $fd]} return | |
1239 | close $fd | |
1240 | } | |
131f503b | 1241 | |
0b812616 | 1242 | set ls_others [list --exclude-per-directory=.gitignore] |
2fe167b6 SP |
1243 | if {[have_info_exclude]} { |
1244 | lappend ls_others "--exclude-from=[gitdir info exclude]" | |
cb07fc2a | 1245 | } |
94a4dd9b SP |
1246 | set user_exclude [get_config core.excludesfile] |
1247 | if {$user_exclude ne {} && [file readable $user_exclude]} { | |
1248 | lappend ls_others "--exclude-from=$user_exclude" | |
1249 | } | |
cb07fc2a | 1250 | |
868c8752 SP |
1251 | set buf_rdi {} |
1252 | set buf_rdf {} | |
1253 | set buf_rlo {} | |
1254 | ||
8f52548a | 1255 | set rescan_active 3 |
1ac17950 | 1256 | ui_status [mc "Scanning for modified files ..."] |
0b812616 SP |
1257 | set fd_di [git_read diff-index --cached -z [PARENT]] |
1258 | set fd_df [git_read diff-files -z] | |
1259 | set fd_lo [eval git_read ls-files --others -z $ls_others] | |
cb07fc2a | 1260 | |
51a989ba SP |
1261 | fconfigure $fd_di -blocking 0 -translation binary -encoding binary |
1262 | fconfigure $fd_df -blocking 0 -translation binary -encoding binary | |
1263 | fconfigure $fd_lo -blocking 0 -translation binary -encoding binary | |
8f52548a SP |
1264 | fileevent $fd_di readable [list read_diff_index $fd_di $after] |
1265 | fileevent $fd_df readable [list read_diff_files $fd_df $after] | |
1266 | fileevent $fd_lo readable [list read_ls_others $fd_lo $after] | |
cb07fc2a SP |
1267 | } |
1268 | ||
131f503b | 1269 | proc load_message {file} { |
c950c66e | 1270 | global ui_comm |
131f503b | 1271 | |
c2758a17 | 1272 | set f [gitdir $file] |
e57ca85e | 1273 | if {[file isfile $f]} { |
131f503b SP |
1274 | if {[catch {set fd [open $f r]}]} { |
1275 | return 0 | |
1276 | } | |
6eb420ef | 1277 | fconfigure $fd -eofchar {} |
e57ca85e | 1278 | set content [string trim [read $fd]] |
131f503b | 1279 | close $fd |
4e55d19a | 1280 | regsub -all -line {[ \r\t]+$} $content {} content |
131f503b SP |
1281 | $ui_comm delete 0.0 end |
1282 | $ui_comm insert end $content | |
1283 | return 1 | |
1284 | } | |
1285 | return 0 | |
1286 | } | |
1287 | ||
2cd1fd1f JW |
1288 | proc run_prepare_commit_msg_hook {} { |
1289 | global pch_error | |
1290 | ||
1291 | # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui | |
1292 | # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an | |
1293 | # empty file but existant file. | |
1294 | ||
1295 | set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a] | |
1296 | ||
1297 | if {[file isfile [gitdir MERGE_MSG]]} { | |
1298 | set pcm_source "merge" | |
1299 | set fd_mm [open [gitdir MERGE_MSG] r] | |
1300 | puts -nonewline $fd_pcm [read $fd_mm] | |
1301 | close $fd_mm | |
1302 | } elseif {[file isfile [gitdir SQUASH_MSG]]} { | |
1303 | set pcm_source "squash" | |
1304 | set fd_sm [open [gitdir SQUASH_MSG] r] | |
1305 | puts -nonewline $fd_pcm [read $fd_sm] | |
1306 | close $fd_sm | |
1307 | } else { | |
1308 | set pcm_source "" | |
1309 | } | |
1310 | ||
1311 | close $fd_pcm | |
1312 | ||
1313 | set fd_ph [githook_read prepare-commit-msg \ | |
1314 | [gitdir PREPARE_COMMIT_MSG] $pcm_source] | |
1315 | if {$fd_ph eq {}} { | |
1316 | catch {file delete [gitdir PREPARE_COMMIT_MSG]} | |
1317 | return 0; | |
1318 | } | |
1319 | ||
1320 | ui_status [mc "Calling prepare-commit-msg hook..."] | |
1321 | set pch_error {} | |
1322 | ||
1323 | fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} | |
1324 | fileevent $fd_ph readable \ | |
1325 | [list prepare_commit_msg_hook_wait $fd_ph] | |
1326 | ||
1327 | return 1; | |
1328 | } | |
1329 | ||
1330 | proc prepare_commit_msg_hook_wait {fd_ph} { | |
1331 | global pch_error | |
1332 | ||
1333 | append pch_error [read $fd_ph] | |
1334 | fconfigure $fd_ph -blocking 1 | |
1335 | if {[eof $fd_ph]} { | |
1336 | if {[catch {close $fd_ph}]} { | |
1337 | ui_status [mc "Commit declined by prepare-commit-msg hook."] | |
1338 | hook_failed_popup prepare-commit-msg $pch_error | |
1339 | catch {file delete [gitdir PREPARE_COMMIT_MSG]} | |
1340 | exit 1 | |
1341 | } else { | |
1342 | load_message PREPARE_COMMIT_MSG | |
1343 | } | |
1344 | set pch_error {} | |
1345 | catch {file delete [gitdir PREPARE_COMMIT_MSG]} | |
1346 | return | |
1347 | } | |
1348 | fconfigure $fd_ph -blocking 0 | |
1349 | catch {file delete [gitdir PREPARE_COMMIT_MSG]} | |
1350 | } | |
1351 | ||
8f52548a | 1352 | proc read_diff_index {fd after} { |
cb07fc2a SP |
1353 | global buf_rdi |
1354 | ||
1355 | append buf_rdi [read $fd] | |
868c8752 SP |
1356 | set c 0 |
1357 | set n [string length $buf_rdi] | |
1358 | while {$c < $n} { | |
1359 | set z1 [string first "\0" $buf_rdi $c] | |
1360 | if {$z1 == -1} break | |
1361 | incr z1 | |
1362 | set z2 [string first "\0" $buf_rdi $z1] | |
1363 | if {$z2 == -1} break | |
1364 | ||
868c8752 | 1365 | incr c |
86291555 | 1366 | set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }] |
51a989ba | 1367 | set p [string range $buf_rdi $z1 [expr {$z2 - 1}]] |
1461c5f3 | 1368 | merge_state \ |
51a989ba | 1369 | [encoding convertfrom $p] \ |
86291555 SP |
1370 | [lindex $i 4]? \ |
1371 | [list [lindex $i 0] [lindex $i 2]] \ | |
1461c5f3 SP |
1372 | [list] |
1373 | set c $z2 | |
86291555 | 1374 | incr c |
cb07fc2a | 1375 | } |
868c8752 SP |
1376 | if {$c < $n} { |
1377 | set buf_rdi [string range $buf_rdi $c end] | |
1378 | } else { | |
1379 | set buf_rdi {} | |
1380 | } | |
1381 | ||
8f52548a | 1382 | rescan_done $fd buf_rdi $after |
cb07fc2a SP |
1383 | } |
1384 | ||
8f52548a | 1385 | proc read_diff_files {fd after} { |
cb07fc2a SP |
1386 | global buf_rdf |
1387 | ||
1388 | append buf_rdf [read $fd] | |
868c8752 SP |
1389 | set c 0 |
1390 | set n [string length $buf_rdf] | |
1391 | while {$c < $n} { | |
1392 | set z1 [string first "\0" $buf_rdf $c] | |
1393 | if {$z1 == -1} break | |
1394 | incr z1 | |
1395 | set z2 [string first "\0" $buf_rdf $z1] | |
1396 | if {$z2 == -1} break | |
1397 | ||
868c8752 | 1398 | incr c |
86291555 | 1399 | set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }] |
51a989ba | 1400 | set p [string range $buf_rdf $z1 [expr {$z2 - 1}]] |
1461c5f3 | 1401 | merge_state \ |
51a989ba | 1402 | [encoding convertfrom $p] \ |
86291555 | 1403 | ?[lindex $i 4] \ |
1461c5f3 | 1404 | [list] \ |
86291555 | 1405 | [list [lindex $i 0] [lindex $i 2]] |
1461c5f3 | 1406 | set c $z2 |
86291555 | 1407 | incr c |
868c8752 SP |
1408 | } |
1409 | if {$c < $n} { | |
1410 | set buf_rdf [string range $buf_rdf $c end] | |
1411 | } else { | |
1412 | set buf_rdf {} | |
cb07fc2a | 1413 | } |
868c8752 | 1414 | |
8f52548a | 1415 | rescan_done $fd buf_rdf $after |
cb07fc2a SP |
1416 | } |
1417 | ||
8f52548a | 1418 | proc read_ls_others {fd after} { |
cb07fc2a SP |
1419 | global buf_rlo |
1420 | ||
1421 | append buf_rlo [read $fd] | |
1422 | set pck [split $buf_rlo "\0"] | |
1423 | set buf_rlo [lindex $pck end] | |
1424 | foreach p [lrange $pck 0 end-1] { | |
89384101 SP |
1425 | set p [encoding convertfrom $p] |
1426 | if {[string index $p end] eq {/}} { | |
1427 | set p [string range $p 0 end-1] | |
1428 | } | |
1429 | merge_state $p ?O | |
cb07fc2a | 1430 | } |
8f52548a | 1431 | rescan_done $fd buf_rlo $after |
cb07fc2a SP |
1432 | } |
1433 | ||
8f52548a | 1434 | proc rescan_done {fd buf after} { |
f522c9b5 | 1435 | global rescan_active current_diff_path |
f7f8d322 | 1436 | global file_states repo_config |
7f1df79b | 1437 | upvar $buf to_clear |
cb07fc2a | 1438 | |
f7f8d322 SP |
1439 | if {![eof $fd]} return |
1440 | set to_clear {} | |
1441 | close $fd | |
8f52548a | 1442 | if {[incr rescan_active -1] > 0} return |
93f654df | 1443 | |
24263b77 | 1444 | prune_selection |
f7f8d322 SP |
1445 | unlock_index |
1446 | display_all_files | |
f522c9b5 | 1447 | if {$current_diff_path ne {}} reshow_diff |
29853b90 AG |
1448 | if {$current_diff_path eq {}} select_first_diff |
1449 | ||
8f52548a | 1450 | uplevel #0 $after |
cb07fc2a SP |
1451 | } |
1452 | ||
24263b77 SP |
1453 | proc prune_selection {} { |
1454 | global file_states selected_paths | |
1455 | ||
1456 | foreach path [array names selected_paths] { | |
1457 | if {[catch {set still_here $file_states($path)}]} { | |
1458 | unset selected_paths($path) | |
1459 | } | |
1460 | } | |
1461 | } | |
1462 | ||
cb07fc2a SP |
1463 | ###################################################################### |
1464 | ## | |
f522c9b5 | 1465 | ## ui helpers |
cb07fc2a | 1466 | |
f522c9b5 SP |
1467 | proc mapicon {w state path} { |
1468 | global all_icons | |
1469 | ||
1470 | if {[catch {set r $all_icons($state$w)}]} { | |
1471 | puts "error: no icon for $w state={$state} $path" | |
1472 | return file_plain | |
1473 | } | |
1474 | return $r | |
1475 | } | |
cb07fc2a | 1476 | |
f522c9b5 SP |
1477 | proc mapdesc {state path} { |
1478 | global all_descs | |
03e4ec53 | 1479 | |
f522c9b5 SP |
1480 | if {[catch {set r $all_descs($state)}]} { |
1481 | puts "error: no desc for state={$state} $path" | |
1482 | return $state | |
1483 | } | |
1484 | return $r | |
1485 | } | |
03e4ec53 | 1486 | |
699d5601 | 1487 | proc ui_status {msg} { |
906ab7f6 SP |
1488 | global main_status |
1489 | if {[info exists main_status]} { | |
1490 | $main_status show $msg | |
1491 | } | |
699d5601 SP |
1492 | } |
1493 | ||
1494 | proc ui_ready {{test {}}} { | |
906ab7f6 SP |
1495 | global main_status |
1496 | if {[info exists main_status]} { | |
1497 | $main_status show [mc "Ready."] $test | |
1498 | } | |
699d5601 SP |
1499 | } |
1500 | ||
f522c9b5 SP |
1501 | proc escape_path {path} { |
1502 | regsub -all {\\} $path "\\\\" path | |
1503 | regsub -all "\n" $path "\\n" path | |
1504 | return $path | |
cb07fc2a SP |
1505 | } |
1506 | ||
f522c9b5 SP |
1507 | proc short_path {path} { |
1508 | return [escape_path [lindex [file split $path] end]] | |
7f1df79b SP |
1509 | } |
1510 | ||
f522c9b5 SP |
1511 | set next_icon_id 0 |
1512 | set null_sha1 [string repeat 0 40] | |
16403d0b | 1513 | |
f522c9b5 SP |
1514 | proc merge_state {path new_state {head_info {}} {index_info {}}} { |
1515 | global file_states next_icon_id null_sha1 | |
16403d0b | 1516 | |
f522c9b5 SP |
1517 | set s0 [string index $new_state 0] |
1518 | set s1 [string index $new_state 1] | |
16403d0b | 1519 | |
f522c9b5 SP |
1520 | if {[catch {set info $file_states($path)}]} { |
1521 | set state __ | |
1522 | set icon n[incr next_icon_id] | |
1523 | } else { | |
1524 | set state [lindex $info 0] | |
1525 | set icon [lindex $info 1] | |
1526 | if {$head_info eq {}} {set head_info [lindex $info 2]} | |
1527 | if {$index_info eq {}} {set index_info [lindex $info 3]} | |
1528 | } | |
16403d0b | 1529 | |
f522c9b5 SP |
1530 | if {$s0 eq {?}} {set s0 [string index $state 0]} \ |
1531 | elseif {$s0 eq {_}} {set s0 _} | |
124355d3 | 1532 | |
f522c9b5 SP |
1533 | if {$s1 eq {?}} {set s1 [string index $state 1]} \ |
1534 | elseif {$s1 eq {_}} {set s1 _} | |
16403d0b | 1535 | |
f522c9b5 SP |
1536 | if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} { |
1537 | set head_info [list 0 $null_sha1] | |
1538 | } elseif {$s0 ne {_} && [string index $state 0] eq {_} | |
1539 | && $head_info eq {}} { | |
1540 | set head_info $index_info | |
1541 | } | |
16403d0b | 1542 | |
f522c9b5 SP |
1543 | set file_states($path) [list $s0$s1 $icon \ |
1544 | $head_info $index_info \ | |
1545 | ] | |
1546 | return $state | |
1547 | } | |
cb07fc2a | 1548 | |
f522c9b5 SP |
1549 | proc display_file_helper {w path icon_name old_m new_m} { |
1550 | global file_lists | |
cb07fc2a | 1551 | |
f522c9b5 | 1552 | if {$new_m eq {_}} { |
156b2921 | 1553 | set lno [lsearch -sorted -exact $file_lists($w) $path] |
5f8b70b1 | 1554 | if {$lno >= 0} { |
f522c9b5 | 1555 | set file_lists($w) [lreplace $file_lists($w) $lno $lno] |
5f8b70b1 | 1556 | incr lno |
f522c9b5 SP |
1557 | $w conf -state normal |
1558 | $w delete $lno.0 [expr {$lno + 1}].0 | |
1559 | $w conf -state disabled | |
03e4ec53 | 1560 | } |
f522c9b5 SP |
1561 | } elseif {$old_m eq {_} && $new_m ne {_}} { |
1562 | lappend file_lists($w) $path | |
1563 | set file_lists($w) [lsort -unique $file_lists($w)] | |
1564 | set lno [lsearch -sorted -exact $file_lists($w) $path] | |
1565 | incr lno | |
1566 | $w conf -state normal | |
1567 | $w image create $lno.0 \ | |
1568 | -align center -padx 5 -pady 1 \ | |
1569 | -name $icon_name \ | |
1570 | -image [mapicon $w $new_m $path] | |
1571 | $w insert $lno.1 "[escape_path $path]\n" | |
1572 | $w conf -state disabled | |
1573 | } elseif {$old_m ne $new_m} { | |
1574 | $w conf -state normal | |
1575 | $w image conf $icon_name -image [mapicon $w $new_m $path] | |
1576 | $w conf -state disabled | |
03e4ec53 | 1577 | } |
f522c9b5 SP |
1578 | } |
1579 | ||
1580 | proc display_file {path state} { | |
1581 | global file_states selected_paths | |
1582 | global ui_index ui_workdir | |
03e4ec53 | 1583 | |
f522c9b5 | 1584 | set old_m [merge_state $path $state] |
cb07fc2a | 1585 | set s $file_states($path) |
f522c9b5 SP |
1586 | set new_m [lindex $s 0] |
1587 | set icon_name [lindex $s 1] | |
82cb8706 | 1588 | |
f522c9b5 SP |
1589 | set o [string index $old_m 0] |
1590 | set n [string index $new_m 0] | |
1591 | if {$o eq {U}} { | |
1592 | set o _ | |
1593 | } | |
1594 | if {$n eq {U}} { | |
1595 | set n _ | |
cb07fc2a | 1596 | } |
f522c9b5 | 1597 | display_file_helper $ui_index $path $icon_name $o $n |
cb07fc2a | 1598 | |
f522c9b5 SP |
1599 | if {[string index $old_m 0] eq {U}} { |
1600 | set o U | |
1601 | } else { | |
1602 | set o [string index $old_m 1] | |
82cb8706 | 1603 | } |
f522c9b5 SP |
1604 | if {[string index $new_m 0] eq {U}} { |
1605 | set n U | |
1606 | } else { | |
1607 | set n [string index $new_m 1] | |
82cb8706 | 1608 | } |
f522c9b5 SP |
1609 | display_file_helper $ui_workdir $path $icon_name $o $n |
1610 | ||
1611 | if {$new_m eq {__}} { | |
1612 | unset file_states($path) | |
1613 | catch {unset selected_paths($path)} | |
cb07fc2a | 1614 | } |
f522c9b5 | 1615 | } |
cb07fc2a | 1616 | |
f522c9b5 SP |
1617 | proc display_all_files_helper {w path icon_name m} { |
1618 | global file_lists | |
1619 | ||
1620 | lappend file_lists($w) $path | |
1621 | set lno [expr {[lindex [split [$w index end] .] 0] - 1}] | |
1622 | $w image create end \ | |
1623 | -align center -padx 5 -pady 1 \ | |
1624 | -name $icon_name \ | |
1625 | -image [mapicon $w $m $path] | |
1626 | $w insert end "[escape_path $path]\n" | |
cb07fc2a SP |
1627 | } |
1628 | ||
f522c9b5 SP |
1629 | proc display_all_files {} { |
1630 | global ui_index ui_workdir | |
1631 | global file_states file_lists | |
1632 | global last_clicked | |
cb07fc2a | 1633 | |
f522c9b5 SP |
1634 | $ui_index conf -state normal |
1635 | $ui_workdir conf -state normal | |
cb07fc2a | 1636 | |
f522c9b5 SP |
1637 | $ui_index delete 0.0 end |
1638 | $ui_workdir delete 0.0 end | |
1639 | set last_clicked {} | |
cb07fc2a | 1640 | |
f522c9b5 SP |
1641 | set file_lists($ui_index) [list] |
1642 | set file_lists($ui_workdir) [list] | |
16403d0b | 1643 | |
f522c9b5 SP |
1644 | foreach path [lsort [array names file_states]] { |
1645 | set s $file_states($path) | |
1646 | set m [lindex $s 0] | |
1647 | set icon_name [lindex $s 1] | |
1648 | ||
1649 | set s [string index $m 0] | |
1650 | if {$s ne {U} && $s ne {_}} { | |
1651 | display_all_files_helper $ui_index $path \ | |
1652 | $icon_name $s | |
16403d0b | 1653 | } |
cb07fc2a | 1654 | |
f522c9b5 SP |
1655 | if {[string index $m 0] eq {U}} { |
1656 | set s U | |
1657 | } else { | |
1658 | set s [string index $m 1] | |
a25c5189 | 1659 | } |
f522c9b5 SP |
1660 | if {$s ne {_}} { |
1661 | display_all_files_helper $ui_workdir $path \ | |
1662 | $icon_name $s | |
a25c5189 SP |
1663 | } |
1664 | } | |
1665 | ||
f522c9b5 SP |
1666 | $ui_index conf -state disabled |
1667 | $ui_workdir conf -state disabled | |
a25c5189 SP |
1668 | } |
1669 | ||
ec6b424a SP |
1670 | ###################################################################### |
1671 | ## | |
f522c9b5 | 1672 | ## icons |
ec6b424a | 1673 | |
f522c9b5 SP |
1674 | set filemask { |
1675 | #define mask_width 14 | |
1676 | #define mask_height 15 | |
1677 | static unsigned char mask_bits[] = { | |
1678 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, | |
1679 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, | |
1680 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f}; | |
1681 | } | |
cb07fc2a SP |
1682 | |
1683 | image create bitmap file_plain -background white -foreground black -data { | |
1684 | #define plain_width 14 | |
1685 | #define plain_height 15 | |
1686 | static unsigned char plain_bits[] = { | |
1687 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, | |
1688 | 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, | |
1689 | 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1690 | } -maskdata $filemask | |
1691 | ||
1692 | image create bitmap file_mod -background white -foreground blue -data { | |
1693 | #define mod_width 14 | |
1694 | #define mod_height 15 | |
1695 | static unsigned char mod_bits[] = { | |
1696 | 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, | |
1697 | 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, | |
1698 | 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; | |
1699 | } -maskdata $filemask | |
1700 | ||
131f503b SP |
1701 | image create bitmap file_fulltick -background white -foreground "#007000" -data { |
1702 | #define file_fulltick_width 14 | |
1703 | #define file_fulltick_height 15 | |
1704 | static unsigned char file_fulltick_bits[] = { | |
cb07fc2a SP |
1705 | 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16, |
1706 | 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10, | |
1707 | 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1708 | } -maskdata $filemask | |
1709 | ||
1710 | image create bitmap file_parttick -background white -foreground "#005050" -data { | |
1711 | #define parttick_width 14 | |
1712 | #define parttick_height 15 | |
1713 | static unsigned char parttick_bits[] = { | |
1714 | 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, | |
1715 | 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10, | |
1716 | 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1717 | } -maskdata $filemask | |
1718 | ||
1719 | image create bitmap file_question -background white -foreground black -data { | |
1720 | #define file_question_width 14 | |
1721 | #define file_question_height 15 | |
1722 | static unsigned char file_question_bits[] = { | |
1723 | 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13, | |
1724 | 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10, | |
1725 | 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1726 | } -maskdata $filemask | |
1727 | ||
1728 | image create bitmap file_removed -background white -foreground red -data { | |
1729 | #define file_removed_width 14 | |
1730 | #define file_removed_height 15 | |
1731 | static unsigned char file_removed_bits[] = { | |
1732 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, | |
1733 | 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13, | |
1734 | 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f}; | |
1735 | } -maskdata $filemask | |
1736 | ||
1737 | image create bitmap file_merge -background white -foreground blue -data { | |
1738 | #define file_merge_width 14 | |
1739 | #define file_merge_height 15 | |
1740 | static unsigned char file_merge_bits[] = { | |
1741 | 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10, | |
1742 | 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, | |
1743 | 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; | |
1744 | } -maskdata $filemask | |
1745 | ||
e681cb7d GH |
1746 | image create bitmap file_statechange -background white -foreground green -data { |
1747 | #define file_merge_width 14 | |
1748 | #define file_merge_height 15 | |
1749 | static unsigned char file_statechange_bits[] = { | |
1750 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10, | |
1751 | 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, | |
1752 | 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1753 | } -maskdata $filemask | |
1754 | ||
6b292675 | 1755 | set ui_index .vpane.files.index.list |
0812665e | 1756 | set ui_workdir .vpane.files.workdir.list |
21e409ad SP |
1757 | |
1758 | set all_icons(_$ui_index) file_plain | |
1759 | set all_icons(A$ui_index) file_fulltick | |
1760 | set all_icons(M$ui_index) file_fulltick | |
1761 | set all_icons(D$ui_index) file_removed | |
1762 | set all_icons(U$ui_index) file_merge | |
e681cb7d | 1763 | set all_icons(T$ui_index) file_statechange |
21e409ad SP |
1764 | |
1765 | set all_icons(_$ui_workdir) file_plain | |
1766 | set all_icons(M$ui_workdir) file_mod | |
1767 | set all_icons(D$ui_workdir) file_question | |
3b4db3c1 | 1768 | set all_icons(U$ui_workdir) file_merge |
21e409ad | 1769 | set all_icons(O$ui_workdir) file_plain |
e681cb7d | 1770 | set all_icons(T$ui_workdir) file_statechange |
21e409ad | 1771 | |
131f503b | 1772 | set max_status_desc 0 |
cb07fc2a | 1773 | foreach i { |
1ac17950 CS |
1774 | {__ {mc "Unmodified"}} |
1775 | ||
1776 | {_M {mc "Modified, not staged"}} | |
1777 | {M_ {mc "Staged for commit"}} | |
1778 | {MM {mc "Portions staged for commit"}} | |
1779 | {MD {mc "Staged for commit, missing"}} | |
1780 | ||
e681cb7d GH |
1781 | {_T {mc "File type changed, not staged"}} |
1782 | {T_ {mc "File type changed, staged"}} | |
1783 | ||
1ac17950 CS |
1784 | {_O {mc "Untracked, not staged"}} |
1785 | {A_ {mc "Staged for commit"}} | |
1786 | {AM {mc "Portions staged for commit"}} | |
1787 | {AD {mc "Staged for commit, missing"}} | |
1788 | ||
1789 | {_D {mc "Missing"}} | |
1790 | {D_ {mc "Staged for removal"}} | |
1791 | {DO {mc "Staged for removal, still present"}} | |
1792 | ||
ff515d81 | 1793 | {_U {mc "Requires merge resolution"}} |
1ac17950 CS |
1794 | {U_ {mc "Requires merge resolution"}} |
1795 | {UU {mc "Requires merge resolution"}} | |
1796 | {UM {mc "Requires merge resolution"}} | |
1797 | {UD {mc "Requires merge resolution"}} | |
ff515d81 | 1798 | {UT {mc "Requires merge resolution"}} |
cb07fc2a | 1799 | } { |
1ac17950 CS |
1800 | set text [eval [lindex $i 1]] |
1801 | if {$max_status_desc < [string length $text]} { | |
1802 | set max_status_desc [string length $text] | |
131f503b | 1803 | } |
1ac17950 | 1804 | set all_descs([lindex $i 0]) $text |
cb07fc2a | 1805 | } |
21e409ad | 1806 | unset i |
cb07fc2a SP |
1807 | |
1808 | ###################################################################### | |
1809 | ## | |
1810 | ## util | |
1811 | ||
35874c16 SP |
1812 | proc scrollbar2many {list mode args} { |
1813 | foreach w $list {eval $w $mode $args} | |
1814 | } | |
1815 | ||
1816 | proc many2scrollbar {list mode sb top bottom} { | |
1817 | $sb set $top $bottom | |
1818 | foreach w $list {$w $mode moveto $top} | |
1819 | } | |
1820 | ||
b4946930 SP |
1821 | proc incr_font_size {font {amt 1}} { |
1822 | set sz [font configure $font -size] | |
1823 | incr sz $amt | |
1824 | font configure $font -size $sz | |
1825 | font configure ${font}bold -size $sz | |
debcd0fd | 1826 | font configure ${font}italic -size $sz |
b4946930 SP |
1827 | } |
1828 | ||
cb07fc2a SP |
1829 | ###################################################################### |
1830 | ## | |
1831 | ## ui commands | |
1832 | ||
1ac17950 | 1833 | set starting_gitk_msg [mc "Starting gitk... please wait..."] |
cc4b1c02 | 1834 | |
d0752429 | 1835 | proc do_gitk {revs} { |
20ddfcaa SP |
1836 | # -- Always start gitk through whatever we were loaded with. This |
1837 | # lets us bypass using shell process on Windows systems. | |
1838 | # | |
79317e5d | 1839 | set exe [_which gitk -script] |
02efd48f | 1840 | set cmd [list [info nameofexecutable] $exe] |
15430be5 AMS |
1841 | if {$exe eq {}} { |
1842 | error_popup [mc "Couldn't find gitk in PATH"] | |
cb07fc2a | 1843 | } else { |
501e4c6f SP |
1844 | global env |
1845 | ||
1846 | if {[info exists env(GIT_DIR)]} { | |
1847 | set old_GIT_DIR $env(GIT_DIR) | |
1848 | } else { | |
1849 | set old_GIT_DIR {} | |
1850 | } | |
1851 | ||
1852 | set pwd [pwd] | |
1853 | cd [file dirname [gitdir]] | |
1854 | set env(GIT_DIR) [file tail [gitdir]] | |
1855 | ||
02efd48f | 1856 | eval exec $cmd $revs & |
501e4c6f SP |
1857 | |
1858 | if {$old_GIT_DIR eq {}} { | |
1859 | unset env(GIT_DIR) | |
1860 | } else { | |
1861 | set env(GIT_DIR) $old_GIT_DIR | |
1862 | } | |
1863 | cd $pwd | |
1864 | ||
02efd48f | 1865 | ui_status $::starting_gitk_msg |
d0752429 | 1866 | after 10000 { |
699d5601 | 1867 | ui_ready $starting_gitk_msg |
d0752429 | 1868 | } |
cb07fc2a SP |
1869 | } |
1870 | } | |
1871 | ||
b5834d70 | 1872 | set is_quitting 0 |
1e65c622 | 1873 | set ret_code 1 |
c4fe7728 | 1874 | |
1e65c622 AG |
1875 | proc terminate_me {win} { |
1876 | global ret_code | |
1877 | if {$win ne {.}} return | |
1878 | exit $ret_code | |
1879 | } | |
1880 | ||
1881 | proc do_quit {{rc {1}}} { | |
c950c66e | 1882 | global ui_comm is_quitting repo_config commit_type |
4578c5cb | 1883 | global GITGUI_BCK_exists GITGUI_BCK_i |
95b002ee | 1884 | global ui_comm_spell |
1e65c622 | 1885 | global ret_code |
c4fe7728 | 1886 | |
b5834d70 SP |
1887 | if {$is_quitting} return |
1888 | set is_quitting 1 | |
131f503b | 1889 | |
db7f34d4 SP |
1890 | if {[winfo exists $ui_comm]} { |
1891 | # -- Stash our current commit buffer. | |
1892 | # | |
1893 | set save [gitdir GITGUI_MSG] | |
4578c5cb SP |
1894 | if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { |
1895 | file rename -force [gitdir GITGUI_BCK] $save | |
1896 | set GITGUI_BCK_exists 0 | |
db7f34d4 | 1897 | } else { |
4578c5cb SP |
1898 | set msg [string trim [$ui_comm get 0.0 end]] |
1899 | regsub -all -line {[ \r\t]+$} $msg {} msg | |
1900 | if {(![string match amend* $commit_type] | |
1901 | || [$ui_comm edit modified]) | |
1902 | && $msg ne {}} { | |
1903 | catch { | |
1904 | set fd [open $save w] | |
1905 | puts -nonewline $fd $msg | |
1906 | close $fd | |
1907 | } | |
1908 | } else { | |
1909 | catch {file delete $save} | |
1910 | } | |
1911 | } | |
1912 | ||
95b002ee SP |
1913 | # -- Cancel our spellchecker if its running. |
1914 | # | |
1915 | if {[info exists ui_comm_spell]} { | |
1916 | $ui_comm_spell stop | |
1917 | } | |
1918 | ||
4578c5cb SP |
1919 | # -- Remove our editor backup, its not needed. |
1920 | # | |
1921 | after cancel $GITGUI_BCK_i | |
1922 | if {$GITGUI_BCK_exists} { | |
1923 | catch {file delete [gitdir GITGUI_BCK]} | |
131f503b | 1924 | } |
131f503b | 1925 | |
db7f34d4 SP |
1926 | # -- Stash our current window geometry into this repository. |
1927 | # | |
1928 | set cfg_geometry [list] | |
1929 | lappend cfg_geometry [wm geometry .] | |
a0592d3f JS |
1930 | lappend cfg_geometry [lindex [.vpane sash coord 0] 0] |
1931 | lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1] | |
db7f34d4 SP |
1932 | if {[catch {set rc_geometry $repo_config(gui.geometry)}]} { |
1933 | set rc_geometry {} | |
1934 | } | |
1935 | if {$cfg_geometry ne $rc_geometry} { | |
81347223 | 1936 | catch {git config gui.geometry $cfg_geometry} |
db7f34d4 | 1937 | } |
51f4d16b SP |
1938 | } |
1939 | ||
1e65c622 | 1940 | set ret_code $rc |
cb07fc2a SP |
1941 | destroy . |
1942 | } | |
1943 | ||
1944 | proc do_rescan {} { | |
699d5601 | 1945 | rescan ui_ready |
cb07fc2a SP |
1946 | } |
1947 | ||
8056cc4f AG |
1948 | proc ui_do_rescan {} { |
1949 | rescan {force_first_diff; ui_ready} | |
1950 | } | |
1951 | ||
6e27d826 | 1952 | proc do_commit {} { |
ec6b424a | 1953 | commit_tree |
6e27d826 SP |
1954 | } |
1955 | ||
8a965b8e AMS |
1956 | proc next_diff {} { |
1957 | global next_diff_p next_diff_w next_diff_i | |
29853b90 AG |
1958 | show_diff $next_diff_p $next_diff_w {} |
1959 | } | |
1960 | ||
1961 | proc find_anchor_pos {lst name} { | |
1962 | set lid [lsearch -sorted -exact $lst $name] | |
1963 | ||
1964 | if {$lid == -1} { | |
1965 | set lid 0 | |
1966 | foreach lname $lst { | |
1967 | if {$lname >= $name} break | |
1968 | incr lid | |
1969 | } | |
1970 | } | |
1971 | ||
1972 | return $lid | |
1973 | } | |
1974 | ||
1975 | proc find_file_from {flist idx delta path mmask} { | |
1976 | global file_states | |
1977 | ||
1978 | set len [llength $flist] | |
1979 | while {$idx >= 0 && $idx < $len} { | |
1980 | set name [lindex $flist $idx] | |
1981 | ||
1982 | if {$name ne $path && [info exists file_states($name)]} { | |
1983 | set state [lindex $file_states($name) 0] | |
1984 | ||
1985 | if {$mmask eq {} || [regexp $mmask $state]} { | |
1986 | return $idx | |
1987 | } | |
1988 | } | |
1989 | ||
1990 | incr idx $delta | |
1991 | } | |
1992 | ||
1993 | return {} | |
1994 | } | |
1995 | ||
1996 | proc find_next_diff {w path {lno {}} {mmask {}}} { | |
1997 | global next_diff_p next_diff_w next_diff_i | |
1998 | global file_lists ui_index ui_workdir | |
1999 | ||
2000 | set flist $file_lists($w) | |
2001 | if {$lno eq {}} { | |
2002 | set lno [find_anchor_pos $flist $path] | |
2003 | } else { | |
2004 | incr lno -1 | |
2005 | } | |
2006 | ||
2007 | if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} { | |
2008 | if {$w eq $ui_index} { | |
2009 | set mmask "^$mmask" | |
2010 | } else { | |
2011 | set mmask "$mmask\$" | |
2012 | } | |
2013 | } | |
2014 | ||
2015 | set idx [find_file_from $flist $lno 1 $path $mmask] | |
2016 | if {$idx eq {}} { | |
2017 | incr lno -1 | |
2018 | set idx [find_file_from $flist $lno -1 $path $mmask] | |
2019 | } | |
2020 | ||
2021 | if {$idx ne {}} { | |
2022 | set next_diff_w $w | |
2023 | set next_diff_p [lindex $flist $idx] | |
2024 | set next_diff_i [expr {$idx+1}] | |
2025 | return 1 | |
2026 | } else { | |
2027 | return 0 | |
2028 | } | |
2029 | } | |
2030 | ||
2031 | proc next_diff_after_action {w path {lno {}} {mmask {}}} { | |
2032 | global current_diff_path | |
2033 | ||
2034 | if {$path ne $current_diff_path} { | |
2035 | return {} | |
2036 | } elseif {[find_next_diff $w $path $lno $mmask]} { | |
2037 | return {next_diff;} | |
2038 | } else { | |
2039 | return {reshow_diff;} | |
2040 | } | |
2041 | } | |
2042 | ||
2043 | proc select_first_diff {} { | |
2044 | global ui_workdir | |
2045 | ||
2046 | if {[find_next_diff $ui_workdir {} 1 {^_?U}] || | |
2047 | [find_next_diff $ui_workdir {} 1 {[^O]$}]} { | |
2048 | next_diff | |
2049 | } | |
8a965b8e AMS |
2050 | } |
2051 | ||
8056cc4f AG |
2052 | proc force_first_diff {} { |
2053 | global current_diff_path | |
2054 | ||
2055 | if {[info exists file_states($current_diff_path)]} { | |
2056 | set state [lindex $file_states($current_diff_path) 0] | |
2057 | ||
2058 | if {[string index $state 1] ne {O}} return | |
2059 | } | |
2060 | ||
2061 | select_first_diff | |
2062 | } | |
2063 | ||
24263b77 | 2064 | proc toggle_or_diff {w x y} { |
20a53c02 | 2065 | global file_states file_lists current_diff_path ui_index ui_workdir |
24263b77 | 2066 | global last_clicked selected_paths |
131f503b | 2067 | |
cb07fc2a SP |
2068 | set pos [split [$w index @$x,$y] .] |
2069 | set lno [lindex $pos 0] | |
2070 | set col [lindex $pos 1] | |
24263b77 SP |
2071 | set path [lindex $file_lists($w) [expr {$lno - 1}]] |
2072 | if {$path eq {}} { | |
2073 | set last_clicked {} | |
2074 | return | |
2075 | } | |
2076 | ||
2077 | set last_clicked [list $w $lno] | |
2078 | array unset selected_paths | |
2079 | $ui_index tag remove in_sel 0.0 end | |
0812665e | 2080 | $ui_workdir tag remove in_sel 0.0 end |
cb07fc2a | 2081 | |
3e34838c | 2082 | # Determine the state of the file |
617ceee6 AG |
2083 | if {[info exists file_states($path)]} { |
2084 | set state [lindex $file_states($path) 0] | |
8056cc4f AG |
2085 | } else { |
2086 | set state {__} | |
2087 | } | |
2088 | ||
8056cc4f | 2089 | # Restage the file, or simply show the diff |
cead78ed | 2090 | if {$col == 0 && $y > 1} { |
3e34838c AG |
2091 | # Conflicts need special handling |
2092 | if {[string first {U} $state] >= 0} { | |
0aea2842 AG |
2093 | # $w must always be $ui_workdir, but... |
2094 | if {$w ne $ui_workdir} { set lno {} } | |
2095 | merge_stage_workdir $path $lno | |
3e34838c AG |
2096 | return |
2097 | } | |
2098 | ||
8056cc4f AG |
2099 | if {[string index $state 1] eq {O}} { |
2100 | set mmask {} | |
2101 | } else { | |
2102 | set mmask {[^O]} | |
2103 | } | |
2104 | ||
2105 | set after [next_diff_after_action $w $path $lno $mmask] | |
8a965b8e | 2106 | |
de5f6d5d | 2107 | if {$w eq $ui_index} { |
74d18d2e | 2108 | update_indexinfo \ |
93e912c5 | 2109 | "Unstaging [short_path $path] from commit" \ |
74d18d2e | 2110 | [list $path] \ |
699d5601 | 2111 | [concat $after [list ui_ready]] |
de5f6d5d | 2112 | } elseif {$w eq $ui_workdir} { |
74d18d2e | 2113 | update_index \ |
4d583c86 | 2114 | "Adding [short_path $path]" \ |
74d18d2e | 2115 | [list $path] \ |
699d5601 | 2116 | [concat $after [list ui_ready]] |
74d18d2e | 2117 | } |
24263b77 | 2118 | } else { |
03e4ec53 | 2119 | show_diff $path $w $lno |
cb07fc2a SP |
2120 | } |
2121 | } | |
2122 | ||
24263b77 | 2123 | proc add_one_to_selection {w x y} { |
833eda73 | 2124 | global file_lists last_clicked selected_paths |
7f1df79b | 2125 | |
833eda73 | 2126 | set lno [lindex [split [$w index @$x,$y] .] 0] |
24263b77 SP |
2127 | set path [lindex $file_lists($w) [expr {$lno - 1}]] |
2128 | if {$path eq {}} { | |
2129 | set last_clicked {} | |
2130 | return | |
2131 | } | |
cb07fc2a | 2132 | |
833eda73 SP |
2133 | if {$last_clicked ne {} |
2134 | && [lindex $last_clicked 0] ne $w} { | |
2135 | array unset selected_paths | |
2136 | [lindex $last_clicked 0] tag remove in_sel 0.0 end | |
2137 | } | |
2138 | ||
24263b77 SP |
2139 | set last_clicked [list $w $lno] |
2140 | if {[catch {set in_sel $selected_paths($path)}]} { | |
2141 | set in_sel 0 | |
2142 | } | |
2143 | if {$in_sel} { | |
2144 | unset selected_paths($path) | |
2145 | $w tag remove in_sel $lno.0 [expr {$lno + 1}].0 | |
2146 | } else { | |
2147 | set selected_paths($path) 1 | |
2148 | $w tag add in_sel $lno.0 [expr {$lno + 1}].0 | |
2149 | } | |
2150 | } | |
2151 | ||
2152 | proc add_range_to_selection {w x y} { | |
833eda73 | 2153 | global file_lists last_clicked selected_paths |
24263b77 SP |
2154 | |
2155 | if {[lindex $last_clicked 0] ne $w} { | |
2156 | toggle_or_diff $w $x $y | |
2157 | return | |
cb07fc2a | 2158 | } |
24263b77 | 2159 | |
833eda73 | 2160 | set lno [lindex [split [$w index @$x,$y] .] 0] |
24263b77 SP |
2161 | set lc [lindex $last_clicked 1] |
2162 | if {$lc < $lno} { | |
2163 | set begin $lc | |
2164 | set end $lno | |
2165 | } else { | |
2166 | set begin $lno | |
2167 | set end $lc | |
2168 | } | |
2169 | ||
2170 | foreach path [lrange $file_lists($w) \ | |
2171 | [expr {$begin - 1}] \ | |
2172 | [expr {$end - 1}]] { | |
2173 | set selected_paths($path) 1 | |
2174 | } | |
2175 | $w tag add in_sel $begin.0 [expr {$end + 1}].0 | |
cb07fc2a SP |
2176 | } |
2177 | ||
c91ee2bd JS |
2178 | proc show_more_context {} { |
2179 | global repo_config | |
2180 | if {$repo_config(gui.diffcontext) < 99} { | |
2181 | incr repo_config(gui.diffcontext) | |
2182 | reshow_diff | |
2183 | } | |
2184 | } | |
2185 | ||
2186 | proc show_less_context {} { | |
2187 | global repo_config | |
55ba8a34 | 2188 | if {$repo_config(gui.diffcontext) > 1} { |
c91ee2bd JS |
2189 | incr repo_config(gui.diffcontext) -1 |
2190 | reshow_diff | |
2191 | } | |
2192 | } | |
2193 | ||
cb07fc2a SP |
2194 | ###################################################################### |
2195 | ## | |
a4bee597 | 2196 | ## ui construction |
db453781 | 2197 | |
6bbd1cb9 | 2198 | load_config 0 |
92148d80 | 2199 | apply_config |
2ebba528 SP |
2200 | set ui_comm {} |
2201 | ||
cb07fc2a | 2202 | # -- Menu Bar |
a49c67d1 | 2203 | # |
b4946930 | 2204 | menu .mbar -tearoff 0 |
1ac17950 CS |
2205 | .mbar add cascade -label [mc Repository] -menu .mbar.repository |
2206 | .mbar add cascade -label [mc Edit] -menu .mbar.edit | |
64a906f8 | 2207 | if {[is_enabled branch]} { |
1ac17950 | 2208 | .mbar add cascade -label [mc Branch] -menu .mbar.branch |
700a65ce | 2209 | } |
2ebba528 | 2210 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
a9813cb5 | 2211 | .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit |
2ebba528 | 2212 | } |
64a906f8 | 2213 | if {[is_enabled transport]} { |
1ac17950 | 2214 | .mbar add cascade -label [mc Merge] -menu .mbar.merge |
6bdf5e5f | 2215 | .mbar add cascade -label [mc Remote] -menu .mbar.remote |
4ccdab02 | 2216 | } |
cb07fc2a SP |
2217 | . configure -menu .mbar |
2218 | ||
a4abfa62 | 2219 | # -- Repository Menu |
a49c67d1 | 2220 | # |
a4abfa62 | 2221 | menu .mbar.repository |
35874c16 SP |
2222 | |
2223 | .mbar.repository add command \ | |
1ac17950 | 2224 | -label [mc "Browse Current Branch's Files"] \ |
c74b6c66 | 2225 | -command {browser::new $current_branch} |
a8139888 | 2226 | set ui_browse_current [.mbar.repository index last] |
8e891fac | 2227 | .mbar.repository add command \ |
1ac17950 | 2228 | -label [mc "Browse Branch Files..."] \ |
8e891fac | 2229 | -command browser_open::dialog |
35874c16 SP |
2230 | .mbar.repository add separator |
2231 | ||
d0752429 | 2232 | .mbar.repository add command \ |
1ac17950 | 2233 | -label [mc "Visualize Current Branch's History"] \ |
7416bbc6 | 2234 | -command {do_gitk $current_branch} |
a8139888 | 2235 | set ui_visualize_current [.mbar.repository index last] |
5753ef1a | 2236 | .mbar.repository add command \ |
1ac17950 | 2237 | -label [mc "Visualize All Branch History"] \ |
7416bbc6 | 2238 | -command {do_gitk --all} |
d0752429 | 2239 | .mbar.repository add separator |
75e355d6 | 2240 | |
a8139888 SP |
2241 | proc current_branch_write {args} { |
2242 | global current_branch | |
2243 | .mbar.repository entryconf $::ui_browse_current \ | |
1ac17950 | 2244 | -label [mc "Browse %s's Files" $current_branch] |
a8139888 | 2245 | .mbar.repository entryconf $::ui_visualize_current \ |
1ac17950 | 2246 | -label [mc "Visualize %s's History" $current_branch] |
a8139888 SP |
2247 | } |
2248 | trace add variable current_branch write current_branch_write | |
2249 | ||
cf25ddc8 | 2250 | if {[is_enabled multicommit]} { |
1ac17950 | 2251 | .mbar.repository add command -label [mc "Database Statistics"] \ |
7416bbc6 | 2252 | -command do_stats |
0fd49d0a | 2253 | |
1ac17950 | 2254 | .mbar.repository add command -label [mc "Compress Database"] \ |
7416bbc6 | 2255 | -command do_gc |
4aca740b | 2256 | |
1ac17950 | 2257 | .mbar.repository add command -label [mc "Verify Database"] \ |
7416bbc6 | 2258 | -command do_fsck_objects |
444f92d0 | 2259 | |
a4abfa62 | 2260 | .mbar.repository add separator |
75e355d6 | 2261 | |
20ddfcaa SP |
2262 | if {[is_Cygwin]} { |
2263 | .mbar.repository add command \ | |
1ac17950 | 2264 | -label [mc "Create Desktop Icon"] \ |
7416bbc6 | 2265 | -command do_cygwin_shortcut |
20ddfcaa | 2266 | } elseif {[is_Windows]} { |
a4abfa62 | 2267 | .mbar.repository add command \ |
1ac17950 | 2268 | -label [mc "Create Desktop Icon"] \ |
7416bbc6 | 2269 | -command do_windows_shortcut |
06c31115 | 2270 | } elseif {[is_MacOSX]} { |
a4abfa62 | 2271 | .mbar.repository add command \ |
1ac17950 | 2272 | -label [mc "Create Desktop Icon"] \ |
7416bbc6 | 2273 | -command do_macosx_app |
4aca740b | 2274 | } |
4ccdab02 | 2275 | } |
85ab313e | 2276 | |
af894943 SF |
2277 | if {[is_MacOSX]} { |
2278 | proc ::tk::mac::Quit {args} { do_quit } | |
2279 | } else { | |
2280 | .mbar.repository add command -label [mc Quit] \ | |
2281 | -command do_quit \ | |
2282 | -accelerator $M1T-Q | |
2283 | } | |
cb07fc2a | 2284 | |
9861671d SP |
2285 | # -- Edit Menu |
2286 | # | |
2287 | menu .mbar.edit | |
1ac17950 | 2288 | .mbar.edit add command -label [mc Undo] \ |
9861671d | 2289 | -command {catch {[focus] edit undo}} \ |
7416bbc6 | 2290 | -accelerator $M1T-Z |
1ac17950 | 2291 | .mbar.edit add command -label [mc Redo] \ |
9861671d | 2292 | -command {catch {[focus] edit redo}} \ |
7416bbc6 | 2293 | -accelerator $M1T-Y |
9861671d | 2294 | .mbar.edit add separator |
1ac17950 | 2295 | .mbar.edit add command -label [mc Cut] \ |
9861671d | 2296 | -command {catch {tk_textCut [focus]}} \ |
7416bbc6 | 2297 | -accelerator $M1T-X |
1ac17950 | 2298 | .mbar.edit add command -label [mc Copy] \ |
9861671d | 2299 | -command {catch {tk_textCopy [focus]}} \ |
7416bbc6 | 2300 | -accelerator $M1T-C |
1ac17950 | 2301 | .mbar.edit add command -label [mc Paste] \ |
9861671d | 2302 | -command {catch {tk_textPaste [focus]; [focus] see insert}} \ |
7416bbc6 | 2303 | -accelerator $M1T-V |
1ac17950 | 2304 | .mbar.edit add command -label [mc Delete] \ |
9861671d | 2305 | -command {catch {[focus] delete sel.first sel.last}} \ |
7416bbc6 | 2306 | -accelerator Del |
9861671d | 2307 | .mbar.edit add separator |
1ac17950 | 2308 | .mbar.edit add command -label [mc "Select All"] \ |
9861671d | 2309 | -command {catch {[focus] tag add sel 0.0 end}} \ |
7416bbc6 | 2310 | -accelerator $M1T-A |
9861671d | 2311 | |
85ab313e SP |
2312 | # -- Branch Menu |
2313 | # | |
64a906f8 | 2314 | if {[is_enabled branch]} { |
700a65ce SP |
2315 | menu .mbar.branch |
2316 | ||
1ac17950 | 2317 | .mbar.branch add command -label [mc "Create..."] \ |
b1fa2bff | 2318 | -command branch_create::dialog \ |
7416bbc6 | 2319 | -accelerator $M1T-N |
700a65ce SP |
2320 | lappend disable_on_lock [list .mbar.branch entryconf \ |
2321 | [.mbar.branch index last] -state] | |
2322 | ||
1ac17950 | 2323 | .mbar.branch add command -label [mc "Checkout..."] \ |
d41b43eb SP |
2324 | -command branch_checkout::dialog \ |
2325 | -accelerator $M1T-O | |
2326 | lappend disable_on_lock [list .mbar.branch entryconf \ | |
2327 | [.mbar.branch index last] -state] | |
2328 | ||
1ac17950 | 2329 | .mbar.branch add command -label [mc "Rename..."] \ |
61f82ce7 SP |
2330 | -command branch_rename::dialog |
2331 | lappend disable_on_lock [list .mbar.branch entryconf \ | |
2332 | [.mbar.branch index last] -state] | |
2333 | ||
1ac17950 | 2334 | .mbar.branch add command -label [mc "Delete..."] \ |
3206c63d | 2335 | -command branch_delete::dialog |
700a65ce SP |
2336 | lappend disable_on_lock [list .mbar.branch entryconf \ |
2337 | [.mbar.branch index last] -state] | |
fd234dfd | 2338 | |
1ac17950 | 2339 | .mbar.branch add command -label [mc "Reset..."] \ |
a6c9b081 | 2340 | -command merge::reset_hard |
fd234dfd SP |
2341 | lappend disable_on_lock [list .mbar.branch entryconf \ |
2342 | [.mbar.branch index last] -state] | |
700a65ce SP |
2343 | } |
2344 | ||
cb07fc2a | 2345 | # -- Commit Menu |
a49c67d1 | 2346 | # |
1e65c622 AG |
2347 | proc commit_btn_caption {} { |
2348 | if {[is_enabled nocommit]} { | |
2349 | return [mc "Done"] | |
2350 | } else { | |
2351 | return [mc Commit@@verb] | |
2352 | } | |
2353 | } | |
2354 | ||
2ebba528 SP |
2355 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
2356 | menu .mbar.commit | |
2357 | ||
1e02b32e SP |
2358 | if {![is_enabled nocommit]} { |
2359 | .mbar.commit add radiobutton \ | |
2360 | -label [mc "New Commit"] \ | |
2361 | -command do_select_commit_type \ | |
2362 | -variable selected_commit_type \ | |
2363 | -value new | |
2364 | lappend disable_on_lock \ | |
2365 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
2366 | ||
2367 | .mbar.commit add radiobutton \ | |
2368 | -label [mc "Amend Last Commit"] \ | |
2369 | -command do_select_commit_type \ | |
2370 | -variable selected_commit_type \ | |
2371 | -value amend | |
2372 | lappend disable_on_lock \ | |
2373 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
2374 | ||
2375 | .mbar.commit add separator | |
2376 | } | |
24ac9b75 | 2377 | |
1ac17950 | 2378 | .mbar.commit add command -label [mc Rescan] \ |
8056cc4f | 2379 | -command ui_do_rescan \ |
7416bbc6 | 2380 | -accelerator F5 |
2ebba528 SP |
2381 | lappend disable_on_lock \ |
2382 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2383 | |
1ac17950 | 2384 | .mbar.commit add command -label [mc "Stage To Commit"] \ |
cd16a6c9 SP |
2385 | -command do_add_selection \ |
2386 | -accelerator $M1T-T | |
2ebba528 SP |
2387 | lappend disable_on_lock \ |
2388 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2389 | |
1ac17950 | 2390 | .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \ |
2ebba528 | 2391 | -command do_add_all \ |
7416bbc6 | 2392 | -accelerator $M1T-I |
2ebba528 SP |
2393 | lappend disable_on_lock \ |
2394 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2395 | |
1ac17950 | 2396 | .mbar.commit add command -label [mc "Unstage From Commit"] \ |
7416bbc6 | 2397 | -command do_unstage_selection |
2ebba528 SP |
2398 | lappend disable_on_lock \ |
2399 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
e734817d | 2400 | |
1ac17950 | 2401 | .mbar.commit add command -label [mc "Revert Changes"] \ |
7416bbc6 | 2402 | -command do_revert_selection |
2ebba528 SP |
2403 | lappend disable_on_lock \ |
2404 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
e734817d | 2405 | |
2ebba528 | 2406 | .mbar.commit add separator |
1461c5f3 | 2407 | |
c91ee2bd JS |
2408 | .mbar.commit add command -label [mc "Show Less Context"] \ |
2409 | -command show_less_context \ | |
729ffa50 | 2410 | -accelerator $M1T-\- |
c91ee2bd JS |
2411 | |
2412 | .mbar.commit add command -label [mc "Show More Context"] \ | |
2413 | -command show_more_context \ | |
729ffa50 | 2414 | -accelerator $M1T-= |
c91ee2bd JS |
2415 | |
2416 | .mbar.commit add separator | |
2417 | ||
ed70e4d7 | 2418 | if {![is_enabled nocommitmsg]} { |
1e02b32e SP |
2419 | .mbar.commit add command -label [mc "Sign Off"] \ |
2420 | -command do_signoff \ | |
2421 | -accelerator $M1T-S | |
2422 | } | |
24ac9b75 | 2423 | |
1e65c622 | 2424 | .mbar.commit add command -label [commit_btn_caption] \ |
2ebba528 | 2425 | -command do_commit \ |
7416bbc6 | 2426 | -accelerator $M1T-Return |
2ebba528 SP |
2427 | lappend disable_on_lock \ |
2428 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
2429 | } | |
cb07fc2a | 2430 | |
9b28a8b9 SP |
2431 | # -- Merge Menu |
2432 | # | |
2433 | if {[is_enabled branch]} { | |
2434 | menu .mbar.merge | |
1ac17950 | 2435 | .mbar.merge add command -label [mc "Local Merge..."] \ |
a870ddc0 SP |
2436 | -command merge::dialog \ |
2437 | -accelerator $M1T-M | |
9b28a8b9 SP |
2438 | lappend disable_on_lock \ |
2439 | [list .mbar.merge entryconf [.mbar.merge index last] -state] | |
1ac17950 | 2440 | .mbar.merge add command -label [mc "Abort Merge..."] \ |
a6c9b081 | 2441 | -command merge::reset_hard |
9b28a8b9 SP |
2442 | lappend disable_on_lock \ |
2443 | [list .mbar.merge entryconf [.mbar.merge index last] -state] | |
9b28a8b9 SP |
2444 | } |
2445 | ||
2446 | # -- Transport Menu | |
2447 | # | |
2448 | if {[is_enabled transport]} { | |
6bdf5e5f | 2449 | menu .mbar.remote |
9b28a8b9 | 2450 | |
6bdf5e5f SP |
2451 | .mbar.remote add command \ |
2452 | -label [mc "Push..."] \ | |
840bcfa7 SP |
2453 | -command do_push_anywhere \ |
2454 | -accelerator $M1T-P | |
6bdf5e5f SP |
2455 | .mbar.remote add command \ |
2456 | -label [mc "Delete..."] \ | |
aa252f19 | 2457 | -command remote_branch_delete::dialog |
9b28a8b9 SP |
2458 | } |
2459 | ||
0c8d7839 SP |
2460 | if {[is_MacOSX]} { |
2461 | # -- Apple Menu (Mac OS X only) | |
2462 | # | |
442b3caa | 2463 | .mbar add cascade -label Apple -menu .mbar.apple |
0c8d7839 SP |
2464 | menu .mbar.apple |
2465 | ||
1ac17950 | 2466 | .mbar.apple add command -label [mc "About %s" [appname]] \ |
7416bbc6 | 2467 | -command do_about |
13824e2d SP |
2468 | .mbar.apple add separator |
2469 | .mbar.apple add command \ | |
2470 | -label [mc "Preferences..."] \ | |
2471 | -command do_options \ | |
2472 | -accelerator $M1T-, | |
2473 | bind . <$M1B-,> do_options | |
0c8d7839 SP |
2474 | } else { |
2475 | # -- Edit Menu | |
2476 | # | |
2477 | .mbar.edit add separator | |
1ac17950 | 2478 | .mbar.edit add command -label [mc "Options..."] \ |
7416bbc6 | 2479 | -command do_options |
273984fc | 2480 | } |
557afe82 | 2481 | |
273984fc SP |
2482 | # -- Help Menu |
2483 | # | |
1ac17950 | 2484 | .mbar add cascade -label [mc Help] -menu .mbar.help |
273984fc | 2485 | menu .mbar.help |
0c8d7839 | 2486 | |
273984fc | 2487 | if {![is_MacOSX]} { |
1ac17950 | 2488 | .mbar.help add command -label [mc "About %s" [appname]] \ |
7416bbc6 | 2489 | -command do_about |
0c8d7839 | 2490 | } |
82aa2354 | 2491 | |
273984fc SP |
2492 | set browser {} |
2493 | catch {set browser $repo_config(instaweb.browser)} | |
20ddfcaa | 2494 | set doc_path [file dirname [gitexec]] |
273984fc SP |
2495 | set doc_path [file join $doc_path Documentation index.html] |
2496 | ||
20ddfcaa | 2497 | if {[is_Cygwin]} { |
ee405993 | 2498 | set doc_path [exec cygpath --mixed $doc_path] |
273984fc SP |
2499 | } |
2500 | ||
2501 | if {$browser eq {}} { | |
2502 | if {[is_MacOSX]} { | |
2503 | set browser open | |
20ddfcaa | 2504 | } elseif {[is_Cygwin]} { |
273984fc SP |
2505 | set program_files [file dirname [exec cygpath --windir]] |
2506 | set program_files [file join $program_files {Program Files}] | |
2507 | set firefox [file join $program_files {Mozilla Firefox} firefox.exe] | |
2508 | set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE] | |
2509 | if {[file exists $firefox]} { | |
2510 | set browser $firefox | |
2511 | } elseif {[file exists $ie]} { | |
2512 | set browser $ie | |
2513 | } | |
2514 | unset program_files firefox ie | |
2515 | } | |
2516 | } | |
2517 | ||
2518 | if {[file isfile $doc_path]} { | |
2519 | set doc_url "file:$doc_path" | |
2520 | } else { | |
2521 | set doc_url {http://www.kernel.org/pub/software/scm/git/docs/} | |
2522 | } | |
2523 | ||
2524 | if {$browser ne {}} { | |
1ac17950 | 2525 | .mbar.help add command -label [mc "Online Documentation"] \ |
7416bbc6 | 2526 | -command [list exec $browser $doc_url &] |
273984fc SP |
2527 | } |
2528 | unset browser doc_path doc_url | |
82aa2354 | 2529 | |
2ebba528 SP |
2530 | # -- Standard bindings |
2531 | # | |
39fa2a98 | 2532 | wm protocol . WM_DELETE_WINDOW do_quit |
2ebba528 SP |
2533 | bind all <$M1B-Key-q> do_quit |
2534 | bind all <$M1B-Key-Q> do_quit | |
2535 | bind all <$M1B-Key-w> {destroy [winfo toplevel %W]} | |
2536 | bind all <$M1B-Key-W> {destroy [winfo toplevel %W]} | |
2537 | ||
3e45ee1e SP |
2538 | set subcommand_args {} |
2539 | proc usage {} { | |
2540 | puts stderr "usage: $::argv0 $::subcommand $::subcommand_args" | |
2541 | exit 1 | |
2542 | } | |
2543 | ||
2ebba528 SP |
2544 | # -- Not a normal commit type invocation? Do that instead! |
2545 | # | |
258871d3 | 2546 | switch -- $subcommand { |
85d2d597 | 2547 | browser - |
2ebba528 | 2548 | blame { |
f7078b40 AG |
2549 | if {$subcommand eq "blame"} { |
2550 | set subcommand_args {[--line=<num>] rev? path} | |
2551 | } else { | |
2552 | set subcommand_args {rev? path} | |
2553 | } | |
c52c9452 | 2554 | if {$argv eq {}} usage |
a0db0d61 | 2555 | set head {} |
3e45ee1e | 2556 | set path {} |
f7078b40 | 2557 | set jump_spec {} |
3e45ee1e SP |
2558 | set is_path 0 |
2559 | foreach a $argv { | |
2560 | if {$is_path || [file exists $_prefix$a]} { | |
2561 | if {$path ne {}} usage | |
6b3d8b97 | 2562 | set path $_prefix$a |
3e45ee1e SP |
2563 | break |
2564 | } elseif {$a eq {--}} { | |
2565 | if {$path ne {}} { | |
a0db0d61 SP |
2566 | if {$head ne {}} usage |
2567 | set head $path | |
3e45ee1e SP |
2568 | set path {} |
2569 | } | |
2570 | set is_path 1 | |
f7078b40 AG |
2571 | } elseif {[regexp {^--line=(\d+)$} $a a lnum]} { |
2572 | if {$jump_spec ne {} || $head ne {}} usage | |
2573 | set jump_spec [list $lnum] | |
a0db0d61 SP |
2574 | } elseif {$head eq {}} { |
2575 | if {$head ne {}} usage | |
2576 | set head $a | |
c52c9452 | 2577 | set is_path 1 |
3e45ee1e SP |
2578 | } else { |
2579 | usage | |
2580 | } | |
2581 | } | |
2582 | unset is_path | |
2583 | ||
c52c9452 SP |
2584 | if {$head ne {} && $path eq {}} { |
2585 | set path $_prefix$head | |
2586 | set head {} | |
2587 | } | |
2588 | ||
a0db0d61 | 2589 | if {$head eq {}} { |
d41b43eb | 2590 | load_current_branch |
a0db0d61 | 2591 | } else { |
02087abc SP |
2592 | if {[regexp {^[0-9a-f]{1,39}$} $head]} { |
2593 | if {[catch { | |
2594 | set head [git rev-parse --verify $head] | |
2595 | } err]} { | |
2596 | puts stderr $err | |
2597 | exit 1 | |
2598 | } | |
2599 | } | |
a0db0d61 | 2600 | set current_branch $head |
2ebba528 | 2601 | } |
a0db0d61 | 2602 | |
85d2d597 SP |
2603 | switch -- $subcommand { |
2604 | browser { | |
f7078b40 | 2605 | if {$jump_spec ne {}} usage |
85d2d597 SP |
2606 | if {$head eq {}} { |
2607 | if {$path ne {} && [file isdirectory $path]} { | |
2608 | set head $current_branch | |
2609 | } else { | |
2610 | set head $path | |
2611 | set path {} | |
2612 | } | |
2613 | } | |
2614 | browser::new $head $path | |
2615 | } | |
2616 | blame { | |
2617 | if {$head eq {} && ![file exists $path]} { | |
c8c4854b | 2618 | puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path] |
85d2d597 SP |
2619 | exit 1 |
2620 | } | |
f7078b40 | 2621 | blame::new $head $path $jump_spec |
85d2d597 | 2622 | } |
c52c9452 | 2623 | } |
258871d3 SP |
2624 | return |
2625 | } | |
2626 | citool - | |
2627 | gui { | |
2628 | if {[llength $argv] != 0} { | |
2629 | puts -nonewline stderr "usage: $argv0" | |
0b2bc460 SP |
2630 | if {$subcommand ne {gui} |
2631 | && [file tail $argv0] ne "git-$subcommand"} { | |
258871d3 SP |
2632 | puts -nonewline stderr " $subcommand" |
2633 | } | |
2634 | puts stderr {} | |
2635 | exit 1 | |
2636 | } | |
2637 | # fall through to setup UI for commits | |
2ebba528 | 2638 | } |
2ebba528 | 2639 | default { |
c0f7a6c3 | 2640 | puts stderr "usage: $argv0 \[{blame|browser|citool}\]" |
2ebba528 SP |
2641 | exit 1 |
2642 | } | |
2643 | } | |
2644 | ||
8553b772 SP |
2645 | # -- Branch Control |
2646 | # | |
2647 | frame .branch \ | |
2648 | -borderwidth 1 \ | |
2649 | -relief sunken | |
2650 | label .branch.l1 \ | |
1ac17950 | 2651 | -text [mc "Current Branch:"] \ |
8553b772 | 2652 | -anchor w \ |
7416bbc6 | 2653 | -justify left |
8553b772 SP |
2654 | label .branch.cb \ |
2655 | -textvariable current_branch \ | |
2656 | -anchor w \ | |
7416bbc6 | 2657 | -justify left |
8553b772 SP |
2658 | pack .branch.l1 -side left |
2659 | pack .branch.cb -side left -fill x | |
2660 | pack .branch -side top -fill x | |
2661 | ||
cb07fc2a | 2662 | # -- Main Window Layout |
a49c67d1 | 2663 | # |
a0592d3f JS |
2664 | panedwindow .vpane -orient horizontal |
2665 | panedwindow .vpane.files -orient vertical | |
c5a1eb88 | 2666 | .vpane add .vpane.files -sticky nsew -height 100 -width 200 |
cb07fc2a SP |
2667 | pack .vpane -anchor n -side top -fill both -expand 1 |
2668 | ||
2669 | # -- Index File List | |
a49c67d1 | 2670 | # |
c5a1eb88 | 2671 | frame .vpane.files.index -height 100 -width 200 |
c73ce762 | 2672 | label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \ |
c382fdd7 PH |
2673 | -background lightgreen -foreground black |
2674 | text $ui_index -background white -foreground black \ | |
2675 | -borderwidth 0 \ | |
c5a1eb88 | 2676 | -width 20 -height 10 \ |
3c236977 | 2677 | -wrap none \ |
6c6dd01a | 2678 | -cursor $cursor_ptr \ |
3c236977 SP |
2679 | -xscrollcommand {.vpane.files.index.sx set} \ |
2680 | -yscrollcommand {.vpane.files.index.sy set} \ | |
cb07fc2a | 2681 | -state disabled |
3c236977 SP |
2682 | scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview] |
2683 | scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview] | |
cb07fc2a | 2684 | pack .vpane.files.index.title -side top -fill x |
3c236977 SP |
2685 | pack .vpane.files.index.sx -side bottom -fill x |
2686 | pack .vpane.files.index.sy -side right -fill y | |
cb07fc2a | 2687 | pack $ui_index -side left -fill both -expand 1 |
cb07fc2a | 2688 | |
0812665e | 2689 | # -- Working Directory File List |
a49c67d1 | 2690 | # |
c5a1eb88 | 2691 | frame .vpane.files.workdir -height 100 -width 200 |
c73ce762 | 2692 | label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \ |
c382fdd7 PH |
2693 | -background lightsalmon -foreground black |
2694 | text $ui_workdir -background white -foreground black \ | |
2695 | -borderwidth 0 \ | |
c5a1eb88 | 2696 | -width 20 -height 10 \ |
3c236977 | 2697 | -wrap none \ |
6c6dd01a | 2698 | -cursor $cursor_ptr \ |
3c236977 SP |
2699 | -xscrollcommand {.vpane.files.workdir.sx set} \ |
2700 | -yscrollcommand {.vpane.files.workdir.sy set} \ | |
cb07fc2a | 2701 | -state disabled |
3c236977 SP |
2702 | scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview] |
2703 | scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview] | |
0812665e | 2704 | pack .vpane.files.workdir.title -side top -fill x |
3c236977 SP |
2705 | pack .vpane.files.workdir.sx -side bottom -fill x |
2706 | pack .vpane.files.workdir.sy -side right -fill y | |
0812665e | 2707 | pack $ui_workdir -side left -fill both -expand 1 |
a0592d3f | 2708 | |
0812665e | 2709 | .vpane.files add .vpane.files.workdir -sticky nsew |
a0592d3f | 2710 | .vpane.files add .vpane.files.index -sticky nsew |
cb07fc2a | 2711 | |
0812665e | 2712 | foreach i [list $ui_index $ui_workdir] { |
3849bfba SP |
2713 | rmsel_tag $i |
2714 | $i tag conf in_diff -background [$i tag cget in_sel -background] | |
24263b77 SP |
2715 | } |
2716 | unset i | |
131f503b | 2717 | |
0fb8f9ce | 2718 | # -- Diff and Commit Area |
a49c67d1 | 2719 | # |
8009dcdc | 2720 | frame .vpane.lower -height 300 -width 400 |
0fb8f9ce SP |
2721 | frame .vpane.lower.commarea |
2722 | frame .vpane.lower.diff -relief sunken -borderwidth 1 | |
a0592d3f JS |
2723 | pack .vpane.lower.diff -fill both -expand 1 |
2724 | pack .vpane.lower.commarea -side bottom -fill x | |
0fd49d0a | 2725 | .vpane add .vpane.lower -sticky nsew |
cb07fc2a SP |
2726 | |
2727 | # -- Commit Area Buttons | |
a49c67d1 | 2728 | # |
0fb8f9ce SP |
2729 | frame .vpane.lower.commarea.buttons |
2730 | label .vpane.lower.commarea.buttons.l -text {} \ | |
cb07fc2a | 2731 | -anchor w \ |
7416bbc6 | 2732 | -justify left |
0fb8f9ce SP |
2733 | pack .vpane.lower.commarea.buttons.l -side top -fill x |
2734 | pack .vpane.lower.commarea.buttons -side left -fill y | |
131f503b | 2735 | |
1ac17950 | 2736 | button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \ |
8056cc4f | 2737 | -command ui_do_rescan |
0fb8f9ce | 2738 | pack .vpane.lower.commarea.buttons.rescan -side top -fill x |
390adaea SP |
2739 | lappend disable_on_lock \ |
2740 | {.vpane.lower.commarea.buttons.rescan conf -state} | |
131f503b | 2741 | |
1ac17950 | 2742 | button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \ |
7416bbc6 | 2743 | -command do_add_all |
7fe7e733 | 2744 | pack .vpane.lower.commarea.buttons.incall -side top -fill x |
390adaea SP |
2745 | lappend disable_on_lock \ |
2746 | {.vpane.lower.commarea.buttons.incall conf -state} | |
131f503b | 2747 | |
ed70e4d7 | 2748 | if {![is_enabled nocommitmsg]} { |
1e02b32e SP |
2749 | button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \ |
2750 | -command do_signoff | |
2751 | pack .vpane.lower.commarea.buttons.signoff -side top -fill x | |
2752 | } | |
131f503b | 2753 | |
1e65c622 | 2754 | button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \ |
7416bbc6 | 2755 | -command do_commit |
0fb8f9ce | 2756 | pack .vpane.lower.commarea.buttons.commit -side top -fill x |
390adaea SP |
2757 | lappend disable_on_lock \ |
2758 | {.vpane.lower.commarea.buttons.commit conf -state} | |
cb07fc2a | 2759 | |
1e02b32e SP |
2760 | if {![is_enabled nocommit]} { |
2761 | button .vpane.lower.commarea.buttons.push -text [mc Push] \ | |
2762 | -command do_push_anywhere | |
2763 | pack .vpane.lower.commarea.buttons.push -side top -fill x | |
1e65c622 AG |
2764 | } |
2765 | ||
cb07fc2a | 2766 | # -- Commit Message Buffer |
a49c67d1 | 2767 | # |
0fb8f9ce | 2768 | frame .vpane.lower.commarea.buffer |
24ac9b75 | 2769 | frame .vpane.lower.commarea.buffer.header |
0fb8f9ce | 2770 | set ui_comm .vpane.lower.commarea.buffer.t |
24ac9b75 | 2771 | set ui_coml .vpane.lower.commarea.buffer.header.l |
1e02b32e SP |
2772 | |
2773 | if {![is_enabled nocommit]} { | |
2774 | radiobutton .vpane.lower.commarea.buffer.header.new \ | |
2775 | -text [mc "New Commit"] \ | |
2776 | -command do_select_commit_type \ | |
2777 | -variable selected_commit_type \ | |
2778 | -value new | |
2779 | lappend disable_on_lock \ | |
2780 | [list .vpane.lower.commarea.buffer.header.new conf -state] | |
2781 | radiobutton .vpane.lower.commarea.buffer.header.amend \ | |
2782 | -text [mc "Amend Last Commit"] \ | |
2783 | -command do_select_commit_type \ | |
2784 | -variable selected_commit_type \ | |
2785 | -value amend | |
2786 | lappend disable_on_lock \ | |
2787 | [list .vpane.lower.commarea.buffer.header.amend conf -state] | |
2788 | } | |
2789 | ||
a49c67d1 | 2790 | label $ui_coml \ |
cb07fc2a | 2791 | -anchor w \ |
7416bbc6 | 2792 | -justify left |
4539eacd SP |
2793 | proc trace_commit_type {varname args} { |
2794 | global ui_coml commit_type | |
2795 | switch -glob -- $commit_type { | |
1ac17950 CS |
2796 | initial {set txt [mc "Initial Commit Message:"]} |
2797 | amend {set txt [mc "Amended Commit Message:"]} | |
2798 | amend-initial {set txt [mc "Amended Initial Commit Message:"]} | |
2799 | amend-merge {set txt [mc "Amended Merge Commit Message:"]} | |
2800 | merge {set txt [mc "Merge Commit Message:"]} | |
2801 | * {set txt [mc "Commit Message:"]} | |
4539eacd SP |
2802 | } |
2803 | $ui_coml conf -text $txt | |
2804 | } | |
2805 | trace add variable commit_type write trace_commit_type | |
24ac9b75 | 2806 | pack $ui_coml -side left -fill x |
1e02b32e SP |
2807 | |
2808 | if {![is_enabled nocommit]} { | |
2809 | pack .vpane.lower.commarea.buffer.header.amend -side right | |
2810 | pack .vpane.lower.commarea.buffer.header.new -side right | |
2811 | } | |
24ac9b75 | 2812 | |
c382fdd7 PH |
2813 | text $ui_comm -background white -foreground black \ |
2814 | -borderwidth 1 \ | |
9861671d | 2815 | -undo true \ |
b2c6fcf1 | 2816 | -maxundo 20 \ |
9861671d | 2817 | -autoseparators true \ |
cb07fc2a | 2818 | -relief sunken \ |
11027d54 | 2819 | -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \ |
b4946930 | 2820 | -font font_diff \ |
6c6dd01a | 2821 | -yscrollcommand {.vpane.lower.commarea.buffer.sby set} |
390adaea SP |
2822 | scrollbar .vpane.lower.commarea.buffer.sby \ |
2823 | -command [list $ui_comm yview] | |
24ac9b75 | 2824 | pack .vpane.lower.commarea.buffer.header -side top -fill x |
0fb8f9ce | 2825 | pack .vpane.lower.commarea.buffer.sby -side right -fill y |
cb07fc2a | 2826 | pack $ui_comm -side left -fill y |
0fb8f9ce SP |
2827 | pack .vpane.lower.commarea.buffer -side left -fill y |
2828 | ||
0e794311 SP |
2829 | # -- Commit Message Buffer Context Menu |
2830 | # | |
e8ab6446 SP |
2831 | set ctxm .vpane.lower.commarea.buffer.ctxm |
2832 | menu $ctxm -tearoff 0 | |
2833 | $ctxm add command \ | |
1ac17950 | 2834 | -label [mc Cut] \ |
e8ab6446 SP |
2835 | -command {tk_textCut $ui_comm} |
2836 | $ctxm add command \ | |
1ac17950 | 2837 | -label [mc Copy] \ |
e8ab6446 SP |
2838 | -command {tk_textCopy $ui_comm} |
2839 | $ctxm add command \ | |
1ac17950 | 2840 | -label [mc Paste] \ |
e8ab6446 SP |
2841 | -command {tk_textPaste $ui_comm} |
2842 | $ctxm add command \ | |
1ac17950 | 2843 | -label [mc Delete] \ |
e8ab6446 SP |
2844 | -command {$ui_comm delete sel.first sel.last} |
2845 | $ctxm add separator | |
2846 | $ctxm add command \ | |
1ac17950 | 2847 | -label [mc "Select All"] \ |
75e78c8a | 2848 | -command {focus $ui_comm;$ui_comm tag add sel 0.0 end} |
e8ab6446 | 2849 | $ctxm add command \ |
1ac17950 | 2850 | -label [mc "Copy All"] \ |
e8ab6446 | 2851 | -command { |
0e794311 SP |
2852 | $ui_comm tag add sel 0.0 end |
2853 | tk_textCopy $ui_comm | |
2854 | $ui_comm tag remove sel 0.0 end | |
e8ab6446 SP |
2855 | } |
2856 | $ctxm add separator | |
2857 | $ctxm add command \ | |
1ac17950 | 2858 | -label [mc "Sign Off"] \ |
0e794311 | 2859 | -command do_signoff |
95b002ee | 2860 | set ui_comm_ctxm $ctxm |
0e794311 | 2861 | |
0fb8f9ce | 2862 | # -- Diff Header |
a49c67d1 | 2863 | # |
20a53c02 SP |
2864 | proc trace_current_diff_path {varname args} { |
2865 | global current_diff_path diff_actions file_states | |
2866 | if {$current_diff_path eq {}} { | |
e8ab6446 SP |
2867 | set s {} |
2868 | set f {} | |
2869 | set p {} | |
2870 | set o disabled | |
2871 | } else { | |
20a53c02 | 2872 | set p $current_diff_path |
e8ab6446 | 2873 | set s [mapdesc [lindex $file_states($p) 0] $p] |
1ac17950 | 2874 | set f [mc "File:"] |
e8ab6446 SP |
2875 | set p [escape_path $p] |
2876 | set o normal | |
2877 | } | |
2878 | ||
2879 | .vpane.lower.diff.header.status configure -text $s | |
2880 | .vpane.lower.diff.header.file configure -text $f | |
2881 | .vpane.lower.diff.header.path configure -text $p | |
2882 | foreach w $diff_actions { | |
2883 | uplevel #0 $w $o | |
2884 | } | |
2885 | } | |
20a53c02 | 2886 | trace add variable current_diff_path write trace_current_diff_path |
e8ab6446 | 2887 | |
9adccb05 | 2888 | frame .vpane.lower.diff.header -background gold |
e8ab6446 | 2889 | label .vpane.lower.diff.header.status \ |
9adccb05 | 2890 | -background gold \ |
c382fdd7 | 2891 | -foreground black \ |
3e7b0e1d SP |
2892 | -width $max_status_desc \ |
2893 | -anchor w \ | |
7416bbc6 | 2894 | -justify left |
e8ab6446 | 2895 | label .vpane.lower.diff.header.file \ |
9adccb05 | 2896 | -background gold \ |
c382fdd7 | 2897 | -foreground black \ |
e8ab6446 | 2898 | -anchor w \ |
7416bbc6 | 2899 | -justify left |
e8ab6446 | 2900 | label .vpane.lower.diff.header.path \ |
9adccb05 | 2901 | -background gold \ |
c382fdd7 | 2902 | -foreground black \ |
fce89e46 | 2903 | -anchor w \ |
7416bbc6 | 2904 | -justify left |
e8ab6446 SP |
2905 | pack .vpane.lower.diff.header.status -side left |
2906 | pack .vpane.lower.diff.header.file -side left | |
2907 | pack .vpane.lower.diff.header.path -fill x | |
2908 | set ctxm .vpane.lower.diff.header.ctxm | |
2909 | menu $ctxm -tearoff 0 | |
2910 | $ctxm add command \ | |
1ac17950 | 2911 | -label [mc Copy] \ |
fce89e46 SP |
2912 | -command { |
2913 | clipboard clear | |
2914 | clipboard append \ | |
2915 | -format STRING \ | |
2916 | -type STRING \ | |
20a53c02 | 2917 | -- $current_diff_path |
fce89e46 | 2918 | } |
e8ab6446 SP |
2919 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
2920 | bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y" | |
0fb8f9ce SP |
2921 | |
2922 | # -- Diff Body | |
a49c67d1 | 2923 | # |
0fb8f9ce SP |
2924 | frame .vpane.lower.diff.body |
2925 | set ui_diff .vpane.lower.diff.body.t | |
c382fdd7 PH |
2926 | text $ui_diff -background white -foreground black \ |
2927 | -borderwidth 0 \ | |
0fb8f9ce | 2928 | -width 80 -height 15 -wrap none \ |
b4946930 | 2929 | -font font_diff \ |
0fb8f9ce SP |
2930 | -xscrollcommand {.vpane.lower.diff.body.sbx set} \ |
2931 | -yscrollcommand {.vpane.lower.diff.body.sby set} \ | |
0fb8f9ce SP |
2932 | -state disabled |
2933 | scrollbar .vpane.lower.diff.body.sbx -orient horizontal \ | |
2934 | -command [list $ui_diff xview] | |
2935 | scrollbar .vpane.lower.diff.body.sby -orient vertical \ | |
2936 | -command [list $ui_diff yview] | |
2937 | pack .vpane.lower.diff.body.sbx -side bottom -fill x | |
2938 | pack .vpane.lower.diff.body.sby -side right -fill y | |
2939 | pack $ui_diff -side left -fill both -expand 1 | |
2940 | pack .vpane.lower.diff.header -side top -fill x | |
2941 | pack .vpane.lower.diff.body -side bottom -fill both -expand 1 | |
2942 | ||
30b14ed3 | 2943 | $ui_diff tag conf d_cr -elide true |
ca521566 SP |
2944 | $ui_diff tag conf d_@ -foreground blue -font font_diffbold |
2945 | $ui_diff tag conf d_+ -foreground {#00a000} | |
fec4a785 SP |
2946 | $ui_diff tag conf d_- -foreground red |
2947 | ||
ca521566 | 2948 | $ui_diff tag conf d_++ -foreground {#00a000} |
fec4a785 SP |
2949 | $ui_diff tag conf d_-- -foreground red |
2950 | $ui_diff tag conf d_+s \ | |
ca521566 SP |
2951 | -foreground {#00a000} \ |
2952 | -background {#e2effa} | |
fec4a785 SP |
2953 | $ui_diff tag conf d_-s \ |
2954 | -foreground red \ | |
ca521566 | 2955 | -background {#e2effa} |
fec4a785 | 2956 | $ui_diff tag conf d_s+ \ |
ca521566 SP |
2957 | -foreground {#00a000} \ |
2958 | -background ivory1 | |
fec4a785 SP |
2959 | $ui_diff tag conf d_s- \ |
2960 | -foreground red \ | |
ca521566 | 2961 | -background ivory1 |
fec4a785 SP |
2962 | |
2963 | $ui_diff tag conf d<<<<<<< \ | |
2964 | -foreground orange \ | |
2965 | -font font_diffbold | |
2966 | $ui_diff tag conf d======= \ | |
2967 | -foreground orange \ | |
2968 | -font font_diffbold | |
2969 | $ui_diff tag conf d>>>>>>> \ | |
2970 | -foreground orange \ | |
2971 | -font font_diffbold | |
cb07fc2a | 2972 | |
ca521566 SP |
2973 | $ui_diff tag raise sel |
2974 | ||
0e794311 SP |
2975 | # -- Diff Body Context Menu |
2976 | # | |
042c2325 AG |
2977 | |
2978 | proc create_common_diff_popup {ctxm} { | |
2979 | $ctxm add command \ | |
2980 | -label [mc "Show Less Context"] \ | |
2981 | -command show_less_context | |
2982 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
2983 | $ctxm add command \ | |
2984 | -label [mc "Show More Context"] \ | |
2985 | -command show_more_context | |
2986 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
2987 | $ctxm add separator | |
2988 | $ctxm add command \ | |
2989 | -label [mc Refresh] \ | |
2990 | -command reshow_diff | |
2991 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
2992 | $ctxm add command \ | |
2993 | -label [mc Copy] \ | |
2994 | -command {tk_textCopy $ui_diff} | |
2995 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
2996 | $ctxm add command \ | |
2997 | -label [mc "Select All"] \ | |
2998 | -command {focus $ui_diff;$ui_diff tag add sel 0.0 end} | |
2999 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3000 | $ctxm add command \ | |
3001 | -label [mc "Copy All"] \ | |
3002 | -command { | |
3003 | $ui_diff tag add sel 0.0 end | |
3004 | tk_textCopy $ui_diff | |
3005 | $ui_diff tag remove sel 0.0 end | |
3006 | } | |
3007 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3008 | $ctxm add separator | |
3009 | $ctxm add command \ | |
3010 | -label [mc "Decrease Font Size"] \ | |
3011 | -command {incr_font_size font_diff -1} | |
3012 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3013 | $ctxm add command \ | |
3014 | -label [mc "Increase Font Size"] \ | |
3015 | -command {incr_font_size font_diff 1} | |
3016 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3017 | $ctxm add separator | |
3fe01623 AG |
3018 | set emenu $ctxm.enc |
3019 | menu $emenu | |
3020 | build_encoding_menu $emenu [list force_diff_encoding] | |
3021 | $ctxm add cascade \ | |
3022 | -label [mc "Encoding"] \ | |
3023 | -menu $emenu | |
3024 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3025 | $ctxm add separator | |
042c2325 AG |
3026 | $ctxm add command -label [mc "Options..."] \ |
3027 | -command do_options | |
3028 | } | |
3029 | ||
e8ab6446 SP |
3030 | set ctxm .vpane.lower.diff.body.ctxm |
3031 | menu $ctxm -tearoff 0 | |
fba6072e JS |
3032 | $ctxm add command \ |
3033 | -label [mc "Apply/Reverse Hunk"] \ | |
3034 | -command {apply_hunk $cursorX $cursorY} | |
3035 | set ui_diff_applyhunk [$ctxm index last] | |
3036 | lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] | |
5821988f JS |
3037 | $ctxm add command \ |
3038 | -label [mc "Apply/Reverse Line"] \ | |
3039 | -command {apply_line $cursorX $cursorY; do_rescan} | |
3040 | set ui_diff_applyline [$ctxm index last] | |
3041 | lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state] | |
fba6072e | 3042 | $ctxm add separator |
042c2325 AG |
3043 | create_common_diff_popup $ctxm |
3044 | ||
3045 | set ctxmmg .vpane.lower.diff.body.ctxmmg | |
3046 | menu $ctxmmg -tearoff 0 | |
7e30682c AG |
3047 | $ctxmmg add command \ |
3048 | -label [mc "Run Merge Tool"] \ | |
3049 | -command {merge_resolve_tool} | |
3050 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3051 | $ctxmmg add separator | |
042c2325 AG |
3052 | $ctxmmg add command \ |
3053 | -label [mc "Use Remote Version"] \ | |
3054 | -command {merge_resolve_one 3} | |
3055 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3056 | $ctxmmg add command \ | |
3057 | -label [mc "Use Local Version"] \ | |
3058 | -command {merge_resolve_one 2} | |
3059 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3060 | $ctxmmg add command \ | |
3061 | -label [mc "Revert To Base"] \ | |
3062 | -command {merge_resolve_one 1} | |
3063 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3064 | $ctxmmg add separator | |
3065 | create_common_diff_popup $ctxmmg | |
3066 | ||
3067 | proc popup_diff_menu {ctxm ctxmmg x y X Y} { | |
ce015c21 | 3068 | global current_diff_path file_states |
83751fc1 SP |
3069 | set ::cursorX $x |
3070 | set ::cursorY $y | |
042c2325 AG |
3071 | if {[info exists file_states($current_diff_path)]} { |
3072 | set state [lindex $file_states($current_diff_path) 0] | |
a25c5189 | 3073 | } else { |
042c2325 AG |
3074 | set state {__} |
3075 | } | |
ff515d81 | 3076 | if {[string first {U} $state] >= 0} { |
042c2325 | 3077 | tk_popup $ctxmmg $X $Y |
047d94d5 | 3078 | } else { |
042c2325 AG |
3079 | if {$::ui_index eq $::current_diff_side} { |
3080 | set l [mc "Unstage Hunk From Commit"] | |
3081 | set t [mc "Unstage Line From Commit"] | |
3082 | } else { | |
3083 | set l [mc "Stage Hunk For Commit"] | |
3084 | set t [mc "Stage Line For Commit"] | |
3085 | } | |
3086 | if {$::is_3way_diff | |
3087 | || $current_diff_path eq {} | |
3088 | || {__} eq $state | |
3089 | || {_O} eq $state | |
3090 | || {_T} eq $state | |
3091 | || {T_} eq $state} { | |
3092 | set s disabled | |
3093 | } else { | |
3094 | set s normal | |
3095 | } | |
3096 | $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l | |
3097 | $ctxm entryconf $::ui_diff_applyline -state $s -label $t | |
3098 | tk_popup $ctxm $X $Y | |
9c9f5fa9 | 3099 | } |
83751fc1 | 3100 | } |
042c2325 | 3101 | bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg %x %y %X %Y] |
0e794311 | 3102 | |
cb07fc2a | 3103 | # -- Status Bar |
e8ab6446 | 3104 | # |
51530d17 | 3105 | set main_status [::status_bar::new .status] |
cb07fc2a | 3106 | pack .status -anchor w -side bottom -fill x |
1ac17950 | 3107 | $main_status show [mc "Initializing..."] |
cb07fc2a | 3108 | |
2d19516d | 3109 | # -- Load geometry |
e8ab6446 | 3110 | # |
2d19516d | 3111 | catch { |
51f4d16b | 3112 | set gm $repo_config(gui.geometry) |
c4fe7728 SP |
3113 | wm geometry . [lindex $gm 0] |
3114 | .vpane sash place 0 \ | |
a0592d3f JS |
3115 | [lindex $gm 1] \ |
3116 | [lindex [.vpane sash coord 0] 1] | |
c4fe7728 | 3117 | .vpane.files sash place 0 \ |
a0592d3f JS |
3118 | [lindex [.vpane.files sash coord 0] 0] \ |
3119 | [lindex $gm 2] | |
c4fe7728 | 3120 | unset gm |
390adaea | 3121 | } |
2d19516d | 3122 | |
cb07fc2a | 3123 | # -- Key Bindings |
e8ab6446 | 3124 | # |
ec6b424a | 3125 | bind $ui_comm <$M1B-Key-Return> {do_commit;break} |
cd16a6c9 SP |
3126 | bind $ui_comm <$M1B-Key-t> {do_add_selection;break} |
3127 | bind $ui_comm <$M1B-Key-T> {do_add_selection;break} | |
93e912c5 SP |
3128 | bind $ui_comm <$M1B-Key-i> {do_add_all;break} |
3129 | bind $ui_comm <$M1B-Key-I> {do_add_all;break} | |
9861671d SP |
3130 | bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break} |
3131 | bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break} | |
3132 | bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break} | |
3133 | bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break} | |
3134 | bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break} | |
3135 | bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break} | |
3136 | bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break} | |
3137 | bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break} | |
729ffa50 MB |
3138 | bind $ui_comm <$M1B-Key-minus> {show_less_context;break} |
3139 | bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} | |
3140 | bind $ui_comm <$M1B-Key-equal> {show_more_context;break} | |
3141 | bind $ui_comm <$M1B-Key-plus> {show_more_context;break} | |
3142 | bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} | |
9861671d SP |
3143 | |
3144 | bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} | |
3145 | bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} | |
3146 | bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break} | |
3147 | bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break} | |
3148 | bind $ui_diff <$M1B-Key-v> {break} | |
3149 | bind $ui_diff <$M1B-Key-V> {break} | |
3150 | bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break} | |
3151 | bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break} | |
b2c6fcf1 SP |
3152 | bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break} |
3153 | bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break} | |
3154 | bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break} | |
3155 | bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break} | |
60aa065f SP |
3156 | bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break} |
3157 | bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break} | |
3158 | bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break} | |
3159 | bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break} | |
3160 | bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break} | |
3161 | bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break} | |
23effa79 | 3162 | bind $ui_diff <Button-1> {focus %W} |
49b86f01 | 3163 | |
64a906f8 | 3164 | if {[is_enabled branch]} { |
b1fa2bff SP |
3165 | bind . <$M1B-Key-n> branch_create::dialog |
3166 | bind . <$M1B-Key-N> branch_create::dialog | |
d41b43eb SP |
3167 | bind . <$M1B-Key-o> branch_checkout::dialog |
3168 | bind . <$M1B-Key-O> branch_checkout::dialog | |
a870ddc0 SP |
3169 | bind . <$M1B-Key-m> merge::dialog |
3170 | bind . <$M1B-Key-M> merge::dialog | |
bd29ebc3 | 3171 | } |
840bcfa7 SP |
3172 | if {[is_enabled transport]} { |
3173 | bind . <$M1B-Key-p> do_push_anywhere | |
3174 | bind . <$M1B-Key-P> do_push_anywhere | |
3175 | } | |
bd29ebc3 | 3176 | |
8056cc4f AG |
3177 | bind . <Key-F5> ui_do_rescan |
3178 | bind . <$M1B-Key-r> ui_do_rescan | |
3179 | bind . <$M1B-Key-R> ui_do_rescan | |
07123f40 SP |
3180 | bind . <$M1B-Key-s> do_signoff |
3181 | bind . <$M1B-Key-S> do_signoff | |
cd16a6c9 SP |
3182 | bind . <$M1B-Key-t> do_add_selection |
3183 | bind . <$M1B-Key-T> do_add_selection | |
93e912c5 SP |
3184 | bind . <$M1B-Key-i> do_add_all |
3185 | bind . <$M1B-Key-I> do_add_all | |
729ffa50 MB |
3186 | bind . <$M1B-Key-minus> {show_less_context;break} |
3187 | bind . <$M1B-Key-KP_Subtract> {show_less_context;break} | |
3188 | bind . <$M1B-Key-equal> {show_more_context;break} | |
3189 | bind . <$M1B-Key-plus> {show_more_context;break} | |
3190 | bind . <$M1B-Key-KP_Add> {show_more_context;break} | |
07123f40 | 3191 | bind . <$M1B-Key-Return> do_commit |
0812665e | 3192 | foreach i [list $ui_index $ui_workdir] { |
24263b77 SP |
3193 | bind $i <Button-1> "toggle_or_diff $i %x %y; break" |
3194 | bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break" | |
3195 | bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break" | |
cb07fc2a | 3196 | } |
62aac80b SP |
3197 | unset i |
3198 | ||
3199 | set file_lists($ui_index) [list] | |
0812665e | 3200 | set file_lists($ui_workdir) [list] |
a49c67d1 | 3201 | |
19c82148 | 3202 | wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]" |
cb07fc2a | 3203 | focus -force $ui_comm |
1d8b3cbf | 3204 | |
85ab313e SP |
3205 | # -- Warn the user about environmental problems. Cygwin's Tcl |
3206 | # does *not* pass its env array onto any processes it spawns. | |
3207 | # This means that git processes get none of our environment. | |
1d8b3cbf | 3208 | # |
20ddfcaa | 3209 | if {[is_Cygwin]} { |
1d8b3cbf SP |
3210 | set ignored_env 0 |
3211 | set suggest_user {} | |
c8c4854b | 3212 | set msg [mc "Possible environment issues exist. |
1d8b3cbf SP |
3213 | |
3214 | The following environment variables are probably | |
3215 | going to be ignored by any Git subprocess run | |
c8c4854b | 3216 | by %s: |
1d8b3cbf | 3217 | |
c8c4854b | 3218 | " [appname]] |
1d8b3cbf SP |
3219 | foreach name [array names env] { |
3220 | switch -regexp -- $name { | |
3221 | {^GIT_INDEX_FILE$} - | |
3222 | {^GIT_OBJECT_DIRECTORY$} - | |
3223 | {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} - | |
3224 | {^GIT_DIFF_OPTS$} - | |
3225 | {^GIT_EXTERNAL_DIFF$} - | |
3226 | {^GIT_PAGER$} - | |
3227 | {^GIT_TRACE$} - | |
3228 | {^GIT_CONFIG$} - | |
3229 | {^GIT_CONFIG_LOCAL$} - | |
3230 | {^GIT_(AUTHOR|COMMITTER)_DATE$} { | |
3231 | append msg " - $name\n" | |
3232 | incr ignored_env | |
3233 | } | |
3234 | {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} { | |
3235 | append msg " - $name\n" | |
3236 | incr ignored_env | |
3237 | set suggest_user $name | |
3238 | } | |
3239 | } | |
3240 | } | |
3241 | if {$ignored_env > 0} { | |
c8c4854b | 3242 | append msg [mc " |
1d8b3cbf | 3243 | This is due to a known issue with the |
c8c4854b | 3244 | Tcl binary distributed by Cygwin."] |
1d8b3cbf SP |
3245 | |
3246 | if {$suggest_user ne {}} { | |
c8c4854b | 3247 | append msg [mc " |
1d8b3cbf | 3248 | |
c8c4854b | 3249 | A good replacement for %s |
1d8b3cbf SP |
3250 | is placing values for the user.name and |
3251 | user.email settings into your personal | |
3252 | ~/.gitconfig file. | |
c8c4854b | 3253 | " $suggest_user] |
1d8b3cbf SP |
3254 | } |
3255 | warn_popup $msg | |
3256 | } | |
3257 | unset ignored_env msg suggest_user name | |
3258 | } | |
3259 | ||
85ab313e SP |
3260 | # -- Only initialize complex UI if we are going to stay running. |
3261 | # | |
64a906f8 | 3262 | if {[is_enabled transport]} { |
4ccdab02 | 3263 | load_all_remotes |
85ab313e | 3264 | |
6bdf5e5f | 3265 | set n [.mbar.remote index end] |
3f7fd924 | 3266 | populate_push_menu |
6bdf5e5f SP |
3267 | populate_fetch_menu |
3268 | set n [expr {[.mbar.remote index end] - $n}] | |
3269 | if {$n > 0} { | |
7e09b153 | 3270 | if {[.mbar.remote type 0] eq "tearoff"} { incr n } |
6bdf5e5f SP |
3271 | .mbar.remote insert $n separator |
3272 | } | |
3273 | unset n | |
4ccdab02 | 3274 | } |
85ab313e | 3275 | |
4578c5cb SP |
3276 | if {[winfo exists $ui_comm]} { |
3277 | set GITGUI_BCK_exists [load_message GITGUI_BCK] | |
3278 | ||
3279 | # -- If both our backup and message files exist use the | |
3280 | # newer of the two files to initialize the buffer. | |
3281 | # | |
3282 | if {$GITGUI_BCK_exists} { | |
3283 | set m [gitdir GITGUI_MSG] | |
3284 | if {[file isfile $m]} { | |
3285 | if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} { | |
3286 | catch {file delete [gitdir GITGUI_MSG]} | |
3287 | } else { | |
3288 | $ui_comm delete 0.0 end | |
3289 | $ui_comm edit reset | |
3290 | $ui_comm edit modified false | |
3291 | catch {file delete [gitdir GITGUI_BCK]} | |
3292 | set GITGUI_BCK_exists 0 | |
3293 | } | |
3294 | } | |
3295 | unset m | |
3296 | } | |
3297 | ||
3298 | proc backup_commit_buffer {} { | |
3299 | global ui_comm GITGUI_BCK_exists | |
3300 | ||
3301 | set m [$ui_comm edit modified] | |
3302 | if {$m || $GITGUI_BCK_exists} { | |
3303 | set msg [string trim [$ui_comm get 0.0 end]] | |
3304 | regsub -all -line {[ \r\t]+$} $msg {} msg | |
3305 | ||
3306 | if {$msg eq {}} { | |
3307 | if {$GITGUI_BCK_exists} { | |
3308 | catch {file delete [gitdir GITGUI_BCK]} | |
3309 | set GITGUI_BCK_exists 0 | |
3310 | } | |
3311 | } elseif {$m} { | |
3312 | catch { | |
3313 | set fd [open [gitdir GITGUI_BCK] w] | |
3314 | puts -nonewline $fd $msg | |
3315 | close $fd | |
3316 | set GITGUI_BCK_exists 1 | |
3317 | } | |
3318 | } | |
3319 | ||
3320 | $ui_comm edit modified false | |
3321 | } | |
3322 | ||
3323 | set ::GITGUI_BCK_i [after 2000 backup_commit_buffer] | |
3324 | } | |
3325 | ||
3326 | backup_commit_buffer | |
95b002ee SP |
3327 | |
3328 | # -- If the user has aspell available we can drive it | |
3329 | # in pipe mode to spellcheck the commit message. | |
3330 | # | |
3331 | set spell_cmd [list |] | |
3332 | set spell_dict [get_config gui.spellingdictionary] | |
3333 | lappend spell_cmd aspell | |
3334 | if {$spell_dict ne {}} { | |
3335 | lappend spell_cmd --master=$spell_dict | |
3336 | } | |
3337 | lappend spell_cmd --mode=none | |
3338 | lappend spell_cmd --encoding=utf-8 | |
3339 | lappend spell_cmd pipe | |
3340 | if {$spell_dict eq {none} | |
3341 | || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} { | |
3342 | bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y] | |
3343 | } else { | |
3344 | set ui_comm_spell [spellcheck::init \ | |
3345 | $spell_fd \ | |
3346 | $ui_comm \ | |
3347 | $ui_comm_ctxm \ | |
3348 | ] | |
3349 | } | |
3350 | unset -nocomplain spell_cmd spell_fd spell_err spell_dict | |
4578c5cb SP |
3351 | } |
3352 | ||
53716a7b | 3353 | lock_index begin-read |
301dfaa9 SP |
3354 | if {![winfo ismapped .]} { |
3355 | wm deiconify . | |
3356 | } | |
1e65c622 AG |
3357 | after 1 { |
3358 | if {[is_enabled initialamend]} { | |
3359 | force_amend | |
3360 | } else { | |
3361 | do_rescan | |
3362 | } | |
3363 | ||
3364 | if {[is_enabled nocommitmsg]} { | |
3365 | $ui_comm configure -state disabled -background gray | |
3366 | } | |
3367 | } | |
3972b987 SP |
3368 | if {[is_enabled multicommit]} { |
3369 | after 1000 hint_gc | |
3370 | } | |
1e65c622 AG |
3371 | if {[is_enabled retcode]} { |
3372 | bind . <Destroy> {+terminate_me %W} | |
3373 | } |