git-gui: align the current path label to the right
[git-gui/bertw.git] / git-gui.sh
blob476ba77d12bdd2a3c7599f071842b71e4411e9ec
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" -- "$@"
12 set appvers {@@GITGUI_VERSION@@}
13 set copyright [string map [list (c) \u00a9] {
14 Copyright (c) 2006-2010 Shawn Pearce, et. al.
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.
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.
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}]
30 ######################################################################
32 ## Tcl/Tk sanity check
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
46 catch {rename send {}} ; # What an evil concept...
48 ######################################################################
50 ## locate our library
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]
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]
68 unset oguirel
70 ######################################################################
72 ## enable verbose loading?
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]
81 rename source real__source
82 proc source {name} {
83 puts stderr "source $name"
84 uplevel 1 real__source $name
86 if {[tk windowingsystem] eq "win32"} { console show }
89 ######################################################################
91 ## Internationalization (i18n) through msgcat and gettext. See
92 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
94 package require msgcat
96 # Check for Windows 7 MUI language pack (missed by msgcat < 1.4.4)
97 if {[tk windowingsystem] eq "win32"
98 && [package vcompare [package provide msgcat] 1.4.4] < 0
99 } then {
100 proc _mc_update_locale {} {
101 set key {HKEY_CURRENT_USER\Control Panel\Desktop}
102 if {![catch {
103 package require registry
104 set uilocale [registry get $key "PreferredUILanguages"]
105 msgcat::ConvertLocale [string map {- _} [lindex $uilocale 0]]
106 } uilocale]} {
107 if {[string length $uilocale] > 0} {
108 msgcat::mclocale $uilocale
112 _mc_update_locale
115 proc _mc_trim {fmt} {
116 set cmk [string first @@ $fmt]
117 if {$cmk > 0} {
118 return [string range $fmt 0 [expr {$cmk - 1}]]
120 return $fmt
123 proc mc {en_fmt args} {
124 set fmt [_mc_trim [::msgcat::mc $en_fmt]]
125 if {[catch {set msg [eval [list format $fmt] $args]} err]} {
126 set msg [eval [list format [_mc_trim $en_fmt]] $args]
128 return $msg
131 proc strcat {args} {
132 return [join $args {}]
135 ::msgcat::mcload $oguimsg
136 unset oguimsg
138 ######################################################################
140 ## On Mac, bring the current Wish process window to front
142 if {[tk windowingsystem] eq "aqua"} {
143 catch {
144 exec osascript -e [format {
145 tell application "System Events"
146 set frontmost of processes whose unix id is %d to true
147 end tell
148 } [pid]]
152 ######################################################################
154 ## read only globals
156 set _appname {Git Gui}
157 set _gitdir {}
158 set _gitworktree {}
159 set _isbare {}
160 set _gitexec {}
161 set _githtmldir {}
162 set _reponame {}
163 set _iscygwin {}
164 set _search_path {}
165 set _shellpath {@@SHELL_PATH@@}
167 set _trace [lsearch -exact $argv --trace]
168 if {$_trace >= 0} {
169 set argv [lreplace $argv $_trace $_trace]
170 set _trace 1
171 if {[tk windowingsystem] eq "win32"} { console show }
172 } else {
173 set _trace 0
176 # variable for the last merged branch (useful for a default when deleting
177 # branches).
178 set _last_merged_branch {}
180 proc shellpath {} {
181 global _shellpath env
182 if {[string match @@* $_shellpath]} {
183 if {[info exists env(SHELL)]} {
184 return $env(SHELL)
185 } else {
186 return /bin/sh
189 return $_shellpath
192 proc appname {} {
193 global _appname
194 return $_appname
197 proc gitdir {args} {
198 global _gitdir
199 if {$args eq {}} {
200 return $_gitdir
202 return [eval [list file join $_gitdir] $args]
205 proc gitexec {args} {
206 global _gitexec
207 if {$_gitexec eq {}} {
208 if {[catch {set _gitexec [git --exec-path]} err]} {
209 error "Git not installed?\n\n$err"
211 if {[is_Cygwin]} {
212 set _gitexec [exec cygpath \
213 --windows \
214 --absolute \
215 $_gitexec]
216 } else {
217 set _gitexec [file normalize $_gitexec]
220 if {$args eq {}} {
221 return $_gitexec
223 return [eval [list file join $_gitexec] $args]
226 proc githtmldir {args} {
227 global _githtmldir
228 if {$_githtmldir eq {}} {
229 if {[catch {set _githtmldir [git --html-path]}]} {
230 # Git not installed or option not yet supported
231 return {}
233 if {[is_Cygwin]} {
234 set _githtmldir [exec cygpath \
235 --windows \
236 --absolute \
237 $_githtmldir]
238 } else {
239 set _githtmldir [file normalize $_githtmldir]
242 if {$args eq {}} {
243 return $_githtmldir
245 return [eval [list file join $_githtmldir] $args]
248 proc reponame {} {
249 return $::_reponame
252 proc is_MacOSX {} {
253 if {[tk windowingsystem] eq {aqua}} {
254 return 1
256 return 0
259 proc is_Windows {} {
260 if {$::tcl_platform(platform) eq {windows}} {
261 return 1
263 return 0
266 proc is_Cygwin {} {
267 global _iscygwin
268 if {$_iscygwin eq {}} {
269 if {$::tcl_platform(platform) eq {windows}} {
270 if {[catch {set p [exec cygpath --windir]} err]} {
271 set _iscygwin 0
272 } else {
273 set _iscygwin 1
275 } else {
276 set _iscygwin 0
279 return $_iscygwin
282 proc is_enabled {option} {
283 global enabled_options
284 if {[catch {set on $enabled_options($option)}]} {return 0}
285 return $on
288 proc enable_option {option} {
289 global enabled_options
290 set enabled_options($option) 1
293 proc disable_option {option} {
294 global enabled_options
295 set enabled_options($option) 0
298 ######################################################################
300 ## config
302 proc is_many_config {name} {
303 switch -glob -- $name {
304 gui.recentrepo -
305 remote.*.fetch -
306 remote.*.push
307 {return 1}
309 {return 0}
313 proc is_config_true {name} {
314 global repo_config
315 if {[catch {set v $repo_config($name)}]} {
316 return 0
318 set v [string tolower $v]
319 if {$v eq {} || $v eq {true} || $v eq {1} || $v eq {yes} || $v eq {on}} {
320 return 1
321 } else {
322 return 0
326 proc is_config_false {name} {
327 global repo_config
328 if {[catch {set v $repo_config($name)}]} {
329 return 0
331 set v [string tolower $v]
332 if {$v eq {false} || $v eq {0} || $v eq {no} || $v eq {off}} {
333 return 1
334 } else {
335 return 0
339 proc get_config {name} {
340 global repo_config
341 if {[catch {set v $repo_config($name)}]} {
342 return {}
343 } else {
344 return $v
348 proc is_bare {} {
349 global _isbare
350 global _gitdir
351 global _gitworktree
353 if {$_isbare eq {}} {
354 if {[catch {
355 set _bare [git rev-parse --is-bare-repository]
356 switch -- $_bare {
357 true { set _isbare 1 }
358 false { set _isbare 0}
359 default { throw }
361 }]} {
362 if {[is_config_true core.bare]
363 || ($_gitworktree eq {}
364 && [lindex [file split $_gitdir] end] ne {.git})} {
365 set _isbare 1
366 } else {
367 set _isbare 0
371 return $_isbare
374 ######################################################################
376 ## handy utils
378 proc _trace_exec {cmd} {
379 if {!$::_trace} return
380 set d {}
381 foreach v $cmd {
382 if {$d ne {}} {
383 append d { }
385 if {[regexp {[ \t\r\n'"$?*]} $v]} {
386 set v [sq $v]
388 append d $v
390 puts stderr $d
393 #'" fix poor old emacs font-lock mode
395 proc _git_cmd {name} {
396 global _git_cmd_path
398 if {[catch {set v $_git_cmd_path($name)}]} {
399 switch -- $name {
400 version -
401 --version -
402 --exec-path { return [list $::_git $name] }
405 set p [gitexec git-$name$::_search_exe]
406 if {[file exists $p]} {
407 set v [list $p]
408 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
409 # Try to determine what sort of magic will make
410 # git-$name go and do its thing, because native
411 # Tcl on Windows doesn't know it.
413 set p [gitexec git-$name]
414 set f [open $p r]
415 set s [gets $f]
416 close $f
418 switch -glob -- [lindex $s 0] {
419 #!*sh { set i sh }
420 #!*perl { set i perl }
421 #!*python { set i python }
422 default { error "git-$name is not supported: $s" }
425 upvar #0 _$i interp
426 if {![info exists interp]} {
427 set interp [_which $i]
429 if {$interp eq {}} {
430 error "git-$name requires $i (not in PATH)"
432 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
433 } else {
434 # Assume it is builtin to git somehow and we
435 # aren't actually able to see a file for it.
437 set v [list $::_git $name]
439 set _git_cmd_path($name) $v
441 return $v
444 proc _which {what args} {
445 global env _search_exe _search_path
447 if {$_search_path eq {}} {
448 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
449 set _search_path [split [exec cygpath \
450 --windows \
451 --path \
452 --absolute \
453 $env(PATH)] {;}]
454 set _search_exe .exe
455 } elseif {[is_Windows]} {
456 set gitguidir [file dirname [info script]]
457 regsub -all ";" $gitguidir "\\;" gitguidir
458 set env(PATH) "$gitguidir;$env(PATH)"
459 set _search_path [split $env(PATH) {;}]
460 set _search_exe .exe
461 } else {
462 set _search_path [split $env(PATH) :]
463 set _search_exe {}
467 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
468 set suffix {}
469 } else {
470 set suffix $_search_exe
473 foreach p $_search_path {
474 set p [file join $p $what$suffix]
475 if {[file exists $p]} {
476 return [file normalize $p]
479 return {}
482 # Test a file for a hashbang to identify executable scripts on Windows.
483 proc is_shellscript {filename} {
484 if {![file exists $filename]} {return 0}
485 set f [open $filename r]
486 fconfigure $f -encoding binary
487 set magic [read $f 2]
488 close $f
489 return [expr {$magic eq "#!"}]
492 # Run a command connected via pipes on stdout.
493 # This is for use with textconv filters and uses sh -c "..." to allow it to
494 # contain a command with arguments. On windows we must check for shell
495 # scripts specifically otherwise just call the filter command.
496 proc open_cmd_pipe {cmd path} {
497 global env
498 if {![file executable [shellpath]]} {
499 set exe [auto_execok [lindex $cmd 0]]
500 if {[is_shellscript [lindex $exe 0]]} {
501 set run [linsert [auto_execok sh] end -c "$cmd \"\$0\"" $path]
502 } else {
503 set run [concat $exe [lrange $cmd 1 end] $path]
505 } else {
506 set run [list [shellpath] -c "$cmd \"\$0\"" $path]
508 return [open |$run r]
511 proc _lappend_nice {cmd_var} {
512 global _nice
513 upvar $cmd_var cmd
515 if {![info exists _nice]} {
516 set _nice [_which nice]
517 if {[catch {exec $_nice git version}]} {
518 set _nice {}
519 } elseif {[is_Windows] && [file dirname $_nice] ne [file dirname $::_git]} {
520 set _nice {}
523 if {$_nice ne {}} {
524 lappend cmd $_nice
528 proc git {args} {
529 set opt [list]
531 while {1} {
532 switch -- [lindex $args 0] {
533 --nice {
534 _lappend_nice opt
537 default {
538 break
543 set args [lrange $args 1 end]
546 set cmdp [_git_cmd [lindex $args 0]]
547 set args [lrange $args 1 end]
549 _trace_exec [concat $opt $cmdp $args]
550 set result [eval exec $opt $cmdp $args]
551 if {$::_trace} {
552 puts stderr "< $result"
554 return $result
557 proc _open_stdout_stderr {cmd} {
558 _trace_exec $cmd
559 if {[catch {
560 set fd [open [concat [list | ] $cmd] r]
561 } err]} {
562 if { [lindex $cmd end] eq {2>@1}
563 && $err eq {can not find channel named "1"}
565 # Older versions of Tcl 8.4 don't have this 2>@1 IO
566 # redirect operator. Fallback to |& cat for those.
567 # The command was not actually started, so its safe
568 # to try to start it a second time.
570 set fd [open [concat \
571 [list | ] \
572 [lrange $cmd 0 end-1] \
573 [list |& cat] \
574 ] r]
575 } else {
576 error $err
579 fconfigure $fd -eofchar {}
580 return $fd
583 proc git_read {args} {
584 set opt [list]
586 while {1} {
587 switch -- [lindex $args 0] {
588 --nice {
589 _lappend_nice opt
592 --stderr {
593 lappend args 2>@1
596 default {
597 break
602 set args [lrange $args 1 end]
605 set cmdp [_git_cmd [lindex $args 0]]
606 set args [lrange $args 1 end]
608 return [_open_stdout_stderr [concat $opt $cmdp $args]]
611 proc git_write {args} {
612 set opt [list]
614 while {1} {
615 switch -- [lindex $args 0] {
616 --nice {
617 _lappend_nice opt
620 default {
621 break
626 set args [lrange $args 1 end]
629 set cmdp [_git_cmd [lindex $args 0]]
630 set args [lrange $args 1 end]
632 _trace_exec [concat $opt $cmdp $args]
633 return [open [concat [list | ] $opt $cmdp $args] w]
636 proc githook_read {hook_name args} {
637 set pchook [gitdir hooks $hook_name]
638 lappend args 2>@1
640 # On Windows [file executable] might lie so we need to ask
641 # the shell if the hook is executable. Yes that's annoying.
643 if {[is_Windows]} {
644 upvar #0 _sh interp
645 if {![info exists interp]} {
646 set interp [_which sh]
648 if {$interp eq {}} {
649 error "hook execution requires sh (not in PATH)"
652 set scr {if test -x "$1";then exec "$@";fi}
653 set sh_c [list $interp -c $scr $interp $pchook]
654 return [_open_stdout_stderr [concat $sh_c $args]]
657 if {[file executable $pchook]} {
658 return [_open_stdout_stderr [concat [list $pchook] $args]]
661 return {}
664 proc kill_file_process {fd} {
665 set process [pid $fd]
667 catch {
668 if {[is_Windows]} {
669 # Use a Cygwin-specific flag to allow killing
670 # native Windows processes
671 exec kill -f $process
672 } else {
673 exec kill $process
678 proc gitattr {path attr default} {
679 if {[catch {set r [git check-attr $attr -- $path]}]} {
680 set r unspecified
681 } else {
682 set r [join [lrange [split $r :] 2 end] :]
683 regsub {^ } $r {} r
685 if {$r eq {unspecified}} {
686 return $default
688 return $r
691 proc sq {value} {
692 regsub -all ' $value "'\\''" value
693 return "'$value'"
696 proc load_current_branch {} {
697 global current_branch is_detached
699 set fd [open [gitdir HEAD] r]
700 if {[gets $fd ref] < 1} {
701 set ref {}
703 close $fd
705 set pfx {ref: refs/heads/}
706 set len [string length $pfx]
707 if {[string equal -length $len $pfx $ref]} {
708 # We're on a branch. It might not exist. But
709 # HEAD looks good enough to be a branch.
711 set current_branch [string range $ref $len end]
712 set is_detached 0
713 } else {
714 # Assume this is a detached head.
716 set current_branch HEAD
717 set is_detached 1
721 auto_load tk_optionMenu
722 rename tk_optionMenu real__tkOptionMenu
723 proc tk_optionMenu {w varName args} {
724 set m [eval real__tkOptionMenu $w $varName $args]
725 $m configure -font font_ui
726 $w configure -font font_ui
727 return $m
730 proc rmsel_tag {text} {
731 $text tag conf sel \
732 -background [$text cget -background] \
733 -foreground [$text cget -foreground] \
734 -borderwidth 0
735 $text tag conf in_sel -background lightgray
736 bind $text <Motion> break
737 return $text
740 wm withdraw .
741 set root_exists 0
742 bind . <Visibility> {
743 bind . <Visibility> {}
744 set root_exists 1
747 if {[is_Windows]} {
748 wm iconbitmap . -default $oguilib/git-gui.ico
749 set ::tk::AlwaysShowSelection 1
750 bind . <Control-F2> {console show}
752 # Spoof an X11 display for SSH
753 if {![info exists env(DISPLAY)]} {
754 set env(DISPLAY) :9999
756 } else {
757 catch {
758 image create photo gitlogo -width 16 -height 16
760 gitlogo put #33CC33 -to 7 0 9 2
761 gitlogo put #33CC33 -to 4 2 12 4
762 gitlogo put #33CC33 -to 7 4 9 6
763 gitlogo put #CC3333 -to 4 6 12 8
764 gitlogo put gray26 -to 4 9 6 10
765 gitlogo put gray26 -to 3 10 6 12
766 gitlogo put gray26 -to 8 9 13 11
767 gitlogo put gray26 -to 8 11 10 12
768 gitlogo put gray26 -to 11 11 13 14
769 gitlogo put gray26 -to 3 12 5 14
770 gitlogo put gray26 -to 5 13
771 gitlogo put gray26 -to 10 13
772 gitlogo put gray26 -to 4 14 12 15
773 gitlogo put gray26 -to 5 15 11 16
774 gitlogo redither
776 image create photo gitlogo32 -width 32 -height 32
777 gitlogo32 copy gitlogo -zoom 2 2
779 wm iconphoto . -default gitlogo gitlogo32
783 ######################################################################
785 ## config defaults
787 set cursor_ptr arrow
788 font create font_ui
789 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
790 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
791 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
792 } else {
793 font create font_diff -family Courier -size 10
794 catch {
795 label .dummy
796 eval font configure font_ui [font actual [.dummy cget -font]]
797 destroy .dummy
801 font create font_uiitalic
802 font create font_uibold
803 font create font_diffbold
804 font create font_diffitalic
806 foreach class {Button Checkbutton Entry Label
807 Labelframe Listbox Message
808 Radiobutton Spinbox Text} {
809 option add *$class.font font_ui
811 if {![is_MacOSX]} {
812 option add *Menu.font font_ui
813 option add *Entry.borderWidth 1 startupFile
814 option add *Entry.relief sunken startupFile
815 option add *RadioButton.anchor w startupFile
817 unset class
819 if {[is_Windows] || [is_MacOSX]} {
820 option add *Menu.tearOff 0
823 if {[is_MacOSX]} {
824 set M1B M1
825 set M1T Cmd
826 } else {
827 set M1B Control
828 set M1T Ctrl
831 proc bind_button3 {w cmd} {
832 bind $w <Any-Button-3> $cmd
833 if {[is_MacOSX]} {
834 # Mac OS X sends Button-2 on right click through three-button mouse,
835 # or through trackpad right-clicking (two-finger touch + click).
836 bind $w <Any-Button-2> $cmd
837 bind $w <Control-Button-1> $cmd
841 proc apply_config {} {
842 global repo_config font_descs
844 foreach option $font_descs {
845 set name [lindex $option 0]
846 set font [lindex $option 1]
847 if {[catch {
848 set need_weight 1
849 foreach {cn cv} $repo_config(gui.$name) {
850 if {$cn eq {-weight}} {
851 set need_weight 0
853 font configure $font $cn $cv
855 if {$need_weight} {
856 font configure $font -weight normal
858 } err]} {
859 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
861 foreach {cn cv} [font configure $font] {
862 font configure ${font}bold $cn $cv
863 font configure ${font}italic $cn $cv
865 font configure ${font}bold -weight bold
866 font configure ${font}italic -slant italic
869 global use_ttk NS
870 set use_ttk 0
871 set NS {}
872 if {$repo_config(gui.usettk)} {
873 set use_ttk [package vsatisfies [package provide Tk] 8.5]
874 if {$use_ttk} {
875 set NS ttk
876 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
877 pave_toplevel .
882 set default_config(branch.autosetupmerge) true
883 set default_config(merge.tool) {}
884 set default_config(mergetool.keepbackup) true
885 set default_config(merge.diffstat) true
886 set default_config(merge.summary) false
887 set default_config(merge.verbosity) 2
888 set default_config(user.name) {}
889 set default_config(user.email) {}
891 set default_config(gui.encoding) [encoding system]
892 set default_config(gui.matchtrackingbranch) false
893 set default_config(gui.textconv) true
894 set default_config(gui.pruneduringfetch) false
895 set default_config(gui.trustmtime) false
896 set default_config(gui.fastcopyblame) false
897 set default_config(gui.maxrecentrepo) 10
898 set default_config(gui.copyblamethreshold) 40
899 set default_config(gui.blamehistoryctx) 7
900 set default_config(gui.diffcontext) 5
901 set default_config(gui.diffopts) {}
902 set default_config(gui.commitmsgwidth) 75
903 set default_config(gui.newbranchtemplate) {}
904 set default_config(gui.spellingdictionary) {}
905 set default_config(gui.fontui) [font configure font_ui]
906 set default_config(gui.fontdiff) [font configure font_diff]
907 # TODO: this option should be added to the git-config documentation
908 set default_config(gui.maxfilesdisplayed) 5000
909 set default_config(gui.usettk) 1
910 set default_config(gui.warndetachedcommit) 1
911 set font_descs {
912 {fontui font_ui {mc "Main Font"}}
913 {fontdiff font_diff {mc "Diff/Console Font"}}
915 set default_config(gui.stageuntracked) ask
916 set default_config(gui.displayuntracked) true
918 ######################################################################
920 ## find git
922 set _git [_which git]
923 if {$_git eq {}} {
924 catch {wm withdraw .}
925 tk_messageBox \
926 -icon error \
927 -type ok \
928 -title [mc "git-gui: fatal error"] \
929 -message [mc "Cannot find git in PATH."]
930 exit 1
933 ######################################################################
935 ## version check
937 if {[catch {set _git_version [git --version]} err]} {
938 catch {wm withdraw .}
939 tk_messageBox \
940 -icon error \
941 -type ok \
942 -title [mc "git-gui: fatal error"] \
943 -message "Cannot determine Git version:
945 $err
947 [appname] requires Git 1.5.0 or later."
948 exit 1
950 if {![regsub {^git version } $_git_version {} _git_version]} {
951 catch {wm withdraw .}
952 tk_messageBox \
953 -icon error \
954 -type ok \
955 -title [mc "git-gui: fatal error"] \
956 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
957 exit 1
960 proc get_trimmed_version {s} {
961 set r {}
962 foreach x [split $s -._] {
963 if {[string is integer -strict $x]} {
964 lappend r $x
965 } else {
966 break
969 return [join $r .]
971 set _real_git_version $_git_version
972 set _git_version [get_trimmed_version $_git_version]
974 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
975 catch {wm withdraw .}
976 if {[tk_messageBox \
977 -icon warning \
978 -type yesno \
979 -default no \
980 -title "[appname]: warning" \
981 -message [mc "Git version cannot be determined.
983 %s claims it is version '%s'.
985 %s requires at least Git 1.5.0 or later.
987 Assume '%s' is version 1.5.0?
988 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
989 set _git_version 1.5.0
990 } else {
991 exit 1
994 unset _real_git_version
996 proc git-version {args} {
997 global _git_version
999 switch [llength $args] {
1001 return $_git_version
1005 set op [lindex $args 0]
1006 set vr [lindex $args 1]
1007 set cm [package vcompare $_git_version $vr]
1008 return [expr $cm $op 0]
1012 set type [lindex $args 0]
1013 set name [lindex $args 1]
1014 set parm [lindex $args 2]
1015 set body [lindex $args 3]
1017 if {($type ne {proc} && $type ne {method})} {
1018 error "Invalid arguments to git-version"
1020 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
1021 error "Last arm of $type $name must be default"
1024 foreach {op vr cb} [lrange $body 0 end-2] {
1025 if {[git-version $op $vr]} {
1026 return [uplevel [list $type $name $parm $cb]]
1030 return [uplevel [list $type $name $parm [lindex $body end]]]
1033 default {
1034 error "git-version >= x"
1040 if {[git-version < 1.5]} {
1041 catch {wm withdraw .}
1042 tk_messageBox \
1043 -icon error \
1044 -type ok \
1045 -title [mc "git-gui: fatal error"] \
1046 -message "[appname] requires Git 1.5.0 or later.
1048 You are using [git-version]:
1050 [git --version]"
1051 exit 1
1054 ######################################################################
1056 ## configure our library
1058 set idx [file join $oguilib tclIndex]
1059 if {[catch {set fd [open $idx r]} err]} {
1060 catch {wm withdraw .}
1061 tk_messageBox \
1062 -icon error \
1063 -type ok \
1064 -title [mc "git-gui: fatal error"] \
1065 -message $err
1066 exit 1
1068 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1069 set idx [list]
1070 while {[gets $fd n] >= 0} {
1071 if {$n ne {} && ![string match #* $n]} {
1072 lappend idx $n
1075 } else {
1076 set idx {}
1078 close $fd
1080 if {$idx ne {}} {
1081 set loaded [list]
1082 foreach p $idx {
1083 if {[lsearch -exact $loaded $p] >= 0} continue
1084 source [file join $oguilib $p]
1085 lappend loaded $p
1087 unset loaded p
1088 } else {
1089 set auto_path [concat [list $oguilib] $auto_path]
1091 unset -nocomplain idx fd
1093 ######################################################################
1095 ## config file parsing
1097 git-version proc _parse_config {arr_name args} {
1098 >= 1.5.3 {
1099 upvar $arr_name arr
1100 array unset arr
1101 set buf {}
1102 catch {
1103 set fd_rc [eval \
1104 [list git_read config] \
1105 $args \
1106 [list --null --list]]
1107 fconfigure $fd_rc -translation binary
1108 set buf [read $fd_rc]
1109 close $fd_rc
1111 foreach line [split $buf "\0"] {
1112 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1113 if {[is_many_config $name]} {
1114 lappend arr($name) $value
1115 } else {
1116 set arr($name) $value
1118 } elseif {[regexp {^([^\n]+)$} $line line name]} {
1119 # no value given, but interpreting them as
1120 # boolean will be handled as true
1121 set arr($name) {}
1125 default {
1126 upvar $arr_name arr
1127 array unset arr
1128 catch {
1129 set fd_rc [eval [list git_read config --list] $args]
1130 while {[gets $fd_rc line] >= 0} {
1131 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1132 if {[is_many_config $name]} {
1133 lappend arr($name) $value
1134 } else {
1135 set arr($name) $value
1137 } elseif {[regexp {^([^=]+)$} $line line name]} {
1138 # no value given, but interpreting them as
1139 # boolean will be handled as true
1140 set arr($name) {}
1143 close $fd_rc
1148 proc load_config {include_global} {
1149 global repo_config global_config system_config default_config
1151 if {$include_global} {
1152 _parse_config system_config --system
1153 _parse_config global_config --global
1155 _parse_config repo_config
1157 foreach name [array names default_config] {
1158 if {[catch {set v $system_config($name)}]} {
1159 set system_config($name) $default_config($name)
1162 foreach name [array names system_config] {
1163 if {[catch {set v $global_config($name)}]} {
1164 set global_config($name) $system_config($name)
1166 if {[catch {set v $repo_config($name)}]} {
1167 set repo_config($name) $system_config($name)
1172 ######################################################################
1174 ## feature option selection
1176 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1177 unset _junk
1178 } else {
1179 set subcommand gui
1181 if {$subcommand eq {gui.sh}} {
1182 set subcommand gui
1184 if {$subcommand eq {gui} && [llength $argv] > 0} {
1185 set subcommand [lindex $argv 0]
1186 set argv [lrange $argv 1 end]
1189 enable_option multicommit
1190 enable_option branch
1191 enable_option transport
1192 disable_option bare
1194 switch -- $subcommand {
1195 browser -
1196 blame {
1197 enable_option bare
1199 disable_option multicommit
1200 disable_option branch
1201 disable_option transport
1203 citool {
1204 enable_option singlecommit
1205 enable_option retcode
1207 disable_option multicommit
1208 disable_option branch
1209 disable_option transport
1211 while {[llength $argv] > 0} {
1212 set a [lindex $argv 0]
1213 switch -- $a {
1214 --amend {
1215 enable_option initialamend
1217 --nocommit {
1218 enable_option nocommit
1219 enable_option nocommitmsg
1221 --commitmsg {
1222 disable_option nocommitmsg
1224 default {
1225 break
1229 set argv [lrange $argv 1 end]
1234 ######################################################################
1236 ## execution environment
1238 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1240 # Suggest our implementation of askpass, if none is set
1241 if {![info exists env(SSH_ASKPASS)]} {
1242 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1245 ######################################################################
1247 ## repository setup
1249 set picked 0
1250 if {[catch {
1251 set _gitdir $env(GIT_DIR)
1252 set _prefix {}
1254 && [catch {
1255 # beware that from the .git dir this sets _gitdir to .
1256 # and _prefix to the empty string
1257 set _gitdir [git rev-parse --git-dir]
1258 set _prefix [git rev-parse --show-prefix]
1259 } err]} {
1260 load_config 1
1261 apply_config
1262 choose_repository::pick
1263 set picked 1
1266 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1267 # run from the .git dir itself) lest the routines to find the worktree
1268 # get confused
1269 if {$_gitdir eq "."} {
1270 set _gitdir [pwd]
1273 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1274 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1276 if {![file isdirectory $_gitdir]} {
1277 catch {wm withdraw .}
1278 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1279 exit 1
1281 # _gitdir exists, so try loading the config
1282 load_config 0
1283 apply_config
1285 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1286 if {[package vsatisfies $_git_version 1.7.0]} {
1287 if { [is_Cygwin] } {
1288 catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
1289 } else {
1290 set _gitworktree [git rev-parse --show-toplevel]
1292 } else {
1293 # try to set work tree from environment, core.worktree or use
1294 # cdup to obtain a relative path to the top of the worktree. If
1295 # run from the top, the ./ prefix ensures normalize expands pwd.
1296 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1297 set _gitworktree [get_config core.worktree]
1298 if {$_gitworktree eq ""} {
1299 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1304 if {$_prefix ne {}} {
1305 if {$_gitworktree eq {}} {
1306 regsub -all {[^/]+/} $_prefix ../ cdup
1307 } else {
1308 set cdup $_gitworktree
1310 if {[catch {cd $cdup} err]} {
1311 catch {wm withdraw .}
1312 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1313 exit 1
1315 set _gitworktree [pwd]
1316 unset cdup
1317 } elseif {![is_enabled bare]} {
1318 if {[is_bare]} {
1319 catch {wm withdraw .}
1320 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1321 exit 1
1323 if {$_gitworktree eq {}} {
1324 set _gitworktree [file dirname $_gitdir]
1326 if {[catch {cd $_gitworktree} err]} {
1327 catch {wm withdraw .}
1328 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1329 exit 1
1331 set _gitworktree [pwd]
1333 set _reponame [file split [file normalize $_gitdir]]
1334 if {[lindex $_reponame end] eq {.git}} {
1335 set _reponame [lindex $_reponame end-1]
1336 } else {
1337 set _reponame [lindex $_reponame end]
1340 set env(GIT_DIR) $_gitdir
1341 set env(GIT_WORK_TREE) $_gitworktree
1343 ######################################################################
1345 ## global init
1347 set current_diff_path {}
1348 set current_diff_side {}
1349 set diff_actions [list]
1351 set HEAD {}
1352 set PARENT {}
1353 set MERGE_HEAD [list]
1354 set commit_type {}
1355 set empty_tree {}
1356 set current_branch {}
1357 set is_detached 0
1358 set current_diff_path {}
1359 set is_3way_diff 0
1360 set is_submodule_diff 0
1361 set is_conflict_diff 0
1362 set selected_commit_type new
1363 set diff_empty_count 0
1365 set nullid "0000000000000000000000000000000000000000"
1366 set nullid2 "0000000000000000000000000000000000000001"
1368 ######################################################################
1370 ## task management
1372 set rescan_active 0
1373 set diff_active 0
1374 set last_clicked {}
1376 set disable_on_lock [list]
1377 set index_lock_type none
1379 proc lock_index {type} {
1380 global index_lock_type disable_on_lock
1382 if {$index_lock_type eq {none}} {
1383 set index_lock_type $type
1384 foreach w $disable_on_lock {
1385 uplevel #0 $w disabled
1387 return 1
1388 } elseif {$index_lock_type eq "begin-$type"} {
1389 set index_lock_type $type
1390 return 1
1392 return 0
1395 proc unlock_index {} {
1396 global index_lock_type disable_on_lock
1398 set index_lock_type none
1399 foreach w $disable_on_lock {
1400 uplevel #0 $w normal
1404 ######################################################################
1406 ## status
1408 proc repository_state {ctvar hdvar mhvar} {
1409 global current_branch
1410 upvar $ctvar ct $hdvar hd $mhvar mh
1412 set mh [list]
1414 load_current_branch
1415 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1416 set hd {}
1417 set ct initial
1418 return
1421 set merge_head [gitdir MERGE_HEAD]
1422 if {[file exists $merge_head]} {
1423 set ct merge
1424 set fd_mh [open $merge_head r]
1425 while {[gets $fd_mh line] >= 0} {
1426 lappend mh $line
1428 close $fd_mh
1429 return
1432 set ct normal
1435 proc PARENT {} {
1436 global PARENT empty_tree
1438 set p [lindex $PARENT 0]
1439 if {$p ne {}} {
1440 return $p
1442 if {$empty_tree eq {}} {
1443 set empty_tree [git mktree << {}]
1445 return $empty_tree
1448 proc force_amend {} {
1449 global selected_commit_type
1450 global HEAD PARENT MERGE_HEAD commit_type
1452 repository_state newType newHEAD newMERGE_HEAD
1453 set HEAD $newHEAD
1454 set PARENT $newHEAD
1455 set MERGE_HEAD $newMERGE_HEAD
1456 set commit_type $newType
1458 set selected_commit_type amend
1459 do_select_commit_type
1462 proc rescan {after {honor_trustmtime 1}} {
1463 global HEAD PARENT MERGE_HEAD commit_type
1464 global ui_index ui_workdir ui_comm
1465 global rescan_active file_states
1466 global repo_config
1468 if {$rescan_active > 0 || ![lock_index read]} return
1470 repository_state newType newHEAD newMERGE_HEAD
1471 if {[string match amend* $commit_type]
1472 && $newType eq {normal}
1473 && $newHEAD eq $HEAD} {
1474 } else {
1475 set HEAD $newHEAD
1476 set PARENT $newHEAD
1477 set MERGE_HEAD $newMERGE_HEAD
1478 set commit_type $newType
1481 array unset file_states
1483 if {!$::GITGUI_BCK_exists &&
1484 (![$ui_comm edit modified]
1485 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1486 if {[string match amend* $commit_type]} {
1487 } elseif {[load_message GITGUI_MSG utf-8]} {
1488 } elseif {[run_prepare_commit_msg_hook]} {
1489 } elseif {[load_message MERGE_MSG]} {
1490 } elseif {[load_message SQUASH_MSG]} {
1492 $ui_comm edit reset
1493 $ui_comm edit modified false
1496 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1497 rescan_stage2 {} $after
1498 } else {
1499 set rescan_active 1
1500 ui_status [mc "Refreshing file status..."]
1501 set fd_rf [git_read update-index \
1502 -q \
1503 --unmerged \
1504 --ignore-missing \
1505 --refresh \
1507 fconfigure $fd_rf -blocking 0 -translation binary
1508 fileevent $fd_rf readable \
1509 [list rescan_stage2 $fd_rf $after]
1513 if {[is_Cygwin]} {
1514 set is_git_info_exclude {}
1515 proc have_info_exclude {} {
1516 global is_git_info_exclude
1518 if {$is_git_info_exclude eq {}} {
1519 if {[catch {exec test -f [gitdir info exclude]}]} {
1520 set is_git_info_exclude 0
1521 } else {
1522 set is_git_info_exclude 1
1525 return $is_git_info_exclude
1527 } else {
1528 proc have_info_exclude {} {
1529 return [file readable [gitdir info exclude]]
1533 proc rescan_stage2 {fd after} {
1534 global rescan_active buf_rdi buf_rdf buf_rlo
1536 if {$fd ne {}} {
1537 read $fd
1538 if {![eof $fd]} return
1539 close $fd
1542 if {[package vsatisfies $::_git_version 1.6.3]} {
1543 set ls_others [list --exclude-standard]
1544 } else {
1545 set ls_others [list --exclude-per-directory=.gitignore]
1546 if {[have_info_exclude]} {
1547 lappend ls_others "--exclude-from=[gitdir info exclude]"
1549 set user_exclude [get_config core.excludesfile]
1550 if {$user_exclude ne {} && [file readable $user_exclude]} {
1551 lappend ls_others "--exclude-from=[file normalize $user_exclude]"
1555 set buf_rdi {}
1556 set buf_rdf {}
1557 set buf_rlo {}
1559 set rescan_active 2
1560 ui_status [mc "Scanning for modified files ..."]
1561 set fd_di [git_read diff-index --cached -z [PARENT]]
1562 set fd_df [git_read diff-files -z]
1564 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1565 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1567 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1568 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1570 if {[is_config_true gui.displayuntracked]} {
1571 set fd_lo [eval git_read ls-files --others -z $ls_others]
1572 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1573 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1574 incr rescan_active
1578 proc load_message {file {encoding {}}} {
1579 global ui_comm
1581 set f [gitdir $file]
1582 if {[file isfile $f]} {
1583 if {[catch {set fd [open $f r]}]} {
1584 return 0
1586 fconfigure $fd -eofchar {}
1587 if {$encoding ne {}} {
1588 fconfigure $fd -encoding $encoding
1590 set content [string trim [read $fd]]
1591 close $fd
1592 regsub -all -line {[ \r\t]+$} $content {} content
1593 $ui_comm delete 0.0 end
1594 $ui_comm insert end $content
1595 return 1
1597 return 0
1600 proc run_prepare_commit_msg_hook {} {
1601 global pch_error
1603 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1604 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1605 # empty file but existent file.
1607 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1609 if {[file isfile [gitdir MERGE_MSG]]} {
1610 set pcm_source "merge"
1611 set fd_mm [open [gitdir MERGE_MSG] r]
1612 puts -nonewline $fd_pcm [read $fd_mm]
1613 close $fd_mm
1614 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1615 set pcm_source "squash"
1616 set fd_sm [open [gitdir SQUASH_MSG] r]
1617 puts -nonewline $fd_pcm [read $fd_sm]
1618 close $fd_sm
1619 } else {
1620 set pcm_source ""
1623 close $fd_pcm
1625 set fd_ph [githook_read prepare-commit-msg \
1626 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1627 if {$fd_ph eq {}} {
1628 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1629 return 0;
1632 ui_status [mc "Calling prepare-commit-msg hook..."]
1633 set pch_error {}
1635 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1636 fileevent $fd_ph readable \
1637 [list prepare_commit_msg_hook_wait $fd_ph]
1639 return 1;
1642 proc prepare_commit_msg_hook_wait {fd_ph} {
1643 global pch_error
1645 append pch_error [read $fd_ph]
1646 fconfigure $fd_ph -blocking 1
1647 if {[eof $fd_ph]} {
1648 if {[catch {close $fd_ph}]} {
1649 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1650 hook_failed_popup prepare-commit-msg $pch_error
1651 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1652 exit 1
1653 } else {
1654 load_message PREPARE_COMMIT_MSG
1656 set pch_error {}
1657 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1658 return
1660 fconfigure $fd_ph -blocking 0
1661 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1664 proc read_diff_index {fd after} {
1665 global buf_rdi
1667 append buf_rdi [read $fd]
1668 set c 0
1669 set n [string length $buf_rdi]
1670 while {$c < $n} {
1671 set z1 [string first "\0" $buf_rdi $c]
1672 if {$z1 == -1} break
1673 incr z1
1674 set z2 [string first "\0" $buf_rdi $z1]
1675 if {$z2 == -1} break
1677 incr c
1678 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1679 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1680 merge_state \
1681 [encoding convertfrom $p] \
1682 [lindex $i 4]? \
1683 [list [lindex $i 0] [lindex $i 2]] \
1684 [list]
1685 set c $z2
1686 incr c
1688 if {$c < $n} {
1689 set buf_rdi [string range $buf_rdi $c end]
1690 } else {
1691 set buf_rdi {}
1694 rescan_done $fd buf_rdi $after
1697 proc read_diff_files {fd after} {
1698 global buf_rdf
1700 append buf_rdf [read $fd]
1701 set c 0
1702 set n [string length $buf_rdf]
1703 while {$c < $n} {
1704 set z1 [string first "\0" $buf_rdf $c]
1705 if {$z1 == -1} break
1706 incr z1
1707 set z2 [string first "\0" $buf_rdf $z1]
1708 if {$z2 == -1} break
1710 incr c
1711 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1712 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1713 merge_state \
1714 [encoding convertfrom $p] \
1715 ?[lindex $i 4] \
1716 [list] \
1717 [list [lindex $i 0] [lindex $i 2]]
1718 set c $z2
1719 incr c
1721 if {$c < $n} {
1722 set buf_rdf [string range $buf_rdf $c end]
1723 } else {
1724 set buf_rdf {}
1727 rescan_done $fd buf_rdf $after
1730 proc read_ls_others {fd after} {
1731 global buf_rlo
1733 append buf_rlo [read $fd]
1734 set pck [split $buf_rlo "\0"]
1735 set buf_rlo [lindex $pck end]
1736 foreach p [lrange $pck 0 end-1] {
1737 set p [encoding convertfrom $p]
1738 if {[string index $p end] eq {/}} {
1739 set p [string range $p 0 end-1]
1741 merge_state $p ?O
1743 rescan_done $fd buf_rlo $after
1746 proc rescan_done {fd buf after} {
1747 global rescan_active current_diff_path
1748 global file_states repo_config
1749 upvar $buf to_clear
1751 if {![eof $fd]} return
1752 set to_clear {}
1753 close $fd
1754 if {[incr rescan_active -1] > 0} return
1756 prune_selection
1757 unlock_index
1758 display_all_files
1759 if {$current_diff_path ne {}} { reshow_diff $after }
1760 if {$current_diff_path eq {}} { select_first_diff $after }
1763 proc prune_selection {} {
1764 global file_states selected_paths
1766 foreach path [array names selected_paths] {
1767 if {[catch {set still_here $file_states($path)}]} {
1768 unset selected_paths($path)
1773 ######################################################################
1775 ## ui helpers
1777 proc mapicon {w state path} {
1778 global all_icons
1780 if {[catch {set r $all_icons($state$w)}]} {
1781 puts "error: no icon for $w state={$state} $path"
1782 return file_plain
1784 return $r
1787 proc mapdesc {state path} {
1788 global all_descs
1790 if {[catch {set r $all_descs($state)}]} {
1791 puts "error: no desc for state={$state} $path"
1792 return $state
1794 return $r
1797 proc ui_status {msg} {
1798 global main_status
1799 if {[info exists main_status]} {
1800 $main_status show $msg
1804 proc ui_ready {{test {}}} {
1805 global main_status
1806 if {[info exists main_status]} {
1807 $main_status show [mc "Ready."] $test
1811 proc escape_path {path} {
1812 regsub -all {\\} $path "\\\\" path
1813 regsub -all "\n" $path "\\n" path
1814 return $path
1817 proc short_path {path} {
1818 return [escape_path [lindex [file split $path] end]]
1821 set next_icon_id 0
1822 set null_sha1 [string repeat 0 40]
1824 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1825 global file_states next_icon_id null_sha1
1827 set s0 [string index $new_state 0]
1828 set s1 [string index $new_state 1]
1830 if {[catch {set info $file_states($path)}]} {
1831 set state __
1832 set icon n[incr next_icon_id]
1833 } else {
1834 set state [lindex $info 0]
1835 set icon [lindex $info 1]
1836 if {$head_info eq {}} {set head_info [lindex $info 2]}
1837 if {$index_info eq {}} {set index_info [lindex $info 3]}
1840 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1841 elseif {$s0 eq {_}} {set s0 _}
1843 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1844 elseif {$s1 eq {_}} {set s1 _}
1846 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1847 set head_info [list 0 $null_sha1]
1848 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1849 && $head_info eq {}} {
1850 set head_info $index_info
1851 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1852 set index_info $head_info
1853 set head_info {}
1856 set file_states($path) [list $s0$s1 $icon \
1857 $head_info $index_info \
1859 return $state
1862 proc display_file_helper {w path icon_name old_m new_m} {
1863 global file_lists
1865 if {$new_m eq {_}} {
1866 set lno [lsearch -sorted -exact $file_lists($w) $path]
1867 if {$lno >= 0} {
1868 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1869 incr lno
1870 $w conf -state normal
1871 $w delete $lno.0 [expr {$lno + 1}].0
1872 $w conf -state disabled
1874 } elseif {$old_m eq {_} && $new_m ne {_}} {
1875 lappend file_lists($w) $path
1876 set file_lists($w) [lsort -unique $file_lists($w)]
1877 set lno [lsearch -sorted -exact $file_lists($w) $path]
1878 incr lno
1879 $w conf -state normal
1880 $w image create $lno.0 \
1881 -align center -padx 5 -pady 1 \
1882 -name $icon_name \
1883 -image [mapicon $w $new_m $path]
1884 $w insert $lno.1 "[escape_path $path]\n"
1885 $w conf -state disabled
1886 } elseif {$old_m ne $new_m} {
1887 $w conf -state normal
1888 $w image conf $icon_name -image [mapicon $w $new_m $path]
1889 $w conf -state disabled
1893 proc display_file {path state} {
1894 global file_states selected_paths
1895 global ui_index ui_workdir
1897 set old_m [merge_state $path $state]
1898 set s $file_states($path)
1899 set new_m [lindex $s 0]
1900 set icon_name [lindex $s 1]
1902 set o [string index $old_m 0]
1903 set n [string index $new_m 0]
1904 if {$o eq {U}} {
1905 set o _
1907 if {$n eq {U}} {
1908 set n _
1910 display_file_helper $ui_index $path $icon_name $o $n
1912 if {[string index $old_m 0] eq {U}} {
1913 set o U
1914 } else {
1915 set o [string index $old_m 1]
1917 if {[string index $new_m 0] eq {U}} {
1918 set n U
1919 } else {
1920 set n [string index $new_m 1]
1922 display_file_helper $ui_workdir $path $icon_name $o $n
1924 if {$new_m eq {__}} {
1925 unset file_states($path)
1926 catch {unset selected_paths($path)}
1930 proc display_all_files_helper {w path icon_name m} {
1931 global file_lists
1933 lappend file_lists($w) $path
1934 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1935 $w image create end \
1936 -align center -padx 5 -pady 1 \
1937 -name $icon_name \
1938 -image [mapicon $w $m $path]
1939 $w insert end "[escape_path $path]\n"
1942 set files_warning 0
1943 proc display_all_files {} {
1944 global ui_index ui_workdir
1945 global file_states file_lists
1946 global last_clicked
1947 global files_warning
1949 $ui_index conf -state normal
1950 $ui_workdir conf -state normal
1952 $ui_index delete 0.0 end
1953 $ui_workdir delete 0.0 end
1954 set last_clicked {}
1956 set file_lists($ui_index) [list]
1957 set file_lists($ui_workdir) [list]
1959 set to_display [lsort [array names file_states]]
1960 set display_limit [get_config gui.maxfilesdisplayed]
1961 if {[llength $to_display] > $display_limit} {
1962 if {!$files_warning} {
1963 # do not repeatedly warn:
1964 set files_warning 1
1965 info_popup [mc "Displaying only %s of %s files." \
1966 $display_limit [llength $to_display]]
1968 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1970 foreach path $to_display {
1971 set s $file_states($path)
1972 set m [lindex $s 0]
1973 set icon_name [lindex $s 1]
1975 set s [string index $m 0]
1976 if {$s ne {U} && $s ne {_}} {
1977 display_all_files_helper $ui_index $path \
1978 $icon_name $s
1981 if {[string index $m 0] eq {U}} {
1982 set s U
1983 } else {
1984 set s [string index $m 1]
1986 if {$s ne {_}} {
1987 display_all_files_helper $ui_workdir $path \
1988 $icon_name $s
1992 $ui_index conf -state disabled
1993 $ui_workdir conf -state disabled
1996 ######################################################################
1998 ## icons
2000 set filemask {
2001 #define mask_width 14
2002 #define mask_height 15
2003 static unsigned char mask_bits[] = {
2004 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2005 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2006 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2009 image create bitmap file_plain -background white -foreground black -data {
2010 #define plain_width 14
2011 #define plain_height 15
2012 static unsigned char plain_bits[] = {
2013 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2014 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2015 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2016 } -maskdata $filemask
2018 image create bitmap file_mod -background white -foreground blue -data {
2019 #define mod_width 14
2020 #define mod_height 15
2021 static unsigned char mod_bits[] = {
2022 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2023 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2024 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2025 } -maskdata $filemask
2027 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2028 #define file_fulltick_width 14
2029 #define file_fulltick_height 15
2030 static unsigned char file_fulltick_bits[] = {
2031 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2032 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2033 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2034 } -maskdata $filemask
2036 image create bitmap file_question -background white -foreground black -data {
2037 #define file_question_width 14
2038 #define file_question_height 15
2039 static unsigned char file_question_bits[] = {
2040 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2041 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2042 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2043 } -maskdata $filemask
2045 image create bitmap file_removed -background white -foreground red -data {
2046 #define file_removed_width 14
2047 #define file_removed_height 15
2048 static unsigned char file_removed_bits[] = {
2049 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2050 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2051 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2052 } -maskdata $filemask
2054 image create bitmap file_merge -background white -foreground blue -data {
2055 #define file_merge_width 14
2056 #define file_merge_height 15
2057 static unsigned char file_merge_bits[] = {
2058 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2059 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2060 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2061 } -maskdata $filemask
2063 image create bitmap file_statechange -background white -foreground green -data {
2064 #define file_statechange_width 14
2065 #define file_statechange_height 15
2066 static unsigned char file_statechange_bits[] = {
2067 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2068 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2069 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2070 } -maskdata $filemask
2072 set ui_index .vpane.files.index.list
2073 set ui_workdir .vpane.files.workdir.list
2075 set all_icons(_$ui_index) file_plain
2076 set all_icons(A$ui_index) file_plain
2077 set all_icons(M$ui_index) file_fulltick
2078 set all_icons(D$ui_index) file_removed
2079 set all_icons(U$ui_index) file_merge
2080 set all_icons(T$ui_index) file_statechange
2082 set all_icons(_$ui_workdir) file_plain
2083 set all_icons(M$ui_workdir) file_mod
2084 set all_icons(D$ui_workdir) file_question
2085 set all_icons(U$ui_workdir) file_merge
2086 set all_icons(O$ui_workdir) file_plain
2087 set all_icons(T$ui_workdir) file_statechange
2089 foreach i {
2090 {__ {mc "Unmodified"}}
2092 {_M {mc "Modified, not staged"}}
2093 {M_ {mc "Staged for commit"}}
2094 {MM {mc "Portions staged for commit"}}
2095 {MD {mc "Staged for commit, missing"}}
2097 {_T {mc "File type changed, not staged"}}
2098 {MT {mc "File type changed, old type staged for commit"}}
2099 {AT {mc "File type changed, old type staged for commit"}}
2100 {T_ {mc "File type changed, staged"}}
2101 {TM {mc "File type change staged, modification not staged"}}
2102 {TD {mc "File type change staged, file missing"}}
2104 {_O {mc "Untracked, not staged"}}
2105 {A_ {mc "Staged for commit"}}
2106 {AM {mc "Portions staged for commit"}}
2107 {AD {mc "Staged for commit, missing"}}
2109 {_D {mc "Missing"}}
2110 {D_ {mc "Staged for removal"}}
2111 {DO {mc "Staged for removal, still present"}}
2113 {_U {mc "Requires merge resolution"}}
2114 {U_ {mc "Requires merge resolution"}}
2115 {UU {mc "Requires merge resolution"}}
2116 {UM {mc "Requires merge resolution"}}
2117 {UD {mc "Requires merge resolution"}}
2118 {UT {mc "Requires merge resolution"}}
2120 set all_descs([lindex $i 0]) [eval [lindex $i 1]]
2122 unset i
2124 ######################################################################
2126 ## util
2128 proc scrollbar2many {list mode args} {
2129 foreach w $list {eval $w $mode $args}
2132 proc many2scrollbar {list mode sb top bottom} {
2133 $sb set $top $bottom
2134 foreach w $list {$w $mode moveto $top}
2137 # delegates mouse selection actions from gutter columns to the main text
2138 # widget
2139 # use delegator_bind, if you need to bind more actions
2140 proc delegate_sel_to {w from} {
2141 set bind_list [list \
2142 <Button-1> \
2143 <B1-Motion> \
2144 <Double-Button-1> \
2145 <Triple-Button-1> \
2146 <Shift-Button-1> \
2147 <Double-Shift-Button-1> \
2148 <Triple-Shift-Button-1> \
2151 foreach seq $bind_list {
2152 set script [bind Text $seq]
2153 set new_script [string map [list %W $w %x 0 word line] $script]
2154 foreach f $from {
2155 bind $f $seq "$new_script; focus $w; break"
2160 # use this for binding any of the mouse actions from a delegator
2161 # see bind_list in delegate_sel_to
2162 proc delegator_bind {tag seq script} {
2163 bind $tag $seq "$script; [bind $tag $seq]"
2166 proc incr_font_size {font {amt 1}} {
2167 set sz [font configure $font -size]
2168 incr sz $amt
2169 font configure $font -size $sz
2170 font configure ${font}bold -size $sz
2171 font configure ${font}italic -size $sz
2174 ######################################################################
2176 ## ui commands
2178 set starting_gitk_msg [mc "Starting gitk... please wait..."]
2180 proc do_gitk {revs {is_submodule false}} {
2181 global current_diff_path file_states current_diff_side ui_index
2182 global _gitdir _gitworktree
2184 # -- Always start gitk through whatever we were loaded with. This
2185 # lets us bypass using shell process on Windows systems.
2187 set exe [_which gitk -script]
2188 set cmd [list [info nameofexecutable] $exe]
2189 if {$exe eq {}} {
2190 error_popup [mc "Couldn't find gitk in PATH"]
2191 } else {
2192 global env
2194 set pwd [pwd]
2196 if {!$is_submodule} {
2197 if {![is_bare]} {
2198 cd $_gitworktree
2200 } else {
2201 cd $current_diff_path
2202 if {$revs eq {--}} {
2203 set s $file_states($current_diff_path)
2204 set old_sha1 {}
2205 set new_sha1 {}
2206 switch -glob -- [lindex $s 0] {
2207 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2208 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2209 MM {
2210 if {$current_diff_side eq $ui_index} {
2211 set old_sha1 [lindex [lindex $s 2] 1]
2212 set new_sha1 [lindex [lindex $s 3] 1]
2213 } else {
2214 set old_sha1 [lindex [lindex $s 3] 1]
2218 set revs $old_sha1...$new_sha1
2220 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2221 # we've been using for the main repository, so unset them.
2222 # TODO we could make life easier (start up faster?) for gitk
2223 # by setting these to the appropriate values to allow gitk
2224 # to skip the heuristics to find their proper value
2225 unset env(GIT_DIR)
2226 unset env(GIT_WORK_TREE)
2228 eval exec $cmd $revs "--" "--" &
2230 set env(GIT_DIR) $_gitdir
2231 set env(GIT_WORK_TREE) $_gitworktree
2232 cd $pwd
2234 ui_status $::starting_gitk_msg
2235 after 10000 {
2236 ui_ready $starting_gitk_msg
2241 proc do_git_gui {} {
2242 global current_diff_path
2244 # -- Always start git gui through whatever we were loaded with. This
2245 # lets us bypass using shell process on Windows systems.
2247 set exe [list [_which git]]
2248 if {$exe eq {}} {
2249 error_popup [mc "Couldn't find git gui in PATH"]
2250 } else {
2251 global env
2252 global _gitdir _gitworktree
2254 # see note in do_gitk about unsetting these vars when
2255 # running tools in a submodule
2256 unset env(GIT_DIR)
2257 unset env(GIT_WORK_TREE)
2259 set pwd [pwd]
2260 cd $current_diff_path
2262 eval exec $exe gui &
2264 set env(GIT_DIR) $_gitdir
2265 set env(GIT_WORK_TREE) $_gitworktree
2266 cd $pwd
2268 ui_status $::starting_gitk_msg
2269 after 10000 {
2270 ui_ready $starting_gitk_msg
2275 proc do_explore {} {
2276 global _gitworktree
2277 set explorer {}
2278 if {[is_Cygwin] || [is_Windows]} {
2279 set explorer "explorer.exe"
2280 } elseif {[is_MacOSX]} {
2281 set explorer "open"
2282 } else {
2283 # freedesktop.org-conforming system is our best shot
2284 set explorer "xdg-open"
2286 eval exec $explorer [list [file nativename $_gitworktree]] &
2289 set is_quitting 0
2290 set ret_code 1
2292 proc terminate_me {win} {
2293 global ret_code
2294 if {$win ne {.}} return
2295 exit $ret_code
2298 proc do_quit {{rc {1}}} {
2299 global ui_comm is_quitting repo_config commit_type
2300 global GITGUI_BCK_exists GITGUI_BCK_i
2301 global ui_comm_spell
2302 global ret_code use_ttk
2304 if {$is_quitting} return
2305 set is_quitting 1
2307 if {[winfo exists $ui_comm]} {
2308 # -- Stash our current commit buffer.
2310 set save [gitdir GITGUI_MSG]
2311 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2312 file rename -force [gitdir GITGUI_BCK] $save
2313 set GITGUI_BCK_exists 0
2314 } else {
2315 set msg [string trim [$ui_comm get 0.0 end]]
2316 regsub -all -line {[ \r\t]+$} $msg {} msg
2317 if {(![string match amend* $commit_type]
2318 || [$ui_comm edit modified])
2319 && $msg ne {}} {
2320 catch {
2321 set fd [open $save w]
2322 fconfigure $fd -encoding utf-8
2323 puts -nonewline $fd $msg
2324 close $fd
2326 } else {
2327 catch {file delete $save}
2331 # -- Cancel our spellchecker if its running.
2333 if {[info exists ui_comm_spell]} {
2334 $ui_comm_spell stop
2337 # -- Remove our editor backup, its not needed.
2339 after cancel $GITGUI_BCK_i
2340 if {$GITGUI_BCK_exists} {
2341 catch {file delete [gitdir GITGUI_BCK]}
2344 # -- Stash our current window geometry into this repository.
2346 set cfg_wmstate [wm state .]
2347 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2348 set rc_wmstate {}
2350 if {$cfg_wmstate ne $rc_wmstate} {
2351 catch {git config gui.wmstate $cfg_wmstate}
2353 if {$cfg_wmstate eq {zoomed}} {
2354 # on Windows wm geometry will lie about window
2355 # position (but not size) when window is zoomed
2356 # restore the window before querying wm geometry
2357 wm state . normal
2359 set cfg_geometry [list]
2360 lappend cfg_geometry [wm geometry .]
2361 if {$use_ttk} {
2362 lappend cfg_geometry [.vpane sashpos 0]
2363 lappend cfg_geometry [.vpane.files sashpos 0]
2364 } else {
2365 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2366 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2368 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2369 set rc_geometry {}
2371 if {$cfg_geometry ne $rc_geometry} {
2372 catch {git config gui.geometry $cfg_geometry}
2376 set ret_code $rc
2378 # Briefly enable send again, working around Tk bug
2379 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2380 tk appname [appname]
2382 destroy .
2385 proc do_rescan {} {
2386 rescan ui_ready
2389 proc ui_do_rescan {} {
2390 rescan {force_first_diff ui_ready}
2393 proc do_commit {} {
2394 commit_tree
2397 proc next_diff {{after {}}} {
2398 global next_diff_p next_diff_w next_diff_i
2399 show_diff $next_diff_p $next_diff_w {} {} $after
2402 proc find_anchor_pos {lst name} {
2403 set lid [lsearch -sorted -exact $lst $name]
2405 if {$lid == -1} {
2406 set lid 0
2407 foreach lname $lst {
2408 if {$lname >= $name} break
2409 incr lid
2413 return $lid
2416 proc find_file_from {flist idx delta path mmask} {
2417 global file_states
2419 set len [llength $flist]
2420 while {$idx >= 0 && $idx < $len} {
2421 set name [lindex $flist $idx]
2423 if {$name ne $path && [info exists file_states($name)]} {
2424 set state [lindex $file_states($name) 0]
2426 if {$mmask eq {} || [regexp $mmask $state]} {
2427 return $idx
2431 incr idx $delta
2434 return {}
2437 proc find_next_diff {w path {lno {}} {mmask {}}} {
2438 global next_diff_p next_diff_w next_diff_i
2439 global file_lists ui_index ui_workdir
2441 set flist $file_lists($w)
2442 if {$lno eq {}} {
2443 set lno [find_anchor_pos $flist $path]
2444 } else {
2445 incr lno -1
2448 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2449 if {$w eq $ui_index} {
2450 set mmask "^$mmask"
2451 } else {
2452 set mmask "$mmask\$"
2456 set idx [find_file_from $flist $lno 1 $path $mmask]
2457 if {$idx eq {}} {
2458 incr lno -1
2459 set idx [find_file_from $flist $lno -1 $path $mmask]
2462 if {$idx ne {}} {
2463 set next_diff_w $w
2464 set next_diff_p [lindex $flist $idx]
2465 set next_diff_i [expr {$idx+1}]
2466 return 1
2467 } else {
2468 return 0
2472 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2473 global current_diff_path
2475 if {$path ne $current_diff_path} {
2476 return {}
2477 } elseif {[find_next_diff $w $path $lno $mmask]} {
2478 return {next_diff;}
2479 } else {
2480 return {reshow_diff;}
2484 proc select_first_diff {after} {
2485 global ui_workdir
2487 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2488 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2489 next_diff $after
2490 } else {
2491 uplevel #0 $after
2495 proc force_first_diff {after} {
2496 global ui_workdir current_diff_path file_states
2498 if {[info exists file_states($current_diff_path)]} {
2499 set state [lindex $file_states($current_diff_path) 0]
2500 } else {
2501 set state {OO}
2504 set reselect 0
2505 if {[string first {U} $state] >= 0} {
2506 # Already a conflict, do nothing
2507 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2508 set reselect 1
2509 } elseif {[string index $state 1] ne {O}} {
2510 # Already a diff & no conflicts, do nothing
2511 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2512 set reselect 1
2515 if {$reselect} {
2516 next_diff $after
2517 } else {
2518 uplevel #0 $after
2522 proc toggle_or_diff {w x y} {
2523 global file_states file_lists current_diff_path ui_index ui_workdir
2524 global last_clicked selected_paths
2526 set pos [split [$w index @$x,$y] .]
2527 set lno [lindex $pos 0]
2528 set col [lindex $pos 1]
2529 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2530 if {$path eq {}} {
2531 set last_clicked {}
2532 return
2535 set last_clicked [list $w $lno]
2536 array unset selected_paths
2537 $ui_index tag remove in_sel 0.0 end
2538 $ui_workdir tag remove in_sel 0.0 end
2540 # Determine the state of the file
2541 if {[info exists file_states($path)]} {
2542 set state [lindex $file_states($path) 0]
2543 } else {
2544 set state {__}
2547 # Restage the file, or simply show the diff
2548 if {$col == 0 && $y > 1} {
2549 # Conflicts need special handling
2550 if {[string first {U} $state] >= 0} {
2551 # $w must always be $ui_workdir, but...
2552 if {$w ne $ui_workdir} { set lno {} }
2553 merge_stage_workdir $path $lno
2554 return
2557 if {[string index $state 1] eq {O}} {
2558 set mmask {}
2559 } else {
2560 set mmask {[^O]}
2563 set after [next_diff_after_action $w $path $lno $mmask]
2565 if {$w eq $ui_index} {
2566 update_indexinfo \
2567 "Unstaging [short_path $path] from commit" \
2568 [list $path] \
2569 [concat $after [list ui_ready]]
2570 } elseif {$w eq $ui_workdir} {
2571 update_index \
2572 "Adding [short_path $path]" \
2573 [list $path] \
2574 [concat $after [list ui_ready]]
2576 } else {
2577 show_diff $path $w $lno
2581 proc add_one_to_selection {w x y} {
2582 global file_lists last_clicked selected_paths
2584 set lno [lindex [split [$w index @$x,$y] .] 0]
2585 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2586 if {$path eq {}} {
2587 set last_clicked {}
2588 return
2591 if {$last_clicked ne {}
2592 && [lindex $last_clicked 0] ne $w} {
2593 array unset selected_paths
2594 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2597 set last_clicked [list $w $lno]
2598 if {[catch {set in_sel $selected_paths($path)}]} {
2599 set in_sel 0
2601 if {$in_sel} {
2602 unset selected_paths($path)
2603 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2604 } else {
2605 set selected_paths($path) 1
2606 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2610 proc add_range_to_selection {w x y} {
2611 global file_lists last_clicked selected_paths
2613 if {[lindex $last_clicked 0] ne $w} {
2614 toggle_or_diff $w $x $y
2615 return
2618 set lno [lindex [split [$w index @$x,$y] .] 0]
2619 set lc [lindex $last_clicked 1]
2620 if {$lc < $lno} {
2621 set begin $lc
2622 set end $lno
2623 } else {
2624 set begin $lno
2625 set end $lc
2628 foreach path [lrange $file_lists($w) \
2629 [expr {$begin - 1}] \
2630 [expr {$end - 1}]] {
2631 set selected_paths($path) 1
2633 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2636 proc show_more_context {} {
2637 global repo_config
2638 if {$repo_config(gui.diffcontext) < 99} {
2639 incr repo_config(gui.diffcontext)
2640 reshow_diff
2644 proc show_less_context {} {
2645 global repo_config
2646 if {$repo_config(gui.diffcontext) > 1} {
2647 incr repo_config(gui.diffcontext) -1
2648 reshow_diff
2652 ######################################################################
2654 ## ui construction
2656 set ui_comm {}
2658 # -- Menu Bar
2660 menu .mbar -tearoff 0
2661 if {[is_MacOSX]} {
2662 # -- Apple Menu (Mac OS X only)
2664 .mbar add cascade -label Apple -menu .mbar.apple
2665 menu .mbar.apple
2667 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2668 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2669 if {[is_enabled branch]} {
2670 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2672 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2673 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2675 if {[is_enabled transport]} {
2676 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2677 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2679 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2680 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2683 # -- Repository Menu
2685 menu .mbar.repository
2687 if {![is_bare]} {
2688 .mbar.repository add command \
2689 -label [mc "Explore Working Copy"] \
2690 -command {do_explore}
2693 if {[is_Windows]} {
2694 .mbar.repository add command \
2695 -label [mc "Git Bash"] \
2696 -command {eval exec [auto_execok start] \
2697 [list "Git Bash" bash --login -l &]}
2700 if {[is_Windows] || ![is_bare]} {
2701 .mbar.repository add separator
2704 .mbar.repository add command \
2705 -label [mc "Browse Current Branch's Files"] \
2706 -command {browser::new $current_branch}
2707 set ui_browse_current [.mbar.repository index last]
2708 .mbar.repository add command \
2709 -label [mc "Browse Branch Files..."] \
2710 -command browser_open::dialog
2711 .mbar.repository add separator
2713 .mbar.repository add command \
2714 -label [mc "Visualize Current Branch's History"] \
2715 -command {do_gitk $current_branch}
2716 set ui_visualize_current [.mbar.repository index last]
2717 .mbar.repository add command \
2718 -label [mc "Visualize All Branch History"] \
2719 -command {do_gitk --all}
2720 .mbar.repository add separator
2722 proc current_branch_write {args} {
2723 global current_branch
2724 .mbar.repository entryconf $::ui_browse_current \
2725 -label [mc "Browse %s's Files" $current_branch]
2726 .mbar.repository entryconf $::ui_visualize_current \
2727 -label [mc "Visualize %s's History" $current_branch]
2729 trace add variable current_branch write current_branch_write
2731 if {[is_enabled multicommit]} {
2732 .mbar.repository add command -label [mc "Database Statistics"] \
2733 -command do_stats
2735 .mbar.repository add command -label [mc "Compress Database"] \
2736 -command do_gc
2738 .mbar.repository add command -label [mc "Verify Database"] \
2739 -command do_fsck_objects
2741 .mbar.repository add separator
2743 if {[is_Cygwin]} {
2744 .mbar.repository add command \
2745 -label [mc "Create Desktop Icon"] \
2746 -command do_cygwin_shortcut
2747 } elseif {[is_Windows]} {
2748 .mbar.repository add command \
2749 -label [mc "Create Desktop Icon"] \
2750 -command do_windows_shortcut
2751 } elseif {[is_MacOSX]} {
2752 .mbar.repository add command \
2753 -label [mc "Create Desktop Icon"] \
2754 -command do_macosx_app
2758 if {[is_MacOSX]} {
2759 proc ::tk::mac::Quit {args} { do_quit }
2760 } else {
2761 .mbar.repository add command -label [mc Quit] \
2762 -command do_quit \
2763 -accelerator $M1T-Q
2766 # -- Edit Menu
2768 menu .mbar.edit
2769 .mbar.edit add command -label [mc Undo] \
2770 -command {catch {[focus] edit undo}} \
2771 -accelerator $M1T-Z
2772 .mbar.edit add command -label [mc Redo] \
2773 -command {catch {[focus] edit redo}} \
2774 -accelerator $M1T-Y
2775 .mbar.edit add separator
2776 .mbar.edit add command -label [mc Cut] \
2777 -command {catch {tk_textCut [focus]}} \
2778 -accelerator $M1T-X
2779 .mbar.edit add command -label [mc Copy] \
2780 -command {catch {tk_textCopy [focus]}} \
2781 -accelerator $M1T-C
2782 .mbar.edit add command -label [mc Paste] \
2783 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2784 -accelerator $M1T-V
2785 .mbar.edit add command -label [mc Delete] \
2786 -command {catch {[focus] delete sel.first sel.last}} \
2787 -accelerator Del
2788 .mbar.edit add separator
2789 .mbar.edit add command -label [mc "Select All"] \
2790 -command {catch {[focus] tag add sel 0.0 end}} \
2791 -accelerator $M1T-A
2793 # -- Branch Menu
2795 if {[is_enabled branch]} {
2796 menu .mbar.branch
2798 .mbar.branch add command -label [mc "Create..."] \
2799 -command branch_create::dialog \
2800 -accelerator $M1T-N
2801 lappend disable_on_lock [list .mbar.branch entryconf \
2802 [.mbar.branch index last] -state]
2804 .mbar.branch add command -label [mc "Checkout..."] \
2805 -command branch_checkout::dialog \
2806 -accelerator $M1T-O
2807 lappend disable_on_lock [list .mbar.branch entryconf \
2808 [.mbar.branch index last] -state]
2810 .mbar.branch add command -label [mc "Rename..."] \
2811 -command branch_rename::dialog
2812 lappend disable_on_lock [list .mbar.branch entryconf \
2813 [.mbar.branch index last] -state]
2815 .mbar.branch add command -label [mc "Delete..."] \
2816 -command branch_delete::dialog
2817 lappend disable_on_lock [list .mbar.branch entryconf \
2818 [.mbar.branch index last] -state]
2820 .mbar.branch add command -label [mc "Reset..."] \
2821 -command merge::reset_hard
2822 lappend disable_on_lock [list .mbar.branch entryconf \
2823 [.mbar.branch index last] -state]
2826 # -- Commit Menu
2828 proc commit_btn_caption {} {
2829 if {[is_enabled nocommit]} {
2830 return [mc "Done"]
2831 } else {
2832 return [mc Commit@@verb]
2836 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2837 menu .mbar.commit
2839 if {![is_enabled nocommit]} {
2840 .mbar.commit add radiobutton \
2841 -label [mc "New Commit"] \
2842 -command do_select_commit_type \
2843 -variable selected_commit_type \
2844 -value new
2845 lappend disable_on_lock \
2846 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2848 .mbar.commit add radiobutton \
2849 -label [mc "Amend Last Commit"] \
2850 -command do_select_commit_type \
2851 -variable selected_commit_type \
2852 -value amend
2853 lappend disable_on_lock \
2854 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2856 .mbar.commit add separator
2859 .mbar.commit add command -label [mc Rescan] \
2860 -command ui_do_rescan \
2861 -accelerator F5
2862 lappend disable_on_lock \
2863 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2865 .mbar.commit add command -label [mc "Stage To Commit"] \
2866 -command do_add_selection \
2867 -accelerator $M1T-T
2868 lappend disable_on_lock \
2869 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2871 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2872 -command do_add_all \
2873 -accelerator $M1T-I
2874 lappend disable_on_lock \
2875 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2877 .mbar.commit add command -label [mc "Unstage From Commit"] \
2878 -command do_unstage_selection \
2879 -accelerator $M1T-U
2880 lappend disable_on_lock \
2881 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2883 .mbar.commit add command -label [mc "Revert Changes"] \
2884 -command do_revert_selection \
2885 -accelerator $M1T-J
2886 lappend disable_on_lock \
2887 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2889 .mbar.commit add separator
2891 .mbar.commit add command -label [mc "Show Less Context"] \
2892 -command show_less_context \
2893 -accelerator $M1T-\-
2895 .mbar.commit add command -label [mc "Show More Context"] \
2896 -command show_more_context \
2897 -accelerator $M1T-=
2899 .mbar.commit add separator
2901 if {![is_enabled nocommitmsg]} {
2902 .mbar.commit add command -label [mc "Sign Off"] \
2903 -command do_signoff \
2904 -accelerator $M1T-S
2907 .mbar.commit add command -label [commit_btn_caption] \
2908 -command do_commit \
2909 -accelerator $M1T-Return
2910 lappend disable_on_lock \
2911 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2914 # -- Merge Menu
2916 if {[is_enabled branch]} {
2917 menu .mbar.merge
2918 .mbar.merge add command -label [mc "Local Merge..."] \
2919 -command merge::dialog \
2920 -accelerator $M1T-M
2921 lappend disable_on_lock \
2922 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2923 .mbar.merge add command -label [mc "Abort Merge..."] \
2924 -command merge::reset_hard
2925 lappend disable_on_lock \
2926 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2929 # -- Transport Menu
2931 if {[is_enabled transport]} {
2932 menu .mbar.remote
2934 .mbar.remote add command \
2935 -label [mc "Add..."] \
2936 -command remote_add::dialog \
2937 -accelerator $M1T-A
2938 .mbar.remote add command \
2939 -label [mc "Push..."] \
2940 -command do_push_anywhere \
2941 -accelerator $M1T-P
2942 .mbar.remote add command \
2943 -label [mc "Delete Branch..."] \
2944 -command remote_branch_delete::dialog
2947 if {[is_MacOSX]} {
2948 proc ::tk::mac::ShowPreferences {} {do_options}
2949 } else {
2950 # -- Edit Menu
2952 .mbar.edit add separator
2953 .mbar.edit add command -label [mc "Options..."] \
2954 -command do_options
2957 # -- Tools Menu
2959 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2960 set tools_menubar .mbar.tools
2961 menu $tools_menubar
2962 $tools_menubar add separator
2963 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2964 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2965 set tools_tailcnt 3
2966 if {[array names repo_config guitool.*.cmd] ne {}} {
2967 tools_populate_all
2971 # -- Help Menu
2973 .mbar add cascade -label [mc Help] -menu .mbar.help
2974 menu .mbar.help
2976 if {[is_MacOSX]} {
2977 .mbar.apple add command -label [mc "About %s" [appname]] \
2978 -command do_about
2979 .mbar.apple add separator
2980 } else {
2981 .mbar.help add command -label [mc "About %s" [appname]] \
2982 -command do_about
2984 . configure -menu .mbar
2986 set doc_path [githtmldir]
2987 if {$doc_path ne {}} {
2988 set doc_path [file join $doc_path index.html]
2990 if {[is_Cygwin]} {
2991 set doc_path [exec cygpath --mixed $doc_path]
2995 if {[file isfile $doc_path]} {
2996 set doc_url "file:$doc_path"
2997 } else {
2998 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
3001 proc start_browser {url} {
3002 git "web--browse" $url
3005 .mbar.help add command -label [mc "Online Documentation"] \
3006 -command [list start_browser $doc_url]
3008 .mbar.help add command -label [mc "Show SSH Key"] \
3009 -command do_ssh_key
3011 unset doc_path doc_url
3013 # -- Standard bindings
3015 wm protocol . WM_DELETE_WINDOW do_quit
3016 bind all <$M1B-Key-q> do_quit
3017 bind all <$M1B-Key-Q> do_quit
3018 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3019 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3021 set subcommand_args {}
3022 proc usage {} {
3023 set s "usage: $::argv0 $::subcommand $::subcommand_args"
3024 if {[tk windowingsystem] eq "win32"} {
3025 wm withdraw .
3026 tk_messageBox -icon info -message $s \
3027 -title [mc "Usage"]
3028 } else {
3029 puts stderr $s
3031 exit 1
3034 proc normalize_relpath {path} {
3035 set elements {}
3036 foreach item [file split $path] {
3037 if {$item eq {.}} continue
3038 if {$item eq {..} && [llength $elements] > 0
3039 && [lindex $elements end] ne {..}} {
3040 set elements [lrange $elements 0 end-1]
3041 continue
3043 lappend elements $item
3045 return [eval file join $elements]
3048 # -- Not a normal commit type invocation? Do that instead!
3050 switch -- $subcommand {
3051 browser -
3052 blame {
3053 if {$subcommand eq "blame"} {
3054 set subcommand_args {[--line=<num>] rev? path}
3055 } else {
3056 set subcommand_args {rev? path}
3058 if {$argv eq {}} usage
3059 set head {}
3060 set path {}
3061 set jump_spec {}
3062 set is_path 0
3063 foreach a $argv {
3064 set p [file join $_prefix $a]
3066 if {$is_path || [file exists $p]} {
3067 if {$path ne {}} usage
3068 set path [normalize_relpath $p]
3069 break
3070 } elseif {$a eq {--}} {
3071 if {$path ne {}} {
3072 if {$head ne {}} usage
3073 set head $path
3074 set path {}
3076 set is_path 1
3077 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
3078 if {$jump_spec ne {} || $head ne {}} usage
3079 set jump_spec [list $lnum]
3080 } elseif {$head eq {}} {
3081 if {$head ne {}} usage
3082 set head $a
3083 set is_path 1
3084 } else {
3085 usage
3088 unset is_path
3090 if {$head ne {} && $path eq {}} {
3091 if {[string index $head 0] eq {/}} {
3092 set path [normalize_relpath $head]
3093 set head {}
3094 } else {
3095 set path [normalize_relpath $_prefix$head]
3096 set head {}
3100 if {$head eq {}} {
3101 load_current_branch
3102 } else {
3103 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
3104 if {[catch {
3105 set head [git rev-parse --verify $head]
3106 } err]} {
3107 if {[tk windowingsystem] eq "win32"} {
3108 tk_messageBox -icon error -title [mc Error] -message $err
3109 } else {
3110 puts stderr $err
3112 exit 1
3115 set current_branch $head
3118 wm deiconify .
3119 switch -- $subcommand {
3120 browser {
3121 if {$jump_spec ne {}} usage
3122 if {$head eq {}} {
3123 if {$path ne {} && [file isdirectory $path]} {
3124 set head $current_branch
3125 } else {
3126 set head $path
3127 set path {}
3130 browser::new $head $path
3132 blame {
3133 if {$head eq {} && ![file exists $path]} {
3134 catch {wm withdraw .}
3135 tk_messageBox \
3136 -icon error \
3137 -type ok \
3138 -title [mc "git-gui: fatal error"] \
3139 -message [mc "fatal: cannot stat path %s: No such file or directory" $path]
3140 exit 1
3142 blame::new $head $path $jump_spec
3145 return
3147 citool -
3148 gui {
3149 if {[llength $argv] != 0} {
3150 usage
3152 # fall through to setup UI for commits
3154 default {
3155 set err "usage: $argv0 \[{blame|browser|citool}\]"
3156 if {[tk windowingsystem] eq "win32"} {
3157 wm withdraw .
3158 tk_messageBox -icon error -message $err \
3159 -title [mc "Usage"]
3160 } else {
3161 puts stderr $err
3163 exit 1
3167 # -- Branch Control
3169 ${NS}::frame .branch
3170 if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
3171 ${NS}::label .branch.l1 \
3172 -text [mc "Current Branch:"] \
3173 -anchor w \
3174 -justify left
3175 ${NS}::label .branch.cb \
3176 -textvariable current_branch \
3177 -anchor w \
3178 -justify left
3179 pack .branch.l1 -side left
3180 pack .branch.cb -side left -fill x
3181 pack .branch -side top -fill x
3183 # -- Main Window Layout
3185 ${NS}::panedwindow .vpane -orient horizontal
3186 ${NS}::panedwindow .vpane.files -orient vertical
3187 if {$use_ttk} {
3188 .vpane add .vpane.files
3189 } else {
3190 .vpane add .vpane.files -sticky nsew -height 100 -width 200
3192 pack .vpane -anchor n -side top -fill both -expand 1
3194 # -- Index File List
3196 ${NS}::frame .vpane.files.index -height 100 -width 200
3197 tlabel .vpane.files.index.title \
3198 -text [mc "Staged Changes (Will Commit)"] \
3199 -background lightgreen -foreground black
3200 text $ui_index -background white -foreground black \
3201 -borderwidth 0 \
3202 -width 20 -height 10 \
3203 -wrap none \
3204 -cursor $cursor_ptr \
3205 -xscrollcommand {.vpane.files.index.sx set} \
3206 -yscrollcommand {.vpane.files.index.sy set} \
3207 -state disabled
3208 ${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3209 ${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3210 pack .vpane.files.index.title -side top -fill x
3211 pack .vpane.files.index.sx -side bottom -fill x
3212 pack .vpane.files.index.sy -side right -fill y
3213 pack $ui_index -side left -fill both -expand 1
3215 # -- Working Directory File List
3217 ${NS}::frame .vpane.files.workdir -height 100 -width 200
3218 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
3219 -background lightsalmon -foreground black
3220 text $ui_workdir -background white -foreground black \
3221 -borderwidth 0 \
3222 -width 20 -height 10 \
3223 -wrap none \
3224 -cursor $cursor_ptr \
3225 -xscrollcommand {.vpane.files.workdir.sx set} \
3226 -yscrollcommand {.vpane.files.workdir.sy set} \
3227 -state disabled
3228 ${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3229 ${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3230 pack .vpane.files.workdir.title -side top -fill x
3231 pack .vpane.files.workdir.sx -side bottom -fill x
3232 pack .vpane.files.workdir.sy -side right -fill y
3233 pack $ui_workdir -side left -fill both -expand 1
3235 .vpane.files add .vpane.files.workdir
3236 .vpane.files add .vpane.files.index
3237 if {!$use_ttk} {
3238 .vpane.files paneconfigure .vpane.files.workdir -sticky news
3239 .vpane.files paneconfigure .vpane.files.index -sticky news
3242 foreach i [list $ui_index $ui_workdir] {
3243 rmsel_tag $i
3244 $i tag conf in_diff -background [$i tag cget in_sel -background]
3245 #$i tag conf in_diff -underline 1
3246 #$i tag conf in_sel -background {#c6e2ff} -font font_diffitalic
3247 $i tag conf in_sel -background [$i cget -background] -underline 1
3249 unset i
3251 # -- Diff and Commit Area
3253 if {$have_tk85} {
3254 ${NS}::panedwindow .vpane.lower -orient vertical
3255 ${NS}::frame .vpane.lower.commarea
3256 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
3257 .vpane.lower add .vpane.lower.diff
3258 .vpane.lower add .vpane.lower.commarea
3259 .vpane add .vpane.lower
3260 if {$use_ttk} {
3261 .vpane.lower pane .vpane.lower.diff -weight 1
3262 .vpane.lower pane .vpane.lower.commarea -weight 0
3263 } else {
3264 .vpane.lower paneconfigure .vpane.lower.diff -stretch always
3265 .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
3267 } else {
3268 frame .vpane.lower -height 300 -width 400
3269 frame .vpane.lower.commarea
3270 frame .vpane.lower.diff -relief sunken -borderwidth 1
3271 pack .vpane.lower.diff -fill both -expand 1
3272 pack .vpane.lower.commarea -side bottom -fill x
3273 .vpane add .vpane.lower
3274 .vpane paneconfigure .vpane.lower -sticky nsew
3277 # -- Commit Area Buttons
3279 ${NS}::frame .vpane.lower.commarea.buttons
3280 ${NS}::label .vpane.lower.commarea.buttons.l -text {} \
3281 -anchor w \
3282 -justify left
3283 pack .vpane.lower.commarea.buttons.l -side top -fill x
3284 pack .vpane.lower.commarea.buttons -side left -fill y
3286 ${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3287 -command ui_do_rescan
3288 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3289 lappend disable_on_lock \
3290 {.vpane.lower.commarea.buttons.rescan conf -state}
3292 ${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3293 -command do_add_all
3294 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3295 lappend disable_on_lock \
3296 {.vpane.lower.commarea.buttons.incall conf -state}
3298 if {![is_enabled nocommitmsg]} {
3299 ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3300 -command do_signoff
3301 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3304 ${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3305 -command do_commit
3306 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3307 lappend disable_on_lock \
3308 {.vpane.lower.commarea.buttons.commit conf -state}
3310 if {![is_enabled nocommit]} {
3311 ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
3312 -command do_push_anywhere
3313 pack .vpane.lower.commarea.buttons.push -side top -fill x
3316 # -- Commit Message Buffer
3318 ${NS}::frame .vpane.lower.commarea.buffer
3319 ${NS}::frame .vpane.lower.commarea.buffer.header
3320 set ui_comm .vpane.lower.commarea.buffer.t
3321 set ui_coml .vpane.lower.commarea.buffer.header.l
3323 if {![is_enabled nocommit]} {
3324 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3325 -text [mc "New Commit"] \
3326 -command do_select_commit_type \
3327 -variable selected_commit_type \
3328 -value new
3329 lappend disable_on_lock \
3330 [list .vpane.lower.commarea.buffer.header.new conf -state]
3331 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3332 -text [mc "Amend Last Commit"] \
3333 -command do_select_commit_type \
3334 -variable selected_commit_type \
3335 -value amend
3336 lappend disable_on_lock \
3337 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3340 ${NS}::label $ui_coml \
3341 -anchor w \
3342 -justify left
3343 proc trace_commit_type {varname args} {
3344 global ui_coml commit_type
3345 switch -glob -- $commit_type {
3346 initial {set txt [mc "Initial Commit Message:"]}
3347 amend {set txt [mc "Amended Commit Message:"]}
3348 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3349 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3350 merge {set txt [mc "Merge Commit Message:"]}
3351 * {set txt [mc "Commit Message:"]}
3353 $ui_coml conf -text $txt
3355 trace add variable commit_type write trace_commit_type
3356 pack $ui_coml -side left -fill x
3358 if {![is_enabled nocommit]} {
3359 pack .vpane.lower.commarea.buffer.header.amend -side right
3360 pack .vpane.lower.commarea.buffer.header.new -side right
3363 text $ui_comm -background white -foreground black \
3364 -borderwidth 1 \
3365 -undo true \
3366 -maxundo 20 \
3367 -autoseparators true \
3368 -relief sunken \
3369 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3370 -font font_diff \
3371 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3372 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3373 -command [list $ui_comm yview]
3374 pack .vpane.lower.commarea.buffer.header -side top -fill x
3375 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3376 pack $ui_comm -side left -fill y
3377 pack .vpane.lower.commarea.buffer -side left -fill y
3379 # -- Commit Message Buffer Context Menu
3381 set ui_comm_ctxm .vpane.lower.commarea.buffer.ctxm
3382 menu $ui_comm_ctxm -tearoff 0
3383 $ui_comm_ctxm add command \
3384 -label [mc Cut] \
3385 -command {tk_textCut $ui_comm}
3386 $ui_comm_ctxm add command \
3387 -label [mc Copy] \
3388 -command {tk_textCopy $ui_comm}
3389 $ui_comm_ctxm add command \
3390 -label [mc Paste] \
3391 -command {tk_textPaste $ui_comm}
3392 $ui_comm_ctxm add command \
3393 -label [mc Delete] \
3394 -command {catch {$ui_comm delete sel.first sel.last}}
3395 $ui_comm_ctxm add separator
3396 $ui_comm_ctxm add command \
3397 -label [mc "Select All"] \
3398 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3399 $ui_comm_ctxm add command \
3400 -label [mc "Copy All"] \
3401 -command {
3402 $ui_comm tag add sel 0.0 end
3403 tk_textCopy $ui_comm
3404 $ui_comm tag remove sel 0.0 end
3406 $ui_comm_ctxm add separator
3407 $ui_comm_ctxm add command \
3408 -label [mc "Sign Off"] \
3409 -command do_signoff
3411 # -- Diff Header
3413 proc trace_current_diff_path {varname args} {
3414 global current_diff_path diff_actions file_states
3415 if {$current_diff_path eq {}} {
3416 set s {}
3417 set f {}
3418 set p {}
3419 set o disabled
3420 } else {
3421 set p $current_diff_path
3422 set s [mapdesc [lindex $file_states($p) 0] $p]
3423 set f [mc "File:"]
3424 set p [escape_path $p]
3425 set o normal
3428 .vpane.lower.diff.header.status configure -text $s
3429 .vpane.lower.diff.header.file configure -text $f
3430 .vpane.lower.diff.header.path configure -text $p
3431 foreach w $diff_actions {
3432 uplevel #0 $w $o
3435 trace add variable current_diff_path write trace_current_diff_path
3437 gold_frame .vpane.lower.diff.header
3438 tlabel .vpane.lower.diff.header.status \
3439 -background gold \
3440 -foreground black \
3441 -anchor w \
3442 -justify left
3443 tlabel .vpane.lower.diff.header.file \
3444 -background gold \
3445 -foreground black \
3446 -anchor w \
3447 -justify left
3448 tlabel .vpane.lower.diff.header.path \
3449 -background gold \
3450 -foreground black \
3451 -anchor w \
3452 -justify left
3453 pack .vpane.lower.diff.header.status -side left
3454 pack .vpane.lower.diff.header.path -side right -fill x
3455 pack .vpane.lower.diff.header.file -side right
3456 set hctxm .vpane.lower.diff.header.ctxm
3457 menu $hctxm -tearoff 0
3458 $hctxm add command \
3459 -label [mc Copy] \
3460 -command {
3461 clipboard clear
3462 clipboard append \
3463 -format STRING \
3464 -type STRING \
3465 -- $current_diff_path
3467 lappend diff_actions [list $hctxm entryconf [$hctxm index last] -state]
3468 bind_button3 .vpane.lower.diff.header.path "tk_popup $hctxm %X %Y"
3470 # -- Diff Body
3472 ${NS}::frame .vpane.lower.diff.body
3473 set ui_diff .vpane.lower.diff.body.t
3474 text $ui_diff -background white -foreground black \
3475 -borderwidth 0 \
3476 -width 80 -height 5 -wrap none \
3477 -font font_diff \
3478 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3479 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3480 -state disabled
3481 catch {$ui_diff configure -tabstyle wordprocessor}
3482 ${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3483 -command [list $ui_diff xview]
3484 ${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
3485 -command [list $ui_diff yview]
3486 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3487 pack .vpane.lower.diff.body.sby -side right -fill y
3488 pack $ui_diff -side left -fill both -expand 1
3489 pack .vpane.lower.diff.header -side top -fill x
3490 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3492 foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 grey60} {
3493 $ui_diff tag configure clr4$n -background $c
3494 $ui_diff tag configure clri4$n -foreground $c
3495 $ui_diff tag configure clr3$n -foreground $c
3496 $ui_diff tag configure clri3$n -background $c
3498 $ui_diff tag configure clr1 -font font_diffbold
3499 $ui_diff tag configure clr4 -underline 1
3501 $ui_diff tag conf d_info -foreground blue -font font_diffbold
3503 $ui_diff tag conf d_cr -elide true
3504 $ui_diff tag conf d_@ -font font_diffbold
3505 $ui_diff tag conf d_+ -foreground {#00a000}
3506 $ui_diff tag conf d_- -foreground red
3508 $ui_diff tag conf d_++ -foreground {#00a000}
3509 $ui_diff tag conf d_-- -foreground red
3510 $ui_diff tag conf d_+s \
3511 -foreground {#00a000} \
3512 -background {#e2effa}
3513 $ui_diff tag conf d_-s \
3514 -foreground red \
3515 -background {#e2effa}
3516 $ui_diff tag conf d_s+ \
3517 -foreground {#00a000} \
3518 -background ivory1
3519 $ui_diff tag conf d_s- \
3520 -foreground red \
3521 -background ivory1
3523 $ui_diff tag conf d< \
3524 -foreground orange \
3525 -font font_diffbold
3526 $ui_diff tag conf d| \
3527 -foreground orange \
3528 -font font_diffbold
3529 $ui_diff tag conf d= \
3530 -foreground orange \
3531 -font font_diffbold
3532 $ui_diff tag conf d> \
3533 -foreground orange \
3534 -font font_diffbold
3536 $ui_diff tag raise sel
3538 # -- Diff Body Context Menu
3541 proc create_common_diff_popup {ctxm} {
3542 $ctxm add command \
3543 -label [mc Refresh] \
3544 -command reshow_diff
3545 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3546 $ctxm add command \
3547 -label [mc Copy] \
3548 -command {tk_textCopy $ui_diff}
3549 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3550 $ctxm add command \
3551 -label [mc "Select All"] \
3552 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3553 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3554 $ctxm add command \
3555 -label [mc "Copy All"] \
3556 -command {
3557 $ui_diff tag add sel 0.0 end
3558 tk_textCopy $ui_diff
3559 $ui_diff tag remove sel 0.0 end
3561 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3562 $ctxm add separator
3563 $ctxm add command \
3564 -label [mc "Decrease Font Size"] \
3565 -command {incr_font_size font_diff -1}
3566 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3567 $ctxm add command \
3568 -label [mc "Increase Font Size"] \
3569 -command {incr_font_size font_diff 1}
3570 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3571 $ctxm add separator
3572 set emenu $ctxm.enc
3573 menu $emenu
3574 build_encoding_menu $emenu [list force_diff_encoding]
3575 $ctxm add cascade \
3576 -label [mc "Encoding"] \
3577 -menu $emenu
3578 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3579 $ctxm add separator
3580 $ctxm add command -label [mc "Options..."] \
3581 -command do_options
3584 set ctxmw .vpane.lower.diff.body.ctxmw
3585 menu $ctxmw -tearoff 0
3586 $ctxmw add command \
3587 -label [mc "Apply/Reverse Hunk"] \
3588 -command {apply_hunk $cursorX $cursorY}
3589 set ui_diff_applyhunk [$ctxmw index last]
3590 lappend diff_actions [list $ctxmw entryconf $ui_diff_applyhunk -state]
3591 $ctxmw add command \
3592 -label [mc "Apply/Reverse Line"] \
3593 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3594 set ui_diff_applyline [$ctxmw index last]
3595 lappend diff_actions [list $ctxmw entryconf $ui_diff_applyline -state]
3596 $ctxmw add separator
3597 $ctxmw add command \
3598 -label [mc "Revert Hunk"] \
3599 -command {apply_hunk $cursorX $cursorY 1}
3600 lappend diff_actions [list $ctxmw entryconf $ui_diff_applyhunk -state]
3601 $ctxmw add command \
3602 -label [mc "Revert Line"] \
3603 -command {apply_range_or_line $cursorX $cursorY 1; do_rescan}
3604 set ui_diff_revertline [$ctxmw index last]
3605 lappend diff_actions [list $ctxmw entryconf $ui_diff_applyline -state]
3606 $ctxmw add separator
3607 $ctxmw add command \
3608 -label [mc "Show Less Context"] \
3609 -command show_less_context
3610 lappend diff_actions [list $ctxmw entryconf [$ctxmw index last] -state]
3611 $ctxmw add command \
3612 -label [mc "Show More Context"] \
3613 -command show_more_context
3614 lappend diff_actions [list $ctxmw entryconf [$ctxmw index last] -state]
3615 $ctxmw add separator
3616 create_common_diff_popup $ctxmw
3618 set ctxmi .vpane.lower.diff.body.ctxmi
3619 menu $ctxmi -tearoff 0
3620 $ctxmi add command \
3621 -label [mc "Apply/Reverse Hunk"] \
3622 -command {apply_hunk $cursorX $cursorY}
3623 lappend diff_actions [list $ctxmi entryconf $ui_diff_applyhunk -state]
3624 $ctxmi add command \
3625 -label [mc "Apply/Reverse Line"] \
3626 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3627 lappend diff_actions [list $ctxmi entryconf $ui_diff_applyline -state]
3628 $ctxmi add separator
3629 $ctxmi add command \
3630 -label [mc "Show Less Context"] \
3631 -command show_less_context
3632 lappend diff_actions [list $ctxmi entryconf [$ctxmi index last] -state]
3633 $ctxmi add command \
3634 -label [mc "Show More Context"] \
3635 -command show_more_context
3636 lappend diff_actions [list $ctxmi entryconf [$ctxmi index last] -state]
3637 $ctxmi add separator
3638 create_common_diff_popup $ctxmi
3640 set ctxmmg .vpane.lower.diff.body.ctxmmg
3641 menu $ctxmmg -tearoff 0
3642 $ctxmmg add command \
3643 -label [mc "Run Merge Tool"] \
3644 -command {merge_resolve_tool}
3645 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3646 $ctxmmg add separator
3647 $ctxmmg add command \
3648 -label [mc "Use Remote Version"] \
3649 -command {merge_resolve_one 3}
3650 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3651 $ctxmmg add command \
3652 -label [mc "Use Local Version"] \
3653 -command {merge_resolve_one 2}
3654 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3655 $ctxmmg add command \
3656 -label [mc "Revert To Base"] \
3657 -command {merge_resolve_one 1}
3658 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3659 $ctxmmg add separator
3660 $ctxmmg add command \
3661 -label [mc "Show Less Context"] \
3662 -command show_less_context
3663 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3664 $ctxmmg add command \
3665 -label [mc "Show More Context"] \
3666 -command show_more_context
3667 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3668 $ctxmmg add separator
3669 create_common_diff_popup $ctxmmg
3671 set ctxmsm .vpane.lower.diff.body.ctxmsm
3672 menu $ctxmsm -tearoff 0
3673 $ctxmsm add command \
3674 -label [mc "Visualize These Changes In The Submodule"] \
3675 -command {do_gitk -- true}
3676 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3677 $ctxmsm add command \
3678 -label [mc "Visualize Current Branch History In The Submodule"] \
3679 -command {do_gitk {} true}
3680 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3681 $ctxmsm add command \
3682 -label [mc "Visualize All Branch History In The Submodule"] \
3683 -command {do_gitk --all true}
3684 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3685 $ctxmsm add separator
3686 $ctxmsm add command \
3687 -label [mc "Start git gui In The Submodule"] \
3688 -command {do_git_gui}
3689 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3690 $ctxmsm add separator
3691 create_common_diff_popup $ctxmsm
3693 proc has_textconv {path} {
3694 if {[is_config_false gui.textconv]} {
3695 return 0
3697 set filter [gitattr $path diff set]
3698 set textconv [get_config [join [list diff $filter textconv] .]]
3699 if {$filter ne {set} && $textconv ne {}} {
3700 return 1
3701 } else {
3702 return 0
3706 proc popup_diff_menu {ctxmw ctxmi ctxmmg ctxmsm x y X Y} {
3707 global current_diff_path file_states
3708 set ::cursorX $x
3709 set ::cursorY $y
3710 if {[info exists file_states($current_diff_path)]} {
3711 set state [lindex $file_states($current_diff_path) 0]
3712 } else {
3713 set state {__}
3715 if {[string first {U} $state] >= 0} {
3716 tk_popup $ctxmmg $X $Y
3717 } elseif {$::is_submodule_diff} {
3718 tk_popup $ctxmsm $X $Y
3719 } else {
3720 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3721 if {$::ui_index eq $::current_diff_side} {
3722 set ctxm $ctxmi
3723 set l [mc "Unstage Hunk From Commit"]
3724 if {$has_range} {
3725 set t [mc "Unstage Lines From Commit"]
3726 } else {
3727 set t [mc "Unstage Line From Commit"]
3729 } else {
3730 set ctxm $ctxmw
3731 set l [mc "Stage Hunk For Commit"]
3732 if {$has_range} {
3733 set t [mc "Stage Lines For Commit"]
3734 set r [mc "Revert Lines"]
3735 } else {
3736 set t [mc "Stage Line For Commit"]
3737 set r [mc "Revert Line"]
3740 if {$::is_3way_diff
3741 || $current_diff_path eq {}
3742 || {__} eq $state
3743 || {_O} eq $state
3744 || [string match {?T} $state]
3745 || [string match {T?} $state]
3746 || [has_textconv $current_diff_path]} {
3747 set s disabled
3748 } else {
3749 set s normal
3751 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3752 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3753 if {$::ui_workdir eq $::current_diff_side} {
3754 $ctxm entryconf $::ui_diff_revertline -state $s -label $r
3756 tk_popup $ctxm $X $Y
3759 bind_button3 $ui_diff [list popup_diff_menu $ctxmw $ctxmi $ctxmmg $ctxmsm %x %y %X %Y]
3761 # -- Status Bar
3763 set main_status [::status_bar::new .status]
3764 pack .status -anchor w -side bottom -fill x
3765 $main_status show [mc "Initializing..."]
3767 # -- Load geometry
3769 proc on_ttk_pane_mapped {w pane pos} {
3770 bind $w <Map> {}
3771 after 0 [list after idle [list $w sashpos $pane $pos]]
3773 proc on_tk_pane_mapped {w pane x y} {
3774 bind $w <Map> {}
3775 after 0 [list after idle [list $w sash place $pane $x $y]]
3777 proc on_application_mapped {} {
3778 global repo_config use_ttk
3779 bind . <Map> {}
3780 set gm $repo_config(gui.geometry)
3781 if {$use_ttk} {
3782 bind .vpane <Map> \
3783 [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
3784 bind .vpane.files <Map> \
3785 [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
3786 } else {
3787 bind .vpane <Map> \
3788 [list on_tk_pane_mapped %W 0 \
3789 [lindex $gm 1] \
3790 [lindex [.vpane sash coord 0] 1]]
3791 bind .vpane.files <Map> \
3792 [list on_tk_pane_mapped %W 0 \
3793 [lindex [.vpane.files sash coord 0] 0] \
3794 [lindex $gm 2]]
3796 wm geometry . [lindex $gm 0]
3798 if {[info exists repo_config(gui.geometry)]} {
3799 bind . <Map> [list on_application_mapped]
3800 wm geometry . [lindex $repo_config(gui.geometry) 0]
3803 # -- Load window state
3805 if {[info exists repo_config(gui.wmstate)]} {
3806 catch {wm state . $repo_config(gui.wmstate)}
3809 # -- Key Bindings
3811 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3812 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3813 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3814 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3815 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3816 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3817 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3818 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3819 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3820 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3821 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3822 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3823 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3824 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3825 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3826 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3827 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3828 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3829 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3830 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3831 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3832 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3834 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3835 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3836 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3837 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3838 bind $ui_diff <$M1B-Key-v> {break}
3839 bind $ui_diff <$M1B-Key-V> {break}
3840 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3841 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3842 bind $ui_diff <$M1B-Key-j> {do_revert_selection;break}
3843 bind $ui_diff <$M1B-Key-J> {do_revert_selection;break}
3844 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3845 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3846 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3847 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3848 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3849 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3850 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3851 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3852 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3853 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3854 bind $ui_diff <Button-1> {focus %W}
3856 if {[is_enabled branch]} {
3857 bind . <$M1B-Key-n> branch_create::dialog
3858 bind . <$M1B-Key-N> branch_create::dialog
3859 bind . <$M1B-Key-o> branch_checkout::dialog
3860 bind . <$M1B-Key-O> branch_checkout::dialog
3861 bind . <$M1B-Key-m> merge::dialog
3862 bind . <$M1B-Key-M> merge::dialog
3864 if {[is_enabled transport]} {
3865 bind . <$M1B-Key-p> do_push_anywhere
3866 bind . <$M1B-Key-P> do_push_anywhere
3869 bind . <Key-F5> ui_do_rescan
3870 bind . <$M1B-Key-r> ui_do_rescan
3871 bind . <$M1B-Key-R> ui_do_rescan
3872 bind . <$M1B-Key-s> do_signoff
3873 bind . <$M1B-Key-S> do_signoff
3874 bind . <$M1B-Key-t> do_add_selection
3875 bind . <$M1B-Key-T> do_add_selection
3876 bind . <$M1B-Key-u> do_unstage_selection
3877 bind . <$M1B-Key-U> do_unstage_selection
3878 bind . <$M1B-Key-j> do_revert_selection
3879 bind . <$M1B-Key-J> do_revert_selection
3880 bind . <$M1B-Key-i> do_add_all
3881 bind . <$M1B-Key-I> do_add_all
3882 bind . <$M1B-Key-minus> {show_less_context;break}
3883 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3884 bind . <$M1B-Key-equal> {show_more_context;break}
3885 bind . <$M1B-Key-plus> {show_more_context;break}
3886 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3887 bind . <$M1B-Key-Return> do_commit
3888 foreach i [list $ui_index $ui_workdir] {
3889 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3890 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3891 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3893 unset i
3895 set file_lists($ui_index) [list]
3896 set file_lists($ui_workdir) [list]
3898 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3899 focus -force $ui_comm
3901 # -- Warn the user about environmental problems. Cygwin's Tcl
3902 # does *not* pass its env array onto any processes it spawns.
3903 # This means that git processes get none of our environment.
3905 if {[is_Cygwin]} {
3906 set ignored_env 0
3907 set suggest_user {}
3908 set msg [mc "Possible environment issues exist.
3910 The following environment variables are probably
3911 going to be ignored by any Git subprocess run
3912 by %s:
3914 " [appname]]
3915 foreach name [array names env] {
3916 switch -regexp -- $name {
3917 {^GIT_INDEX_FILE$} -
3918 {^GIT_OBJECT_DIRECTORY$} -
3919 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3920 {^GIT_DIFF_OPTS$} -
3921 {^GIT_EXTERNAL_DIFF$} -
3922 {^GIT_PAGER$} -
3923 {^GIT_TRACE$} -
3924 {^GIT_CONFIG$} -
3925 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3926 append msg " - $name\n"
3927 incr ignored_env
3929 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3930 append msg " - $name\n"
3931 incr ignored_env
3932 set suggest_user $name
3936 if {$ignored_env > 0} {
3937 append msg [mc "
3938 This is due to a known issue with the
3939 Tcl binary distributed by Cygwin."]
3941 if {$suggest_user ne {}} {
3942 append msg [mc "
3944 A good replacement for %s
3945 is placing values for the user.name and
3946 user.email settings into your personal
3947 ~/.gitconfig file.
3948 " $suggest_user]
3950 warn_popup $msg
3952 unset ignored_env msg suggest_user name
3955 # -- Only initialize complex UI if we are going to stay running.
3957 if {[is_enabled transport]} {
3958 load_all_remotes
3960 set n [.mbar.remote index end]
3961 populate_remotes_menu
3962 set n [expr {[.mbar.remote index end] - $n}]
3963 if {$n > 0} {
3964 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3965 .mbar.remote insert $n separator
3967 unset n
3970 if {[winfo exists $ui_comm]} {
3971 set GITGUI_BCK_exists [load_message GITGUI_BCK utf-8]
3973 # -- If both our backup and message files exist use the
3974 # newer of the two files to initialize the buffer.
3976 if {$GITGUI_BCK_exists} {
3977 set m [gitdir GITGUI_MSG]
3978 if {[file isfile $m]} {
3979 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3980 catch {file delete [gitdir GITGUI_MSG]}
3981 } else {
3982 $ui_comm delete 0.0 end
3983 $ui_comm edit reset
3984 $ui_comm edit modified false
3985 catch {file delete [gitdir GITGUI_BCK]}
3986 set GITGUI_BCK_exists 0
3989 unset m
3992 proc backup_commit_buffer {} {
3993 global ui_comm GITGUI_BCK_exists
3995 set m [$ui_comm edit modified]
3996 if {$m || $GITGUI_BCK_exists} {
3997 set msg [string trim [$ui_comm get 0.0 end]]
3998 regsub -all -line {[ \r\t]+$} $msg {} msg
4000 if {$msg eq {}} {
4001 if {$GITGUI_BCK_exists} {
4002 catch {file delete [gitdir GITGUI_BCK]}
4003 set GITGUI_BCK_exists 0
4005 } elseif {$m} {
4006 catch {
4007 set fd [open [gitdir GITGUI_BCK] w]
4008 fconfigure $fd -encoding utf-8
4009 puts -nonewline $fd $msg
4010 close $fd
4011 set GITGUI_BCK_exists 1
4015 $ui_comm edit modified false
4018 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
4021 backup_commit_buffer
4023 # -- If the user has aspell available we can drive it
4024 # in pipe mode to spellcheck the commit message.
4026 set spell_cmd [list |]
4027 set spell_dict [get_config gui.spellingdictionary]
4028 lappend spell_cmd aspell
4029 if {$spell_dict ne {}} {
4030 lappend spell_cmd --master=$spell_dict
4032 lappend spell_cmd --mode=none
4033 lappend spell_cmd --encoding=utf-8
4034 lappend spell_cmd pipe
4035 if {$spell_dict eq {none}
4036 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
4037 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
4038 } else {
4039 set ui_comm_spell [spellcheck::init \
4040 $spell_fd \
4041 $ui_comm \
4042 $ui_comm_ctxm \
4045 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4048 lock_index begin-read
4049 if {![winfo ismapped .]} {
4050 wm deiconify .
4052 after 1 {
4053 if {[is_enabled initialamend]} {
4054 force_amend
4055 } else {
4056 do_rescan
4059 if {[is_enabled nocommitmsg]} {
4060 $ui_comm configure -state disabled -background gray
4063 if {[is_enabled multicommit] && ![is_config_false gui.gcwarning]} {
4064 after 1000 hint_gc
4066 if {[is_enabled retcode]} {
4067 bind . <Destroy> {+terminate_me %W}
4069 if {$picked && [is_config_true gui.autoexplore]} {
4070 do_explore
4073 # Local variables:
4074 # mode: tcl
4075 # indent-tabs-mode: t
4076 # tab-width: 4
4077 # End: