]>
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 {} |
21985a11 | 124 | set _gitworktree {} |
29e5573d | 125 | set _isbare {} |
20ddfcaa | 126 | set _gitexec {} |
3eb5682b | 127 | set _githtmldir {} |
c950c66e | 128 | set _reponame {} |
20ddfcaa | 129 | set _iscygwin {} |
0b812616 | 130 | set _search_path {} |
c950c66e | 131 | |
16dd62ac SP |
132 | set _trace [lsearch -exact $argv --trace] |
133 | if {$_trace >= 0} { | |
134 | set argv [lreplace $argv $_trace $_trace] | |
135 | set _trace 1 | |
136 | } else { | |
137 | set _trace 0 | |
138 | } | |
139 | ||
c950c66e SP |
140 | proc appname {} { |
141 | global _appname | |
142 | return $_appname | |
143 | } | |
144 | ||
c2758a17 | 145 | proc gitdir {args} { |
c950c66e | 146 | global _gitdir |
c2758a17 SP |
147 | if {$args eq {}} { |
148 | return $_gitdir | |
149 | } | |
0b812616 | 150 | return [eval [list file join $_gitdir] $args] |
c950c66e SP |
151 | } |
152 | ||
20ddfcaa SP |
153 | proc gitexec {args} { |
154 | global _gitexec | |
155 | if {$_gitexec eq {}} { | |
81347223 | 156 | if {[catch {set _gitexec [git --exec-path]} err]} { |
20ddfcaa SP |
157 | error "Git not installed?\n\n$err" |
158 | } | |
0b812616 SP |
159 | if {[is_Cygwin]} { |
160 | set _gitexec [exec cygpath \ | |
161 | --windows \ | |
162 | --absolute \ | |
163 | $_gitexec] | |
164 | } else { | |
165 | set _gitexec [file normalize $_gitexec] | |
166 | } | |
20ddfcaa SP |
167 | } |
168 | if {$args eq {}} { | |
169 | return $_gitexec | |
170 | } | |
0b812616 | 171 | return [eval [list file join $_gitexec] $args] |
20ddfcaa SP |
172 | } |
173 | ||
3eb5682b MH |
174 | proc githtmldir {args} { |
175 | global _githtmldir | |
176 | if {$_githtmldir eq {}} { | |
177 | if {[catch {set _githtmldir [git --html-path]}]} { | |
178 | # Git not installed or option not yet supported | |
179 | return {} | |
180 | } | |
181 | if {[is_Cygwin]} { | |
182 | set _githtmldir [exec cygpath \ | |
183 | --windows \ | |
184 | --absolute \ | |
185 | $_githtmldir] | |
186 | } else { | |
187 | set _githtmldir [file normalize $_githtmldir] | |
188 | } | |
189 | } | |
190 | if {$args eq {}} { | |
191 | return $_githtmldir | |
192 | } | |
193 | return [eval [list file join $_githtmldir] $args] | |
194 | } | |
195 | ||
c950c66e | 196 | proc reponame {} { |
d36cd968 | 197 | return $::_reponame |
c950c66e | 198 | } |
da5239dc | 199 | |
20ddfcaa | 200 | proc is_MacOSX {} { |
20ddfcaa SP |
201 | if {[tk windowingsystem] eq {aqua}} { |
202 | return 1 | |
203 | } | |
204 | return 0 | |
205 | } | |
206 | ||
207 | proc is_Windows {} { | |
d36cd968 | 208 | if {$::tcl_platform(platform) eq {windows}} { |
20ddfcaa SP |
209 | return 1 |
210 | } | |
211 | return 0 | |
212 | } | |
213 | ||
214 | proc is_Cygwin {} { | |
d36cd968 | 215 | global _iscygwin |
20ddfcaa | 216 | if {$_iscygwin eq {}} { |
d36cd968 | 217 | if {$::tcl_platform(platform) eq {windows}} { |
20ddfcaa SP |
218 | if {[catch {set p [exec cygpath --windir]} err]} { |
219 | set _iscygwin 0 | |
220 | } else { | |
221 | set _iscygwin 1 | |
222 | } | |
223 | } else { | |
224 | set _iscygwin 0 | |
225 | } | |
226 | } | |
227 | return $_iscygwin | |
228 | } | |
229 | ||
cf25ddc8 SP |
230 | proc is_enabled {option} { |
231 | global enabled_options | |
232 | if {[catch {set on $enabled_options($option)}]} {return 0} | |
233 | return $on | |
234 | } | |
235 | ||
236 | proc enable_option {option} { | |
237 | global enabled_options | |
238 | set enabled_options($option) 1 | |
239 | } | |
240 | ||
241 | proc disable_option {option} { | |
242 | global enabled_options | |
243 | set enabled_options($option) 0 | |
244 | } | |
245 | ||
2d19516d SP |
246 | ###################################################################### |
247 | ## | |
248 | ## config | |
249 | ||
51f4d16b SP |
250 | proc is_many_config {name} { |
251 | switch -glob -- $name { | |
24f7c64b | 252 | gui.recentrepo - |
51f4d16b SP |
253 | remote.*.fetch - |
254 | remote.*.push | |
255 | {return 1} | |
256 | * | |
257 | {return 0} | |
258 | } | |
259 | } | |
2d19516d | 260 | |
c539449b SP |
261 | proc is_config_true {name} { |
262 | global repo_config | |
263 | if {[catch {set v $repo_config($name)}]} { | |
264 | return 0 | |
265 | } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} { | |
266 | return 1 | |
267 | } else { | |
268 | return 0 | |
269 | } | |
270 | } | |
271 | ||
61f82ce7 SP |
272 | proc get_config {name} { |
273 | global repo_config | |
274 | if {[catch {set v $repo_config($name)}]} { | |
275 | return {} | |
276 | } else { | |
277 | return $v | |
278 | } | |
279 | } | |
280 | ||
29e5573d GB |
281 | proc is_bare {} { |
282 | global _isbare | |
283 | global _gitdir | |
284 | global _gitworktree | |
285 | ||
286 | if {$_isbare eq {}} { | |
287 | if {[catch { | |
288 | set _bare [git rev-parse --is-bare-repository] | |
289 | switch -- $_bare { | |
290 | true { set _isbare 1 } | |
291 | false { set _isbare 0} | |
292 | default { throw } | |
293 | } | |
294 | }]} { | |
295 | if {[is_config_true core.bare] | |
296 | || ($_gitworktree eq {} | |
297 | && [lindex [file split $_gitdir] end] ne {.git})} { | |
298 | set _isbare 1 | |
299 | } else { | |
300 | set _isbare 0 | |
301 | } | |
302 | } | |
303 | } | |
304 | return $_isbare | |
305 | } | |
306 | ||
81347223 SP |
307 | ###################################################################### |
308 | ## | |
309 | ## handy utils | |
310 | ||
16dd62ac SP |
311 | proc _trace_exec {cmd} { |
312 | if {!$::_trace} return | |
313 | set d {} | |
314 | foreach v $cmd { | |
315 | if {$d ne {}} { | |
316 | append d { } | |
317 | } | |
318 | if {[regexp {[ \t\r\n'"$?*]} $v]} { | |
319 | set v [sq $v] | |
320 | } | |
321 | append d $v | |
322 | } | |
323 | puts stderr $d | |
324 | } | |
325 | ||
0b812616 SP |
326 | proc _git_cmd {name} { |
327 | global _git_cmd_path | |
328 | ||
329 | if {[catch {set v $_git_cmd_path($name)}]} { | |
330 | switch -- $name { | |
70a7595c | 331 | version - |
0b812616 SP |
332 | --version - |
333 | --exec-path { return [list $::_git $name] } | |
334 | } | |
335 | ||
336 | set p [gitexec git-$name$::_search_exe] | |
337 | if {[file exists $p]} { | |
338 | set v [list $p] | |
c136f2b8 SP |
339 | } elseif {[is_Windows] && [file exists [gitexec git-$name]]} { |
340 | # Try to determine what sort of magic will make | |
341 | # git-$name go and do its thing, because native | |
342 | # Tcl on Windows doesn't know it. | |
0b812616 | 343 | # |
c136f2b8 SP |
344 | set p [gitexec git-$name] |
345 | set f [open $p r] | |
346 | set s [gets $f] | |
347 | close $f | |
348 | ||
6e4ba05c | 349 | switch -glob -- [lindex $s 0] { |
c136f2b8 SP |
350 | #!*sh { set i sh } |
351 | #!*perl { set i perl } | |
352 | #!*python { set i python } | |
353 | default { error "git-$name is not supported: $s" } | |
354 | } | |
355 | ||
356 | upvar #0 _$i interp | |
357 | if {![info exists interp]} { | |
358 | set interp [_which $i] | |
359 | } | |
360 | if {$interp eq {}} { | |
361 | error "git-$name requires $i (not in PATH)" | |
362 | } | |
6e4ba05c | 363 | set v [concat [list $interp] [lrange $s 1 end] [list $p]] |
0b812616 | 364 | } else { |
c6729890 SP |
365 | # Assume it is builtin to git somehow and we |
366 | # aren't actually able to see a file for it. | |
367 | # | |
368 | set v [list $::_git $name] | |
0b812616 SP |
369 | } |
370 | set _git_cmd_path($name) $v | |
371 | } | |
372 | return $v | |
373 | } | |
374 | ||
79317e5d | 375 | proc _which {what args} { |
0b812616 SP |
376 | global env _search_exe _search_path |
377 | ||
378 | if {$_search_path eq {}} { | |
299077fb | 379 | if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} { |
0b812616 SP |
380 | set _search_path [split [exec cygpath \ |
381 | --windows \ | |
382 | --path \ | |
383 | --absolute \ | |
384 | $env(PATH)] {;}] | |
385 | set _search_exe .exe | |
386 | } elseif {[is_Windows]} { | |
be700fe3 SP |
387 | set gitguidir [file dirname [info script]] |
388 | regsub -all ";" $gitguidir "\\;" gitguidir | |
389 | set env(PATH) "$gitguidir;$env(PATH)" | |
0b812616 SP |
390 | set _search_path [split $env(PATH) {;}] |
391 | set _search_exe .exe | |
392 | } else { | |
393 | set _search_path [split $env(PATH) :] | |
394 | set _search_exe {} | |
395 | } | |
396 | } | |
397 | ||
79317e5d SP |
398 | if {[is_Windows] && [lsearch -exact $args -script] >= 0} { |
399 | set suffix {} | |
400 | } else { | |
401 | set suffix $_search_exe | |
402 | } | |
403 | ||
0b812616 | 404 | foreach p $_search_path { |
79317e5d | 405 | set p [file join $p $what$suffix] |
0b812616 SP |
406 | if {[file exists $p]} { |
407 | return [file normalize $p] | |
408 | } | |
409 | } | |
410 | return {} | |
411 | } | |
412 | ||
6f62b4f7 SP |
413 | proc _lappend_nice {cmd_var} { |
414 | global _nice | |
415 | upvar $cmd_var cmd | |
416 | ||
417 | if {![info exists _nice]} { | |
418 | set _nice [_which nice] | |
9c898a18 HV |
419 | if {[catch {exec $_nice git version}]} { |
420 | set _nice {} | |
421 | } | |
6f62b4f7 SP |
422 | } |
423 | if {$_nice ne {}} { | |
424 | lappend cmd $_nice | |
425 | } | |
426 | } | |
427 | ||
81347223 | 428 | proc git {args} { |
16dd62ac | 429 | set opt [list] |
0b812616 SP |
430 | |
431 | while {1} { | |
432 | switch -- [lindex $args 0] { | |
433 | --nice { | |
6f62b4f7 | 434 | _lappend_nice opt |
0b812616 SP |
435 | } |
436 | ||
437 | default { | |
438 | break | |
439 | } | |
440 | ||
441 | } | |
442 | ||
443 | set args [lrange $args 1 end] | |
444 | } | |
445 | ||
446 | set cmdp [_git_cmd [lindex $args 0]] | |
447 | set args [lrange $args 1 end] | |
448 | ||
16dd62ac SP |
449 | _trace_exec [concat $opt $cmdp $args] |
450 | set result [eval exec $opt $cmdp $args] | |
451 | if {$::_trace} { | |
452 | puts stderr "< $result" | |
453 | } | |
454 | return $result | |
0b812616 SP |
455 | } |
456 | ||
74c4763c | 457 | proc _open_stdout_stderr {cmd} { |
16dd62ac | 458 | _trace_exec $cmd |
74c4763c | 459 | if {[catch { |
16dd62ac | 460 | set fd [open [concat [list | ] $cmd] r] |
74c4763c SP |
461 | } err]} { |
462 | if { [lindex $cmd end] eq {2>@1} | |
463 | && $err eq {can not find channel named "1"} | |
464 | } { | |
465 | # Older versions of Tcl 8.4 don't have this 2>@1 IO | |
466 | # redirect operator. Fallback to |& cat for those. | |
467 | # The command was not actually started, so its safe | |
468 | # to try to start it a second time. | |
469 | # | |
470 | set fd [open [concat \ | |
16dd62ac | 471 | [list | ] \ |
74c4763c SP |
472 | [lrange $cmd 0 end-1] \ |
473 | [list |& cat] \ | |
474 | ] r] | |
475 | } else { | |
476 | error $err | |
477 | } | |
478 | } | |
6eb420ef | 479 | fconfigure $fd -eofchar {} |
74c4763c SP |
480 | return $fd |
481 | } | |
482 | ||
0b812616 | 483 | proc git_read {args} { |
16dd62ac | 484 | set opt [list] |
0b812616 SP |
485 | |
486 | while {1} { | |
487 | switch -- [lindex $args 0] { | |
488 | --nice { | |
6f62b4f7 | 489 | _lappend_nice opt |
0b812616 SP |
490 | } |
491 | ||
492 | --stderr { | |
493 | lappend args 2>@1 | |
494 | } | |
495 | ||
496 | default { | |
497 | break | |
498 | } | |
499 | ||
500 | } | |
501 | ||
502 | set args [lrange $args 1 end] | |
503 | } | |
504 | ||
505 | set cmdp [_git_cmd [lindex $args 0]] | |
506 | set args [lrange $args 1 end] | |
507 | ||
74c4763c | 508 | return [_open_stdout_stderr [concat $opt $cmdp $args]] |
0b812616 SP |
509 | } |
510 | ||
511 | proc git_write {args} { | |
16dd62ac | 512 | set opt [list] |
0b812616 SP |
513 | |
514 | while {1} { | |
515 | switch -- [lindex $args 0] { | |
516 | --nice { | |
6f62b4f7 | 517 | _lappend_nice opt |
0b812616 SP |
518 | } |
519 | ||
520 | default { | |
521 | break | |
522 | } | |
523 | ||
524 | } | |
525 | ||
526 | set args [lrange $args 1 end] | |
527 | } | |
528 | ||
529 | set cmdp [_git_cmd [lindex $args 0]] | |
530 | set args [lrange $args 1 end] | |
531 | ||
16dd62ac SP |
532 | _trace_exec [concat $opt $cmdp $args] |
533 | return [open [concat [list | ] $opt $cmdp $args] w] | |
81347223 SP |
534 | } |
535 | ||
ed76cb70 SP |
536 | proc githook_read {hook_name args} { |
537 | set pchook [gitdir hooks $hook_name] | |
538 | lappend args 2>@1 | |
539 | ||
fbc0e7ac | 540 | # On Windows [file executable] might lie so we need to ask |
ed76cb70 SP |
541 | # the shell if the hook is executable. Yes that's annoying. |
542 | # | |
fbc0e7ac | 543 | if {[is_Windows]} { |
ed76cb70 SP |
544 | upvar #0 _sh interp |
545 | if {![info exists interp]} { | |
546 | set interp [_which sh] | |
547 | } | |
548 | if {$interp eq {}} { | |
549 | error "hook execution requires sh (not in PATH)" | |
550 | } | |
551 | ||
552 | set scr {if test -x "$1";then exec "$@";fi} | |
16dd62ac | 553 | set sh_c [list $interp -c $scr $interp $pchook] |
ed76cb70 SP |
554 | return [_open_stdout_stderr [concat $sh_c $args]] |
555 | } | |
556 | ||
557 | if {[file executable $pchook]} { | |
16dd62ac | 558 | return [_open_stdout_stderr [concat [list $pchook] $args]] |
ed76cb70 SP |
559 | } |
560 | ||
561 | return {} | |
562 | } | |
563 | ||
e6131d30 AG |
564 | proc kill_file_process {fd} { |
565 | set process [pid $fd] | |
566 | ||
567 | catch { | |
568 | if {[is_Windows]} { | |
569 | # Use a Cygwin-specific flag to allow killing | |
570 | # native Windows processes | |
571 | exec kill -f $process | |
572 | } else { | |
573 | exec kill $process | |
574 | } | |
575 | } | |
576 | } | |
577 | ||
1ffca60f SP |
578 | proc gitattr {path attr default} { |
579 | if {[catch {set r [git check-attr $attr -- $path]}]} { | |
580 | set r unspecified | |
581 | } else { | |
582 | set r [join [lrange [split $r :] 2 end] :] | |
583 | regsub {^ } $r {} r | |
584 | } | |
585 | if {$r eq {unspecified}} { | |
586 | return $default | |
587 | } | |
588 | return $r | |
589 | } | |
590 | ||
7eafa2f1 SP |
591 | proc sq {value} { |
592 | regsub -all ' $value "'\\''" value | |
593 | return "'$value'" | |
594 | } | |
595 | ||
d41b43eb SP |
596 | proc load_current_branch {} { |
597 | global current_branch is_detached | |
598 | ||
fc4e8da7 | 599 | set fd [open [gitdir HEAD] r] |
311e02a4 | 600 | if {[gets $fd ref] < 1} { |
fc4e8da7 SP |
601 | set ref {} |
602 | } | |
603 | close $fd | |
311e02a4 SP |
604 | |
605 | set pfx {ref: refs/heads/} | |
606 | set len [string length $pfx] | |
607 | if {[string equal -length $len $pfx $ref]} { | |
608 | # We're on a branch. It might not exist. But | |
609 | # HEAD looks good enough to be a branch. | |
610 | # | |
d41b43eb SP |
611 | set current_branch [string range $ref $len end] |
612 | set is_detached 0 | |
311e02a4 SP |
613 | } else { |
614 | # Assume this is a detached head. | |
615 | # | |
d41b43eb SP |
616 | set current_branch HEAD |
617 | set is_detached 1 | |
311e02a4 | 618 | } |
fc4e8da7 SP |
619 | } |
620 | ||
2739291b SP |
621 | auto_load tk_optionMenu |
622 | rename tk_optionMenu real__tkOptionMenu | |
623 | proc tk_optionMenu {w varName args} { | |
624 | set m [eval real__tkOptionMenu $w $varName $args] | |
625 | $m configure -font font_ui | |
626 | $w configure -font font_ui | |
627 | return $m | |
628 | } | |
629 | ||
3849bfba SP |
630 | proc rmsel_tag {text} { |
631 | $text tag conf sel \ | |
632 | -background [$text cget -background] \ | |
633 | -foreground [$text cget -foreground] \ | |
634 | -borderwidth 0 | |
635 | $text tag conf in_sel -background lightgray | |
636 | bind $text <Motion> break | |
637 | return $text | |
638 | } | |
639 | ||
a4bee597 SP |
640 | set root_exists 0 |
641 | bind . <Visibility> { | |
642 | bind . <Visibility> {} | |
643 | set root_exists 1 | |
644 | } | |
645 | ||
1bdd8a15 SP |
646 | if {[is_Windows]} { |
647 | wm iconbitmap . -default $oguilib/git-gui.ico | |
f10d5b06 | 648 | set ::tk::AlwaysShowSelection 1 |
8c762125 AG |
649 | |
650 | # Spoof an X11 display for SSH | |
651 | if {![info exists env(DISPLAY)]} { | |
652 | set env(DISPLAY) :9999 | |
653 | } | |
d1f2b362 GB |
654 | } else { |
655 | catch { | |
656 | image create photo gitlogo -width 16 -height 16 | |
657 | ||
658 | gitlogo put #33CC33 -to 7 0 9 2 | |
659 | gitlogo put #33CC33 -to 4 2 12 4 | |
660 | gitlogo put #33CC33 -to 7 4 9 6 | |
661 | gitlogo put #CC3333 -to 4 6 12 8 | |
662 | gitlogo put gray26 -to 4 9 6 10 | |
663 | gitlogo put gray26 -to 3 10 6 12 | |
664 | gitlogo put gray26 -to 8 9 13 11 | |
665 | gitlogo put gray26 -to 8 11 10 12 | |
666 | gitlogo put gray26 -to 11 11 13 14 | |
667 | gitlogo put gray26 -to 3 12 5 14 | |
668 | gitlogo put gray26 -to 5 13 | |
669 | gitlogo put gray26 -to 10 13 | |
670 | gitlogo put gray26 -to 4 14 12 15 | |
671 | gitlogo put gray26 -to 5 15 11 16 | |
672 | gitlogo redither | |
673 | ||
674 | wm iconphoto . -default gitlogo | |
675 | } | |
1bdd8a15 SP |
676 | } |
677 | ||
a4bee597 SP |
678 | ###################################################################### |
679 | ## | |
680 | ## config defaults | |
681 | ||
682 | set cursor_ptr arrow | |
a4bee597 | 683 | font create font_ui |
c80d7be5 PT |
684 | if {[lsearch -exact [font names] TkDefaultFont] != -1} { |
685 | eval [linsert [font actual TkDefaultFont] 0 font configure font_ui] | |
686 | eval [linsert [font actual TkFixedFont] 0 font create font_diff] | |
687 | } else { | |
688 | font create font_diff -family Courier -size 10 | |
689 | catch { | |
690 | label .dummy | |
691 | eval font configure font_ui [font actual [.dummy cget -font]] | |
692 | destroy .dummy | |
693 | } | |
a4bee597 SP |
694 | } |
695 | ||
696 | font create font_uiitalic | |
697 | font create font_uibold | |
698 | font create font_diffbold | |
699 | font create font_diffitalic | |
700 | ||
701 | foreach class {Button Checkbutton Entry Label | |
a91be3fc | 702 | Labelframe Listbox Message |
a4bee597 SP |
703 | Radiobutton Spinbox Text} { |
704 | option add *$class.font font_ui | |
705 | } | |
a91be3fc DS |
706 | if {![is_MacOSX]} { |
707 | option add *Menu.font font_ui | |
c80d7be5 PT |
708 | option add *Entry.borderWidth 1 startupFile |
709 | option add *Entry.relief sunken startupFile | |
710 | option add *RadioButton.anchor w startupFile | |
a91be3fc | 711 | } |
a4bee597 SP |
712 | unset class |
713 | ||
714 | if {[is_Windows] || [is_MacOSX]} { | |
715 | option add *Menu.tearOff 0 | |
716 | } | |
717 | ||
718 | if {[is_MacOSX]} { | |
719 | set M1B M1 | |
720 | set M1T Cmd | |
721 | } else { | |
722 | set M1B Control | |
723 | set M1T Ctrl | |
724 | } | |
725 | ||
726 | proc bind_button3 {w cmd} { | |
727 | bind $w <Any-Button-3> $cmd | |
728 | if {[is_MacOSX]} { | |
729 | # Mac OS X sends Button-2 on right click through three-button mouse, | |
730 | # or through trackpad right-clicking (two-finger touch + click). | |
731 | bind $w <Any-Button-2> $cmd | |
732 | bind $w <Control-Button-1> $cmd | |
733 | } | |
734 | } | |
735 | ||
736 | proc apply_config {} { | |
737 | global repo_config font_descs | |
738 | ||
739 | foreach option $font_descs { | |
740 | set name [lindex $option 0] | |
741 | set font [lindex $option 1] | |
742 | if {[catch { | |
48b8d2b3 | 743 | set need_weight 1 |
a4bee597 | 744 | foreach {cn cv} $repo_config(gui.$name) { |
48b8d2b3 SP |
745 | if {$cn eq {-weight}} { |
746 | set need_weight 0 | |
747 | } | |
748 | font configure $font $cn $cv | |
749 | } | |
750 | if {$need_weight} { | |
751 | font configure $font -weight normal | |
a4bee597 SP |
752 | } |
753 | } err]} { | |
754 | error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"] | |
755 | } | |
756 | foreach {cn cv} [font configure $font] { | |
757 | font configure ${font}bold $cn $cv | |
758 | font configure ${font}italic $cn $cv | |
759 | } | |
760 | font configure ${font}bold -weight bold | |
761 | font configure ${font}italic -slant italic | |
762 | } | |
c80d7be5 PT |
763 | |
764 | global use_ttk NS | |
765 | set use_ttk 0 | |
766 | set NS {} | |
767 | if {$repo_config(gui.usettk)} { | |
768 | set use_ttk [package vsatisfies [package provide Tk] 8.5] | |
769 | if {$use_ttk} { | |
770 | set NS ttk | |
771 | bind [winfo class .] <<ThemeChanged>> [list InitTheme] | |
772 | pave_toplevel . | |
773 | } | |
774 | } | |
a4bee597 SP |
775 | } |
776 | ||
fe70225d | 777 | set default_config(branch.autosetupmerge) true |
7e30682c | 778 | set default_config(merge.tool) {} |
fb25092a | 779 | set default_config(mergetool.keepbackup) true |
a4bee597 SP |
780 | set default_config(merge.diffstat) true |
781 | set default_config(merge.summary) false | |
782 | set default_config(merge.verbosity) 2 | |
783 | set default_config(user.name) {} | |
784 | set default_config(user.email) {} | |
785 | ||
72e6b002 | 786 | set default_config(gui.encoding) [encoding system] |
a4bee597 SP |
787 | set default_config(gui.matchtrackingbranch) false |
788 | set default_config(gui.pruneduringfetch) false | |
789 | set default_config(gui.trustmtime) false | |
57cae87b AG |
790 | set default_config(gui.fastcopyblame) false |
791 | set default_config(gui.copyblamethreshold) 40 | |
a9c80b83 | 792 | set default_config(gui.blamehistoryctx) 7 |
a4bee597 | 793 | set default_config(gui.diffcontext) 5 |
11027d54 | 794 | set default_config(gui.commitmsgwidth) 75 |
a4bee597 | 795 | set default_config(gui.newbranchtemplate) {} |
95b002ee | 796 | set default_config(gui.spellingdictionary) {} |
a4bee597 SP |
797 | set default_config(gui.fontui) [font configure font_ui] |
798 | set default_config(gui.fontdiff) [font configure font_diff] | |
dd6451f9 DZ |
799 | # TODO: this option should be added to the git-config documentation |
800 | set default_config(gui.maxfilesdisplayed) 5000 | |
c80d7be5 | 801 | set default_config(gui.usettk) 1 |
a4bee597 SP |
802 | set font_descs { |
803 | {fontui font_ui {mc "Main Font"}} | |
804 | {fontdiff font_diff {mc "Diff/Console Font"}} | |
805 | } | |
806 | ||
0b812616 SP |
807 | ###################################################################### |
808 | ## | |
809 | ## find git | |
810 | ||
811 | set _git [_which git] | |
812 | if {$_git eq {}} { | |
813 | catch {wm withdraw .} | |
183a1d14 SP |
814 | tk_messageBox \ |
815 | -icon error \ | |
816 | -type ok \ | |
817 | -title [mc "git-gui: fatal error"] \ | |
818 | -message [mc "Cannot find git in PATH."] | |
0b812616 SP |
819 | exit 1 |
820 | } | |
0b812616 | 821 | |
54acdd95 SP |
822 | ###################################################################### |
823 | ## | |
824 | ## version check | |
825 | ||
d6967022 | 826 | if {[catch {set _git_version [git --version]} err]} { |
54acdd95 | 827 | catch {wm withdraw .} |
875b7c93 SP |
828 | tk_messageBox \ |
829 | -icon error \ | |
830 | -type ok \ | |
c8c4854b | 831 | -title [mc "git-gui: fatal error"] \ |
875b7c93 | 832 | -message "Cannot determine Git version: |
54acdd95 SP |
833 | |
834 | $err | |
835 | ||
d6967022 SP |
836 | [appname] requires Git 1.5.0 or later." |
837 | exit 1 | |
838 | } | |
839 | if {![regsub {^git version } $_git_version {} _git_version]} { | |
840 | catch {wm withdraw .} | |
875b7c93 SP |
841 | tk_messageBox \ |
842 | -icon error \ | |
843 | -type ok \ | |
c8c4854b | 844 | -title [mc "git-gui: fatal error"] \ |
31bb1d1b | 845 | -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"] |
54acdd95 SP |
846 | exit 1 |
847 | } | |
301dfaa9 SP |
848 | |
849 | set _real_git_version $_git_version | |
2c2a3782 | 850 | regsub -- {[\-\.]dirty$} $_git_version {} _git_version |
d6967022 | 851 | regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version |
764369c5 | 852 | regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version |
91464dfb | 853 | regsub {\.GIT$} $_git_version {} _git_version |
764369c5 | 854 | regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version |
d6967022 | 855 | |
301dfaa9 SP |
856 | if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { |
857 | catch {wm withdraw .} | |
858 | if {[tk_messageBox \ | |
859 | -icon warning \ | |
860 | -type yesno \ | |
861 | -default no \ | |
862 | -title "[appname]: warning" \ | |
1ac17950 | 863 | -message [mc "Git version cannot be determined. |
301dfaa9 | 864 | |
1ac17950 | 865 | %s claims it is version '%s'. |
301dfaa9 | 866 | |
1ac17950 | 867 | %s requires at least Git 1.5.0 or later. |
301dfaa9 | 868 | |
1ac17950 CS |
869 | Assume '%s' is version 1.5.0? |
870 | " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} { | |
301dfaa9 SP |
871 | set _git_version 1.5.0 |
872 | } else { | |
873 | exit 1 | |
874 | } | |
875 | } | |
876 | unset _real_git_version | |
877 | ||
d6967022 SP |
878 | proc git-version {args} { |
879 | global _git_version | |
880 | ||
881 | switch [llength $args] { | |
882 | 0 { | |
883 | return $_git_version | |
54acdd95 | 884 | } |
d6967022 SP |
885 | |
886 | 2 { | |
887 | set op [lindex $args 0] | |
888 | set vr [lindex $args 1] | |
889 | set cm [package vcompare $_git_version $vr] | |
890 | return [expr $cm $op 0] | |
891 | } | |
892 | ||
893 | 4 { | |
894 | set type [lindex $args 0] | |
895 | set name [lindex $args 1] | |
896 | set parm [lindex $args 2] | |
897 | set body [lindex $args 3] | |
898 | ||
899 | if {($type ne {proc} && $type ne {method})} { | |
900 | error "Invalid arguments to git-version" | |
901 | } | |
902 | if {[llength $body] < 2 || [lindex $body end-1] ne {default}} { | |
903 | error "Last arm of $type $name must be default" | |
904 | } | |
905 | ||
906 | foreach {op vr cb} [lrange $body 0 end-2] { | |
907 | if {[git-version $op $vr]} { | |
908 | return [uplevel [list $type $name $parm $cb]] | |
909 | } | |
910 | } | |
911 | ||
912 | return [uplevel [list $type $name $parm [lindex $body end]]] | |
913 | } | |
914 | ||
915 | default { | |
916 | error "git-version >= x" | |
917 | } | |
918 | ||
919 | } | |
920 | } | |
921 | ||
922 | if {[git-version < 1.5]} { | |
54acdd95 | 923 | catch {wm withdraw .} |
875b7c93 SP |
924 | tk_messageBox \ |
925 | -icon error \ | |
926 | -type ok \ | |
c8c4854b | 927 | -title [mc "git-gui: fatal error"] \ |
875b7c93 | 928 | -message "[appname] requires Git 1.5.0 or later. |
d6967022 SP |
929 | |
930 | You are using [git-version]: | |
931 | ||
932 | [git --version]" | |
54acdd95 SP |
933 | exit 1 |
934 | } | |
54acdd95 | 935 | |
875b7c93 SP |
936 | ###################################################################### |
937 | ## | |
938 | ## configure our library | |
939 | ||
875b7c93 SP |
940 | set idx [file join $oguilib tclIndex] |
941 | if {[catch {set fd [open $idx r]} err]} { | |
942 | catch {wm withdraw .} | |
943 | tk_messageBox \ | |
944 | -icon error \ | |
945 | -type ok \ | |
c8c4854b | 946 | -title [mc "git-gui: fatal error"] \ |
875b7c93 SP |
947 | -message $err |
948 | exit 1 | |
949 | } | |
950 | if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} { | |
951 | set idx [list] | |
952 | while {[gets $fd n] >= 0} { | |
953 | if {$n ne {} && ![string match #* $n]} { | |
954 | lappend idx $n | |
955 | } | |
956 | } | |
957 | } else { | |
958 | set idx {} | |
959 | } | |
960 | close $fd | |
961 | ||
962 | if {$idx ne {}} { | |
963 | set loaded [list] | |
964 | foreach p $idx { | |
965 | if {[lsearch -exact $loaded $p] >= 0} continue | |
966 | source [file join $oguilib $p] | |
967 | lappend loaded $p | |
968 | } | |
969 | unset loaded p | |
970 | } else { | |
971 | set auto_path [concat [list $oguilib] $auto_path] | |
972 | } | |
fc703c20 | 973 | unset -nocomplain idx fd |
875b7c93 | 974 | |
ba7cc660 | 975 | ###################################################################### |
69f85ffa SP |
976 | ## |
977 | ## config file parsing | |
978 | ||
f00d504a | 979 | git-version proc _parse_config {arr_name args} { |
85f7a94b SP |
980 | >= 1.5.3 { |
981 | upvar $arr_name arr | |
982 | array unset arr | |
983 | set buf {} | |
984 | catch { | |
a5bb31fb SP |
985 | set fd_rc [eval \ |
986 | [list git_read config] \ | |
987 | $args \ | |
988 | [list --null --list]] | |
85f7a94b SP |
989 | fconfigure $fd_rc -translation binary |
990 | set buf [read $fd_rc] | |
991 | close $fd_rc | |
992 | } | |
993 | foreach line [split $buf "\0"] { | |
994 | if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} { | |
995 | if {[is_many_config $name]} { | |
996 | lappend arr($name) $value | |
997 | } else { | |
998 | set arr($name) $value | |
999 | } | |
1000 | } | |
1001 | } | |
1002 | } | |
f00d504a SP |
1003 | default { |
1004 | upvar $arr_name arr | |
1005 | array unset arr | |
69f85ffa | 1006 | catch { |
f00d504a | 1007 | set fd_rc [eval [list git_read config --list] $args] |
69f85ffa SP |
1008 | while {[gets $fd_rc line] >= 0} { |
1009 | if {[regexp {^([^=]+)=(.*)$} $line line name value]} { | |
1010 | if {[is_many_config $name]} { | |
f00d504a | 1011 | lappend arr($name) $value |
69f85ffa | 1012 | } else { |
f00d504a | 1013 | set arr($name) $value |
69f85ffa SP |
1014 | } |
1015 | } | |
1016 | } | |
1017 | close $fd_rc | |
1018 | } | |
1019 | } | |
f00d504a | 1020 | } |
69f85ffa | 1021 | |
f00d504a | 1022 | proc load_config {include_global} { |
153ad78b | 1023 | global repo_config global_config system_config default_config |
f00d504a SP |
1024 | |
1025 | if {$include_global} { | |
153ad78b | 1026 | _parse_config system_config --system |
f00d504a | 1027 | _parse_config global_config --global |
69f85ffa | 1028 | } |
f00d504a | 1029 | _parse_config repo_config |
69f85ffa SP |
1030 | |
1031 | foreach name [array names default_config] { | |
153ad78b AG |
1032 | if {[catch {set v $system_config($name)}]} { |
1033 | set system_config($name) $default_config($name) | |
1034 | } | |
1035 | } | |
1036 | foreach name [array names system_config] { | |
69f85ffa | 1037 | if {[catch {set v $global_config($name)}]} { |
153ad78b | 1038 | set global_config($name) $system_config($name) |
69f85ffa SP |
1039 | } |
1040 | if {[catch {set v $repo_config($name)}]} { | |
153ad78b | 1041 | set repo_config($name) $system_config($name) |
69f85ffa SP |
1042 | } |
1043 | } | |
1044 | } | |
1045 | ||
1046 | ###################################################################### | |
ba7cc660 SP |
1047 | ## |
1048 | ## feature option selection | |
1049 | ||
0b2bc460 | 1050 | if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} { |
ba7cc660 SP |
1051 | unset _junk |
1052 | } else { | |
1053 | set subcommand gui | |
1054 | } | |
1055 | if {$subcommand eq {gui.sh}} { | |
1056 | set subcommand gui | |
1057 | } | |
1058 | if {$subcommand eq {gui} && [llength $argv] > 0} { | |
1059 | set subcommand [lindex $argv 0] | |
1060 | set argv [lrange $argv 1 end] | |
1061 | } | |
1062 | ||
1063 | enable_option multicommit | |
1064 | enable_option branch | |
1065 | enable_option transport | |
c52c9452 | 1066 | disable_option bare |
ba7cc660 SP |
1067 | |
1068 | switch -- $subcommand { | |
1069 | browser - | |
1070 | blame { | |
c52c9452 SP |
1071 | enable_option bare |
1072 | ||
ba7cc660 SP |
1073 | disable_option multicommit |
1074 | disable_option branch | |
1075 | disable_option transport | |
1076 | } | |
1077 | citool { | |
1078 | enable_option singlecommit | |
1e65c622 | 1079 | enable_option retcode |
ba7cc660 SP |
1080 | |
1081 | disable_option multicommit | |
1082 | disable_option branch | |
1083 | disable_option transport | |
1e65c622 AG |
1084 | |
1085 | while {[llength $argv] > 0} { | |
1086 | set a [lindex $argv 0] | |
1087 | switch -- $a { | |
1088 | --amend { | |
1089 | enable_option initialamend | |
1090 | } | |
1091 | --nocommit { | |
1092 | enable_option nocommit | |
1093 | enable_option nocommitmsg | |
1094 | } | |
1095 | --commitmsg { | |
1096 | disable_option nocommitmsg | |
1097 | } | |
1098 | default { | |
1099 | break | |
1100 | } | |
1101 | } | |
1102 | ||
1103 | set argv [lrange $argv 1 end] | |
1104 | } | |
ba7cc660 SP |
1105 | } |
1106 | } | |
1107 | ||
e29c0d10 AG |
1108 | ###################################################################### |
1109 | ## | |
1110 | ## execution environment | |
1111 | ||
1112 | set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}] | |
1113 | ||
1114 | # Suggest our implementation of askpass, if none is set | |
1115 | if {![info exists env(SSH_ASKPASS)]} { | |
1116 | set env(SSH_ASKPASS) [gitexec git-gui--askpass] | |
1117 | } | |
1118 | ||
2d19516d SP |
1119 | ###################################################################### |
1120 | ## | |
1121 | ## repository setup | |
1122 | ||
bb4812bc | 1123 | set picked 0 |
c6127856 SP |
1124 | if {[catch { |
1125 | set _gitdir $env(GIT_DIR) | |
1126 | set _prefix {} | |
1127 | }] | |
1128 | && [catch { | |
87cd09f4 GB |
1129 | # beware that from the .git dir this sets _gitdir to . |
1130 | # and _prefix to the empty string | |
c6127856 SP |
1131 | set _gitdir [git rev-parse --git-dir] |
1132 | set _prefix [git rev-parse --show-prefix] | |
1133 | } err]} { | |
ab08b363 SP |
1134 | load_config 1 |
1135 | apply_config | |
1136 | choose_repository::pick | |
bb4812bc | 1137 | set picked 1 |
2d19516d | 1138 | } |
87cd09f4 GB |
1139 | |
1140 | # we expand the _gitdir when it's just a single dot (i.e. when we're being | |
1141 | # run from the .git dir itself) lest the routines to find the worktree | |
1142 | # get confused | |
1143 | if {$_gitdir eq "."} { | |
1144 | set _gitdir [pwd] | |
1145 | } | |
1146 | ||
20ddfcaa | 1147 | if {![file isdirectory $_gitdir] && [is_Cygwin]} { |
2f7c9a7f | 1148 | catch {set _gitdir [exec cygpath --windows $_gitdir]} |
20ddfcaa | 1149 | } |
c950c66e | 1150 | if {![file isdirectory $_gitdir]} { |
dbccbbda | 1151 | catch {wm withdraw .} |
31bb1d1b | 1152 | error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"] |
dbccbbda SP |
1153 | exit 1 |
1154 | } | |
21985a11 GB |
1155 | # _gitdir exists, so try loading the config |
1156 | load_config 0 | |
1157 | apply_config | |
1158 | # try to set work tree from environment, falling back to core.worktree | |
1159 | if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} { | |
1160 | set _gitworktree [get_config core.worktree] | |
13a3d637 PT |
1161 | if {$_gitworktree eq ""} { |
1162 | set _gitworktree [file dirname [file normalize $_gitdir]] | |
1163 | } | |
21985a11 | 1164 | } |
c80d25db | 1165 | if {$_prefix ne {}} { |
21985a11 GB |
1166 | if {$_gitworktree eq {}} { |
1167 | regsub -all {[^/]+/} $_prefix ../ cdup | |
1168 | } else { | |
1169 | set cdup $_gitworktree | |
1170 | } | |
c80d25db SP |
1171 | if {[catch {cd $cdup} err]} { |
1172 | catch {wm withdraw .} | |
31bb1d1b | 1173 | error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"] |
c80d25db SP |
1174 | exit 1 |
1175 | } | |
21985a11 | 1176 | set _gitworktree [pwd] |
c80d25db SP |
1177 | unset cdup |
1178 | } elseif {![is_enabled bare]} { | |
29e5573d | 1179 | if {[is_bare]} { |
c52c9452 | 1180 | catch {wm withdraw .} |
29e5573d | 1181 | error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"] |
c52c9452 SP |
1182 | exit 1 |
1183 | } | |
21985a11 GB |
1184 | if {$_gitworktree eq {}} { |
1185 | set _gitworktree [file dirname $_gitdir] | |
1186 | } | |
1187 | if {[catch {cd $_gitworktree} err]} { | |
c52c9452 | 1188 | catch {wm withdraw .} |
21985a11 | 1189 | error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"] |
c52c9452 SP |
1190 | exit 1 |
1191 | } | |
21985a11 | 1192 | set _gitworktree [pwd] |
dbccbbda | 1193 | } |
c52c9452 SP |
1194 | set _reponame [file split [file normalize $_gitdir]] |
1195 | if {[lindex $_reponame end] eq {.git}} { | |
1196 | set _reponame [lindex $_reponame end-1] | |
1197 | } else { | |
1198 | set _reponame [lindex $_reponame end] | |
2d19516d | 1199 | } |
2d19516d | 1200 | |
a9fa11fe GB |
1201 | set env(GIT_DIR) $_gitdir |
1202 | set env(GIT_WORK_TREE) $_gitworktree | |
1203 | ||
372ef954 SP |
1204 | ###################################################################### |
1205 | ## | |
1206 | ## global init | |
1207 | ||
1208 | set current_diff_path {} | |
1209 | set current_diff_side {} | |
1210 | set diff_actions [list] | |
372ef954 SP |
1211 | |
1212 | set HEAD {} | |
1213 | set PARENT {} | |
1214 | set MERGE_HEAD [list] | |
1215 | set commit_type {} | |
1216 | set empty_tree {} | |
1217 | set current_branch {} | |
d41b43eb | 1218 | set is_detached 0 |
372ef954 | 1219 | set current_diff_path {} |
9c9f5fa9 | 1220 | set is_3way_diff 0 |
cd846aa1 | 1221 | set is_submodule_diff 0 |
3e34838c | 1222 | set is_conflict_diff 0 |
372ef954 | 1223 | set selected_commit_type new |
8052e788 | 1224 | set diff_empty_count 0 |
372ef954 | 1225 | |
a9786bb4 AG |
1226 | set nullid "0000000000000000000000000000000000000000" |
1227 | set nullid2 "0000000000000000000000000000000000000001" | |
1228 | ||
cb07fc2a SP |
1229 | ###################################################################### |
1230 | ## | |
e210e674 | 1231 | ## task management |
cb07fc2a | 1232 | |
8f52548a | 1233 | set rescan_active 0 |
131f503b | 1234 | set diff_active 0 |
24263b77 | 1235 | set last_clicked {} |
131f503b | 1236 | |
e210e674 SP |
1237 | set disable_on_lock [list] |
1238 | set index_lock_type none | |
1239 | ||
1240 | proc lock_index {type} { | |
1241 | global index_lock_type disable_on_lock | |
131f503b | 1242 | |
043f7011 | 1243 | if {$index_lock_type eq {none}} { |
e210e674 SP |
1244 | set index_lock_type $type |
1245 | foreach w $disable_on_lock { | |
1246 | uplevel #0 $w disabled | |
1247 | } | |
1248 | return 1 | |
53716a7b | 1249 | } elseif {$index_lock_type eq "begin-$type"} { |
e210e674 | 1250 | set index_lock_type $type |
131f503b SP |
1251 | return 1 |
1252 | } | |
1253 | return 0 | |
1254 | } | |
cb07fc2a | 1255 | |
e210e674 SP |
1256 | proc unlock_index {} { |
1257 | global index_lock_type disable_on_lock | |
1258 | ||
1259 | set index_lock_type none | |
1260 | foreach w $disable_on_lock { | |
1261 | uplevel #0 $w normal | |
1262 | } | |
1263 | } | |
1264 | ||
1265 | ###################################################################### | |
1266 | ## | |
1267 | ## status | |
1268 | ||
f18e40a1 | 1269 | proc repository_state {ctvar hdvar mhvar} { |
c950c66e | 1270 | global current_branch |
f18e40a1 SP |
1271 | upvar $ctvar ct $hdvar hd $mhvar mh |
1272 | ||
1273 | set mh [list] | |
ec6b424a | 1274 | |
d41b43eb | 1275 | load_current_branch |
81347223 | 1276 | if {[catch {set hd [git rev-parse --verify HEAD]}]} { |
4539eacd | 1277 | set hd {} |
ec6b424a | 1278 | set ct initial |
f18e40a1 SP |
1279 | return |
1280 | } | |
1281 | ||
c2758a17 | 1282 | set merge_head [gitdir MERGE_HEAD] |
f18e40a1 | 1283 | if {[file exists $merge_head]} { |
ec6b424a | 1284 | set ct merge |
f18e40a1 SP |
1285 | set fd_mh [open $merge_head r] |
1286 | while {[gets $fd_mh line] >= 0} { | |
1287 | lappend mh $line | |
1288 | } | |
1289 | close $fd_mh | |
1290 | return | |
ec6b424a | 1291 | } |
f18e40a1 SP |
1292 | |
1293 | set ct normal | |
ec6b424a SP |
1294 | } |
1295 | ||
4539eacd SP |
1296 | proc PARENT {} { |
1297 | global PARENT empty_tree | |
1298 | ||
f18e40a1 SP |
1299 | set p [lindex $PARENT 0] |
1300 | if {$p ne {}} { | |
1301 | return $p | |
4539eacd SP |
1302 | } |
1303 | if {$empty_tree eq {}} { | |
81347223 | 1304 | set empty_tree [git mktree << {}] |
4539eacd SP |
1305 | } |
1306 | return $empty_tree | |
1307 | } | |
1308 | ||
1e65c622 AG |
1309 | proc force_amend {} { |
1310 | global selected_commit_type | |
1311 | global HEAD PARENT MERGE_HEAD commit_type | |
1312 | ||
1313 | repository_state newType newHEAD newMERGE_HEAD | |
1314 | set HEAD $newHEAD | |
1315 | set PARENT $newHEAD | |
1316 | set MERGE_HEAD $newMERGE_HEAD | |
1317 | set commit_type $newType | |
1318 | ||
1319 | set selected_commit_type amend | |
1320 | do_select_commit_type | |
1321 | } | |
1322 | ||
46aaf90b | 1323 | proc rescan {after {honor_trustmtime 1}} { |
f18e40a1 | 1324 | global HEAD PARENT MERGE_HEAD commit_type |
699d5601 | 1325 | global ui_index ui_workdir ui_comm |
8f52548a | 1326 | global rescan_active file_states |
cf25ddc8 | 1327 | global repo_config |
cb07fc2a | 1328 | |
8f52548a | 1329 | if {$rescan_active > 0 || ![lock_index read]} return |
cb07fc2a | 1330 | |
f18e40a1 | 1331 | repository_state newType newHEAD newMERGE_HEAD |
4539eacd | 1332 | if {[string match amend* $commit_type] |
f18e40a1 SP |
1333 | && $newType eq {normal} |
1334 | && $newHEAD eq $HEAD} { | |
e57ca85e | 1335 | } else { |
f18e40a1 SP |
1336 | set HEAD $newHEAD |
1337 | set PARENT $newHEAD | |
1338 | set MERGE_HEAD $newMERGE_HEAD | |
1339 | set commit_type $newType | |
e57ca85e SP |
1340 | } |
1341 | ||
cb07fc2a | 1342 | array unset file_states |
cb07fc2a | 1343 | |
1e0a92fd SP |
1344 | if {!$::GITGUI_BCK_exists && |
1345 | (![$ui_comm edit modified] | |
1346 | || [string trim [$ui_comm get 0.0 end]] eq {})} { | |
b2f3bb1b SP |
1347 | if {[string match amend* $commit_type]} { |
1348 | } elseif {[load_message GITGUI_MSG]} { | |
2cd1fd1f | 1349 | } elseif {[run_prepare_commit_msg_hook]} { |
131f503b SP |
1350 | } elseif {[load_message MERGE_MSG]} { |
1351 | } elseif {[load_message SQUASH_MSG]} { | |
1352 | } | |
b2c6fcf1 | 1353 | $ui_comm edit reset |
21d7744f | 1354 | $ui_comm edit modified false |
131f503b SP |
1355 | } |
1356 | ||
46aaf90b | 1357 | if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} { |
8f52548a | 1358 | rescan_stage2 {} $after |
e534f3a8 | 1359 | } else { |
8f52548a | 1360 | set rescan_active 1 |
1ac17950 | 1361 | ui_status [mc "Refreshing file status..."] |
0b812616 SP |
1362 | set fd_rf [git_read update-index \ |
1363 | -q \ | |
1364 | --unmerged \ | |
1365 | --ignore-missing \ | |
1366 | --refresh \ | |
1367 | ] | |
e534f3a8 | 1368 | fconfigure $fd_rf -blocking 0 -translation binary |
390adaea | 1369 | fileevent $fd_rf readable \ |
8f52548a | 1370 | [list rescan_stage2 $fd_rf $after] |
e534f3a8 | 1371 | } |
131f503b SP |
1372 | } |
1373 | ||
2fe167b6 | 1374 | if {[is_Cygwin]} { |
2fe167b6 SP |
1375 | set is_git_info_exclude {} |
1376 | proc have_info_exclude {} { | |
7f83aa2d | 1377 | global is_git_info_exclude |
2fe167b6 | 1378 | |
7f83aa2d SP |
1379 | if {$is_git_info_exclude eq {}} { |
1380 | if {[catch {exec test -f [gitdir info exclude]}]} { | |
1381 | set is_git_info_exclude 0 | |
1382 | } else { | |
1383 | set is_git_info_exclude 1 | |
2fe167b6 | 1384 | } |
2fe167b6 | 1385 | } |
7f83aa2d | 1386 | return $is_git_info_exclude |
2fe167b6 SP |
1387 | } |
1388 | } else { | |
1389 | proc have_info_exclude {} { | |
1390 | return [file readable [gitdir info exclude]] | |
1391 | } | |
1392 | } | |
1393 | ||
8f52548a | 1394 | proc rescan_stage2 {fd after} { |
4539eacd | 1395 | global rescan_active buf_rdi buf_rdf buf_rlo |
131f503b | 1396 | |
043f7011 | 1397 | if {$fd ne {}} { |
e534f3a8 SP |
1398 | read $fd |
1399 | if {![eof $fd]} return | |
1400 | close $fd | |
1401 | } | |
131f503b | 1402 | |
0b812616 | 1403 | set ls_others [list --exclude-per-directory=.gitignore] |
2fe167b6 SP |
1404 | if {[have_info_exclude]} { |
1405 | lappend ls_others "--exclude-from=[gitdir info exclude]" | |
cb07fc2a | 1406 | } |
94a4dd9b SP |
1407 | set user_exclude [get_config core.excludesfile] |
1408 | if {$user_exclude ne {} && [file readable $user_exclude]} { | |
1409 | lappend ls_others "--exclude-from=$user_exclude" | |
1410 | } | |
cb07fc2a | 1411 | |
868c8752 SP |
1412 | set buf_rdi {} |
1413 | set buf_rdf {} | |
1414 | set buf_rlo {} | |
1415 | ||
8f52548a | 1416 | set rescan_active 3 |
1ac17950 | 1417 | ui_status [mc "Scanning for modified files ..."] |
0b812616 SP |
1418 | set fd_di [git_read diff-index --cached -z [PARENT]] |
1419 | set fd_df [git_read diff-files -z] | |
1420 | set fd_lo [eval git_read ls-files --others -z $ls_others] | |
cb07fc2a | 1421 | |
51a989ba SP |
1422 | fconfigure $fd_di -blocking 0 -translation binary -encoding binary |
1423 | fconfigure $fd_df -blocking 0 -translation binary -encoding binary | |
1424 | fconfigure $fd_lo -blocking 0 -translation binary -encoding binary | |
8f52548a SP |
1425 | fileevent $fd_di readable [list read_diff_index $fd_di $after] |
1426 | fileevent $fd_df readable [list read_diff_files $fd_df $after] | |
1427 | fileevent $fd_lo readable [list read_ls_others $fd_lo $after] | |
cb07fc2a SP |
1428 | } |
1429 | ||
131f503b | 1430 | proc load_message {file} { |
c950c66e | 1431 | global ui_comm |
131f503b | 1432 | |
c2758a17 | 1433 | set f [gitdir $file] |
e57ca85e | 1434 | if {[file isfile $f]} { |
131f503b SP |
1435 | if {[catch {set fd [open $f r]}]} { |
1436 | return 0 | |
1437 | } | |
6eb420ef | 1438 | fconfigure $fd -eofchar {} |
e57ca85e | 1439 | set content [string trim [read $fd]] |
131f503b | 1440 | close $fd |
4e55d19a | 1441 | regsub -all -line {[ \r\t]+$} $content {} content |
131f503b SP |
1442 | $ui_comm delete 0.0 end |
1443 | $ui_comm insert end $content | |
1444 | return 1 | |
1445 | } | |
1446 | return 0 | |
1447 | } | |
1448 | ||
2cd1fd1f JW |
1449 | proc run_prepare_commit_msg_hook {} { |
1450 | global pch_error | |
1451 | ||
1452 | # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui | |
1453 | # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an | |
1454 | # empty file but existant file. | |
1455 | ||
1456 | set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a] | |
1457 | ||
1458 | if {[file isfile [gitdir MERGE_MSG]]} { | |
1459 | set pcm_source "merge" | |
1460 | set fd_mm [open [gitdir MERGE_MSG] r] | |
1461 | puts -nonewline $fd_pcm [read $fd_mm] | |
1462 | close $fd_mm | |
1463 | } elseif {[file isfile [gitdir SQUASH_MSG]]} { | |
1464 | set pcm_source "squash" | |
1465 | set fd_sm [open [gitdir SQUASH_MSG] r] | |
1466 | puts -nonewline $fd_pcm [read $fd_sm] | |
1467 | close $fd_sm | |
1468 | } else { | |
1469 | set pcm_source "" | |
1470 | } | |
1471 | ||
1472 | close $fd_pcm | |
1473 | ||
1474 | set fd_ph [githook_read prepare-commit-msg \ | |
1475 | [gitdir PREPARE_COMMIT_MSG] $pcm_source] | |
1476 | if {$fd_ph eq {}} { | |
1477 | catch {file delete [gitdir PREPARE_COMMIT_MSG]} | |
1478 | return 0; | |
1479 | } | |
1480 | ||
1481 | ui_status [mc "Calling prepare-commit-msg hook..."] | |
1482 | set pch_error {} | |
1483 | ||
1484 | fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} | |
1485 | fileevent $fd_ph readable \ | |
1486 | [list prepare_commit_msg_hook_wait $fd_ph] | |
1487 | ||
1488 | return 1; | |
1489 | } | |
1490 | ||
1491 | proc prepare_commit_msg_hook_wait {fd_ph} { | |
1492 | global pch_error | |
1493 | ||
1494 | append pch_error [read $fd_ph] | |
1495 | fconfigure $fd_ph -blocking 1 | |
1496 | if {[eof $fd_ph]} { | |
1497 | if {[catch {close $fd_ph}]} { | |
1498 | ui_status [mc "Commit declined by prepare-commit-msg hook."] | |
1499 | hook_failed_popup prepare-commit-msg $pch_error | |
1500 | catch {file delete [gitdir PREPARE_COMMIT_MSG]} | |
1501 | exit 1 | |
1502 | } else { | |
1503 | load_message PREPARE_COMMIT_MSG | |
1504 | } | |
1505 | set pch_error {} | |
1506 | catch {file delete [gitdir PREPARE_COMMIT_MSG]} | |
1507 | return | |
1508 | } | |
1509 | fconfigure $fd_ph -blocking 0 | |
1510 | catch {file delete [gitdir PREPARE_COMMIT_MSG]} | |
1511 | } | |
1512 | ||
8f52548a | 1513 | proc read_diff_index {fd after} { |
cb07fc2a SP |
1514 | global buf_rdi |
1515 | ||
1516 | append buf_rdi [read $fd] | |
868c8752 SP |
1517 | set c 0 |
1518 | set n [string length $buf_rdi] | |
1519 | while {$c < $n} { | |
1520 | set z1 [string first "\0" $buf_rdi $c] | |
1521 | if {$z1 == -1} break | |
1522 | incr z1 | |
1523 | set z2 [string first "\0" $buf_rdi $z1] | |
1524 | if {$z2 == -1} break | |
1525 | ||
868c8752 | 1526 | incr c |
86291555 | 1527 | set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }] |
51a989ba | 1528 | set p [string range $buf_rdi $z1 [expr {$z2 - 1}]] |
1461c5f3 | 1529 | merge_state \ |
51a989ba | 1530 | [encoding convertfrom $p] \ |
86291555 SP |
1531 | [lindex $i 4]? \ |
1532 | [list [lindex $i 0] [lindex $i 2]] \ | |
1461c5f3 SP |
1533 | [list] |
1534 | set c $z2 | |
86291555 | 1535 | incr c |
cb07fc2a | 1536 | } |
868c8752 SP |
1537 | if {$c < $n} { |
1538 | set buf_rdi [string range $buf_rdi $c end] | |
1539 | } else { | |
1540 | set buf_rdi {} | |
1541 | } | |
1542 | ||
8f52548a | 1543 | rescan_done $fd buf_rdi $after |
cb07fc2a SP |
1544 | } |
1545 | ||
8f52548a | 1546 | proc read_diff_files {fd after} { |
cb07fc2a SP |
1547 | global buf_rdf |
1548 | ||
1549 | append buf_rdf [read $fd] | |
868c8752 SP |
1550 | set c 0 |
1551 | set n [string length $buf_rdf] | |
1552 | while {$c < $n} { | |
1553 | set z1 [string first "\0" $buf_rdf $c] | |
1554 | if {$z1 == -1} break | |
1555 | incr z1 | |
1556 | set z2 [string first "\0" $buf_rdf $z1] | |
1557 | if {$z2 == -1} break | |
1558 | ||
868c8752 | 1559 | incr c |
86291555 | 1560 | set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }] |
51a989ba | 1561 | set p [string range $buf_rdf $z1 [expr {$z2 - 1}]] |
1461c5f3 | 1562 | merge_state \ |
51a989ba | 1563 | [encoding convertfrom $p] \ |
86291555 | 1564 | ?[lindex $i 4] \ |
1461c5f3 | 1565 | [list] \ |
86291555 | 1566 | [list [lindex $i 0] [lindex $i 2]] |
1461c5f3 | 1567 | set c $z2 |
86291555 | 1568 | incr c |
868c8752 SP |
1569 | } |
1570 | if {$c < $n} { | |
1571 | set buf_rdf [string range $buf_rdf $c end] | |
1572 | } else { | |
1573 | set buf_rdf {} | |
cb07fc2a | 1574 | } |
868c8752 | 1575 | |
8f52548a | 1576 | rescan_done $fd buf_rdf $after |
cb07fc2a SP |
1577 | } |
1578 | ||
8f52548a | 1579 | proc read_ls_others {fd after} { |
cb07fc2a SP |
1580 | global buf_rlo |
1581 | ||
1582 | append buf_rlo [read $fd] | |
1583 | set pck [split $buf_rlo "\0"] | |
1584 | set buf_rlo [lindex $pck end] | |
1585 | foreach p [lrange $pck 0 end-1] { | |
89384101 SP |
1586 | set p [encoding convertfrom $p] |
1587 | if {[string index $p end] eq {/}} { | |
1588 | set p [string range $p 0 end-1] | |
1589 | } | |
1590 | merge_state $p ?O | |
cb07fc2a | 1591 | } |
8f52548a | 1592 | rescan_done $fd buf_rlo $after |
cb07fc2a SP |
1593 | } |
1594 | ||
8f52548a | 1595 | proc rescan_done {fd buf after} { |
f522c9b5 | 1596 | global rescan_active current_diff_path |
f7f8d322 | 1597 | global file_states repo_config |
7f1df79b | 1598 | upvar $buf to_clear |
cb07fc2a | 1599 | |
f7f8d322 SP |
1600 | if {![eof $fd]} return |
1601 | set to_clear {} | |
1602 | close $fd | |
8f52548a | 1603 | if {[incr rescan_active -1] > 0} return |
93f654df | 1604 | |
24263b77 | 1605 | prune_selection |
f7f8d322 SP |
1606 | unlock_index |
1607 | display_all_files | |
7cf4566f AG |
1608 | if {$current_diff_path ne {}} { reshow_diff $after } |
1609 | if {$current_diff_path eq {}} { select_first_diff $after } | |
cb07fc2a SP |
1610 | } |
1611 | ||
24263b77 SP |
1612 | proc prune_selection {} { |
1613 | global file_states selected_paths | |
1614 | ||
1615 | foreach path [array names selected_paths] { | |
1616 | if {[catch {set still_here $file_states($path)}]} { | |
1617 | unset selected_paths($path) | |
1618 | } | |
1619 | } | |
1620 | } | |
1621 | ||
cb07fc2a SP |
1622 | ###################################################################### |
1623 | ## | |
f522c9b5 | 1624 | ## ui helpers |
cb07fc2a | 1625 | |
f522c9b5 SP |
1626 | proc mapicon {w state path} { |
1627 | global all_icons | |
1628 | ||
1629 | if {[catch {set r $all_icons($state$w)}]} { | |
1630 | puts "error: no icon for $w state={$state} $path" | |
1631 | return file_plain | |
1632 | } | |
1633 | return $r | |
1634 | } | |
cb07fc2a | 1635 | |
f522c9b5 SP |
1636 | proc mapdesc {state path} { |
1637 | global all_descs | |
03e4ec53 | 1638 | |
f522c9b5 SP |
1639 | if {[catch {set r $all_descs($state)}]} { |
1640 | puts "error: no desc for state={$state} $path" | |
1641 | return $state | |
1642 | } | |
1643 | return $r | |
1644 | } | |
03e4ec53 | 1645 | |
699d5601 | 1646 | proc ui_status {msg} { |
906ab7f6 SP |
1647 | global main_status |
1648 | if {[info exists main_status]} { | |
1649 | $main_status show $msg | |
1650 | } | |
699d5601 SP |
1651 | } |
1652 | ||
1653 | proc ui_ready {{test {}}} { | |
906ab7f6 SP |
1654 | global main_status |
1655 | if {[info exists main_status]} { | |
1656 | $main_status show [mc "Ready."] $test | |
1657 | } | |
699d5601 SP |
1658 | } |
1659 | ||
f522c9b5 SP |
1660 | proc escape_path {path} { |
1661 | regsub -all {\\} $path "\\\\" path | |
1662 | regsub -all "\n" $path "\\n" path | |
1663 | return $path | |
cb07fc2a SP |
1664 | } |
1665 | ||
f522c9b5 SP |
1666 | proc short_path {path} { |
1667 | return [escape_path [lindex [file split $path] end]] | |
7f1df79b SP |
1668 | } |
1669 | ||
f522c9b5 SP |
1670 | set next_icon_id 0 |
1671 | set null_sha1 [string repeat 0 40] | |
16403d0b | 1672 | |
f522c9b5 SP |
1673 | proc merge_state {path new_state {head_info {}} {index_info {}}} { |
1674 | global file_states next_icon_id null_sha1 | |
16403d0b | 1675 | |
f522c9b5 SP |
1676 | set s0 [string index $new_state 0] |
1677 | set s1 [string index $new_state 1] | |
16403d0b | 1678 | |
f522c9b5 SP |
1679 | if {[catch {set info $file_states($path)}]} { |
1680 | set state __ | |
1681 | set icon n[incr next_icon_id] | |
1682 | } else { | |
1683 | set state [lindex $info 0] | |
1684 | set icon [lindex $info 1] | |
1685 | if {$head_info eq {}} {set head_info [lindex $info 2]} | |
1686 | if {$index_info eq {}} {set index_info [lindex $info 3]} | |
1687 | } | |
16403d0b | 1688 | |
f522c9b5 SP |
1689 | if {$s0 eq {?}} {set s0 [string index $state 0]} \ |
1690 | elseif {$s0 eq {_}} {set s0 _} | |
124355d3 | 1691 | |
f522c9b5 SP |
1692 | if {$s1 eq {?}} {set s1 [string index $state 1]} \ |
1693 | elseif {$s1 eq {_}} {set s1 _} | |
16403d0b | 1694 | |
f522c9b5 SP |
1695 | if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} { |
1696 | set head_info [list 0 $null_sha1] | |
1697 | } elseif {$s0 ne {_} && [string index $state 0] eq {_} | |
1698 | && $head_info eq {}} { | |
1699 | set head_info $index_info | |
7ec2b69f JL |
1700 | } elseif {$s0 eq {_} && [string index $state 0] ne {_}} { |
1701 | set index_info $head_info | |
1702 | set head_info {} | |
f522c9b5 | 1703 | } |
16403d0b | 1704 | |
f522c9b5 SP |
1705 | set file_states($path) [list $s0$s1 $icon \ |
1706 | $head_info $index_info \ | |
1707 | ] | |
1708 | return $state | |
1709 | } | |
cb07fc2a | 1710 | |
f522c9b5 SP |
1711 | proc display_file_helper {w path icon_name old_m new_m} { |
1712 | global file_lists | |
cb07fc2a | 1713 | |
f522c9b5 | 1714 | if {$new_m eq {_}} { |
156b2921 | 1715 | set lno [lsearch -sorted -exact $file_lists($w) $path] |
5f8b70b1 | 1716 | if {$lno >= 0} { |
f522c9b5 | 1717 | set file_lists($w) [lreplace $file_lists($w) $lno $lno] |
5f8b70b1 | 1718 | incr lno |
f522c9b5 SP |
1719 | $w conf -state normal |
1720 | $w delete $lno.0 [expr {$lno + 1}].0 | |
1721 | $w conf -state disabled | |
03e4ec53 | 1722 | } |
f522c9b5 SP |
1723 | } elseif {$old_m eq {_} && $new_m ne {_}} { |
1724 | lappend file_lists($w) $path | |
1725 | set file_lists($w) [lsort -unique $file_lists($w)] | |
1726 | set lno [lsearch -sorted -exact $file_lists($w) $path] | |
1727 | incr lno | |
1728 | $w conf -state normal | |
1729 | $w image create $lno.0 \ | |
1730 | -align center -padx 5 -pady 1 \ | |
1731 | -name $icon_name \ | |
1732 | -image [mapicon $w $new_m $path] | |
1733 | $w insert $lno.1 "[escape_path $path]\n" | |
1734 | $w conf -state disabled | |
1735 | } elseif {$old_m ne $new_m} { | |
1736 | $w conf -state normal | |
1737 | $w image conf $icon_name -image [mapicon $w $new_m $path] | |
1738 | $w conf -state disabled | |
03e4ec53 | 1739 | } |
f522c9b5 SP |
1740 | } |
1741 | ||
1742 | proc display_file {path state} { | |
1743 | global file_states selected_paths | |
1744 | global ui_index ui_workdir | |
03e4ec53 | 1745 | |
f522c9b5 | 1746 | set old_m [merge_state $path $state] |
cb07fc2a | 1747 | set s $file_states($path) |
f522c9b5 SP |
1748 | set new_m [lindex $s 0] |
1749 | set icon_name [lindex $s 1] | |
82cb8706 | 1750 | |
f522c9b5 SP |
1751 | set o [string index $old_m 0] |
1752 | set n [string index $new_m 0] | |
1753 | if {$o eq {U}} { | |
1754 | set o _ | |
1755 | } | |
1756 | if {$n eq {U}} { | |
1757 | set n _ | |
cb07fc2a | 1758 | } |
f522c9b5 | 1759 | display_file_helper $ui_index $path $icon_name $o $n |
cb07fc2a | 1760 | |
f522c9b5 SP |
1761 | if {[string index $old_m 0] eq {U}} { |
1762 | set o U | |
1763 | } else { | |
1764 | set o [string index $old_m 1] | |
82cb8706 | 1765 | } |
f522c9b5 SP |
1766 | if {[string index $new_m 0] eq {U}} { |
1767 | set n U | |
1768 | } else { | |
1769 | set n [string index $new_m 1] | |
82cb8706 | 1770 | } |
f522c9b5 SP |
1771 | display_file_helper $ui_workdir $path $icon_name $o $n |
1772 | ||
1773 | if {$new_m eq {__}} { | |
1774 | unset file_states($path) | |
1775 | catch {unset selected_paths($path)} | |
cb07fc2a | 1776 | } |
f522c9b5 | 1777 | } |
cb07fc2a | 1778 | |
f522c9b5 SP |
1779 | proc display_all_files_helper {w path icon_name m} { |
1780 | global file_lists | |
1781 | ||
1782 | lappend file_lists($w) $path | |
1783 | set lno [expr {[lindex [split [$w index end] .] 0] - 1}] | |
1784 | $w image create end \ | |
1785 | -align center -padx 5 -pady 1 \ | |
1786 | -name $icon_name \ | |
1787 | -image [mapicon $w $m $path] | |
1788 | $w insert end "[escape_path $path]\n" | |
cb07fc2a SP |
1789 | } |
1790 | ||
dd6451f9 | 1791 | set files_warning 0 |
f522c9b5 SP |
1792 | proc display_all_files {} { |
1793 | global ui_index ui_workdir | |
1794 | global file_states file_lists | |
1795 | global last_clicked | |
dd6451f9 | 1796 | global files_warning |
cb07fc2a | 1797 | |
f522c9b5 SP |
1798 | $ui_index conf -state normal |
1799 | $ui_workdir conf -state normal | |
cb07fc2a | 1800 | |
f522c9b5 SP |
1801 | $ui_index delete 0.0 end |
1802 | $ui_workdir delete 0.0 end | |
1803 | set last_clicked {} | |
cb07fc2a | 1804 | |
f522c9b5 SP |
1805 | set file_lists($ui_index) [list] |
1806 | set file_lists($ui_workdir) [list] | |
16403d0b | 1807 | |
dd6451f9 DZ |
1808 | set to_display [lsort [array names file_states]] |
1809 | set display_limit [get_config gui.maxfilesdisplayed] | |
1810 | if {[llength $to_display] > $display_limit} { | |
1811 | if {!$files_warning} { | |
1812 | # do not repeatedly warn: | |
1813 | set files_warning 1 | |
1814 | info_popup [mc "Displaying only %s of %s files." \ | |
1815 | $display_limit [llength $to_display]] | |
1816 | } | |
1817 | set to_display [lrange $to_display 0 [expr {$display_limit-1}]] | |
1818 | } | |
1819 | foreach path $to_display { | |
f522c9b5 SP |
1820 | set s $file_states($path) |
1821 | set m [lindex $s 0] | |
1822 | set icon_name [lindex $s 1] | |
1823 | ||
1824 | set s [string index $m 0] | |
1825 | if {$s ne {U} && $s ne {_}} { | |
1826 | display_all_files_helper $ui_index $path \ | |
1827 | $icon_name $s | |
16403d0b | 1828 | } |
cb07fc2a | 1829 | |
f522c9b5 SP |
1830 | if {[string index $m 0] eq {U}} { |
1831 | set s U | |
1832 | } else { | |
1833 | set s [string index $m 1] | |
a25c5189 | 1834 | } |
f522c9b5 SP |
1835 | if {$s ne {_}} { |
1836 | display_all_files_helper $ui_workdir $path \ | |
1837 | $icon_name $s | |
a25c5189 SP |
1838 | } |
1839 | } | |
1840 | ||
f522c9b5 SP |
1841 | $ui_index conf -state disabled |
1842 | $ui_workdir conf -state disabled | |
a25c5189 SP |
1843 | } |
1844 | ||
ec6b424a SP |
1845 | ###################################################################### |
1846 | ## | |
f522c9b5 | 1847 | ## icons |
ec6b424a | 1848 | |
f522c9b5 SP |
1849 | set filemask { |
1850 | #define mask_width 14 | |
1851 | #define mask_height 15 | |
1852 | static unsigned char mask_bits[] = { | |
1853 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, | |
1854 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, | |
1855 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f}; | |
1856 | } | |
cb07fc2a SP |
1857 | |
1858 | image create bitmap file_plain -background white -foreground black -data { | |
1859 | #define plain_width 14 | |
1860 | #define plain_height 15 | |
1861 | static unsigned char plain_bits[] = { | |
1862 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, | |
1863 | 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, | |
1864 | 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1865 | } -maskdata $filemask | |
1866 | ||
1867 | image create bitmap file_mod -background white -foreground blue -data { | |
1868 | #define mod_width 14 | |
1869 | #define mod_height 15 | |
1870 | static unsigned char mod_bits[] = { | |
1871 | 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, | |
1872 | 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, | |
1873 | 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; | |
1874 | } -maskdata $filemask | |
1875 | ||
131f503b SP |
1876 | image create bitmap file_fulltick -background white -foreground "#007000" -data { |
1877 | #define file_fulltick_width 14 | |
1878 | #define file_fulltick_height 15 | |
1879 | static unsigned char file_fulltick_bits[] = { | |
cb07fc2a SP |
1880 | 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16, |
1881 | 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10, | |
1882 | 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1883 | } -maskdata $filemask | |
1884 | ||
cb07fc2a SP |
1885 | image create bitmap file_question -background white -foreground black -data { |
1886 | #define file_question_width 14 | |
1887 | #define file_question_height 15 | |
1888 | static unsigned char file_question_bits[] = { | |
1889 | 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13, | |
1890 | 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10, | |
1891 | 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1892 | } -maskdata $filemask | |
1893 | ||
1894 | image create bitmap file_removed -background white -foreground red -data { | |
1895 | #define file_removed_width 14 | |
1896 | #define file_removed_height 15 | |
1897 | static unsigned char file_removed_bits[] = { | |
1898 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, | |
1899 | 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13, | |
1900 | 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f}; | |
1901 | } -maskdata $filemask | |
1902 | ||
1903 | image create bitmap file_merge -background white -foreground blue -data { | |
1904 | #define file_merge_width 14 | |
1905 | #define file_merge_height 15 | |
1906 | static unsigned char file_merge_bits[] = { | |
1907 | 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10, | |
1908 | 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, | |
1909 | 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; | |
1910 | } -maskdata $filemask | |
1911 | ||
e681cb7d GH |
1912 | image create bitmap file_statechange -background white -foreground green -data { |
1913 | #define file_merge_width 14 | |
1914 | #define file_merge_height 15 | |
1915 | static unsigned char file_statechange_bits[] = { | |
1916 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10, | |
1917 | 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, | |
1918 | 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; | |
1919 | } -maskdata $filemask | |
1920 | ||
6b292675 | 1921 | set ui_index .vpane.files.index.list |
0812665e | 1922 | set ui_workdir .vpane.files.workdir.list |
21e409ad SP |
1923 | |
1924 | set all_icons(_$ui_index) file_plain | |
0602de48 | 1925 | set all_icons(A$ui_index) file_plain |
21e409ad SP |
1926 | set all_icons(M$ui_index) file_fulltick |
1927 | set all_icons(D$ui_index) file_removed | |
1928 | set all_icons(U$ui_index) file_merge | |
e681cb7d | 1929 | set all_icons(T$ui_index) file_statechange |
21e409ad SP |
1930 | |
1931 | set all_icons(_$ui_workdir) file_plain | |
1932 | set all_icons(M$ui_workdir) file_mod | |
1933 | set all_icons(D$ui_workdir) file_question | |
3b4db3c1 | 1934 | set all_icons(U$ui_workdir) file_merge |
21e409ad | 1935 | set all_icons(O$ui_workdir) file_plain |
e681cb7d | 1936 | set all_icons(T$ui_workdir) file_statechange |
21e409ad | 1937 | |
131f503b | 1938 | set max_status_desc 0 |
cb07fc2a | 1939 | foreach i { |
1ac17950 CS |
1940 | {__ {mc "Unmodified"}} |
1941 | ||
1942 | {_M {mc "Modified, not staged"}} | |
1943 | {M_ {mc "Staged for commit"}} | |
1944 | {MM {mc "Portions staged for commit"}} | |
1945 | {MD {mc "Staged for commit, missing"}} | |
1946 | ||
e681cb7d GH |
1947 | {_T {mc "File type changed, not staged"}} |
1948 | {T_ {mc "File type changed, staged"}} | |
1949 | ||
1ac17950 CS |
1950 | {_O {mc "Untracked, not staged"}} |
1951 | {A_ {mc "Staged for commit"}} | |
1952 | {AM {mc "Portions staged for commit"}} | |
1953 | {AD {mc "Staged for commit, missing"}} | |
1954 | ||
1955 | {_D {mc "Missing"}} | |
1956 | {D_ {mc "Staged for removal"}} | |
1957 | {DO {mc "Staged for removal, still present"}} | |
1958 | ||
ff515d81 | 1959 | {_U {mc "Requires merge resolution"}} |
1ac17950 CS |
1960 | {U_ {mc "Requires merge resolution"}} |
1961 | {UU {mc "Requires merge resolution"}} | |
1962 | {UM {mc "Requires merge resolution"}} | |
1963 | {UD {mc "Requires merge resolution"}} | |
ff515d81 | 1964 | {UT {mc "Requires merge resolution"}} |
cb07fc2a | 1965 | } { |
1ac17950 CS |
1966 | set text [eval [lindex $i 1]] |
1967 | if {$max_status_desc < [string length $text]} { | |
1968 | set max_status_desc [string length $text] | |
131f503b | 1969 | } |
1ac17950 | 1970 | set all_descs([lindex $i 0]) $text |
cb07fc2a | 1971 | } |
21e409ad | 1972 | unset i |
cb07fc2a SP |
1973 | |
1974 | ###################################################################### | |
1975 | ## | |
1976 | ## util | |
1977 | ||
35874c16 SP |
1978 | proc scrollbar2many {list mode args} { |
1979 | foreach w $list {eval $w $mode $args} | |
1980 | } | |
1981 | ||
1982 | proc many2scrollbar {list mode sb top bottom} { | |
1983 | $sb set $top $bottom | |
1984 | foreach w $list {$w $mode moveto $top} | |
1985 | } | |
1986 | ||
b4946930 SP |
1987 | proc incr_font_size {font {amt 1}} { |
1988 | set sz [font configure $font -size] | |
1989 | incr sz $amt | |
1990 | font configure $font -size $sz | |
1991 | font configure ${font}bold -size $sz | |
debcd0fd | 1992 | font configure ${font}italic -size $sz |
b4946930 SP |
1993 | } |
1994 | ||
cb07fc2a SP |
1995 | ###################################################################### |
1996 | ## | |
1997 | ## ui commands | |
1998 | ||
1ac17950 | 1999 | set starting_gitk_msg [mc "Starting gitk... please wait..."] |
cc4b1c02 | 2000 | |
25476c63 JL |
2001 | proc do_gitk {revs {is_submodule false}} { |
2002 | global current_diff_path file_states current_diff_side ui_index | |
a9fa11fe | 2003 | global _gitdir _gitworktree |
25476c63 | 2004 | |
20ddfcaa SP |
2005 | # -- Always start gitk through whatever we were loaded with. This |
2006 | # lets us bypass using shell process on Windows systems. | |
2007 | # | |
79317e5d | 2008 | set exe [_which gitk -script] |
02efd48f | 2009 | set cmd [list [info nameofexecutable] $exe] |
15430be5 AMS |
2010 | if {$exe eq {}} { |
2011 | error_popup [mc "Couldn't find gitk in PATH"] | |
cb07fc2a | 2012 | } else { |
501e4c6f SP |
2013 | global env |
2014 | ||
501e4c6f | 2015 | set pwd [pwd] |
501e4c6f | 2016 | |
25476c63 | 2017 | if {!$is_submodule} { |
29e5573d | 2018 | if {![is_bare]} { |
21985a11 GB |
2019 | cd $_gitworktree |
2020 | } | |
25476c63 JL |
2021 | } else { |
2022 | cd $current_diff_path | |
2023 | if {$revs eq {--}} { | |
2024 | set s $file_states($current_diff_path) | |
2025 | set old_sha1 {} | |
2026 | set new_sha1 {} | |
2027 | switch -glob -- [lindex $s 0] { | |
2028 | M_ { set old_sha1 [lindex [lindex $s 2] 1] } | |
2029 | _M { set old_sha1 [lindex [lindex $s 3] 1] } | |
2030 | MM { | |
2031 | if {$current_diff_side eq $ui_index} { | |
2032 | set old_sha1 [lindex [lindex $s 2] 1] | |
2033 | set new_sha1 [lindex [lindex $s 3] 1] | |
2034 | } else { | |
2035 | set old_sha1 [lindex [lindex $s 3] 1] | |
2036 | } | |
2037 | } | |
2038 | } | |
2039 | set revs $old_sha1...$new_sha1 | |
2040 | } | |
a9fa11fe GB |
2041 | # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones |
2042 | # we've been using for the main repository, so unset them. | |
2043 | # TODO we could make life easier (start up faster?) for gitk | |
2044 | # by setting these to the appropriate values to allow gitk | |
2045 | # to skip the heuristics to find their proper value | |
2046 | unset env(GIT_DIR) | |
2047 | unset env(GIT_WORK_TREE) | |
25476c63 | 2048 | } |
e27d106e | 2049 | eval exec $cmd $revs "--" "--" & |
501e4c6f | 2050 | |
a9fa11fe GB |
2051 | set env(GIT_DIR) $_gitdir |
2052 | set env(GIT_WORK_TREE) $_gitworktree | |
25476c63 JL |
2053 | cd $pwd |
2054 | ||
2055 | ui_status $::starting_gitk_msg | |
2056 | after 10000 { | |
2057 | ui_ready $starting_gitk_msg | |
2058 | } | |
2059 | } | |
2060 | } | |
2061 | ||
2062 | proc do_git_gui {} { | |
2063 | global current_diff_path | |
2064 | ||
2065 | # -- Always start git gui through whatever we were loaded with. This | |
2066 | # lets us bypass using shell process on Windows systems. | |
2067 | # | |
831cc7eb | 2068 | set exe [list [_which git]] |
25476c63 JL |
2069 | if {$exe eq {}} { |
2070 | error_popup [mc "Couldn't find git gui in PATH"] | |
2071 | } else { | |
2072 | global env | |
a9fa11fe | 2073 | global _gitdir _gitworktree |
25476c63 | 2074 | |
a9fa11fe GB |
2075 | # see note in do_gitk about unsetting these vars when |
2076 | # running tools in a submodule | |
2077 | unset env(GIT_DIR) | |
2078 | unset env(GIT_WORK_TREE) | |
25476c63 JL |
2079 | |
2080 | set pwd [pwd] | |
2081 | cd $current_diff_path | |
2082 | ||
2083 | eval exec $exe gui & | |
2084 | ||
a9fa11fe GB |
2085 | set env(GIT_DIR) $_gitdir |
2086 | set env(GIT_WORK_TREE) $_gitworktree | |
501e4c6f SP |
2087 | cd $pwd |
2088 | ||
02efd48f | 2089 | ui_status $::starting_gitk_msg |
d0752429 | 2090 | after 10000 { |
699d5601 | 2091 | ui_ready $starting_gitk_msg |
d0752429 | 2092 | } |
cb07fc2a SP |
2093 | } |
2094 | } | |
2095 | ||
afd54240 | 2096 | proc do_explore {} { |
21985a11 | 2097 | global _gitworktree |
afd54240 PB |
2098 | set explorer {} |
2099 | if {[is_Cygwin] || [is_Windows]} { | |
2100 | set explorer "explorer.exe" | |
2101 | } elseif {[is_MacOSX]} { | |
2102 | set explorer "open" | |
2103 | } else { | |
2104 | # freedesktop.org-conforming system is our best shot | |
2105 | set explorer "xdg-open" | |
2106 | } | |
2e0cda65 | 2107 | eval exec $explorer [list [file nativename $_gitworktree]] & |
afd54240 PB |
2108 | } |
2109 | ||
b5834d70 | 2110 | set is_quitting 0 |
1e65c622 | 2111 | set ret_code 1 |
c4fe7728 | 2112 | |
1e65c622 AG |
2113 | proc terminate_me {win} { |
2114 | global ret_code | |
2115 | if {$win ne {.}} return | |
2116 | exit $ret_code | |
2117 | } | |
2118 | ||
2119 | proc do_quit {{rc {1}}} { | |
c950c66e | 2120 | global ui_comm is_quitting repo_config commit_type |
4578c5cb | 2121 | global GITGUI_BCK_exists GITGUI_BCK_i |
95b002ee | 2122 | global ui_comm_spell |
c80d7be5 | 2123 | global ret_code use_ttk |
c4fe7728 | 2124 | |
b5834d70 SP |
2125 | if {$is_quitting} return |
2126 | set is_quitting 1 | |
131f503b | 2127 | |
db7f34d4 SP |
2128 | if {[winfo exists $ui_comm]} { |
2129 | # -- Stash our current commit buffer. | |
2130 | # | |
2131 | set save [gitdir GITGUI_MSG] | |
4578c5cb SP |
2132 | if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { |
2133 | file rename -force [gitdir GITGUI_BCK] $save | |
2134 | set GITGUI_BCK_exists 0 | |
db7f34d4 | 2135 | } else { |
4578c5cb SP |
2136 | set msg [string trim [$ui_comm get 0.0 end]] |
2137 | regsub -all -line {[ \r\t]+$} $msg {} msg | |
2138 | if {(![string match amend* $commit_type] | |
2139 | || [$ui_comm edit modified]) | |
2140 | && $msg ne {}} { | |
2141 | catch { | |
2142 | set fd [open $save w] | |
2143 | puts -nonewline $fd $msg | |
2144 | close $fd | |
2145 | } | |
2146 | } else { | |
2147 | catch {file delete $save} | |
2148 | } | |
2149 | } | |
2150 | ||
95b002ee SP |
2151 | # -- Cancel our spellchecker if its running. |
2152 | # | |
2153 | if {[info exists ui_comm_spell]} { | |
2154 | $ui_comm_spell stop | |
2155 | } | |
2156 | ||
4578c5cb SP |
2157 | # -- Remove our editor backup, its not needed. |
2158 | # | |
2159 | after cancel $GITGUI_BCK_i | |
2160 | if {$GITGUI_BCK_exists} { | |
2161 | catch {file delete [gitdir GITGUI_BCK]} | |
131f503b | 2162 | } |
131f503b | 2163 | |
db7f34d4 SP |
2164 | # -- Stash our current window geometry into this repository. |
2165 | # | |
ed7b6033 AB |
2166 | set cfg_wmstate [wm state .] |
2167 | if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} { | |
2168 | set rc_wmstate {} | |
2169 | } | |
2170 | if {$cfg_wmstate ne $rc_wmstate} { | |
2171 | catch {git config gui.wmstate $cfg_wmstate} | |
2172 | } | |
2173 | if {$cfg_wmstate eq {zoomed}} { | |
2174 | # on Windows wm geometry will lie about window | |
2175 | # position (but not size) when window is zoomed | |
2176 | # restore the window before querying wm geometry | |
2177 | wm state . normal | |
2178 | } | |
db7f34d4 SP |
2179 | set cfg_geometry [list] |
2180 | lappend cfg_geometry [wm geometry .] | |
c80d7be5 PT |
2181 | if {$use_ttk} { |
2182 | lappend cfg_geometry [.vpane sashpos 0] | |
2183 | lappend cfg_geometry [.vpane.files sashpos 0] | |
2184 | } else { | |
2185 | lappend cfg_geometry [lindex [.vpane sash coord 0] 0] | |
2186 | lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1] | |
2187 | } | |
db7f34d4 SP |
2188 | if {[catch {set rc_geometry $repo_config(gui.geometry)}]} { |
2189 | set rc_geometry {} | |
2190 | } | |
2191 | if {$cfg_geometry ne $rc_geometry} { | |
81347223 | 2192 | catch {git config gui.geometry $cfg_geometry} |
db7f34d4 | 2193 | } |
51f4d16b SP |
2194 | } |
2195 | ||
1e65c622 | 2196 | set ret_code $rc |
60204ddb JM |
2197 | |
2198 | # Briefly enable send again, working around Tk bug | |
2199 | # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997 | |
2200 | tk appname [appname] | |
2201 | ||
cb07fc2a SP |
2202 | destroy . |
2203 | } | |
2204 | ||
2205 | proc do_rescan {} { | |
699d5601 | 2206 | rescan ui_ready |
cb07fc2a SP |
2207 | } |
2208 | ||
8056cc4f | 2209 | proc ui_do_rescan {} { |
7cf4566f | 2210 | rescan {force_first_diff ui_ready} |
8056cc4f AG |
2211 | } |
2212 | ||
6e27d826 | 2213 | proc do_commit {} { |
ec6b424a | 2214 | commit_tree |
6e27d826 SP |
2215 | } |
2216 | ||
7cf4566f | 2217 | proc next_diff {{after {}}} { |
8a965b8e | 2218 | global next_diff_p next_diff_w next_diff_i |
7cf4566f | 2219 | show_diff $next_diff_p $next_diff_w {} {} $after |
29853b90 AG |
2220 | } |
2221 | ||
2222 | proc find_anchor_pos {lst name} { | |
2223 | set lid [lsearch -sorted -exact $lst $name] | |
2224 | ||
2225 | if {$lid == -1} { | |
2226 | set lid 0 | |
2227 | foreach lname $lst { | |
2228 | if {$lname >= $name} break | |
2229 | incr lid | |
2230 | } | |
2231 | } | |
2232 | ||
2233 | return $lid | |
2234 | } | |
2235 | ||
2236 | proc find_file_from {flist idx delta path mmask} { | |
2237 | global file_states | |
2238 | ||
2239 | set len [llength $flist] | |
2240 | while {$idx >= 0 && $idx < $len} { | |
2241 | set name [lindex $flist $idx] | |
2242 | ||
2243 | if {$name ne $path && [info exists file_states($name)]} { | |
2244 | set state [lindex $file_states($name) 0] | |
2245 | ||
2246 | if {$mmask eq {} || [regexp $mmask $state]} { | |
2247 | return $idx | |
2248 | } | |
2249 | } | |
2250 | ||
2251 | incr idx $delta | |
2252 | } | |
2253 | ||
2254 | return {} | |
2255 | } | |
2256 | ||
2257 | proc find_next_diff {w path {lno {}} {mmask {}}} { | |
2258 | global next_diff_p next_diff_w next_diff_i | |
2259 | global file_lists ui_index ui_workdir | |
2260 | ||
2261 | set flist $file_lists($w) | |
2262 | if {$lno eq {}} { | |
2263 | set lno [find_anchor_pos $flist $path] | |
2264 | } else { | |
2265 | incr lno -1 | |
2266 | } | |
2267 | ||
2268 | if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} { | |
2269 | if {$w eq $ui_index} { | |
2270 | set mmask "^$mmask" | |
2271 | } else { | |
2272 | set mmask "$mmask\$" | |
2273 | } | |
2274 | } | |
2275 | ||
2276 | set idx [find_file_from $flist $lno 1 $path $mmask] | |
2277 | if {$idx eq {}} { | |
2278 | incr lno -1 | |
2279 | set idx [find_file_from $flist $lno -1 $path $mmask] | |
2280 | } | |
2281 | ||
2282 | if {$idx ne {}} { | |
2283 | set next_diff_w $w | |
2284 | set next_diff_p [lindex $flist $idx] | |
2285 | set next_diff_i [expr {$idx+1}] | |
2286 | return 1 | |
2287 | } else { | |
2288 | return 0 | |
2289 | } | |
2290 | } | |
2291 | ||
2292 | proc next_diff_after_action {w path {lno {}} {mmask {}}} { | |
2293 | global current_diff_path | |
2294 | ||
2295 | if {$path ne $current_diff_path} { | |
2296 | return {} | |
2297 | } elseif {[find_next_diff $w $path $lno $mmask]} { | |
2298 | return {next_diff;} | |
2299 | } else { | |
2300 | return {reshow_diff;} | |
2301 | } | |
2302 | } | |
2303 | ||
7cf4566f | 2304 | proc select_first_diff {after} { |
29853b90 AG |
2305 | global ui_workdir |
2306 | ||
2307 | if {[find_next_diff $ui_workdir {} 1 {^_?U}] || | |
2308 | [find_next_diff $ui_workdir {} 1 {[^O]$}]} { | |
7cf4566f AG |
2309 | next_diff $after |
2310 | } else { | |
2311 | uplevel #0 $after | |
29853b90 | 2312 | } |
8a965b8e AMS |
2313 | } |
2314 | ||
7cf4566f AG |
2315 | proc force_first_diff {after} { |
2316 | global ui_workdir current_diff_path file_states | |
8056cc4f AG |
2317 | |
2318 | if {[info exists file_states($current_diff_path)]} { | |
2319 | set state [lindex $file_states($current_diff_path) 0] | |
7cf4566f AG |
2320 | } else { |
2321 | set state {OO} | |
2322 | } | |
8056cc4f | 2323 | |
7cf4566f AG |
2324 | set reselect 0 |
2325 | if {[string first {U} $state] >= 0} { | |
2326 | # Already a conflict, do nothing | |
2327 | } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} { | |
2328 | set reselect 1 | |
2329 | } elseif {[string index $state 1] ne {O}} { | |
2330 | # Already a diff & no conflicts, do nothing | |
2331 | } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} { | |
2332 | set reselect 1 | |
8056cc4f AG |
2333 | } |
2334 | ||
7cf4566f AG |
2335 | if {$reselect} { |
2336 | next_diff $after | |
2337 | } else { | |
2338 | uplevel #0 $after | |
2339 | } | |
8056cc4f AG |
2340 | } |
2341 | ||
24263b77 | 2342 | proc toggle_or_diff {w x y} { |
20a53c02 | 2343 | global file_states file_lists current_diff_path ui_index ui_workdir |
24263b77 | 2344 | global last_clicked selected_paths |
131f503b | 2345 | |
cb07fc2a SP |
2346 | set pos [split [$w index @$x,$y] .] |
2347 | set lno [lindex $pos 0] | |
2348 | set col [lindex $pos 1] | |
24263b77 SP |
2349 | set path [lindex $file_lists($w) [expr {$lno - 1}]] |
2350 | if {$path eq {}} { | |
2351 | set last_clicked {} | |
2352 | return | |
2353 | } | |
2354 | ||
2355 | set last_clicked [list $w $lno] | |
2356 | array unset selected_paths | |
2357 | $ui_index tag remove in_sel 0.0 end | |
0812665e | 2358 | $ui_workdir tag remove in_sel 0.0 end |
cb07fc2a | 2359 | |
3e34838c | 2360 | # Determine the state of the file |
617ceee6 AG |
2361 | if {[info exists file_states($path)]} { |
2362 | set state [lindex $file_states($path) 0] | |
8056cc4f AG |
2363 | } else { |
2364 | set state {__} | |
2365 | } | |
2366 | ||
8056cc4f | 2367 | # Restage the file, or simply show the diff |
cead78ed | 2368 | if {$col == 0 && $y > 1} { |
3e34838c AG |
2369 | # Conflicts need special handling |
2370 | if {[string first {U} $state] >= 0} { | |
0aea2842 AG |
2371 | # $w must always be $ui_workdir, but... |
2372 | if {$w ne $ui_workdir} { set lno {} } | |
2373 | merge_stage_workdir $path $lno | |
3e34838c AG |
2374 | return |
2375 | } | |
2376 | ||
8056cc4f AG |
2377 | if {[string index $state 1] eq {O}} { |
2378 | set mmask {} | |
2379 | } else { | |
2380 | set mmask {[^O]} | |
2381 | } | |
2382 | ||
2383 | set after [next_diff_after_action $w $path $lno $mmask] | |
8a965b8e | 2384 | |
de5f6d5d | 2385 | if {$w eq $ui_index} { |
74d18d2e | 2386 | update_indexinfo \ |
93e912c5 | 2387 | "Unstaging [short_path $path] from commit" \ |
74d18d2e | 2388 | [list $path] \ |
699d5601 | 2389 | [concat $after [list ui_ready]] |
de5f6d5d | 2390 | } elseif {$w eq $ui_workdir} { |
74d18d2e | 2391 | update_index \ |
4d583c86 | 2392 | "Adding [short_path $path]" \ |
74d18d2e | 2393 | [list $path] \ |
699d5601 | 2394 | [concat $after [list ui_ready]] |
74d18d2e | 2395 | } |
24263b77 | 2396 | } else { |
03e4ec53 | 2397 | show_diff $path $w $lno |
cb07fc2a SP |
2398 | } |
2399 | } | |
2400 | ||
24263b77 | 2401 | proc add_one_to_selection {w x y} { |
833eda73 | 2402 | global file_lists last_clicked selected_paths |
7f1df79b | 2403 | |
833eda73 | 2404 | set lno [lindex [split [$w index @$x,$y] .] 0] |
24263b77 SP |
2405 | set path [lindex $file_lists($w) [expr {$lno - 1}]] |
2406 | if {$path eq {}} { | |
2407 | set last_clicked {} | |
2408 | return | |
2409 | } | |
cb07fc2a | 2410 | |
833eda73 SP |
2411 | if {$last_clicked ne {} |
2412 | && [lindex $last_clicked 0] ne $w} { | |
2413 | array unset selected_paths | |
2414 | [lindex $last_clicked 0] tag remove in_sel 0.0 end | |
2415 | } | |
2416 | ||
24263b77 SP |
2417 | set last_clicked [list $w $lno] |
2418 | if {[catch {set in_sel $selected_paths($path)}]} { | |
2419 | set in_sel 0 | |
2420 | } | |
2421 | if {$in_sel} { | |
2422 | unset selected_paths($path) | |
2423 | $w tag remove in_sel $lno.0 [expr {$lno + 1}].0 | |
2424 | } else { | |
2425 | set selected_paths($path) 1 | |
2426 | $w tag add in_sel $lno.0 [expr {$lno + 1}].0 | |
2427 | } | |
2428 | } | |
2429 | ||
2430 | proc add_range_to_selection {w x y} { | |
833eda73 | 2431 | global file_lists last_clicked selected_paths |
24263b77 SP |
2432 | |
2433 | if {[lindex $last_clicked 0] ne $w} { | |
2434 | toggle_or_diff $w $x $y | |
2435 | return | |
cb07fc2a | 2436 | } |
24263b77 | 2437 | |
833eda73 | 2438 | set lno [lindex [split [$w index @$x,$y] .] 0] |
24263b77 SP |
2439 | set lc [lindex $last_clicked 1] |
2440 | if {$lc < $lno} { | |
2441 | set begin $lc | |
2442 | set end $lno | |
2443 | } else { | |
2444 | set begin $lno | |
2445 | set end $lc | |
2446 | } | |
2447 | ||
2448 | foreach path [lrange $file_lists($w) \ | |
2449 | [expr {$begin - 1}] \ | |
2450 | [expr {$end - 1}]] { | |
2451 | set selected_paths($path) 1 | |
2452 | } | |
2453 | $w tag add in_sel $begin.0 [expr {$end + 1}].0 | |
cb07fc2a SP |
2454 | } |
2455 | ||
c91ee2bd JS |
2456 | proc show_more_context {} { |
2457 | global repo_config | |
2458 | if {$repo_config(gui.diffcontext) < 99} { | |
2459 | incr repo_config(gui.diffcontext) | |
2460 | reshow_diff | |
2461 | } | |
2462 | } | |
2463 | ||
2464 | proc show_less_context {} { | |
2465 | global repo_config | |
55ba8a34 | 2466 | if {$repo_config(gui.diffcontext) > 1} { |
c91ee2bd JS |
2467 | incr repo_config(gui.diffcontext) -1 |
2468 | reshow_diff | |
2469 | } | |
2470 | } | |
2471 | ||
cb07fc2a SP |
2472 | ###################################################################### |
2473 | ## | |
a4bee597 | 2474 | ## ui construction |
db453781 | 2475 | |
2ebba528 SP |
2476 | set ui_comm {} |
2477 | ||
cb07fc2a | 2478 | # -- Menu Bar |
a49c67d1 | 2479 | # |
b4946930 | 2480 | menu .mbar -tearoff 0 |
a91be3fc DS |
2481 | if {[is_MacOSX]} { |
2482 | # -- Apple Menu (Mac OS X only) | |
2483 | # | |
2484 | .mbar add cascade -label Apple -menu .mbar.apple | |
2485 | menu .mbar.apple | |
2486 | } | |
1ac17950 CS |
2487 | .mbar add cascade -label [mc Repository] -menu .mbar.repository |
2488 | .mbar add cascade -label [mc Edit] -menu .mbar.edit | |
64a906f8 | 2489 | if {[is_enabled branch]} { |
1ac17950 | 2490 | .mbar add cascade -label [mc Branch] -menu .mbar.branch |
700a65ce | 2491 | } |
2ebba528 | 2492 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
a9813cb5 | 2493 | .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit |
2ebba528 | 2494 | } |
64a906f8 | 2495 | if {[is_enabled transport]} { |
1ac17950 | 2496 | .mbar add cascade -label [mc Merge] -menu .mbar.merge |
6bdf5e5f | 2497 | .mbar add cascade -label [mc Remote] -menu .mbar.remote |
4ccdab02 | 2498 | } |
0ce76ded AG |
2499 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
2500 | .mbar add cascade -label [mc Tools] -menu .mbar.tools | |
2501 | } | |
cb07fc2a | 2502 | |
a4abfa62 | 2503 | # -- Repository Menu |
a49c67d1 | 2504 | # |
a4abfa62 | 2505 | menu .mbar.repository |
35874c16 | 2506 | |
29e5573d GB |
2507 | if {![is_bare]} { |
2508 | .mbar.repository add command \ | |
2509 | -label [mc "Explore Working Copy"] \ | |
2510 | -command {do_explore} | |
2511 | .mbar.repository add separator | |
2512 | } | |
afd54240 | 2513 | |
35874c16 | 2514 | .mbar.repository add command \ |
1ac17950 | 2515 | -label [mc "Browse Current Branch's Files"] \ |
c74b6c66 | 2516 | -command {browser::new $current_branch} |
a8139888 | 2517 | set ui_browse_current [.mbar.repository index last] |
8e891fac | 2518 | .mbar.repository add command \ |
1ac17950 | 2519 | -label [mc "Browse Branch Files..."] \ |
8e891fac | 2520 | -command browser_open::dialog |
35874c16 SP |
2521 | .mbar.repository add separator |
2522 | ||
d0752429 | 2523 | .mbar.repository add command \ |
1ac17950 | 2524 | -label [mc "Visualize Current Branch's History"] \ |
7416bbc6 | 2525 | -command {do_gitk $current_branch} |
a8139888 | 2526 | set ui_visualize_current [.mbar.repository index last] |
5753ef1a | 2527 | .mbar.repository add command \ |
1ac17950 | 2528 | -label [mc "Visualize All Branch History"] \ |
7416bbc6 | 2529 | -command {do_gitk --all} |
d0752429 | 2530 | .mbar.repository add separator |
75e355d6 | 2531 | |
a8139888 SP |
2532 | proc current_branch_write {args} { |
2533 | global current_branch | |
2534 | .mbar.repository entryconf $::ui_browse_current \ | |
1ac17950 | 2535 | -label [mc "Browse %s's Files" $current_branch] |
a8139888 | 2536 | .mbar.repository entryconf $::ui_visualize_current \ |
1ac17950 | 2537 | -label [mc "Visualize %s's History" $current_branch] |
a8139888 SP |
2538 | } |
2539 | trace add variable current_branch write current_branch_write | |
2540 | ||
cf25ddc8 | 2541 | if {[is_enabled multicommit]} { |
1ac17950 | 2542 | .mbar.repository add command -label [mc "Database Statistics"] \ |
7416bbc6 | 2543 | -command do_stats |
0fd49d0a | 2544 | |
1ac17950 | 2545 | .mbar.repository add command -label [mc "Compress Database"] \ |
7416bbc6 | 2546 | -command do_gc |
4aca740b | 2547 | |
1ac17950 | 2548 | .mbar.repository add command -label [mc "Verify Database"] \ |
7416bbc6 | 2549 | -command do_fsck_objects |
444f92d0 | 2550 | |
a4abfa62 | 2551 | .mbar.repository add separator |
75e355d6 | 2552 | |
20ddfcaa SP |
2553 | if {[is_Cygwin]} { |
2554 | .mbar.repository add command \ | |
1ac17950 | 2555 | -label [mc "Create Desktop Icon"] \ |
7416bbc6 | 2556 | -command do_cygwin_shortcut |
20ddfcaa | 2557 | } elseif {[is_Windows]} { |
a4abfa62 | 2558 | .mbar.repository add command \ |
1ac17950 | 2559 | -label [mc "Create Desktop Icon"] \ |
7416bbc6 | 2560 | -command do_windows_shortcut |
06c31115 | 2561 | } elseif {[is_MacOSX]} { |
a4abfa62 | 2562 | .mbar.repository add command \ |
1ac17950 | 2563 | -label [mc "Create Desktop Icon"] \ |
7416bbc6 | 2564 | -command do_macosx_app |
4aca740b | 2565 | } |
4ccdab02 | 2566 | } |
85ab313e | 2567 | |
af894943 SF |
2568 | if {[is_MacOSX]} { |
2569 | proc ::tk::mac::Quit {args} { do_quit } | |
2570 | } else { | |
2571 | .mbar.repository add command -label [mc Quit] \ | |
2572 | -command do_quit \ | |
2573 | -accelerator $M1T-Q | |
2574 | } | |
cb07fc2a | 2575 | |
9861671d SP |
2576 | # -- Edit Menu |
2577 | # | |
2578 | menu .mbar.edit | |
1ac17950 | 2579 | .mbar.edit add command -label [mc Undo] \ |
9861671d | 2580 | -command {catch {[focus] edit undo}} \ |
7416bbc6 | 2581 | -accelerator $M1T-Z |
1ac17950 | 2582 | .mbar.edit add command -label [mc Redo] \ |
9861671d | 2583 | -command {catch {[focus] edit redo}} \ |
7416bbc6 | 2584 | -accelerator $M1T-Y |
9861671d | 2585 | .mbar.edit add separator |
1ac17950 | 2586 | .mbar.edit add command -label [mc Cut] \ |
9861671d | 2587 | -command {catch {tk_textCut [focus]}} \ |
7416bbc6 | 2588 | -accelerator $M1T-X |
1ac17950 | 2589 | .mbar.edit add command -label [mc Copy] \ |
9861671d | 2590 | -command {catch {tk_textCopy [focus]}} \ |
7416bbc6 | 2591 | -accelerator $M1T-C |
1ac17950 | 2592 | .mbar.edit add command -label [mc Paste] \ |
9861671d | 2593 | -command {catch {tk_textPaste [focus]; [focus] see insert}} \ |
7416bbc6 | 2594 | -accelerator $M1T-V |
1ac17950 | 2595 | .mbar.edit add command -label [mc Delete] \ |
9861671d | 2596 | -command {catch {[focus] delete sel.first sel.last}} \ |
7416bbc6 | 2597 | -accelerator Del |
9861671d | 2598 | .mbar.edit add separator |
1ac17950 | 2599 | .mbar.edit add command -label [mc "Select All"] \ |
9861671d | 2600 | -command {catch {[focus] tag add sel 0.0 end}} \ |
7416bbc6 | 2601 | -accelerator $M1T-A |
9861671d | 2602 | |
85ab313e SP |
2603 | # -- Branch Menu |
2604 | # | |
64a906f8 | 2605 | if {[is_enabled branch]} { |
700a65ce SP |
2606 | menu .mbar.branch |
2607 | ||
1ac17950 | 2608 | .mbar.branch add command -label [mc "Create..."] \ |
b1fa2bff | 2609 | -command branch_create::dialog \ |
7416bbc6 | 2610 | -accelerator $M1T-N |
700a65ce SP |
2611 | lappend disable_on_lock [list .mbar.branch entryconf \ |
2612 | [.mbar.branch index last] -state] | |
2613 | ||
1ac17950 | 2614 | .mbar.branch add command -label [mc "Checkout..."] \ |
d41b43eb SP |
2615 | -command branch_checkout::dialog \ |
2616 | -accelerator $M1T-O | |
2617 | lappend disable_on_lock [list .mbar.branch entryconf \ | |
2618 | [.mbar.branch index last] -state] | |
2619 | ||
1ac17950 | 2620 | .mbar.branch add command -label [mc "Rename..."] \ |
61f82ce7 SP |
2621 | -command branch_rename::dialog |
2622 | lappend disable_on_lock [list .mbar.branch entryconf \ | |
2623 | [.mbar.branch index last] -state] | |
2624 | ||
1ac17950 | 2625 | .mbar.branch add command -label [mc "Delete..."] \ |
3206c63d | 2626 | -command branch_delete::dialog |
700a65ce SP |
2627 | lappend disable_on_lock [list .mbar.branch entryconf \ |
2628 | [.mbar.branch index last] -state] | |
fd234dfd | 2629 | |
1ac17950 | 2630 | .mbar.branch add command -label [mc "Reset..."] \ |
a6c9b081 | 2631 | -command merge::reset_hard |
fd234dfd SP |
2632 | lappend disable_on_lock [list .mbar.branch entryconf \ |
2633 | [.mbar.branch index last] -state] | |
700a65ce SP |
2634 | } |
2635 | ||
cb07fc2a | 2636 | # -- Commit Menu |
a49c67d1 | 2637 | # |
1e65c622 AG |
2638 | proc commit_btn_caption {} { |
2639 | if {[is_enabled nocommit]} { | |
2640 | return [mc "Done"] | |
2641 | } else { | |
2642 | return [mc Commit@@verb] | |
2643 | } | |
2644 | } | |
2645 | ||
2ebba528 SP |
2646 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
2647 | menu .mbar.commit | |
2648 | ||
1e02b32e SP |
2649 | if {![is_enabled nocommit]} { |
2650 | .mbar.commit add radiobutton \ | |
2651 | -label [mc "New Commit"] \ | |
2652 | -command do_select_commit_type \ | |
2653 | -variable selected_commit_type \ | |
2654 | -value new | |
2655 | lappend disable_on_lock \ | |
2656 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
2657 | ||
2658 | .mbar.commit add radiobutton \ | |
2659 | -label [mc "Amend Last Commit"] \ | |
2660 | -command do_select_commit_type \ | |
2661 | -variable selected_commit_type \ | |
2662 | -value amend | |
2663 | lappend disable_on_lock \ | |
2664 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
2665 | ||
2666 | .mbar.commit add separator | |
2667 | } | |
24ac9b75 | 2668 | |
1ac17950 | 2669 | .mbar.commit add command -label [mc Rescan] \ |
8056cc4f | 2670 | -command ui_do_rescan \ |
7416bbc6 | 2671 | -accelerator F5 |
2ebba528 SP |
2672 | lappend disable_on_lock \ |
2673 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2674 | |
1ac17950 | 2675 | .mbar.commit add command -label [mc "Stage To Commit"] \ |
cd16a6c9 SP |
2676 | -command do_add_selection \ |
2677 | -accelerator $M1T-T | |
2ebba528 SP |
2678 | lappend disable_on_lock \ |
2679 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2680 | |
1ac17950 | 2681 | .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \ |
2ebba528 | 2682 | -command do_add_all \ |
7416bbc6 | 2683 | -accelerator $M1T-I |
2ebba528 SP |
2684 | lappend disable_on_lock \ |
2685 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
24ac9b75 | 2686 | |
1ac17950 | 2687 | .mbar.commit add command -label [mc "Unstage From Commit"] \ |
b677c66e VS |
2688 | -command do_unstage_selection \ |
2689 | -accelerator $M1T-U | |
2ebba528 SP |
2690 | lappend disable_on_lock \ |
2691 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
e734817d | 2692 | |
1ac17950 | 2693 | .mbar.commit add command -label [mc "Revert Changes"] \ |
b677c66e VS |
2694 | -command do_revert_selection \ |
2695 | -accelerator $M1T-J | |
2ebba528 SP |
2696 | lappend disable_on_lock \ |
2697 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
e734817d | 2698 | |
2ebba528 | 2699 | .mbar.commit add separator |
1461c5f3 | 2700 | |
c91ee2bd JS |
2701 | .mbar.commit add command -label [mc "Show Less Context"] \ |
2702 | -command show_less_context \ | |
729ffa50 | 2703 | -accelerator $M1T-\- |
c91ee2bd JS |
2704 | |
2705 | .mbar.commit add command -label [mc "Show More Context"] \ | |
2706 | -command show_more_context \ | |
729ffa50 | 2707 | -accelerator $M1T-= |
c91ee2bd JS |
2708 | |
2709 | .mbar.commit add separator | |
2710 | ||
ed70e4d7 | 2711 | if {![is_enabled nocommitmsg]} { |
1e02b32e SP |
2712 | .mbar.commit add command -label [mc "Sign Off"] \ |
2713 | -command do_signoff \ | |
2714 | -accelerator $M1T-S | |
2715 | } | |
24ac9b75 | 2716 | |
1e65c622 | 2717 | .mbar.commit add command -label [commit_btn_caption] \ |
2ebba528 | 2718 | -command do_commit \ |
7416bbc6 | 2719 | -accelerator $M1T-Return |
2ebba528 SP |
2720 | lappend disable_on_lock \ |
2721 | [list .mbar.commit entryconf [.mbar.commit index last] -state] | |
2722 | } | |
cb07fc2a | 2723 | |
9b28a8b9 SP |
2724 | # -- Merge Menu |
2725 | # | |
2726 | if {[is_enabled branch]} { | |
2727 | menu .mbar.merge | |
1ac17950 | 2728 | .mbar.merge add command -label [mc "Local Merge..."] \ |
a870ddc0 SP |
2729 | -command merge::dialog \ |
2730 | -accelerator $M1T-M | |
9b28a8b9 SP |
2731 | lappend disable_on_lock \ |
2732 | [list .mbar.merge entryconf [.mbar.merge index last] -state] | |
1ac17950 | 2733 | .mbar.merge add command -label [mc "Abort Merge..."] \ |
a6c9b081 | 2734 | -command merge::reset_hard |
9b28a8b9 SP |
2735 | lappend disable_on_lock \ |
2736 | [list .mbar.merge entryconf [.mbar.merge index last] -state] | |
9b28a8b9 SP |
2737 | } |
2738 | ||
2739 | # -- Transport Menu | |
2740 | # | |
2741 | if {[is_enabled transport]} { | |
6bdf5e5f | 2742 | menu .mbar.remote |
9b28a8b9 | 2743 | |
ba6485e0 PB |
2744 | .mbar.remote add command \ |
2745 | -label [mc "Add..."] \ | |
2746 | -command remote_add::dialog \ | |
2747 | -accelerator $M1T-A | |
6bdf5e5f SP |
2748 | .mbar.remote add command \ |
2749 | -label [mc "Push..."] \ | |
840bcfa7 SP |
2750 | -command do_push_anywhere \ |
2751 | -accelerator $M1T-P | |
6bdf5e5f | 2752 | .mbar.remote add command \ |
3c1c2a00 | 2753 | -label [mc "Delete Branch..."] \ |
aa252f19 | 2754 | -command remote_branch_delete::dialog |
9b28a8b9 SP |
2755 | } |
2756 | ||
0c8d7839 | 2757 | if {[is_MacOSX]} { |
a91be3fc | 2758 | proc ::tk::mac::ShowPreferences {} {do_options} |
0c8d7839 SP |
2759 | } else { |
2760 | # -- Edit Menu | |
2761 | # | |
2762 | .mbar.edit add separator | |
1ac17950 | 2763 | .mbar.edit add command -label [mc "Options..."] \ |
7416bbc6 | 2764 | -command do_options |
273984fc | 2765 | } |
557afe82 | 2766 | |
0ce76ded AG |
2767 | # -- Tools Menu |
2768 | # | |
2769 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { | |
2770 | set tools_menubar .mbar.tools | |
2771 | menu $tools_menubar | |
2772 | $tools_menubar add separator | |
2773 | $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog | |
2774 | $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog | |
2775 | set tools_tailcnt 3 | |
2776 | if {[array names repo_config guitool.*.cmd] ne {}} { | |
2777 | tools_populate_all | |
2778 | } | |
2779 | } | |
2780 | ||
273984fc SP |
2781 | # -- Help Menu |
2782 | # | |
1ac17950 | 2783 | .mbar add cascade -label [mc Help] -menu .mbar.help |
273984fc | 2784 | menu .mbar.help |
0c8d7839 | 2785 | |
a91be3fc DS |
2786 | if {[is_MacOSX]} { |
2787 | .mbar.apple add command -label [mc "About %s" [appname]] \ | |
2788 | -command do_about | |
2789 | .mbar.apple add separator | |
2790 | } else { | |
1ac17950 | 2791 | .mbar.help add command -label [mc "About %s" [appname]] \ |
7416bbc6 | 2792 | -command do_about |
0c8d7839 | 2793 | } |
a91be3fc | 2794 | . configure -menu .mbar |
2db21e70 | 2795 | |
3eb5682b MH |
2796 | set doc_path [githtmldir] |
2797 | if {$doc_path ne {}} { | |
2798 | set doc_path [file join $doc_path index.html] | |
273984fc | 2799 | |
3eb5682b MH |
2800 | if {[is_Cygwin]} { |
2801 | set doc_path [exec cygpath --mixed $doc_path] | |
2802 | } | |
273984fc SP |
2803 | } |
2804 | ||
273984fc SP |
2805 | if {[file isfile $doc_path]} { |
2806 | set doc_url "file:$doc_path" | |
2807 | } else { | |
2808 | set doc_url {http://www.kernel.org/pub/software/scm/git/docs/} | |
2809 | } | |
2810 | ||
2db21e70 PB |
2811 | proc start_browser {url} { |
2812 | git "web--browse" $url | |
273984fc | 2813 | } |
2db21e70 PB |
2814 | |
2815 | .mbar.help add command -label [mc "Online Documentation"] \ | |
2816 | -command [list start_browser $doc_url] | |
98a6846b AG |
2817 | |
2818 | .mbar.help add command -label [mc "Show SSH Key"] \ | |
2819 | -command do_ssh_key | |
2820 | ||
2db21e70 | 2821 | unset doc_path doc_url |
82aa2354 | 2822 | |
2ebba528 SP |
2823 | # -- Standard bindings |
2824 | # | |
39fa2a98 | 2825 | wm protocol . WM_DELETE_WINDOW do_quit |
2ebba528 SP |
2826 | bind all <$M1B-Key-q> do_quit |
2827 | bind all <$M1B-Key-Q> do_quit | |
2828 | bind all <$M1B-Key-w> {destroy [winfo toplevel %W]} | |
2829 | bind all <$M1B-Key-W> {destroy [winfo toplevel %W]} | |
2830 | ||
3e45ee1e SP |
2831 | set subcommand_args {} |
2832 | proc usage {} { | |
2833 | puts stderr "usage: $::argv0 $::subcommand $::subcommand_args" | |
2834 | exit 1 | |
2835 | } | |
2836 | ||
95e706b5 AG |
2837 | proc normalize_relpath {path} { |
2838 | set elements {} | |
2839 | foreach item [file split $path] { | |
2840 | if {$item eq {.}} continue | |
2841 | if {$item eq {..} && [llength $elements] > 0 | |
2842 | && [lindex $elements end] ne {..}} { | |
2843 | set elements [lrange $elements 0 end-1] | |
2844 | continue | |
2845 | } | |
2846 | lappend elements $item | |
2847 | } | |
2848 | return [eval file join $elements] | |
2849 | } | |
2850 | ||
2ebba528 SP |
2851 | # -- Not a normal commit type invocation? Do that instead! |
2852 | # | |
258871d3 | 2853 | switch -- $subcommand { |
85d2d597 | 2854 | browser - |
2ebba528 | 2855 | blame { |
f7078b40 AG |
2856 | if {$subcommand eq "blame"} { |
2857 | set subcommand_args {[--line=<num>] rev? path} | |
2858 | } else { | |
2859 | set subcommand_args {rev? path} | |
2860 | } | |
c52c9452 | 2861 | if {$argv eq {}} usage |
a0db0d61 | 2862 | set head {} |
3e45ee1e | 2863 | set path {} |
f7078b40 | 2864 | set jump_spec {} |
3e45ee1e SP |
2865 | set is_path 0 |
2866 | foreach a $argv { | |
2867 | if {$is_path || [file exists $_prefix$a]} { | |
2868 | if {$path ne {}} usage | |
95e706b5 | 2869 | set path [normalize_relpath $_prefix$a] |
3e45ee1e SP |
2870 | break |
2871 | } elseif {$a eq {--}} { | |
2872 | if {$path ne {}} { | |
a0db0d61 SP |
2873 | if {$head ne {}} usage |
2874 | set head $path | |
3e45ee1e SP |
2875 | set path {} |
2876 | } | |
2877 | set is_path 1 | |
f7078b40 AG |
2878 | } elseif {[regexp {^--line=(\d+)$} $a a lnum]} { |
2879 | if {$jump_spec ne {} || $head ne {}} usage | |
2880 | set jump_spec [list $lnum] | |
a0db0d61 SP |
2881 | } elseif {$head eq {}} { |
2882 | if {$head ne {}} usage | |
2883 | set head $a | |
c52c9452 | 2884 | set is_path 1 |
3e45ee1e SP |
2885 | } else { |
2886 | usage | |
2887 | } | |
2888 | } | |
2889 | unset is_path | |
2890 | ||
c52c9452 | 2891 | if {$head ne {} && $path eq {}} { |
95e706b5 | 2892 | set path [normalize_relpath $_prefix$head] |
c52c9452 SP |
2893 | set head {} |
2894 | } | |
2895 | ||
a0db0d61 | 2896 | if {$head eq {}} { |
d41b43eb | 2897 | load_current_branch |
a0db0d61 | 2898 | } else { |
02087abc SP |
2899 | if {[regexp {^[0-9a-f]{1,39}$} $head]} { |
2900 | if {[catch { | |
2901 | set head [git rev-parse --verify $head] | |
2902 | } err]} { | |
2903 | puts stderr $err | |
2904 | exit 1 | |
2905 | } | |
2906 | } | |
a0db0d61 | 2907 | set current_branch $head |
2ebba528 | 2908 | } |
a0db0d61 | 2909 | |
85d2d597 SP |
2910 | switch -- $subcommand { |
2911 | browser { | |
f7078b40 | 2912 | if {$jump_spec ne {}} usage |
85d2d597 SP |
2913 | if {$head eq {}} { |
2914 | if {$path ne {} && [file isdirectory $path]} { | |
2915 | set head $current_branch | |
2916 | } else { | |
2917 | set head $path | |
2918 | set path {} | |
2919 | } | |
2920 | } | |
2921 | browser::new $head $path | |
2922 | } | |
2923 | blame { | |
2924 | if {$head eq {} && ![file exists $path]} { | |
c8c4854b | 2925 | puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path] |
85d2d597 SP |
2926 | exit 1 |
2927 | } | |
f7078b40 | 2928 | blame::new $head $path $jump_spec |
85d2d597 | 2929 | } |
c52c9452 | 2930 | } |
258871d3 SP |
2931 | return |
2932 | } | |
2933 | citool - | |
2934 | gui { | |
2935 | if {[llength $argv] != 0} { | |
2936 | puts -nonewline stderr "usage: $argv0" | |
0b2bc460 SP |
2937 | if {$subcommand ne {gui} |
2938 | && [file tail $argv0] ne "git-$subcommand"} { | |
258871d3 SP |
2939 | puts -nonewline stderr " $subcommand" |
2940 | } | |
2941 | puts stderr {} | |
2942 | exit 1 | |
2943 | } | |
2944 | # fall through to setup UI for commits | |
2ebba528 | 2945 | } |
2ebba528 | 2946 | default { |
c0f7a6c3 | 2947 | puts stderr "usage: $argv0 \[{blame|browser|citool}\]" |
2ebba528 SP |
2948 | exit 1 |
2949 | } | |
2950 | } | |
2951 | ||
8553b772 SP |
2952 | # -- Branch Control |
2953 | # | |
c80d7be5 PT |
2954 | ${NS}::frame .branch |
2955 | if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken} | |
2956 | ${NS}::label .branch.l1 \ | |
1ac17950 | 2957 | -text [mc "Current Branch:"] \ |
8553b772 | 2958 | -anchor w \ |
7416bbc6 | 2959 | -justify left |
c80d7be5 | 2960 | ${NS}::label .branch.cb \ |
8553b772 SP |
2961 | -textvariable current_branch \ |
2962 | -anchor w \ | |
7416bbc6 | 2963 | -justify left |
8553b772 SP |
2964 | pack .branch.l1 -side left |
2965 | pack .branch.cb -side left -fill x | |
2966 | pack .branch -side top -fill x | |
2967 | ||
cb07fc2a | 2968 | # -- Main Window Layout |
a49c67d1 | 2969 | # |
c80d7be5 PT |
2970 | ${NS}::panedwindow .vpane -orient horizontal |
2971 | ${NS}::panedwindow .vpane.files -orient vertical | |
2972 | if {$use_ttk} { | |
2973 | .vpane add .vpane.files | |
2974 | } else { | |
2975 | .vpane add .vpane.files -sticky nsew -height 100 -width 200 | |
2976 | } | |
cb07fc2a SP |
2977 | pack .vpane -anchor n -side top -fill both -expand 1 |
2978 | ||
2979 | # -- Index File List | |
a49c67d1 | 2980 | # |
c80d7be5 PT |
2981 | ${NS}::frame .vpane.files.index -height 100 -width 200 |
2982 | tlabel .vpane.files.index.title \ | |
2983 | -text [mc "Staged Changes (Will Commit)"] \ | |
c382fdd7 PH |
2984 | -background lightgreen -foreground black |
2985 | text $ui_index -background white -foreground black \ | |
2986 | -borderwidth 0 \ | |
c5a1eb88 | 2987 | -width 20 -height 10 \ |
3c236977 | 2988 | -wrap none \ |
6c6dd01a | 2989 | -cursor $cursor_ptr \ |
3c236977 SP |
2990 | -xscrollcommand {.vpane.files.index.sx set} \ |
2991 | -yscrollcommand {.vpane.files.index.sy set} \ | |
cb07fc2a | 2992 | -state disabled |
c80d7be5 PT |
2993 | ${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview] |
2994 | ${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview] | |
cb07fc2a | 2995 | pack .vpane.files.index.title -side top -fill x |
3c236977 SP |
2996 | pack .vpane.files.index.sx -side bottom -fill x |
2997 | pack .vpane.files.index.sy -side right -fill y | |
cb07fc2a | 2998 | pack $ui_index -side left -fill both -expand 1 |
cb07fc2a | 2999 | |
0812665e | 3000 | # -- Working Directory File List |
a49c67d1 | 3001 | # |
c80d7be5 PT |
3002 | ${NS}::frame .vpane.files.workdir -height 100 -width 200 |
3003 | tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \ | |
c382fdd7 PH |
3004 | -background lightsalmon -foreground black |
3005 | text $ui_workdir -background white -foreground black \ | |
3006 | -borderwidth 0 \ | |
c5a1eb88 | 3007 | -width 20 -height 10 \ |
3c236977 | 3008 | -wrap none \ |
6c6dd01a | 3009 | -cursor $cursor_ptr \ |
3c236977 SP |
3010 | -xscrollcommand {.vpane.files.workdir.sx set} \ |
3011 | -yscrollcommand {.vpane.files.workdir.sy set} \ | |
cb07fc2a | 3012 | -state disabled |
c80d7be5 PT |
3013 | ${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview] |
3014 | ${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview] | |
0812665e | 3015 | pack .vpane.files.workdir.title -side top -fill x |
3c236977 SP |
3016 | pack .vpane.files.workdir.sx -side bottom -fill x |
3017 | pack .vpane.files.workdir.sy -side right -fill y | |
0812665e | 3018 | pack $ui_workdir -side left -fill both -expand 1 |
a0592d3f | 3019 | |
c80d7be5 PT |
3020 | .vpane.files add .vpane.files.workdir |
3021 | .vpane.files add .vpane.files.index | |
3022 | if {!$use_ttk} { | |
3023 | .vpane.files paneconfigure .vpane.files.workdir -sticky news | |
3024 | .vpane.files paneconfigure .vpane.files.index -sticky news | |
3025 | } | |
cb07fc2a | 3026 | |
0812665e | 3027 | foreach i [list $ui_index $ui_workdir] { |
3849bfba SP |
3028 | rmsel_tag $i |
3029 | $i tag conf in_diff -background [$i tag cget in_sel -background] | |
24263b77 SP |
3030 | } |
3031 | unset i | |
131f503b | 3032 | |
0fb8f9ce | 3033 | # -- Diff and Commit Area |
a49c67d1 | 3034 | # |
c80d7be5 PT |
3035 | ${NS}::frame .vpane.lower -height 300 -width 400 |
3036 | ${NS}::frame .vpane.lower.commarea | |
3037 | ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 | |
a0592d3f JS |
3038 | pack .vpane.lower.diff -fill both -expand 1 |
3039 | pack .vpane.lower.commarea -side bottom -fill x | |
c80d7be5 PT |
3040 | .vpane add .vpane.lower |
3041 | if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew} | |
cb07fc2a SP |
3042 | |
3043 | # -- Commit Area Buttons | |
a49c67d1 | 3044 | # |
c80d7be5 PT |
3045 | ${NS}::frame .vpane.lower.commarea.buttons |
3046 | ${NS}::label .vpane.lower.commarea.buttons.l -text {} \ | |
cb07fc2a | 3047 | -anchor w \ |
7416bbc6 | 3048 | -justify left |
0fb8f9ce SP |
3049 | pack .vpane.lower.commarea.buttons.l -side top -fill x |
3050 | pack .vpane.lower.commarea.buttons -side left -fill y | |
131f503b | 3051 | |
c80d7be5 | 3052 | ${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \ |
8056cc4f | 3053 | -command ui_do_rescan |
0fb8f9ce | 3054 | pack .vpane.lower.commarea.buttons.rescan -side top -fill x |
390adaea SP |
3055 | lappend disable_on_lock \ |
3056 | {.vpane.lower.commarea.buttons.rescan conf -state} | |
131f503b | 3057 | |
c80d7be5 | 3058 | ${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \ |
7416bbc6 | 3059 | -command do_add_all |
7fe7e733 | 3060 | pack .vpane.lower.commarea.buttons.incall -side top -fill x |
390adaea SP |
3061 | lappend disable_on_lock \ |
3062 | {.vpane.lower.commarea.buttons.incall conf -state} | |
131f503b | 3063 | |
ed70e4d7 | 3064 | if {![is_enabled nocommitmsg]} { |
c80d7be5 | 3065 | ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \ |
1e02b32e SP |
3066 | -command do_signoff |
3067 | pack .vpane.lower.commarea.buttons.signoff -side top -fill x | |
3068 | } | |
131f503b | 3069 | |
c80d7be5 | 3070 | ${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \ |
7416bbc6 | 3071 | -command do_commit |
0fb8f9ce | 3072 | pack .vpane.lower.commarea.buttons.commit -side top -fill x |
390adaea SP |
3073 | lappend disable_on_lock \ |
3074 | {.vpane.lower.commarea.buttons.commit conf -state} | |
cb07fc2a | 3075 | |
1e02b32e | 3076 | if {![is_enabled nocommit]} { |
c80d7be5 | 3077 | ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \ |
1e02b32e SP |
3078 | -command do_push_anywhere |
3079 | pack .vpane.lower.commarea.buttons.push -side top -fill x | |
1e65c622 AG |
3080 | } |
3081 | ||
cb07fc2a | 3082 | # -- Commit Message Buffer |
a49c67d1 | 3083 | # |
c80d7be5 PT |
3084 | ${NS}::frame .vpane.lower.commarea.buffer |
3085 | ${NS}::frame .vpane.lower.commarea.buffer.header | |
0fb8f9ce | 3086 | set ui_comm .vpane.lower.commarea.buffer.t |
24ac9b75 | 3087 | set ui_coml .vpane.lower.commarea.buffer.header.l |
1e02b32e SP |
3088 | |
3089 | if {![is_enabled nocommit]} { | |
c80d7be5 | 3090 | ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \ |
1e02b32e SP |
3091 | -text [mc "New Commit"] \ |
3092 | -command do_select_commit_type \ | |
3093 | -variable selected_commit_type \ | |
3094 | -value new | |
3095 | lappend disable_on_lock \ | |
3096 | [list .vpane.lower.commarea.buffer.header.new conf -state] | |
c80d7be5 | 3097 | ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \ |
1e02b32e SP |
3098 | -text [mc "Amend Last Commit"] \ |
3099 | -command do_select_commit_type \ | |
3100 | -variable selected_commit_type \ | |
3101 | -value amend | |
3102 | lappend disable_on_lock \ | |
3103 | [list .vpane.lower.commarea.buffer.header.amend conf -state] | |
3104 | } | |
3105 | ||
c80d7be5 | 3106 | ${NS}::label $ui_coml \ |
cb07fc2a | 3107 | -anchor w \ |
7416bbc6 | 3108 | -justify left |
4539eacd SP |
3109 | proc trace_commit_type {varname args} { |
3110 | global ui_coml commit_type | |
3111 | switch -glob -- $commit_type { | |
1ac17950 CS |
3112 | initial {set txt [mc "Initial Commit Message:"]} |
3113 | amend {set txt [mc "Amended Commit Message:"]} | |
3114 | amend-initial {set txt [mc "Amended Initial Commit Message:"]} | |
3115 | amend-merge {set txt [mc "Amended Merge Commit Message:"]} | |
3116 | merge {set txt [mc "Merge Commit Message:"]} | |
3117 | * {set txt [mc "Commit Message:"]} | |
4539eacd SP |
3118 | } |
3119 | $ui_coml conf -text $txt | |
3120 | } | |
3121 | trace add variable commit_type write trace_commit_type | |
24ac9b75 | 3122 | pack $ui_coml -side left -fill x |
1e02b32e SP |
3123 | |
3124 | if {![is_enabled nocommit]} { | |
3125 | pack .vpane.lower.commarea.buffer.header.amend -side right | |
3126 | pack .vpane.lower.commarea.buffer.header.new -side right | |
3127 | } | |
24ac9b75 | 3128 | |
c382fdd7 PH |
3129 | text $ui_comm -background white -foreground black \ |
3130 | -borderwidth 1 \ | |
9861671d | 3131 | -undo true \ |
b2c6fcf1 | 3132 | -maxundo 20 \ |
9861671d | 3133 | -autoseparators true \ |
cb07fc2a | 3134 | -relief sunken \ |
11027d54 | 3135 | -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \ |
b4946930 | 3136 | -font font_diff \ |
6c6dd01a | 3137 | -yscrollcommand {.vpane.lower.commarea.buffer.sby set} |
c80d7be5 | 3138 | ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \ |
390adaea | 3139 | -command [list $ui_comm yview] |
24ac9b75 | 3140 | pack .vpane.lower.commarea.buffer.header -side top -fill x |
0fb8f9ce | 3141 | pack .vpane.lower.commarea.buffer.sby -side right -fill y |
cb07fc2a | 3142 | pack $ui_comm -side left -fill y |
0fb8f9ce SP |
3143 | pack .vpane.lower.commarea.buffer -side left -fill y |
3144 | ||
0e794311 SP |
3145 | # -- Commit Message Buffer Context Menu |
3146 | # | |
e8ab6446 SP |
3147 | set ctxm .vpane.lower.commarea.buffer.ctxm |
3148 | menu $ctxm -tearoff 0 | |
3149 | $ctxm add command \ | |
1ac17950 | 3150 | -label [mc Cut] \ |
e8ab6446 SP |
3151 | -command {tk_textCut $ui_comm} |
3152 | $ctxm add command \ | |
1ac17950 | 3153 | -label [mc Copy] \ |
e8ab6446 SP |
3154 | -command {tk_textCopy $ui_comm} |
3155 | $ctxm add command \ | |
1ac17950 | 3156 | -label [mc Paste] \ |
e8ab6446 SP |
3157 | -command {tk_textPaste $ui_comm} |
3158 | $ctxm add command \ | |
1ac17950 | 3159 | -label [mc Delete] \ |
bf516eca | 3160 | -command {catch {$ui_comm delete sel.first sel.last}} |
e8ab6446 SP |
3161 | $ctxm add separator |
3162 | $ctxm add command \ | |
1ac17950 | 3163 | -label [mc "Select All"] \ |
75e78c8a | 3164 | -command {focus $ui_comm;$ui_comm tag add sel 0.0 end} |
e8ab6446 | 3165 | $ctxm add command \ |
1ac17950 | 3166 | -label [mc "Copy All"] \ |
e8ab6446 | 3167 | -command { |
0e794311 SP |
3168 | $ui_comm tag add sel 0.0 end |
3169 | tk_textCopy $ui_comm | |
3170 | $ui_comm tag remove sel 0.0 end | |
e8ab6446 SP |
3171 | } |
3172 | $ctxm add separator | |
3173 | $ctxm add command \ | |
1ac17950 | 3174 | -label [mc "Sign Off"] \ |
0e794311 | 3175 | -command do_signoff |
95b002ee | 3176 | set ui_comm_ctxm $ctxm |
0e794311 | 3177 | |
0fb8f9ce | 3178 | # -- Diff Header |
a49c67d1 | 3179 | # |
20a53c02 SP |
3180 | proc trace_current_diff_path {varname args} { |
3181 | global current_diff_path diff_actions file_states | |
3182 | if {$current_diff_path eq {}} { | |
e8ab6446 SP |
3183 | set s {} |
3184 | set f {} | |
3185 | set p {} | |
3186 | set o disabled | |
3187 | } else { | |
20a53c02 | 3188 | set p $current_diff_path |
e8ab6446 | 3189 | set s [mapdesc [lindex $file_states($p) 0] $p] |
1ac17950 | 3190 | set f [mc "File:"] |
e8ab6446 SP |
3191 | set p [escape_path $p] |
3192 | set o normal | |
3193 | } | |
3194 | ||
3195 | .vpane.lower.diff.header.status configure -text $s | |
3196 | .vpane.lower.diff.header.file configure -text $f | |
3197 | .vpane.lower.diff.header.path configure -text $p | |
3198 | foreach w $diff_actions { | |
3199 | uplevel #0 $w $o | |
3200 | } | |
3201 | } | |
20a53c02 | 3202 | trace add variable current_diff_path write trace_current_diff_path |
e8ab6446 | 3203 | |
c80d7be5 PT |
3204 | gold_frame .vpane.lower.diff.header |
3205 | tlabel .vpane.lower.diff.header.status \ | |
9adccb05 | 3206 | -background gold \ |
c382fdd7 | 3207 | -foreground black \ |
3e7b0e1d SP |
3208 | -width $max_status_desc \ |
3209 | -anchor w \ | |
7416bbc6 | 3210 | -justify left |
c80d7be5 | 3211 | tlabel .vpane.lower.diff.header.file \ |
9adccb05 | 3212 | -background gold \ |
c382fdd7 | 3213 | -foreground black \ |
e8ab6446 | 3214 | -anchor w \ |
7416bbc6 | 3215 | -justify left |
c80d7be5 | 3216 | tlabel .vpane.lower.diff.header.path \ |
9adccb05 | 3217 | -background gold \ |
c382fdd7 | 3218 | -foreground black \ |
fce89e46 | 3219 | -anchor w \ |
7416bbc6 | 3220 | -justify left |
e8ab6446 SP |
3221 | pack .vpane.lower.diff.header.status -side left |
3222 | pack .vpane.lower.diff.header.file -side left | |
3223 | pack .vpane.lower.diff.header.path -fill x | |
3224 | set ctxm .vpane.lower.diff.header.ctxm | |
3225 | menu $ctxm -tearoff 0 | |
3226 | $ctxm add command \ | |
1ac17950 | 3227 | -label [mc Copy] \ |
fce89e46 SP |
3228 | -command { |
3229 | clipboard clear | |
3230 | clipboard append \ | |
3231 | -format STRING \ | |
3232 | -type STRING \ | |
20a53c02 | 3233 | -- $current_diff_path |
fce89e46 | 3234 | } |
e8ab6446 SP |
3235 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
3236 | bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y" | |
0fb8f9ce SP |
3237 | |
3238 | # -- Diff Body | |
a49c67d1 | 3239 | # |
c80d7be5 | 3240 | ${NS}::frame .vpane.lower.diff.body |
0fb8f9ce | 3241 | set ui_diff .vpane.lower.diff.body.t |
c382fdd7 PH |
3242 | text $ui_diff -background white -foreground black \ |
3243 | -borderwidth 0 \ | |
acb9108c | 3244 | -width 80 -height 5 -wrap none \ |
b4946930 | 3245 | -font font_diff \ |
0fb8f9ce SP |
3246 | -xscrollcommand {.vpane.lower.diff.body.sbx set} \ |
3247 | -yscrollcommand {.vpane.lower.diff.body.sby set} \ | |
0fb8f9ce | 3248 | -state disabled |
c80d7be5 | 3249 | ${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \ |
0fb8f9ce | 3250 | -command [list $ui_diff xview] |
c80d7be5 | 3251 | ${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \ |
0fb8f9ce SP |
3252 | -command [list $ui_diff yview] |
3253 | pack .vpane.lower.diff.body.sbx -side bottom -fill x | |
3254 | pack .vpane.lower.diff.body.sby -side right -fill y | |
3255 | pack $ui_diff -side left -fill both -expand 1 | |
3256 | pack .vpane.lower.diff.header -side top -fill x | |
3257 | pack .vpane.lower.diff.body -side bottom -fill both -expand 1 | |
3258 | ||
30b14ed3 | 3259 | $ui_diff tag conf d_cr -elide true |
ca521566 SP |
3260 | $ui_diff tag conf d_@ -foreground blue -font font_diffbold |
3261 | $ui_diff tag conf d_+ -foreground {#00a000} | |
fec4a785 SP |
3262 | $ui_diff tag conf d_- -foreground red |
3263 | ||
ca521566 | 3264 | $ui_diff tag conf d_++ -foreground {#00a000} |
fec4a785 SP |
3265 | $ui_diff tag conf d_-- -foreground red |
3266 | $ui_diff tag conf d_+s \ | |
ca521566 SP |
3267 | -foreground {#00a000} \ |
3268 | -background {#e2effa} | |
fec4a785 SP |
3269 | $ui_diff tag conf d_-s \ |
3270 | -foreground red \ | |
ca521566 | 3271 | -background {#e2effa} |
fec4a785 | 3272 | $ui_diff tag conf d_s+ \ |
ca521566 SP |
3273 | -foreground {#00a000} \ |
3274 | -background ivory1 | |
fec4a785 SP |
3275 | $ui_diff tag conf d_s- \ |
3276 | -foreground red \ | |
ca521566 | 3277 | -background ivory1 |
fec4a785 SP |
3278 | |
3279 | $ui_diff tag conf d<<<<<<< \ | |
3280 | -foreground orange \ | |
3281 | -font font_diffbold | |
3282 | $ui_diff tag conf d======= \ | |
3283 | -foreground orange \ | |
3284 | -font font_diffbold | |
3285 | $ui_diff tag conf d>>>>>>> \ | |
3286 | -foreground orange \ | |
3287 | -font font_diffbold | |
cb07fc2a | 3288 | |
ca521566 SP |
3289 | $ui_diff tag raise sel |
3290 | ||
0e794311 SP |
3291 | # -- Diff Body Context Menu |
3292 | # | |
042c2325 AG |
3293 | |
3294 | proc create_common_diff_popup {ctxm} { | |
042c2325 AG |
3295 | $ctxm add command \ |
3296 | -label [mc Refresh] \ | |
3297 | -command reshow_diff | |
3298 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3299 | $ctxm add command \ | |
3300 | -label [mc Copy] \ | |
3301 | -command {tk_textCopy $ui_diff} | |
3302 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3303 | $ctxm add command \ | |
3304 | -label [mc "Select All"] \ | |
3305 | -command {focus $ui_diff;$ui_diff tag add sel 0.0 end} | |
3306 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3307 | $ctxm add command \ | |
3308 | -label [mc "Copy All"] \ | |
3309 | -command { | |
3310 | $ui_diff tag add sel 0.0 end | |
3311 | tk_textCopy $ui_diff | |
3312 | $ui_diff tag remove sel 0.0 end | |
3313 | } | |
3314 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3315 | $ctxm add separator | |
3316 | $ctxm add command \ | |
3317 | -label [mc "Decrease Font Size"] \ | |
3318 | -command {incr_font_size font_diff -1} | |
3319 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3320 | $ctxm add command \ | |
3321 | -label [mc "Increase Font Size"] \ | |
3322 | -command {incr_font_size font_diff 1} | |
3323 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3324 | $ctxm add separator | |
3fe01623 AG |
3325 | set emenu $ctxm.enc |
3326 | menu $emenu | |
3327 | build_encoding_menu $emenu [list force_diff_encoding] | |
3328 | $ctxm add cascade \ | |
3329 | -label [mc "Encoding"] \ | |
3330 | -menu $emenu | |
3331 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3332 | $ctxm add separator | |
042c2325 AG |
3333 | $ctxm add command -label [mc "Options..."] \ |
3334 | -command do_options | |
3335 | } | |
3336 | ||
e8ab6446 SP |
3337 | set ctxm .vpane.lower.diff.body.ctxm |
3338 | menu $ctxm -tearoff 0 | |
fba6072e JS |
3339 | $ctxm add command \ |
3340 | -label [mc "Apply/Reverse Hunk"] \ | |
3341 | -command {apply_hunk $cursorX $cursorY} | |
3342 | set ui_diff_applyhunk [$ctxm index last] | |
3343 | lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] | |
5821988f JS |
3344 | $ctxm add command \ |
3345 | -label [mc "Apply/Reverse Line"] \ | |
ff07c3b6 | 3346 | -command {apply_range_or_line $cursorX $cursorY; do_rescan} |
5821988f JS |
3347 | set ui_diff_applyline [$ctxm index last] |
3348 | lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state] | |
fba6072e | 3349 | $ctxm add separator |
25476c63 JL |
3350 | $ctxm add command \ |
3351 | -label [mc "Show Less Context"] \ | |
3352 | -command show_less_context | |
3353 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3354 | $ctxm add command \ | |
3355 | -label [mc "Show More Context"] \ | |
3356 | -command show_more_context | |
3357 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] | |
3358 | $ctxm add separator | |
042c2325 AG |
3359 | create_common_diff_popup $ctxm |
3360 | ||
3361 | set ctxmmg .vpane.lower.diff.body.ctxmmg | |
3362 | menu $ctxmmg -tearoff 0 | |
7e30682c AG |
3363 | $ctxmmg add command \ |
3364 | -label [mc "Run Merge Tool"] \ | |
3365 | -command {merge_resolve_tool} | |
3366 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3367 | $ctxmmg add separator | |
042c2325 AG |
3368 | $ctxmmg add command \ |
3369 | -label [mc "Use Remote Version"] \ | |
3370 | -command {merge_resolve_one 3} | |
3371 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3372 | $ctxmmg add command \ | |
3373 | -label [mc "Use Local Version"] \ | |
3374 | -command {merge_resolve_one 2} | |
3375 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3376 | $ctxmmg add command \ | |
3377 | -label [mc "Revert To Base"] \ | |
3378 | -command {merge_resolve_one 1} | |
3379 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3380 | $ctxmmg add separator | |
25476c63 JL |
3381 | $ctxmmg add command \ |
3382 | -label [mc "Show Less Context"] \ | |
3383 | -command show_less_context | |
3384 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3385 | $ctxmmg add command \ | |
3386 | -label [mc "Show More Context"] \ | |
3387 | -command show_more_context | |
3388 | lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] | |
3389 | $ctxmmg add separator | |
042c2325 AG |
3390 | create_common_diff_popup $ctxmmg |
3391 | ||
25476c63 JL |
3392 | set ctxmsm .vpane.lower.diff.body.ctxmsm |
3393 | menu $ctxmsm -tearoff 0 | |
3394 | $ctxmsm add command \ | |
3395 | -label [mc "Visualize These Changes In The Submodule"] \ | |
3396 | -command {do_gitk -- true} | |
3397 | lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] | |
3398 | $ctxmsm add command \ | |
3399 | -label [mc "Visualize Current Branch History In The Submodule"] \ | |
3400 | -command {do_gitk {} true} | |
3401 | lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] | |
3402 | $ctxmsm add command \ | |
3403 | -label [mc "Visualize All Branch History In The Submodule"] \ | |
3404 | -command {do_gitk --all true} | |
3405 | lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] | |
3406 | $ctxmsm add separator | |
3407 | $ctxmsm add command \ | |
3408 | -label [mc "Start git gui In The Submodule"] \ | |
3409 | -command {do_git_gui} | |
3410 | lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] | |
3411 | $ctxmsm add separator | |
3412 | create_common_diff_popup $ctxmsm | |
3413 | ||
3414 | proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} { | |
ce015c21 | 3415 | global current_diff_path file_states |
83751fc1 SP |
3416 | set ::cursorX $x |
3417 | set ::cursorY $y | |
042c2325 AG |
3418 | if {[info exists file_states($current_diff_path)]} { |
3419 | set state [lindex $file_states($current_diff_path) 0] | |
a25c5189 | 3420 | } else { |
042c2325 AG |
3421 | set state {__} |
3422 | } | |
ff515d81 | 3423 | if {[string first {U} $state] >= 0} { |
042c2325 | 3424 | tk_popup $ctxmmg $X $Y |
25476c63 JL |
3425 | } elseif {$::is_submodule_diff} { |
3426 | tk_popup $ctxmsm $X $Y | |
047d94d5 | 3427 | } else { |
ff07c3b6 | 3428 | set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}] |
042c2325 AG |
3429 | if {$::ui_index eq $::current_diff_side} { |
3430 | set l [mc "Unstage Hunk From Commit"] | |
ff07c3b6 JE |
3431 | if {$has_range} { |
3432 | set t [mc "Unstage Lines From Commit"] | |
3433 | } else { | |
3434 | set t [mc "Unstage Line From Commit"] | |
3435 | } | |
042c2325 AG |
3436 | } else { |
3437 | set l [mc "Stage Hunk For Commit"] | |
ff07c3b6 JE |
3438 | if {$has_range} { |
3439 | set t [mc "Stage Lines For Commit"] | |
3440 | } else { | |
3441 | set t [mc "Stage Line For Commit"] | |
3442 | } | |
042c2325 | 3443 | } |
25476c63 | 3444 | if {$::is_3way_diff |
042c2325 AG |
3445 | || $current_diff_path eq {} |
3446 | || {__} eq $state | |
3447 | || {_O} eq $state | |
3448 | || {_T} eq $state | |
3449 | || {T_} eq $state} { | |
3450 | set s disabled | |
3451 | } else { | |
3452 | set s normal | |
3453 | } | |
3454 | $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l | |
3455 | $ctxm entryconf $::ui_diff_applyline -state $s -label $t | |
3456 | tk_popup $ctxm $X $Y | |
9c9f5fa9 | 3457 | } |
83751fc1 | 3458 | } |
25476c63 | 3459 | bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y] |
0e794311 | 3460 | |
cb07fc2a | 3461 | # -- Status Bar |
e8ab6446 | 3462 | # |
51530d17 | 3463 | set main_status [::status_bar::new .status] |
cb07fc2a | 3464 | pack .status -anchor w -side bottom -fill x |
1ac17950 | 3465 | $main_status show [mc "Initializing..."] |
cb07fc2a | 3466 | |
2d19516d | 3467 | # -- Load geometry |
e8ab6446 | 3468 | # |
2d19516d | 3469 | catch { |
51f4d16b | 3470 | set gm $repo_config(gui.geometry) |
c4fe7728 | 3471 | wm geometry . [lindex $gm 0] |
c80d7be5 PT |
3472 | if {$use_ttk} { |
3473 | .vpane sashpos 0 [lindex $gm 1] | |
3474 | .vpane.files sashpos 0 [lindex $gm 2] | |
3475 | } else { | |
3476 | .vpane sash place 0 \ | |
3477 | [lindex $gm 1] \ | |
3478 | [lindex [.vpane sash coord 0] 1] | |
3479 | .vpane.files sash place 0 \ | |
3480 | [lindex [.vpane.files sash coord 0] 0] \ | |
3481 | [lindex $gm 2] | |
3482 | } | |
c4fe7728 | 3483 | unset gm |
390adaea | 3484 | } |
2d19516d | 3485 | |
ed7b6033 AB |
3486 | # -- Load window state |
3487 | # | |
3488 | catch { | |
3489 | set gws $repo_config(gui.wmstate) | |
3490 | wm state . $gws | |
3491 | unset gws | |
3492 | } | |
3493 | ||
cb07fc2a | 3494 | # -- Key Bindings |
e8ab6446 | 3495 | # |
ec6b424a | 3496 | bind $ui_comm <$M1B-Key-Return> {do_commit;break} |
cd16a6c9 SP |
3497 | bind $ui_comm <$M1B-Key-t> {do_add_selection;break} |
3498 | bind $ui_comm <$M1B-Key-T> {do_add_selection;break} | |
b677c66e VS |
3499 | bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break} |
3500 | bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break} | |
3501 | bind $ui_comm <$M1B-Key-j> {do_revert_selection;break} | |
3502 | bind $ui_comm <$M1B-Key-J> {do_revert_selection;break} | |
93e912c5 SP |
3503 | bind $ui_comm <$M1B-Key-i> {do_add_all;break} |
3504 | bind $ui_comm <$M1B-Key-I> {do_add_all;break} | |
9861671d SP |
3505 | bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break} |
3506 | bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break} | |
3507 | bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break} | |
3508 | bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break} | |
3509 | bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break} | |
3510 | bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break} | |
3511 | bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break} | |
3512 | bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break} | |
729ffa50 MB |
3513 | bind $ui_comm <$M1B-Key-minus> {show_less_context;break} |
3514 | bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} | |
3515 | bind $ui_comm <$M1B-Key-equal> {show_more_context;break} | |
3516 | bind $ui_comm <$M1B-Key-plus> {show_more_context;break} | |
3517 | bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} | |
9861671d SP |
3518 | |
3519 | bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} | |
3520 | bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} | |
3521 | bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break} | |
3522 | bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break} | |
3523 | bind $ui_diff <$M1B-Key-v> {break} | |
3524 | bind $ui_diff <$M1B-Key-V> {break} | |
3525 | bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break} | |
3526 | bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break} | |
b2c6fcf1 SP |
3527 | bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break} |
3528 | bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break} | |
3529 | bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break} | |
3530 | bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break} | |
60aa065f SP |
3531 | bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break} |
3532 | bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break} | |
3533 | bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break} | |
3534 | bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break} | |
3535 | bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break} | |
3536 | bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break} | |
23effa79 | 3537 | bind $ui_diff <Button-1> {focus %W} |
49b86f01 | 3538 | |
64a906f8 | 3539 | if {[is_enabled branch]} { |
b1fa2bff SP |
3540 | bind . <$M1B-Key-n> branch_create::dialog |
3541 | bind . <$M1B-Key-N> branch_create::dialog | |
d41b43eb SP |
3542 | bind . <$M1B-Key-o> branch_checkout::dialog |
3543 | bind . <$M1B-Key-O> branch_checkout::dialog | |
a870ddc0 SP |
3544 | bind . <$M1B-Key-m> merge::dialog |
3545 | bind . <$M1B-Key-M> merge::dialog | |
bd29ebc3 | 3546 | } |
840bcfa7 SP |
3547 | if {[is_enabled transport]} { |
3548 | bind . <$M1B-Key-p> do_push_anywhere | |
3549 | bind . <$M1B-Key-P> do_push_anywhere | |
3550 | } | |
bd29ebc3 | 3551 | |
8056cc4f AG |
3552 | bind . <Key-F5> ui_do_rescan |
3553 | bind . <$M1B-Key-r> ui_do_rescan | |
3554 | bind . <$M1B-Key-R> ui_do_rescan | |
07123f40 SP |
3555 | bind . <$M1B-Key-s> do_signoff |
3556 | bind . <$M1B-Key-S> do_signoff | |
cd16a6c9 SP |
3557 | bind . <$M1B-Key-t> do_add_selection |
3558 | bind . <$M1B-Key-T> do_add_selection | |
d6db1bbe HV |
3559 | bind . <$M1B-Key-j> do_revert_selection |
3560 | bind . <$M1B-Key-J> do_revert_selection | |
93e912c5 SP |
3561 | bind . <$M1B-Key-i> do_add_all |
3562 | bind . <$M1B-Key-I> do_add_all | |
729ffa50 MB |
3563 | bind . <$M1B-Key-minus> {show_less_context;break} |
3564 | bind . <$M1B-Key-KP_Subtract> {show_less_context;break} | |
3565 | bind . <$M1B-Key-equal> {show_more_context;break} | |
3566 | bind . <$M1B-Key-plus> {show_more_context;break} | |
3567 | bind . <$M1B-Key-KP_Add> {show_more_context;break} | |
07123f40 | 3568 | bind . <$M1B-Key-Return> do_commit |
0812665e | 3569 | foreach i [list $ui_index $ui_workdir] { |
24263b77 SP |
3570 | bind $i <Button-1> "toggle_or_diff $i %x %y; break" |
3571 | bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break" | |
3572 | bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break" | |
cb07fc2a | 3573 | } |
62aac80b SP |
3574 | unset i |
3575 | ||
3576 | set file_lists($ui_index) [list] | |
0812665e | 3577 | set file_lists($ui_workdir) [list] |
a49c67d1 | 3578 | |
21985a11 | 3579 | wm title . "[appname] ([reponame]) [file normalize $_gitworktree]" |
cb07fc2a | 3580 | focus -force $ui_comm |
1d8b3cbf | 3581 | |
85ab313e SP |
3582 | # -- Warn the user about environmental problems. Cygwin's Tcl |
3583 | # does *not* pass its env array onto any processes it spawns. | |
3584 | # This means that git processes get none of our environment. | |
1d8b3cbf | 3585 | # |
20ddfcaa | 3586 | if {[is_Cygwin]} { |
1d8b3cbf SP |
3587 | set ignored_env 0 |
3588 | set suggest_user {} | |
c8c4854b | 3589 | set msg [mc "Possible environment issues exist. |
1d8b3cbf SP |
3590 | |
3591 | The following environment variables are probably | |
3592 | going to be ignored by any Git subprocess run | |
c8c4854b | 3593 | by %s: |
1d8b3cbf | 3594 | |
c8c4854b | 3595 | " [appname]] |
1d8b3cbf SP |
3596 | foreach name [array names env] { |
3597 | switch -regexp -- $name { | |
3598 | {^GIT_INDEX_FILE$} - | |
3599 | {^GIT_OBJECT_DIRECTORY$} - | |
3600 | {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} - | |
3601 | {^GIT_DIFF_OPTS$} - | |
3602 | {^GIT_EXTERNAL_DIFF$} - | |
3603 | {^GIT_PAGER$} - | |
3604 | {^GIT_TRACE$} - | |
3605 | {^GIT_CONFIG$} - | |
1d8b3cbf SP |
3606 | {^GIT_(AUTHOR|COMMITTER)_DATE$} { |
3607 | append msg " - $name\n" | |
3608 | incr ignored_env | |
3609 | } | |
3610 | {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} { | |
3611 | append msg " - $name\n" | |
3612 | incr ignored_env | |
3613 | set suggest_user $name | |
3614 | } | |
3615 | } | |
3616 | } | |
3617 | if {$ignored_env > 0} { | |
c8c4854b | 3618 | append msg [mc " |
1d8b3cbf | 3619 | This is due to a known issue with the |
c8c4854b | 3620 | Tcl binary distributed by Cygwin."] |
1d8b3cbf SP |
3621 | |
3622 | if {$suggest_user ne {}} { | |
c8c4854b | 3623 | append msg [mc " |
1d8b3cbf | 3624 | |
c8c4854b | 3625 | A good replacement for %s |
1d8b3cbf SP |
3626 | is placing values for the user.name and |
3627 | user.email settings into your personal | |
3628 | ~/.gitconfig file. | |
c8c4854b | 3629 | " $suggest_user] |
1d8b3cbf SP |
3630 | } |
3631 | warn_popup $msg | |
3632 | } | |
3633 | unset ignored_env msg suggest_user name | |
3634 | } | |
3635 | ||
85ab313e SP |
3636 | # -- Only initialize complex UI if we are going to stay running. |
3637 | # | |
64a906f8 | 3638 | if {[is_enabled transport]} { |
4ccdab02 | 3639 | load_all_remotes |
85ab313e | 3640 | |
6bdf5e5f | 3641 | set n [.mbar.remote index end] |
8329bd07 | 3642 | populate_remotes_menu |
6bdf5e5f SP |
3643 | set n [expr {[.mbar.remote index end] - $n}] |
3644 | if {$n > 0} { | |
7e09b153 | 3645 | if {[.mbar.remote type 0] eq "tearoff"} { incr n } |
6bdf5e5f SP |
3646 | .mbar.remote insert $n separator |
3647 | } | |
3648 | unset n | |
4ccdab02 | 3649 | } |
85ab313e | 3650 | |
4578c5cb SP |
3651 | if {[winfo exists $ui_comm]} { |
3652 | set GITGUI_BCK_exists [load_message GITGUI_BCK] | |
3653 | ||
3654 | # -- If both our backup and message files exist use the | |
3655 | # newer of the two files to initialize the buffer. | |
3656 | # | |
3657 | if {$GITGUI_BCK_exists} { | |
3658 | set m [gitdir GITGUI_MSG] | |
3659 | if {[file isfile $m]} { | |
3660 | if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} { | |
3661 | catch {file delete [gitdir GITGUI_MSG]} | |
3662 | } else { | |
3663 | $ui_comm delete 0.0 end | |
3664 | $ui_comm edit reset | |
3665 | $ui_comm edit modified false | |
3666 | catch {file delete [gitdir GITGUI_BCK]} | |
3667 | set GITGUI_BCK_exists 0 | |
3668 | } | |
3669 | } | |
3670 | unset m | |
3671 | } | |
3672 | ||
3673 | proc backup_commit_buffer {} { | |
3674 | global ui_comm GITGUI_BCK_exists | |
3675 | ||
3676 | set m [$ui_comm edit modified] | |
3677 | if {$m || $GITGUI_BCK_exists} { | |
3678 | set msg [string trim [$ui_comm get 0.0 end]] | |
3679 | regsub -all -line {[ \r\t]+$} $msg {} msg | |
3680 | ||
3681 | if {$msg eq {}} { | |
3682 | if {$GITGUI_BCK_exists} { | |
3683 | catch {file delete [gitdir GITGUI_BCK]} | |
3684 | set GITGUI_BCK_exists 0 | |
3685 | } | |
3686 | } elseif {$m} { | |
3687 | catch { | |
3688 | set fd [open [gitdir GITGUI_BCK] w] | |
3689 | puts -nonewline $fd $msg | |
3690 | close $fd | |
3691 | set GITGUI_BCK_exists 1 | |
3692 | } | |
3693 | } | |
3694 | ||
3695 | $ui_comm edit modified false | |
3696 | } | |
3697 | ||
3698 | set ::GITGUI_BCK_i [after 2000 backup_commit_buffer] | |
3699 | } | |
3700 | ||
3701 | backup_commit_buffer | |
95b002ee SP |
3702 | |
3703 | # -- If the user has aspell available we can drive it | |
3704 | # in pipe mode to spellcheck the commit message. | |
3705 | # | |
3706 | set spell_cmd [list |] | |
3707 | set spell_dict [get_config gui.spellingdictionary] | |
3708 | lappend spell_cmd aspell | |
3709 | if {$spell_dict ne {}} { | |
3710 | lappend spell_cmd --master=$spell_dict | |
3711 | } | |
3712 | lappend spell_cmd --mode=none | |
3713 | lappend spell_cmd --encoding=utf-8 | |
3714 | lappend spell_cmd pipe | |
3715 | if {$spell_dict eq {none} | |
3716 | || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} { | |
3717 | bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y] | |
3718 | } else { | |
3719 | set ui_comm_spell [spellcheck::init \ | |
3720 | $spell_fd \ | |
3721 | $ui_comm \ | |
3722 | $ui_comm_ctxm \ | |
3723 | ] | |
3724 | } | |
3725 | unset -nocomplain spell_cmd spell_fd spell_err spell_dict | |
4578c5cb SP |
3726 | } |
3727 | ||
53716a7b | 3728 | lock_index begin-read |
301dfaa9 SP |
3729 | if {![winfo ismapped .]} { |
3730 | wm deiconify . | |
3731 | } | |
1e65c622 AG |
3732 | after 1 { |
3733 | if {[is_enabled initialamend]} { | |
3734 | force_amend | |
3735 | } else { | |
3736 | do_rescan | |
3737 | } | |
3738 | ||
3739 | if {[is_enabled nocommitmsg]} { | |
3740 | $ui_comm configure -state disabled -background gray | |
3741 | } | |
3742 | } | |
3972b987 SP |
3743 | if {[is_enabled multicommit]} { |
3744 | after 1000 hint_gc | |
3745 | } | |
1e65c622 AG |
3746 | if {[is_enabled retcode]} { |
3747 | bind . <Destroy> {+terminate_me %W} | |
3748 | } | |
bb4812bc PB |
3749 | if {$picked && [is_config_true gui.autoexplore]} { |
3750 | do_explore | |
3751 | } | |
c80d7be5 PT |
3752 | |
3753 | # Local variables: | |
3754 | # mode: tcl | |
3755 | # indent-tabs-mode: t | |
3756 | # tab-width: 4 | |
3757 | # End: |