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