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