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