Merge branch 'maint'
[git/git-p4.git] / git-gui.sh
blob7c25bb98089ec4c0a57993020a30d2d1afad8dae
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 [encoding convertfrom utf-8 {
14 Copyright © 2006, 2007 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 [mc "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 dirname [file normalize $argv0]]]
56 set oguilib [file join $oguilib share git-gui lib]
57 set oguimsg [file join $oguilib msgs]
58 } elseif {[string match @@* $oguirel]} {
59 set oguilib [file join [file dirname [file normalize $argv0]] lib]
60 set oguimsg [file join [file dirname [file normalize $argv0]] po]
61 } else {
62 set oguimsg [file join $oguilib msgs]
64 unset oguirel
66 ######################################################################
68 ## enable verbose loading?
70 if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
71 unset _verbose
72 rename auto_load real__auto_load
73 proc auto_load {name args} {
74 puts stderr "auto_load $name"
75 return [uplevel 1 real__auto_load $name $args]
77 rename source real__source
78 proc source {name} {
79 puts stderr "source $name"
80 uplevel 1 real__source $name
84 ######################################################################
86 ## Internationalization (i18n) through msgcat and gettext. See
87 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
89 package require msgcat
91 proc _mc_trim {fmt} {
92 set cmk [string first @@ $fmt]
93 if {$cmk > 0} {
94 return [string range $fmt 0 [expr {$cmk - 1}]]
96 return $fmt
99 proc mc {en_fmt args} {
100 set fmt [_mc_trim [::msgcat::mc $en_fmt]]
101 if {[catch {set msg [eval [list format $fmt] $args]} err]} {
102 set msg [eval [list format [_mc_trim $en_fmt]] $args]
104 return $msg
107 proc strcat {args} {
108 return [join $args {}]
111 ::msgcat::mcload $oguimsg
112 unset oguimsg
114 ######################################################################
116 ## read only globals
118 set _appname {Git Gui}
119 set _gitdir {}
120 set _gitexec {}
121 set _reponame {}
122 set _iscygwin {}
123 set _search_path {}
125 proc appname {} {
126 global _appname
127 return $_appname
130 proc gitdir {args} {
131 global _gitdir
132 if {$args eq {}} {
133 return $_gitdir
135 return [eval [list file join $_gitdir] $args]
138 proc gitexec {args} {
139 global _gitexec
140 if {$_gitexec eq {}} {
141 if {[catch {set _gitexec [git --exec-path]} err]} {
142 error "Git not installed?\n\n$err"
144 if {[is_Cygwin]} {
145 set _gitexec [exec cygpath \
146 --windows \
147 --absolute \
148 $_gitexec]
149 } else {
150 set _gitexec [file normalize $_gitexec]
153 if {$args eq {}} {
154 return $_gitexec
156 return [eval [list file join $_gitexec] $args]
159 proc reponame {} {
160 return $::_reponame
163 proc is_MacOSX {} {
164 if {[tk windowingsystem] eq {aqua}} {
165 return 1
167 return 0
170 proc is_Windows {} {
171 if {$::tcl_platform(platform) eq {windows}} {
172 return 1
174 return 0
177 proc is_Cygwin {} {
178 global _iscygwin
179 if {$_iscygwin eq {}} {
180 if {$::tcl_platform(platform) eq {windows}} {
181 if {[catch {set p [exec cygpath --windir]} err]} {
182 set _iscygwin 0
183 } else {
184 set _iscygwin 1
186 } else {
187 set _iscygwin 0
190 return $_iscygwin
193 proc is_enabled {option} {
194 global enabled_options
195 if {[catch {set on $enabled_options($option)}]} {return 0}
196 return $on
199 proc enable_option {option} {
200 global enabled_options
201 set enabled_options($option) 1
204 proc disable_option {option} {
205 global enabled_options
206 set enabled_options($option) 0
209 ######################################################################
211 ## config
213 proc is_many_config {name} {
214 switch -glob -- $name {
215 gui.recentrepo -
216 remote.*.fetch -
217 remote.*.push
218 {return 1}
220 {return 0}
224 proc is_config_true {name} {
225 global repo_config
226 if {[catch {set v $repo_config($name)}]} {
227 return 0
228 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
229 return 1
230 } else {
231 return 0
235 proc get_config {name} {
236 global repo_config
237 if {[catch {set v $repo_config($name)}]} {
238 return {}
239 } else {
240 return $v
244 ######################################################################
246 ## handy utils
248 proc _git_cmd {name} {
249 global _git_cmd_path
251 if {[catch {set v $_git_cmd_path($name)}]} {
252 switch -- $name {
253 version -
254 --version -
255 --exec-path { return [list $::_git $name] }
258 set p [gitexec git-$name$::_search_exe]
259 if {[file exists $p]} {
260 set v [list $p]
261 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
262 # Try to determine what sort of magic will make
263 # git-$name go and do its thing, because native
264 # Tcl on Windows doesn't know it.
266 set p [gitexec git-$name]
267 set f [open $p r]
268 set s [gets $f]
269 close $f
271 switch -glob -- [lindex $s 0] {
272 #!*sh { set i sh }
273 #!*perl { set i perl }
274 #!*python { set i python }
275 default { error "git-$name is not supported: $s" }
278 upvar #0 _$i interp
279 if {![info exists interp]} {
280 set interp [_which $i]
282 if {$interp eq {}} {
283 error "git-$name requires $i (not in PATH)"
285 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
286 } else {
287 # Assume it is builtin to git somehow and we
288 # aren't actually able to see a file for it.
290 set v [list $::_git $name]
292 set _git_cmd_path($name) $v
294 return $v
297 proc _which {what} {
298 global env _search_exe _search_path
300 if {$_search_path eq {}} {
301 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
302 set _search_path [split [exec cygpath \
303 --windows \
304 --path \
305 --absolute \
306 $env(PATH)] {;}]
307 set _search_exe .exe
308 } elseif {[is_Windows]} {
309 set gitguidir [file dirname [info script]]
310 regsub -all ";" $gitguidir "\\;" gitguidir
311 set env(PATH) "$gitguidir;$env(PATH)"
312 set _search_path [split $env(PATH) {;}]
313 set _search_exe .exe
314 } else {
315 set _search_path [split $env(PATH) :]
316 set _search_exe {}
320 foreach p $_search_path {
321 set p [file join $p $what$_search_exe]
322 if {[file exists $p]} {
323 return [file normalize $p]
326 return {}
329 proc _lappend_nice {cmd_var} {
330 global _nice
331 upvar $cmd_var cmd
333 if {![info exists _nice]} {
334 set _nice [_which nice]
336 if {$_nice ne {}} {
337 lappend cmd $_nice
341 proc git {args} {
342 set opt [list exec]
344 while {1} {
345 switch -- [lindex $args 0] {
346 --nice {
347 _lappend_nice opt
350 default {
351 break
356 set args [lrange $args 1 end]
359 set cmdp [_git_cmd [lindex $args 0]]
360 set args [lrange $args 1 end]
362 return [eval $opt $cmdp $args]
365 proc _open_stdout_stderr {cmd} {
366 if {[catch {
367 set fd [open $cmd r]
368 } err]} {
369 if { [lindex $cmd end] eq {2>@1}
370 && $err eq {can not find channel named "1"}
372 # Older versions of Tcl 8.4 don't have this 2>@1 IO
373 # redirect operator. Fallback to |& cat for those.
374 # The command was not actually started, so its safe
375 # to try to start it a second time.
377 set fd [open [concat \
378 [lrange $cmd 0 end-1] \
379 [list |& cat] \
380 ] r]
381 } else {
382 error $err
385 fconfigure $fd -eofchar {}
386 return $fd
389 proc git_read {args} {
390 set opt [list |]
392 while {1} {
393 switch -- [lindex $args 0] {
394 --nice {
395 _lappend_nice opt
398 --stderr {
399 lappend args 2>@1
402 default {
403 break
408 set args [lrange $args 1 end]
411 set cmdp [_git_cmd [lindex $args 0]]
412 set args [lrange $args 1 end]
414 return [_open_stdout_stderr [concat $opt $cmdp $args]]
417 proc git_write {args} {
418 set opt [list |]
420 while {1} {
421 switch -- [lindex $args 0] {
422 --nice {
423 _lappend_nice opt
426 default {
427 break
432 set args [lrange $args 1 end]
435 set cmdp [_git_cmd [lindex $args 0]]
436 set args [lrange $args 1 end]
438 return [open [concat $opt $cmdp $args] w]
441 proc githook_read {hook_name args} {
442 set pchook [gitdir hooks $hook_name]
443 lappend args 2>@1
445 # On Cygwin [file executable] might lie so we need to ask
446 # the shell if the hook is executable. Yes that's annoying.
448 if {[is_Cygwin]} {
449 upvar #0 _sh interp
450 if {![info exists interp]} {
451 set interp [_which sh]
453 if {$interp eq {}} {
454 error "hook execution requires sh (not in PATH)"
457 set scr {if test -x "$1";then exec "$@";fi}
458 set sh_c [list | $interp -c $scr $interp $pchook]
459 return [_open_stdout_stderr [concat $sh_c $args]]
462 if {[file executable $pchook]} {
463 return [_open_stdout_stderr [concat [list | $pchook] $args]]
466 return {}
469 proc sq {value} {
470 regsub -all ' $value "'\\''" value
471 return "'$value'"
474 proc load_current_branch {} {
475 global current_branch is_detached
477 set fd [open [gitdir HEAD] r]
478 if {[gets $fd ref] < 1} {
479 set ref {}
481 close $fd
483 set pfx {ref: refs/heads/}
484 set len [string length $pfx]
485 if {[string equal -length $len $pfx $ref]} {
486 # We're on a branch. It might not exist. But
487 # HEAD looks good enough to be a branch.
489 set current_branch [string range $ref $len end]
490 set is_detached 0
491 } else {
492 # Assume this is a detached head.
494 set current_branch HEAD
495 set is_detached 1
499 auto_load tk_optionMenu
500 rename tk_optionMenu real__tkOptionMenu
501 proc tk_optionMenu {w varName args} {
502 set m [eval real__tkOptionMenu $w $varName $args]
503 $m configure -font font_ui
504 $w configure -font font_ui
505 return $m
508 proc rmsel_tag {text} {
509 $text tag conf sel \
510 -background [$text cget -background] \
511 -foreground [$text cget -foreground] \
512 -borderwidth 0
513 $text tag conf in_sel -background lightgray
514 bind $text <Motion> break
515 return $text
518 set root_exists 0
519 bind . <Visibility> {
520 bind . <Visibility> {}
521 set root_exists 1
524 if {[is_Windows]} {
525 wm iconbitmap . -default $oguilib/git-gui.ico
528 ######################################################################
530 ## config defaults
532 set cursor_ptr arrow
533 font create font_diff -family Courier -size 10
534 font create font_ui
535 catch {
536 label .dummy
537 eval font configure font_ui [font actual [.dummy cget -font]]
538 destroy .dummy
541 font create font_uiitalic
542 font create font_uibold
543 font create font_diffbold
544 font create font_diffitalic
546 foreach class {Button Checkbutton Entry Label
547 Labelframe Listbox Menu Message
548 Radiobutton Spinbox Text} {
549 option add *$class.font font_ui
551 unset class
553 if {[is_Windows] || [is_MacOSX]} {
554 option add *Menu.tearOff 0
557 if {[is_MacOSX]} {
558 set M1B M1
559 set M1T Cmd
560 } else {
561 set M1B Control
562 set M1T Ctrl
565 proc bind_button3 {w cmd} {
566 bind $w <Any-Button-3> $cmd
567 if {[is_MacOSX]} {
568 # Mac OS X sends Button-2 on right click through three-button mouse,
569 # or through trackpad right-clicking (two-finger touch + click).
570 bind $w <Any-Button-2> $cmd
571 bind $w <Control-Button-1> $cmd
575 proc apply_config {} {
576 global repo_config font_descs
578 foreach option $font_descs {
579 set name [lindex $option 0]
580 set font [lindex $option 1]
581 if {[catch {
582 set need_weight 1
583 foreach {cn cv} $repo_config(gui.$name) {
584 if {$cn eq {-weight}} {
585 set need_weight 0
587 font configure $font $cn $cv
589 if {$need_weight} {
590 font configure $font -weight normal
592 } err]} {
593 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
595 foreach {cn cv} [font configure $font] {
596 font configure ${font}bold $cn $cv
597 font configure ${font}italic $cn $cv
599 font configure ${font}bold -weight bold
600 font configure ${font}italic -slant italic
604 set default_config(merge.diffstat) true
605 set default_config(merge.summary) false
606 set default_config(merge.verbosity) 2
607 set default_config(user.name) {}
608 set default_config(user.email) {}
610 set default_config(gui.matchtrackingbranch) false
611 set default_config(gui.pruneduringfetch) false
612 set default_config(gui.trustmtime) false
613 set default_config(gui.diffcontext) 5
614 set default_config(gui.commitmsgwidth) 75
615 set default_config(gui.newbranchtemplate) {}
616 set default_config(gui.spellingdictionary) {}
617 set default_config(gui.fontui) [font configure font_ui]
618 set default_config(gui.fontdiff) [font configure font_diff]
619 set font_descs {
620 {fontui font_ui {mc "Main Font"}}
621 {fontdiff font_diff {mc "Diff/Console Font"}}
624 ######################################################################
626 ## find git
628 set _git [_which git]
629 if {$_git eq {}} {
630 catch {wm withdraw .}
631 tk_messageBox \
632 -icon error \
633 -type ok \
634 -title [mc "git-gui: fatal error"] \
635 -message [mc "Cannot find git in PATH."]
636 exit 1
639 ######################################################################
641 ## version check
643 if {[catch {set _git_version [git --version]} err]} {
644 catch {wm withdraw .}
645 tk_messageBox \
646 -icon error \
647 -type ok \
648 -title [mc "git-gui: fatal error"] \
649 -message "Cannot determine Git version:
651 $err
653 [appname] requires Git 1.5.0 or later."
654 exit 1
656 if {![regsub {^git version } $_git_version {} _git_version]} {
657 catch {wm withdraw .}
658 tk_messageBox \
659 -icon error \
660 -type ok \
661 -title [mc "git-gui: fatal error"] \
662 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
663 exit 1
666 set _real_git_version $_git_version
667 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
668 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
669 regsub {\.rc[0-9]+$} $_git_version {} _git_version
670 regsub {\.GIT$} $_git_version {} _git_version
671 regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
673 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
674 catch {wm withdraw .}
675 if {[tk_messageBox \
676 -icon warning \
677 -type yesno \
678 -default no \
679 -title "[appname]: warning" \
680 -message [mc "Git version cannot be determined.
682 %s claims it is version '%s'.
684 %s requires at least Git 1.5.0 or later.
686 Assume '%s' is version 1.5.0?
687 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
688 set _git_version 1.5.0
689 } else {
690 exit 1
693 unset _real_git_version
695 proc git-version {args} {
696 global _git_version
698 switch [llength $args] {
700 return $_git_version
704 set op [lindex $args 0]
705 set vr [lindex $args 1]
706 set cm [package vcompare $_git_version $vr]
707 return [expr $cm $op 0]
711 set type [lindex $args 0]
712 set name [lindex $args 1]
713 set parm [lindex $args 2]
714 set body [lindex $args 3]
716 if {($type ne {proc} && $type ne {method})} {
717 error "Invalid arguments to git-version"
719 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
720 error "Last arm of $type $name must be default"
723 foreach {op vr cb} [lrange $body 0 end-2] {
724 if {[git-version $op $vr]} {
725 return [uplevel [list $type $name $parm $cb]]
729 return [uplevel [list $type $name $parm [lindex $body end]]]
732 default {
733 error "git-version >= x"
739 if {[git-version < 1.5]} {
740 catch {wm withdraw .}
741 tk_messageBox \
742 -icon error \
743 -type ok \
744 -title [mc "git-gui: fatal error"] \
745 -message "[appname] requires Git 1.5.0 or later.
747 You are using [git-version]:
749 [git --version]"
750 exit 1
753 ######################################################################
755 ## configure our library
757 set idx [file join $oguilib tclIndex]
758 if {[catch {set fd [open $idx r]} err]} {
759 catch {wm withdraw .}
760 tk_messageBox \
761 -icon error \
762 -type ok \
763 -title [mc "git-gui: fatal error"] \
764 -message $err
765 exit 1
767 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
768 set idx [list]
769 while {[gets $fd n] >= 0} {
770 if {$n ne {} && ![string match #* $n]} {
771 lappend idx $n
774 } else {
775 set idx {}
777 close $fd
779 if {$idx ne {}} {
780 set loaded [list]
781 foreach p $idx {
782 if {[lsearch -exact $loaded $p] >= 0} continue
783 source [file join $oguilib $p]
784 lappend loaded $p
786 unset loaded p
787 } else {
788 set auto_path [concat [list $oguilib] $auto_path]
790 unset -nocomplain idx fd
792 ######################################################################
794 ## config file parsing
796 git-version proc _parse_config {arr_name args} {
797 >= 1.5.3 {
798 upvar $arr_name arr
799 array unset arr
800 set buf {}
801 catch {
802 set fd_rc [eval \
803 [list git_read config] \
804 $args \
805 [list --null --list]]
806 fconfigure $fd_rc -translation binary
807 set buf [read $fd_rc]
808 close $fd_rc
810 foreach line [split $buf "\0"] {
811 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
812 if {[is_many_config $name]} {
813 lappend arr($name) $value
814 } else {
815 set arr($name) $value
820 default {
821 upvar $arr_name arr
822 array unset arr
823 catch {
824 set fd_rc [eval [list git_read config --list] $args]
825 while {[gets $fd_rc line] >= 0} {
826 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
827 if {[is_many_config $name]} {
828 lappend arr($name) $value
829 } else {
830 set arr($name) $value
834 close $fd_rc
839 proc load_config {include_global} {
840 global repo_config global_config default_config
842 if {$include_global} {
843 _parse_config global_config --global
845 _parse_config repo_config
847 foreach name [array names default_config] {
848 if {[catch {set v $global_config($name)}]} {
849 set global_config($name) $default_config($name)
851 if {[catch {set v $repo_config($name)}]} {
852 set repo_config($name) $default_config($name)
857 ######################################################################
859 ## feature option selection
861 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
862 unset _junk
863 } else {
864 set subcommand gui
866 if {$subcommand eq {gui.sh}} {
867 set subcommand gui
869 if {$subcommand eq {gui} && [llength $argv] > 0} {
870 set subcommand [lindex $argv 0]
871 set argv [lrange $argv 1 end]
874 enable_option multicommit
875 enable_option branch
876 enable_option transport
877 disable_option bare
879 switch -- $subcommand {
880 browser -
881 blame {
882 enable_option bare
884 disable_option multicommit
885 disable_option branch
886 disable_option transport
888 citool {
889 enable_option singlecommit
891 disable_option multicommit
892 disable_option branch
893 disable_option transport
897 ######################################################################
899 ## repository setup
901 if {[catch {
902 set _gitdir $env(GIT_DIR)
903 set _prefix {}
905 && [catch {
906 set _gitdir [git rev-parse --git-dir]
907 set _prefix [git rev-parse --show-prefix]
908 } err]} {
909 load_config 1
910 apply_config
911 choose_repository::pick
913 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
914 catch {set _gitdir [exec cygpath --windows $_gitdir]}
916 if {![file isdirectory $_gitdir]} {
917 catch {wm withdraw .}
918 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
919 exit 1
921 if {$_prefix ne {}} {
922 regsub -all {[^/]+/} $_prefix ../ cdup
923 if {[catch {cd $cdup} err]} {
924 catch {wm withdraw .}
925 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
926 exit 1
928 unset cdup
929 } elseif {![is_enabled bare]} {
930 if {[lindex [file split $_gitdir] end] ne {.git}} {
931 catch {wm withdraw .}
932 error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"]
933 exit 1
935 if {[catch {cd [file dirname $_gitdir]} err]} {
936 catch {wm withdraw .}
937 error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"]
938 exit 1
941 set _reponame [file split [file normalize $_gitdir]]
942 if {[lindex $_reponame end] eq {.git}} {
943 set _reponame [lindex $_reponame end-1]
944 } else {
945 set _reponame [lindex $_reponame end]
948 ######################################################################
950 ## global init
952 set current_diff_path {}
953 set current_diff_side {}
954 set diff_actions [list]
956 set HEAD {}
957 set PARENT {}
958 set MERGE_HEAD [list]
959 set commit_type {}
960 set empty_tree {}
961 set current_branch {}
962 set is_detached 0
963 set current_diff_path {}
964 set is_3way_diff 0
965 set selected_commit_type new
967 ######################################################################
969 ## task management
971 set rescan_active 0
972 set diff_active 0
973 set last_clicked {}
975 set disable_on_lock [list]
976 set index_lock_type none
978 proc lock_index {type} {
979 global index_lock_type disable_on_lock
981 if {$index_lock_type eq {none}} {
982 set index_lock_type $type
983 foreach w $disable_on_lock {
984 uplevel #0 $w disabled
986 return 1
987 } elseif {$index_lock_type eq "begin-$type"} {
988 set index_lock_type $type
989 return 1
991 return 0
994 proc unlock_index {} {
995 global index_lock_type disable_on_lock
997 set index_lock_type none
998 foreach w $disable_on_lock {
999 uplevel #0 $w normal
1003 ######################################################################
1005 ## status
1007 proc repository_state {ctvar hdvar mhvar} {
1008 global current_branch
1009 upvar $ctvar ct $hdvar hd $mhvar mh
1011 set mh [list]
1013 load_current_branch
1014 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1015 set hd {}
1016 set ct initial
1017 return
1020 set merge_head [gitdir MERGE_HEAD]
1021 if {[file exists $merge_head]} {
1022 set ct merge
1023 set fd_mh [open $merge_head r]
1024 while {[gets $fd_mh line] >= 0} {
1025 lappend mh $line
1027 close $fd_mh
1028 return
1031 set ct normal
1034 proc PARENT {} {
1035 global PARENT empty_tree
1037 set p [lindex $PARENT 0]
1038 if {$p ne {}} {
1039 return $p
1041 if {$empty_tree eq {}} {
1042 set empty_tree [git mktree << {}]
1044 return $empty_tree
1047 proc rescan {after {honor_trustmtime 1}} {
1048 global HEAD PARENT MERGE_HEAD commit_type
1049 global ui_index ui_workdir ui_comm
1050 global rescan_active file_states
1051 global repo_config
1053 if {$rescan_active > 0 || ![lock_index read]} return
1055 repository_state newType newHEAD newMERGE_HEAD
1056 if {[string match amend* $commit_type]
1057 && $newType eq {normal}
1058 && $newHEAD eq $HEAD} {
1059 } else {
1060 set HEAD $newHEAD
1061 set PARENT $newHEAD
1062 set MERGE_HEAD $newMERGE_HEAD
1063 set commit_type $newType
1066 array unset file_states
1068 if {!$::GITGUI_BCK_exists &&
1069 (![$ui_comm edit modified]
1070 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1071 if {[string match amend* $commit_type]} {
1072 } elseif {[load_message GITGUI_MSG]} {
1073 } elseif {[load_message MERGE_MSG]} {
1074 } elseif {[load_message SQUASH_MSG]} {
1076 $ui_comm edit reset
1077 $ui_comm edit modified false
1080 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1081 rescan_stage2 {} $after
1082 } else {
1083 set rescan_active 1
1084 ui_status [mc "Refreshing file status..."]
1085 set fd_rf [git_read update-index \
1086 -q \
1087 --unmerged \
1088 --ignore-missing \
1089 --refresh \
1091 fconfigure $fd_rf -blocking 0 -translation binary
1092 fileevent $fd_rf readable \
1093 [list rescan_stage2 $fd_rf $after]
1097 if {[is_Cygwin]} {
1098 set is_git_info_link {}
1099 set is_git_info_exclude {}
1100 proc have_info_exclude {} {
1101 global is_git_info_link is_git_info_exclude
1103 if {$is_git_info_link eq {}} {
1104 set is_git_info_link [file isfile [gitdir info.lnk]]
1107 if {$is_git_info_link} {
1108 if {$is_git_info_exclude eq {}} {
1109 if {[catch {exec test -f [gitdir info exclude]}]} {
1110 set is_git_info_exclude 0
1111 } else {
1112 set is_git_info_exclude 1
1115 return $is_git_info_exclude
1116 } else {
1117 return [file readable [gitdir info exclude]]
1120 } else {
1121 proc have_info_exclude {} {
1122 return [file readable [gitdir info exclude]]
1126 proc rescan_stage2 {fd after} {
1127 global rescan_active buf_rdi buf_rdf buf_rlo
1129 if {$fd ne {}} {
1130 read $fd
1131 if {![eof $fd]} return
1132 close $fd
1135 set ls_others [list --exclude-per-directory=.gitignore]
1136 if {[have_info_exclude]} {
1137 lappend ls_others "--exclude-from=[gitdir info exclude]"
1139 set user_exclude [get_config core.excludesfile]
1140 if {$user_exclude ne {} && [file readable $user_exclude]} {
1141 lappend ls_others "--exclude-from=$user_exclude"
1144 set buf_rdi {}
1145 set buf_rdf {}
1146 set buf_rlo {}
1148 set rescan_active 3
1149 ui_status [mc "Scanning for modified files ..."]
1150 set fd_di [git_read diff-index --cached -z [PARENT]]
1151 set fd_df [git_read diff-files -z]
1152 set fd_lo [eval git_read ls-files --others -z $ls_others]
1154 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1155 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1156 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1157 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1158 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1159 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1162 proc load_message {file} {
1163 global ui_comm
1165 set f [gitdir $file]
1166 if {[file isfile $f]} {
1167 if {[catch {set fd [open $f r]}]} {
1168 return 0
1170 fconfigure $fd -eofchar {}
1171 set content [string trim [read $fd]]
1172 close $fd
1173 regsub -all -line {[ \r\t]+$} $content {} content
1174 $ui_comm delete 0.0 end
1175 $ui_comm insert end $content
1176 return 1
1178 return 0
1181 proc read_diff_index {fd after} {
1182 global buf_rdi
1184 append buf_rdi [read $fd]
1185 set c 0
1186 set n [string length $buf_rdi]
1187 while {$c < $n} {
1188 set z1 [string first "\0" $buf_rdi $c]
1189 if {$z1 == -1} break
1190 incr z1
1191 set z2 [string first "\0" $buf_rdi $z1]
1192 if {$z2 == -1} break
1194 incr c
1195 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1196 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1197 merge_state \
1198 [encoding convertfrom $p] \
1199 [lindex $i 4]? \
1200 [list [lindex $i 0] [lindex $i 2]] \
1201 [list]
1202 set c $z2
1203 incr c
1205 if {$c < $n} {
1206 set buf_rdi [string range $buf_rdi $c end]
1207 } else {
1208 set buf_rdi {}
1211 rescan_done $fd buf_rdi $after
1214 proc read_diff_files {fd after} {
1215 global buf_rdf
1217 append buf_rdf [read $fd]
1218 set c 0
1219 set n [string length $buf_rdf]
1220 while {$c < $n} {
1221 set z1 [string first "\0" $buf_rdf $c]
1222 if {$z1 == -1} break
1223 incr z1
1224 set z2 [string first "\0" $buf_rdf $z1]
1225 if {$z2 == -1} break
1227 incr c
1228 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1229 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1230 merge_state \
1231 [encoding convertfrom $p] \
1232 ?[lindex $i 4] \
1233 [list] \
1234 [list [lindex $i 0] [lindex $i 2]]
1235 set c $z2
1236 incr c
1238 if {$c < $n} {
1239 set buf_rdf [string range $buf_rdf $c end]
1240 } else {
1241 set buf_rdf {}
1244 rescan_done $fd buf_rdf $after
1247 proc read_ls_others {fd after} {
1248 global buf_rlo
1250 append buf_rlo [read $fd]
1251 set pck [split $buf_rlo "\0"]
1252 set buf_rlo [lindex $pck end]
1253 foreach p [lrange $pck 0 end-1] {
1254 set p [encoding convertfrom $p]
1255 if {[string index $p end] eq {/}} {
1256 set p [string range $p 0 end-1]
1258 merge_state $p ?O
1260 rescan_done $fd buf_rlo $after
1263 proc rescan_done {fd buf after} {
1264 global rescan_active current_diff_path
1265 global file_states repo_config
1266 upvar $buf to_clear
1268 if {![eof $fd]} return
1269 set to_clear {}
1270 close $fd
1271 if {[incr rescan_active -1] > 0} return
1273 prune_selection
1274 unlock_index
1275 display_all_files
1276 if {$current_diff_path ne {}} reshow_diff
1277 uplevel #0 $after
1280 proc prune_selection {} {
1281 global file_states selected_paths
1283 foreach path [array names selected_paths] {
1284 if {[catch {set still_here $file_states($path)}]} {
1285 unset selected_paths($path)
1290 ######################################################################
1292 ## ui helpers
1294 proc mapicon {w state path} {
1295 global all_icons
1297 if {[catch {set r $all_icons($state$w)}]} {
1298 puts "error: no icon for $w state={$state} $path"
1299 return file_plain
1301 return $r
1304 proc mapdesc {state path} {
1305 global all_descs
1307 if {[catch {set r $all_descs($state)}]} {
1308 puts "error: no desc for state={$state} $path"
1309 return $state
1311 return $r
1314 proc ui_status {msg} {
1315 global main_status
1316 if {[info exists main_status]} {
1317 $main_status show $msg
1321 proc ui_ready {{test {}}} {
1322 global main_status
1323 if {[info exists main_status]} {
1324 $main_status show [mc "Ready."] $test
1328 proc escape_path {path} {
1329 regsub -all {\\} $path "\\\\" path
1330 regsub -all "\n" $path "\\n" path
1331 return $path
1334 proc short_path {path} {
1335 return [escape_path [lindex [file split $path] end]]
1338 set next_icon_id 0
1339 set null_sha1 [string repeat 0 40]
1341 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1342 global file_states next_icon_id null_sha1
1344 set s0 [string index $new_state 0]
1345 set s1 [string index $new_state 1]
1347 if {[catch {set info $file_states($path)}]} {
1348 set state __
1349 set icon n[incr next_icon_id]
1350 } else {
1351 set state [lindex $info 0]
1352 set icon [lindex $info 1]
1353 if {$head_info eq {}} {set head_info [lindex $info 2]}
1354 if {$index_info eq {}} {set index_info [lindex $info 3]}
1357 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1358 elseif {$s0 eq {_}} {set s0 _}
1360 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1361 elseif {$s1 eq {_}} {set s1 _}
1363 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1364 set head_info [list 0 $null_sha1]
1365 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1366 && $head_info eq {}} {
1367 set head_info $index_info
1370 set file_states($path) [list $s0$s1 $icon \
1371 $head_info $index_info \
1373 return $state
1376 proc display_file_helper {w path icon_name old_m new_m} {
1377 global file_lists
1379 if {$new_m eq {_}} {
1380 set lno [lsearch -sorted -exact $file_lists($w) $path]
1381 if {$lno >= 0} {
1382 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1383 incr lno
1384 $w conf -state normal
1385 $w delete $lno.0 [expr {$lno + 1}].0
1386 $w conf -state disabled
1388 } elseif {$old_m eq {_} && $new_m ne {_}} {
1389 lappend file_lists($w) $path
1390 set file_lists($w) [lsort -unique $file_lists($w)]
1391 set lno [lsearch -sorted -exact $file_lists($w) $path]
1392 incr lno
1393 $w conf -state normal
1394 $w image create $lno.0 \
1395 -align center -padx 5 -pady 1 \
1396 -name $icon_name \
1397 -image [mapicon $w $new_m $path]
1398 $w insert $lno.1 "[escape_path $path]\n"
1399 $w conf -state disabled
1400 } elseif {$old_m ne $new_m} {
1401 $w conf -state normal
1402 $w image conf $icon_name -image [mapicon $w $new_m $path]
1403 $w conf -state disabled
1407 proc display_file {path state} {
1408 global file_states selected_paths
1409 global ui_index ui_workdir
1411 set old_m [merge_state $path $state]
1412 set s $file_states($path)
1413 set new_m [lindex $s 0]
1414 set icon_name [lindex $s 1]
1416 set o [string index $old_m 0]
1417 set n [string index $new_m 0]
1418 if {$o eq {U}} {
1419 set o _
1421 if {$n eq {U}} {
1422 set n _
1424 display_file_helper $ui_index $path $icon_name $o $n
1426 if {[string index $old_m 0] eq {U}} {
1427 set o U
1428 } else {
1429 set o [string index $old_m 1]
1431 if {[string index $new_m 0] eq {U}} {
1432 set n U
1433 } else {
1434 set n [string index $new_m 1]
1436 display_file_helper $ui_workdir $path $icon_name $o $n
1438 if {$new_m eq {__}} {
1439 unset file_states($path)
1440 catch {unset selected_paths($path)}
1444 proc display_all_files_helper {w path icon_name m} {
1445 global file_lists
1447 lappend file_lists($w) $path
1448 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1449 $w image create end \
1450 -align center -padx 5 -pady 1 \
1451 -name $icon_name \
1452 -image [mapicon $w $m $path]
1453 $w insert end "[escape_path $path]\n"
1456 proc display_all_files {} {
1457 global ui_index ui_workdir
1458 global file_states file_lists
1459 global last_clicked
1461 $ui_index conf -state normal
1462 $ui_workdir conf -state normal
1464 $ui_index delete 0.0 end
1465 $ui_workdir delete 0.0 end
1466 set last_clicked {}
1468 set file_lists($ui_index) [list]
1469 set file_lists($ui_workdir) [list]
1471 foreach path [lsort [array names file_states]] {
1472 set s $file_states($path)
1473 set m [lindex $s 0]
1474 set icon_name [lindex $s 1]
1476 set s [string index $m 0]
1477 if {$s ne {U} && $s ne {_}} {
1478 display_all_files_helper $ui_index $path \
1479 $icon_name $s
1482 if {[string index $m 0] eq {U}} {
1483 set s U
1484 } else {
1485 set s [string index $m 1]
1487 if {$s ne {_}} {
1488 display_all_files_helper $ui_workdir $path \
1489 $icon_name $s
1493 $ui_index conf -state disabled
1494 $ui_workdir conf -state disabled
1497 ######################################################################
1499 ## icons
1501 set filemask {
1502 #define mask_width 14
1503 #define mask_height 15
1504 static unsigned char mask_bits[] = {
1505 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1506 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1507 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1510 image create bitmap file_plain -background white -foreground black -data {
1511 #define plain_width 14
1512 #define plain_height 15
1513 static unsigned char plain_bits[] = {
1514 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1515 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1516 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1517 } -maskdata $filemask
1519 image create bitmap file_mod -background white -foreground blue -data {
1520 #define mod_width 14
1521 #define mod_height 15
1522 static unsigned char mod_bits[] = {
1523 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1524 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1525 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1526 } -maskdata $filemask
1528 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1529 #define file_fulltick_width 14
1530 #define file_fulltick_height 15
1531 static unsigned char file_fulltick_bits[] = {
1532 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1533 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1534 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1535 } -maskdata $filemask
1537 image create bitmap file_parttick -background white -foreground "#005050" -data {
1538 #define parttick_width 14
1539 #define parttick_height 15
1540 static unsigned char parttick_bits[] = {
1541 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1542 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1543 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1544 } -maskdata $filemask
1546 image create bitmap file_question -background white -foreground black -data {
1547 #define file_question_width 14
1548 #define file_question_height 15
1549 static unsigned char file_question_bits[] = {
1550 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1551 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1552 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1553 } -maskdata $filemask
1555 image create bitmap file_removed -background white -foreground red -data {
1556 #define file_removed_width 14
1557 #define file_removed_height 15
1558 static unsigned char file_removed_bits[] = {
1559 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1560 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1561 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1562 } -maskdata $filemask
1564 image create bitmap file_merge -background white -foreground blue -data {
1565 #define file_merge_width 14
1566 #define file_merge_height 15
1567 static unsigned char file_merge_bits[] = {
1568 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1569 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1570 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1571 } -maskdata $filemask
1573 set ui_index .vpane.files.index.list
1574 set ui_workdir .vpane.files.workdir.list
1576 set all_icons(_$ui_index) file_plain
1577 set all_icons(A$ui_index) file_fulltick
1578 set all_icons(M$ui_index) file_fulltick
1579 set all_icons(D$ui_index) file_removed
1580 set all_icons(U$ui_index) file_merge
1582 set all_icons(_$ui_workdir) file_plain
1583 set all_icons(M$ui_workdir) file_mod
1584 set all_icons(D$ui_workdir) file_question
1585 set all_icons(U$ui_workdir) file_merge
1586 set all_icons(O$ui_workdir) file_plain
1588 set max_status_desc 0
1589 foreach i {
1590 {__ {mc "Unmodified"}}
1592 {_M {mc "Modified, not staged"}}
1593 {M_ {mc "Staged for commit"}}
1594 {MM {mc "Portions staged for commit"}}
1595 {MD {mc "Staged for commit, missing"}}
1597 {_O {mc "Untracked, not staged"}}
1598 {A_ {mc "Staged for commit"}}
1599 {AM {mc "Portions staged for commit"}}
1600 {AD {mc "Staged for commit, missing"}}
1602 {_D {mc "Missing"}}
1603 {D_ {mc "Staged for removal"}}
1604 {DO {mc "Staged for removal, still present"}}
1606 {U_ {mc "Requires merge resolution"}}
1607 {UU {mc "Requires merge resolution"}}
1608 {UM {mc "Requires merge resolution"}}
1609 {UD {mc "Requires merge resolution"}}
1611 set text [eval [lindex $i 1]]
1612 if {$max_status_desc < [string length $text]} {
1613 set max_status_desc [string length $text]
1615 set all_descs([lindex $i 0]) $text
1617 unset i
1619 ######################################################################
1621 ## util
1623 proc scrollbar2many {list mode args} {
1624 foreach w $list {eval $w $mode $args}
1627 proc many2scrollbar {list mode sb top bottom} {
1628 $sb set $top $bottom
1629 foreach w $list {$w $mode moveto $top}
1632 proc incr_font_size {font {amt 1}} {
1633 set sz [font configure $font -size]
1634 incr sz $amt
1635 font configure $font -size $sz
1636 font configure ${font}bold -size $sz
1637 font configure ${font}italic -size $sz
1640 ######################################################################
1642 ## ui commands
1644 set starting_gitk_msg [mc "Starting gitk... please wait..."]
1646 proc do_gitk {revs} {
1647 # -- Always start gitk through whatever we were loaded with. This
1648 # lets us bypass using shell process on Windows systems.
1650 set exe [file join [file dirname $::_git] gitk]
1651 set cmd [list [info nameofexecutable] $exe]
1652 if {! [file exists $exe]} {
1653 error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe]
1654 } else {
1655 global env
1657 if {[info exists env(GIT_DIR)]} {
1658 set old_GIT_DIR $env(GIT_DIR)
1659 } else {
1660 set old_GIT_DIR {}
1663 set pwd [pwd]
1664 cd [file dirname [gitdir]]
1665 set env(GIT_DIR) [file tail [gitdir]]
1667 eval exec $cmd $revs &
1669 if {$old_GIT_DIR eq {}} {
1670 unset env(GIT_DIR)
1671 } else {
1672 set env(GIT_DIR) $old_GIT_DIR
1674 cd $pwd
1676 ui_status $::starting_gitk_msg
1677 after 10000 {
1678 ui_ready $starting_gitk_msg
1683 set is_quitting 0
1685 proc do_quit {} {
1686 global ui_comm is_quitting repo_config commit_type
1687 global GITGUI_BCK_exists GITGUI_BCK_i
1688 global ui_comm_spell
1690 if {$is_quitting} return
1691 set is_quitting 1
1693 if {[winfo exists $ui_comm]} {
1694 # -- Stash our current commit buffer.
1696 set save [gitdir GITGUI_MSG]
1697 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
1698 file rename -force [gitdir GITGUI_BCK] $save
1699 set GITGUI_BCK_exists 0
1700 } else {
1701 set msg [string trim [$ui_comm get 0.0 end]]
1702 regsub -all -line {[ \r\t]+$} $msg {} msg
1703 if {(![string match amend* $commit_type]
1704 || [$ui_comm edit modified])
1705 && $msg ne {}} {
1706 catch {
1707 set fd [open $save w]
1708 puts -nonewline $fd $msg
1709 close $fd
1711 } else {
1712 catch {file delete $save}
1716 # -- Cancel our spellchecker if its running.
1718 if {[info exists ui_comm_spell]} {
1719 $ui_comm_spell stop
1722 # -- Remove our editor backup, its not needed.
1724 after cancel $GITGUI_BCK_i
1725 if {$GITGUI_BCK_exists} {
1726 catch {file delete [gitdir GITGUI_BCK]}
1729 # -- Stash our current window geometry into this repository.
1731 set cfg_geometry [list]
1732 lappend cfg_geometry [wm geometry .]
1733 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
1734 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
1735 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1736 set rc_geometry {}
1738 if {$cfg_geometry ne $rc_geometry} {
1739 catch {git config gui.geometry $cfg_geometry}
1743 destroy .
1746 proc do_rescan {} {
1747 rescan ui_ready
1750 proc do_commit {} {
1751 commit_tree
1754 proc toggle_or_diff {w x y} {
1755 global file_states file_lists current_diff_path ui_index ui_workdir
1756 global last_clicked selected_paths
1758 set pos [split [$w index @$x,$y] .]
1759 set lno [lindex $pos 0]
1760 set col [lindex $pos 1]
1761 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1762 if {$path eq {}} {
1763 set last_clicked {}
1764 return
1767 set last_clicked [list $w $lno]
1768 array unset selected_paths
1769 $ui_index tag remove in_sel 0.0 end
1770 $ui_workdir tag remove in_sel 0.0 end
1772 if {$col == 0} {
1773 if {$current_diff_path eq $path} {
1774 set after {reshow_diff;}
1775 } else {
1776 set after {}
1778 if {$w eq $ui_index} {
1779 update_indexinfo \
1780 "Unstaging [short_path $path] from commit" \
1781 [list $path] \
1782 [concat $after [list ui_ready]]
1783 } elseif {$w eq $ui_workdir} {
1784 update_index \
1785 "Adding [short_path $path]" \
1786 [list $path] \
1787 [concat $after [list ui_ready]]
1789 } else {
1790 show_diff $path $w $lno
1794 proc add_one_to_selection {w x y} {
1795 global file_lists last_clicked selected_paths
1797 set lno [lindex [split [$w index @$x,$y] .] 0]
1798 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1799 if {$path eq {}} {
1800 set last_clicked {}
1801 return
1804 if {$last_clicked ne {}
1805 && [lindex $last_clicked 0] ne $w} {
1806 array unset selected_paths
1807 [lindex $last_clicked 0] tag remove in_sel 0.0 end
1810 set last_clicked [list $w $lno]
1811 if {[catch {set in_sel $selected_paths($path)}]} {
1812 set in_sel 0
1814 if {$in_sel} {
1815 unset selected_paths($path)
1816 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
1817 } else {
1818 set selected_paths($path) 1
1819 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1823 proc add_range_to_selection {w x y} {
1824 global file_lists last_clicked selected_paths
1826 if {[lindex $last_clicked 0] ne $w} {
1827 toggle_or_diff $w $x $y
1828 return
1831 set lno [lindex [split [$w index @$x,$y] .] 0]
1832 set lc [lindex $last_clicked 1]
1833 if {$lc < $lno} {
1834 set begin $lc
1835 set end $lno
1836 } else {
1837 set begin $lno
1838 set end $lc
1841 foreach path [lrange $file_lists($w) \
1842 [expr {$begin - 1}] \
1843 [expr {$end - 1}]] {
1844 set selected_paths($path) 1
1846 $w tag add in_sel $begin.0 [expr {$end + 1}].0
1849 proc show_more_context {} {
1850 global repo_config
1851 if {$repo_config(gui.diffcontext) < 99} {
1852 incr repo_config(gui.diffcontext)
1853 reshow_diff
1857 proc show_less_context {} {
1858 global repo_config
1859 if {$repo_config(gui.diffcontext) >= 1} {
1860 incr repo_config(gui.diffcontext) -1
1861 reshow_diff
1865 ######################################################################
1867 ## ui construction
1869 load_config 0
1870 apply_config
1871 set ui_comm {}
1873 # -- Menu Bar
1875 menu .mbar -tearoff 0
1876 .mbar add cascade -label [mc Repository] -menu .mbar.repository
1877 .mbar add cascade -label [mc Edit] -menu .mbar.edit
1878 if {[is_enabled branch]} {
1879 .mbar add cascade -label [mc Branch] -menu .mbar.branch
1881 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1882 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
1884 if {[is_enabled transport]} {
1885 .mbar add cascade -label [mc Merge] -menu .mbar.merge
1886 .mbar add cascade -label [mc Remote] -menu .mbar.remote
1888 . configure -menu .mbar
1890 # -- Repository Menu
1892 menu .mbar.repository
1894 .mbar.repository add command \
1895 -label [mc "Browse Current Branch's Files"] \
1896 -command {browser::new $current_branch}
1897 set ui_browse_current [.mbar.repository index last]
1898 .mbar.repository add command \
1899 -label [mc "Browse Branch Files..."] \
1900 -command browser_open::dialog
1901 .mbar.repository add separator
1903 .mbar.repository add command \
1904 -label [mc "Visualize Current Branch's History"] \
1905 -command {do_gitk $current_branch}
1906 set ui_visualize_current [.mbar.repository index last]
1907 .mbar.repository add command \
1908 -label [mc "Visualize All Branch History"] \
1909 -command {do_gitk --all}
1910 .mbar.repository add separator
1912 proc current_branch_write {args} {
1913 global current_branch
1914 .mbar.repository entryconf $::ui_browse_current \
1915 -label [mc "Browse %s's Files" $current_branch]
1916 .mbar.repository entryconf $::ui_visualize_current \
1917 -label [mc "Visualize %s's History" $current_branch]
1919 trace add variable current_branch write current_branch_write
1921 if {[is_enabled multicommit]} {
1922 .mbar.repository add command -label [mc "Database Statistics"] \
1923 -command do_stats
1925 .mbar.repository add command -label [mc "Compress Database"] \
1926 -command do_gc
1928 .mbar.repository add command -label [mc "Verify Database"] \
1929 -command do_fsck_objects
1931 .mbar.repository add separator
1933 if {[is_Cygwin]} {
1934 .mbar.repository add command \
1935 -label [mc "Create Desktop Icon"] \
1936 -command do_cygwin_shortcut
1937 } elseif {[is_Windows]} {
1938 .mbar.repository add command \
1939 -label [mc "Create Desktop Icon"] \
1940 -command do_windows_shortcut
1941 } elseif {[is_MacOSX]} {
1942 .mbar.repository add command \
1943 -label [mc "Create Desktop Icon"] \
1944 -command do_macosx_app
1948 .mbar.repository add command -label [mc Quit] \
1949 -command do_quit \
1950 -accelerator $M1T-Q
1952 # -- Edit Menu
1954 menu .mbar.edit
1955 .mbar.edit add command -label [mc Undo] \
1956 -command {catch {[focus] edit undo}} \
1957 -accelerator $M1T-Z
1958 .mbar.edit add command -label [mc Redo] \
1959 -command {catch {[focus] edit redo}} \
1960 -accelerator $M1T-Y
1961 .mbar.edit add separator
1962 .mbar.edit add command -label [mc Cut] \
1963 -command {catch {tk_textCut [focus]}} \
1964 -accelerator $M1T-X
1965 .mbar.edit add command -label [mc Copy] \
1966 -command {catch {tk_textCopy [focus]}} \
1967 -accelerator $M1T-C
1968 .mbar.edit add command -label [mc Paste] \
1969 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
1970 -accelerator $M1T-V
1971 .mbar.edit add command -label [mc Delete] \
1972 -command {catch {[focus] delete sel.first sel.last}} \
1973 -accelerator Del
1974 .mbar.edit add separator
1975 .mbar.edit add command -label [mc "Select All"] \
1976 -command {catch {[focus] tag add sel 0.0 end}} \
1977 -accelerator $M1T-A
1979 # -- Branch Menu
1981 if {[is_enabled branch]} {
1982 menu .mbar.branch
1984 .mbar.branch add command -label [mc "Create..."] \
1985 -command branch_create::dialog \
1986 -accelerator $M1T-N
1987 lappend disable_on_lock [list .mbar.branch entryconf \
1988 [.mbar.branch index last] -state]
1990 .mbar.branch add command -label [mc "Checkout..."] \
1991 -command branch_checkout::dialog \
1992 -accelerator $M1T-O
1993 lappend disable_on_lock [list .mbar.branch entryconf \
1994 [.mbar.branch index last] -state]
1996 .mbar.branch add command -label [mc "Rename..."] \
1997 -command branch_rename::dialog
1998 lappend disable_on_lock [list .mbar.branch entryconf \
1999 [.mbar.branch index last] -state]
2001 .mbar.branch add command -label [mc "Delete..."] \
2002 -command branch_delete::dialog
2003 lappend disable_on_lock [list .mbar.branch entryconf \
2004 [.mbar.branch index last] -state]
2006 .mbar.branch add command -label [mc "Reset..."] \
2007 -command merge::reset_hard
2008 lappend disable_on_lock [list .mbar.branch entryconf \
2009 [.mbar.branch index last] -state]
2012 # -- Commit Menu
2014 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2015 menu .mbar.commit
2017 .mbar.commit add radiobutton \
2018 -label [mc "New Commit"] \
2019 -command do_select_commit_type \
2020 -variable selected_commit_type \
2021 -value new
2022 lappend disable_on_lock \
2023 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2025 .mbar.commit add radiobutton \
2026 -label [mc "Amend Last Commit"] \
2027 -command do_select_commit_type \
2028 -variable selected_commit_type \
2029 -value amend
2030 lappend disable_on_lock \
2031 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2033 .mbar.commit add separator
2035 .mbar.commit add command -label [mc Rescan] \
2036 -command do_rescan \
2037 -accelerator F5
2038 lappend disable_on_lock \
2039 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2041 .mbar.commit add command -label [mc "Stage To Commit"] \
2042 -command do_add_selection \
2043 -accelerator $M1T-T
2044 lappend disable_on_lock \
2045 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2047 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2048 -command do_add_all \
2049 -accelerator $M1T-I
2050 lappend disable_on_lock \
2051 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2053 .mbar.commit add command -label [mc "Unstage From Commit"] \
2054 -command do_unstage_selection
2055 lappend disable_on_lock \
2056 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2058 .mbar.commit add command -label [mc "Revert Changes"] \
2059 -command do_revert_selection
2060 lappend disable_on_lock \
2061 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2063 .mbar.commit add separator
2065 .mbar.commit add command -label [mc "Show Less Context"] \
2066 -command show_less_context \
2067 -accelerator $M1T-\-
2069 .mbar.commit add command -label [mc "Show More Context"] \
2070 -command show_more_context \
2071 -accelerator $M1T-=
2073 .mbar.commit add separator
2075 .mbar.commit add command -label [mc "Sign Off"] \
2076 -command do_signoff \
2077 -accelerator $M1T-S
2079 .mbar.commit add command -label [mc Commit@@verb] \
2080 -command do_commit \
2081 -accelerator $M1T-Return
2082 lappend disable_on_lock \
2083 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2086 # -- Merge Menu
2088 if {[is_enabled branch]} {
2089 menu .mbar.merge
2090 .mbar.merge add command -label [mc "Local Merge..."] \
2091 -command merge::dialog \
2092 -accelerator $M1T-M
2093 lappend disable_on_lock \
2094 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2095 .mbar.merge add command -label [mc "Abort Merge..."] \
2096 -command merge::reset_hard
2097 lappend disable_on_lock \
2098 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2101 # -- Transport Menu
2103 if {[is_enabled transport]} {
2104 menu .mbar.remote
2106 .mbar.remote add command \
2107 -label [mc "Push..."] \
2108 -command do_push_anywhere \
2109 -accelerator $M1T-P
2110 .mbar.remote add command \
2111 -label [mc "Delete..."] \
2112 -command remote_branch_delete::dialog
2115 if {[is_MacOSX]} {
2116 # -- Apple Menu (Mac OS X only)
2118 .mbar add cascade -label Apple -menu .mbar.apple
2119 menu .mbar.apple
2121 .mbar.apple add command -label [mc "About %s" [appname]] \
2122 -command do_about
2123 .mbar.apple add separator
2124 .mbar.apple add command \
2125 -label [mc "Preferences..."] \
2126 -command do_options \
2127 -accelerator $M1T-,
2128 bind . <$M1B-,> do_options
2129 } else {
2130 # -- Edit Menu
2132 .mbar.edit add separator
2133 .mbar.edit add command -label [mc "Options..."] \
2134 -command do_options
2137 # -- Help Menu
2139 .mbar add cascade -label [mc Help] -menu .mbar.help
2140 menu .mbar.help
2142 if {![is_MacOSX]} {
2143 .mbar.help add command -label [mc "About %s" [appname]] \
2144 -command do_about
2147 set browser {}
2148 catch {set browser $repo_config(instaweb.browser)}
2149 set doc_path [file dirname [gitexec]]
2150 set doc_path [file join $doc_path Documentation index.html]
2152 if {[is_Cygwin]} {
2153 set doc_path [exec cygpath --mixed $doc_path]
2156 if {$browser eq {}} {
2157 if {[is_MacOSX]} {
2158 set browser open
2159 } elseif {[is_Cygwin]} {
2160 set program_files [file dirname [exec cygpath --windir]]
2161 set program_files [file join $program_files {Program Files}]
2162 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
2163 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
2164 if {[file exists $firefox]} {
2165 set browser $firefox
2166 } elseif {[file exists $ie]} {
2167 set browser $ie
2169 unset program_files firefox ie
2173 if {[file isfile $doc_path]} {
2174 set doc_url "file:$doc_path"
2175 } else {
2176 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2179 if {$browser ne {}} {
2180 .mbar.help add command -label [mc "Online Documentation"] \
2181 -command [list exec $browser $doc_url &]
2183 unset browser doc_path doc_url
2185 # -- Standard bindings
2187 wm protocol . WM_DELETE_WINDOW do_quit
2188 bind all <$M1B-Key-q> do_quit
2189 bind all <$M1B-Key-Q> do_quit
2190 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2191 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2193 set subcommand_args {}
2194 proc usage {} {
2195 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2196 exit 1
2199 # -- Not a normal commit type invocation? Do that instead!
2201 switch -- $subcommand {
2202 browser -
2203 blame {
2204 set subcommand_args {rev? path}
2205 if {$argv eq {}} usage
2206 set head {}
2207 set path {}
2208 set is_path 0
2209 foreach a $argv {
2210 if {$is_path || [file exists $_prefix$a]} {
2211 if {$path ne {}} usage
2212 set path $_prefix$a
2213 break
2214 } elseif {$a eq {--}} {
2215 if {$path ne {}} {
2216 if {$head ne {}} usage
2217 set head $path
2218 set path {}
2220 set is_path 1
2221 } elseif {$head eq {}} {
2222 if {$head ne {}} usage
2223 set head $a
2224 set is_path 1
2225 } else {
2226 usage
2229 unset is_path
2231 if {$head ne {} && $path eq {}} {
2232 set path $_prefix$head
2233 set head {}
2236 if {$head eq {}} {
2237 load_current_branch
2238 } else {
2239 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2240 if {[catch {
2241 set head [git rev-parse --verify $head]
2242 } err]} {
2243 puts stderr $err
2244 exit 1
2247 set current_branch $head
2250 switch -- $subcommand {
2251 browser {
2252 if {$head eq {}} {
2253 if {$path ne {} && [file isdirectory $path]} {
2254 set head $current_branch
2255 } else {
2256 set head $path
2257 set path {}
2260 browser::new $head $path
2262 blame {
2263 if {$head eq {} && ![file exists $path]} {
2264 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2265 exit 1
2267 blame::new $head $path
2270 return
2272 citool -
2273 gui {
2274 if {[llength $argv] != 0} {
2275 puts -nonewline stderr "usage: $argv0"
2276 if {$subcommand ne {gui}
2277 && [file tail $argv0] ne "git-$subcommand"} {
2278 puts -nonewline stderr " $subcommand"
2280 puts stderr {}
2281 exit 1
2283 # fall through to setup UI for commits
2285 default {
2286 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2287 exit 1
2291 # -- Branch Control
2293 frame .branch \
2294 -borderwidth 1 \
2295 -relief sunken
2296 label .branch.l1 \
2297 -text [mc "Current Branch:"] \
2298 -anchor w \
2299 -justify left
2300 label .branch.cb \
2301 -textvariable current_branch \
2302 -anchor w \
2303 -justify left
2304 pack .branch.l1 -side left
2305 pack .branch.cb -side left -fill x
2306 pack .branch -side top -fill x
2308 # -- Main Window Layout
2310 panedwindow .vpane -orient horizontal
2311 panedwindow .vpane.files -orient vertical
2312 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2313 pack .vpane -anchor n -side top -fill both -expand 1
2315 # -- Index File List
2317 frame .vpane.files.index -height 100 -width 200
2318 label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
2319 -background lightgreen -foreground black
2320 text $ui_index -background white -foreground black \
2321 -borderwidth 0 \
2322 -width 20 -height 10 \
2323 -wrap none \
2324 -cursor $cursor_ptr \
2325 -xscrollcommand {.vpane.files.index.sx set} \
2326 -yscrollcommand {.vpane.files.index.sy set} \
2327 -state disabled
2328 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2329 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
2330 pack .vpane.files.index.title -side top -fill x
2331 pack .vpane.files.index.sx -side bottom -fill x
2332 pack .vpane.files.index.sy -side right -fill y
2333 pack $ui_index -side left -fill both -expand 1
2335 # -- Working Directory File List
2337 frame .vpane.files.workdir -height 100 -width 200
2338 label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
2339 -background lightsalmon -foreground black
2340 text $ui_workdir -background white -foreground black \
2341 -borderwidth 0 \
2342 -width 20 -height 10 \
2343 -wrap none \
2344 -cursor $cursor_ptr \
2345 -xscrollcommand {.vpane.files.workdir.sx set} \
2346 -yscrollcommand {.vpane.files.workdir.sy set} \
2347 -state disabled
2348 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2349 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2350 pack .vpane.files.workdir.title -side top -fill x
2351 pack .vpane.files.workdir.sx -side bottom -fill x
2352 pack .vpane.files.workdir.sy -side right -fill y
2353 pack $ui_workdir -side left -fill both -expand 1
2355 .vpane.files add .vpane.files.workdir -sticky nsew
2356 .vpane.files add .vpane.files.index -sticky nsew
2358 foreach i [list $ui_index $ui_workdir] {
2359 rmsel_tag $i
2360 $i tag conf in_diff -background [$i tag cget in_sel -background]
2362 unset i
2364 # -- Diff and Commit Area
2366 frame .vpane.lower -height 300 -width 400
2367 frame .vpane.lower.commarea
2368 frame .vpane.lower.diff -relief sunken -borderwidth 1
2369 pack .vpane.lower.diff -fill both -expand 1
2370 pack .vpane.lower.commarea -side bottom -fill x
2371 .vpane add .vpane.lower -sticky nsew
2373 # -- Commit Area Buttons
2375 frame .vpane.lower.commarea.buttons
2376 label .vpane.lower.commarea.buttons.l -text {} \
2377 -anchor w \
2378 -justify left
2379 pack .vpane.lower.commarea.buttons.l -side top -fill x
2380 pack .vpane.lower.commarea.buttons -side left -fill y
2382 button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
2383 -command do_rescan
2384 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2385 lappend disable_on_lock \
2386 {.vpane.lower.commarea.buttons.rescan conf -state}
2388 button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
2389 -command do_add_all
2390 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2391 lappend disable_on_lock \
2392 {.vpane.lower.commarea.buttons.incall conf -state}
2394 button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
2395 -command do_signoff
2396 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2398 button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \
2399 -command do_commit
2400 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2401 lappend disable_on_lock \
2402 {.vpane.lower.commarea.buttons.commit conf -state}
2404 button .vpane.lower.commarea.buttons.push -text [mc Push] \
2405 -command do_push_anywhere
2406 pack .vpane.lower.commarea.buttons.push -side top -fill x
2408 # -- Commit Message Buffer
2410 frame .vpane.lower.commarea.buffer
2411 frame .vpane.lower.commarea.buffer.header
2412 set ui_comm .vpane.lower.commarea.buffer.t
2413 set ui_coml .vpane.lower.commarea.buffer.header.l
2414 radiobutton .vpane.lower.commarea.buffer.header.new \
2415 -text [mc "New Commit"] \
2416 -command do_select_commit_type \
2417 -variable selected_commit_type \
2418 -value new
2419 lappend disable_on_lock \
2420 [list .vpane.lower.commarea.buffer.header.new conf -state]
2421 radiobutton .vpane.lower.commarea.buffer.header.amend \
2422 -text [mc "Amend Last Commit"] \
2423 -command do_select_commit_type \
2424 -variable selected_commit_type \
2425 -value amend
2426 lappend disable_on_lock \
2427 [list .vpane.lower.commarea.buffer.header.amend conf -state]
2428 label $ui_coml \
2429 -anchor w \
2430 -justify left
2431 proc trace_commit_type {varname args} {
2432 global ui_coml commit_type
2433 switch -glob -- $commit_type {
2434 initial {set txt [mc "Initial Commit Message:"]}
2435 amend {set txt [mc "Amended Commit Message:"]}
2436 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
2437 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
2438 merge {set txt [mc "Merge Commit Message:"]}
2439 * {set txt [mc "Commit Message:"]}
2441 $ui_coml conf -text $txt
2443 trace add variable commit_type write trace_commit_type
2444 pack $ui_coml -side left -fill x
2445 pack .vpane.lower.commarea.buffer.header.amend -side right
2446 pack .vpane.lower.commarea.buffer.header.new -side right
2448 text $ui_comm -background white -foreground black \
2449 -borderwidth 1 \
2450 -undo true \
2451 -maxundo 20 \
2452 -autoseparators true \
2453 -relief sunken \
2454 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
2455 -font font_diff \
2456 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2457 scrollbar .vpane.lower.commarea.buffer.sby \
2458 -command [list $ui_comm yview]
2459 pack .vpane.lower.commarea.buffer.header -side top -fill x
2460 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2461 pack $ui_comm -side left -fill y
2462 pack .vpane.lower.commarea.buffer -side left -fill y
2464 # -- Commit Message Buffer Context Menu
2466 set ctxm .vpane.lower.commarea.buffer.ctxm
2467 menu $ctxm -tearoff 0
2468 $ctxm add command \
2469 -label [mc Cut] \
2470 -command {tk_textCut $ui_comm}
2471 $ctxm add command \
2472 -label [mc Copy] \
2473 -command {tk_textCopy $ui_comm}
2474 $ctxm add command \
2475 -label [mc Paste] \
2476 -command {tk_textPaste $ui_comm}
2477 $ctxm add command \
2478 -label [mc Delete] \
2479 -command {$ui_comm delete sel.first sel.last}
2480 $ctxm add separator
2481 $ctxm add command \
2482 -label [mc "Select All"] \
2483 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
2484 $ctxm add command \
2485 -label [mc "Copy All"] \
2486 -command {
2487 $ui_comm tag add sel 0.0 end
2488 tk_textCopy $ui_comm
2489 $ui_comm tag remove sel 0.0 end
2491 $ctxm add separator
2492 $ctxm add command \
2493 -label [mc "Sign Off"] \
2494 -command do_signoff
2495 set ui_comm_ctxm $ctxm
2497 # -- Diff Header
2499 proc trace_current_diff_path {varname args} {
2500 global current_diff_path diff_actions file_states
2501 if {$current_diff_path eq {}} {
2502 set s {}
2503 set f {}
2504 set p {}
2505 set o disabled
2506 } else {
2507 set p $current_diff_path
2508 set s [mapdesc [lindex $file_states($p) 0] $p]
2509 set f [mc "File:"]
2510 set p [escape_path $p]
2511 set o normal
2514 .vpane.lower.diff.header.status configure -text $s
2515 .vpane.lower.diff.header.file configure -text $f
2516 .vpane.lower.diff.header.path configure -text $p
2517 foreach w $diff_actions {
2518 uplevel #0 $w $o
2521 trace add variable current_diff_path write trace_current_diff_path
2523 frame .vpane.lower.diff.header -background gold
2524 label .vpane.lower.diff.header.status \
2525 -background gold \
2526 -foreground black \
2527 -width $max_status_desc \
2528 -anchor w \
2529 -justify left
2530 label .vpane.lower.diff.header.file \
2531 -background gold \
2532 -foreground black \
2533 -anchor w \
2534 -justify left
2535 label .vpane.lower.diff.header.path \
2536 -background gold \
2537 -foreground black \
2538 -anchor w \
2539 -justify left
2540 pack .vpane.lower.diff.header.status -side left
2541 pack .vpane.lower.diff.header.file -side left
2542 pack .vpane.lower.diff.header.path -fill x
2543 set ctxm .vpane.lower.diff.header.ctxm
2544 menu $ctxm -tearoff 0
2545 $ctxm add command \
2546 -label [mc Copy] \
2547 -command {
2548 clipboard clear
2549 clipboard append \
2550 -format STRING \
2551 -type STRING \
2552 -- $current_diff_path
2554 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2555 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
2557 # -- Diff Body
2559 frame .vpane.lower.diff.body
2560 set ui_diff .vpane.lower.diff.body.t
2561 text $ui_diff -background white -foreground black \
2562 -borderwidth 0 \
2563 -width 80 -height 15 -wrap none \
2564 -font font_diff \
2565 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2566 -yscrollcommand {.vpane.lower.diff.body.sby set} \
2567 -state disabled
2568 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2569 -command [list $ui_diff xview]
2570 scrollbar .vpane.lower.diff.body.sby -orient vertical \
2571 -command [list $ui_diff yview]
2572 pack .vpane.lower.diff.body.sbx -side bottom -fill x
2573 pack .vpane.lower.diff.body.sby -side right -fill y
2574 pack $ui_diff -side left -fill both -expand 1
2575 pack .vpane.lower.diff.header -side top -fill x
2576 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2578 $ui_diff tag conf d_cr -elide true
2579 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
2580 $ui_diff tag conf d_+ -foreground {#00a000}
2581 $ui_diff tag conf d_- -foreground red
2583 $ui_diff tag conf d_++ -foreground {#00a000}
2584 $ui_diff tag conf d_-- -foreground red
2585 $ui_diff tag conf d_+s \
2586 -foreground {#00a000} \
2587 -background {#e2effa}
2588 $ui_diff tag conf d_-s \
2589 -foreground red \
2590 -background {#e2effa}
2591 $ui_diff tag conf d_s+ \
2592 -foreground {#00a000} \
2593 -background ivory1
2594 $ui_diff tag conf d_s- \
2595 -foreground red \
2596 -background ivory1
2598 $ui_diff tag conf d<<<<<<< \
2599 -foreground orange \
2600 -font font_diffbold
2601 $ui_diff tag conf d======= \
2602 -foreground orange \
2603 -font font_diffbold
2604 $ui_diff tag conf d>>>>>>> \
2605 -foreground orange \
2606 -font font_diffbold
2608 $ui_diff tag raise sel
2610 # -- Diff Body Context Menu
2612 set ctxm .vpane.lower.diff.body.ctxm
2613 menu $ctxm -tearoff 0
2614 $ctxm add command \
2615 -label [mc "Apply/Reverse Hunk"] \
2616 -command {apply_hunk $cursorX $cursorY}
2617 set ui_diff_applyhunk [$ctxm index last]
2618 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
2619 $ctxm add separator
2620 $ctxm add command \
2621 -label [mc "Show Less Context"] \
2622 -command show_less_context
2623 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2624 $ctxm add command \
2625 -label [mc "Show More Context"] \
2626 -command show_more_context
2627 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2628 $ctxm add separator
2629 $ctxm add command \
2630 -label [mc Refresh] \
2631 -command reshow_diff
2632 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2633 $ctxm add command \
2634 -label [mc Copy] \
2635 -command {tk_textCopy $ui_diff}
2636 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2637 $ctxm add command \
2638 -label [mc "Select All"] \
2639 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2640 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2641 $ctxm add command \
2642 -label [mc "Copy All"] \
2643 -command {
2644 $ui_diff tag add sel 0.0 end
2645 tk_textCopy $ui_diff
2646 $ui_diff tag remove sel 0.0 end
2648 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2649 $ctxm add separator
2650 $ctxm add command \
2651 -label [mc "Decrease Font Size"] \
2652 -command {incr_font_size font_diff -1}
2653 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2654 $ctxm add command \
2655 -label [mc "Increase Font Size"] \
2656 -command {incr_font_size font_diff 1}
2657 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2658 $ctxm add separator
2659 $ctxm add command -label [mc "Options..."] \
2660 -command do_options
2661 proc popup_diff_menu {ctxm x y X Y} {
2662 global current_diff_path file_states
2663 set ::cursorX $x
2664 set ::cursorY $y
2665 if {$::ui_index eq $::current_diff_side} {
2666 set l [mc "Unstage Hunk From Commit"]
2667 } else {
2668 set l [mc "Stage Hunk For Commit"]
2670 if {$::is_3way_diff
2671 || $current_diff_path eq {}
2672 || ![info exists file_states($current_diff_path)]
2673 || {_O} eq [lindex $file_states($current_diff_path) 0]} {
2674 set s disabled
2675 } else {
2676 set s normal
2678 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
2679 tk_popup $ctxm $X $Y
2681 bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y]
2683 # -- Status Bar
2685 set main_status [::status_bar::new .status]
2686 pack .status -anchor w -side bottom -fill x
2687 $main_status show [mc "Initializing..."]
2689 # -- Load geometry
2691 catch {
2692 set gm $repo_config(gui.geometry)
2693 wm geometry . [lindex $gm 0]
2694 .vpane sash place 0 \
2695 [lindex $gm 1] \
2696 [lindex [.vpane sash coord 0] 1]
2697 .vpane.files sash place 0 \
2698 [lindex [.vpane.files sash coord 0] 0] \
2699 [lindex $gm 2]
2700 unset gm
2703 # -- Key Bindings
2705 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2706 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
2707 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
2708 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
2709 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2710 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2711 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2712 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2713 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2714 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2715 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2716 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2717 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2718 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
2719 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
2720 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
2721 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
2722 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
2724 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2725 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2726 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2727 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2728 bind $ui_diff <$M1B-Key-v> {break}
2729 bind $ui_diff <$M1B-Key-V> {break}
2730 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2731 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2732 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2733 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2734 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2735 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
2736 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
2737 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
2738 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
2739 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
2740 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
2741 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
2742 bind $ui_diff <Button-1> {focus %W}
2744 if {[is_enabled branch]} {
2745 bind . <$M1B-Key-n> branch_create::dialog
2746 bind . <$M1B-Key-N> branch_create::dialog
2747 bind . <$M1B-Key-o> branch_checkout::dialog
2748 bind . <$M1B-Key-O> branch_checkout::dialog
2749 bind . <$M1B-Key-m> merge::dialog
2750 bind . <$M1B-Key-M> merge::dialog
2752 if {[is_enabled transport]} {
2753 bind . <$M1B-Key-p> do_push_anywhere
2754 bind . <$M1B-Key-P> do_push_anywhere
2757 bind . <Key-F5> do_rescan
2758 bind . <$M1B-Key-r> do_rescan
2759 bind . <$M1B-Key-R> do_rescan
2760 bind . <$M1B-Key-s> do_signoff
2761 bind . <$M1B-Key-S> do_signoff
2762 bind . <$M1B-Key-t> do_add_selection
2763 bind . <$M1B-Key-T> do_add_selection
2764 bind . <$M1B-Key-i> do_add_all
2765 bind . <$M1B-Key-I> do_add_all
2766 bind . <$M1B-Key-minus> {show_less_context;break}
2767 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
2768 bind . <$M1B-Key-equal> {show_more_context;break}
2769 bind . <$M1B-Key-plus> {show_more_context;break}
2770 bind . <$M1B-Key-KP_Add> {show_more_context;break}
2771 bind . <$M1B-Key-Return> do_commit
2772 foreach i [list $ui_index $ui_workdir] {
2773 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
2774 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2775 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
2777 unset i
2779 set file_lists($ui_index) [list]
2780 set file_lists($ui_workdir) [list]
2782 wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2783 focus -force $ui_comm
2785 # -- Warn the user about environmental problems. Cygwin's Tcl
2786 # does *not* pass its env array onto any processes it spawns.
2787 # This means that git processes get none of our environment.
2789 if {[is_Cygwin]} {
2790 set ignored_env 0
2791 set suggest_user {}
2792 set msg [mc "Possible environment issues exist.
2794 The following environment variables are probably
2795 going to be ignored by any Git subprocess run
2796 by %s:
2798 " [appname]]
2799 foreach name [array names env] {
2800 switch -regexp -- $name {
2801 {^GIT_INDEX_FILE$} -
2802 {^GIT_OBJECT_DIRECTORY$} -
2803 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
2804 {^GIT_DIFF_OPTS$} -
2805 {^GIT_EXTERNAL_DIFF$} -
2806 {^GIT_PAGER$} -
2807 {^GIT_TRACE$} -
2808 {^GIT_CONFIG$} -
2809 {^GIT_CONFIG_LOCAL$} -
2810 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
2811 append msg " - $name\n"
2812 incr ignored_env
2814 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
2815 append msg " - $name\n"
2816 incr ignored_env
2817 set suggest_user $name
2821 if {$ignored_env > 0} {
2822 append msg [mc "
2823 This is due to a known issue with the
2824 Tcl binary distributed by Cygwin."]
2826 if {$suggest_user ne {}} {
2827 append msg [mc "
2829 A good replacement for %s
2830 is placing values for the user.name and
2831 user.email settings into your personal
2832 ~/.gitconfig file.
2833 " $suggest_user]
2835 warn_popup $msg
2837 unset ignored_env msg suggest_user name
2840 # -- Only initialize complex UI if we are going to stay running.
2842 if {[is_enabled transport]} {
2843 load_all_remotes
2845 set n [.mbar.remote index end]
2846 populate_push_menu
2847 populate_fetch_menu
2848 set n [expr {[.mbar.remote index end] - $n}]
2849 if {$n > 0} {
2850 .mbar.remote insert $n separator
2852 unset n
2855 if {[winfo exists $ui_comm]} {
2856 set GITGUI_BCK_exists [load_message GITGUI_BCK]
2858 # -- If both our backup and message files exist use the
2859 # newer of the two files to initialize the buffer.
2861 if {$GITGUI_BCK_exists} {
2862 set m [gitdir GITGUI_MSG]
2863 if {[file isfile $m]} {
2864 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
2865 catch {file delete [gitdir GITGUI_MSG]}
2866 } else {
2867 $ui_comm delete 0.0 end
2868 $ui_comm edit reset
2869 $ui_comm edit modified false
2870 catch {file delete [gitdir GITGUI_BCK]}
2871 set GITGUI_BCK_exists 0
2874 unset m
2877 proc backup_commit_buffer {} {
2878 global ui_comm GITGUI_BCK_exists
2880 set m [$ui_comm edit modified]
2881 if {$m || $GITGUI_BCK_exists} {
2882 set msg [string trim [$ui_comm get 0.0 end]]
2883 regsub -all -line {[ \r\t]+$} $msg {} msg
2885 if {$msg eq {}} {
2886 if {$GITGUI_BCK_exists} {
2887 catch {file delete [gitdir GITGUI_BCK]}
2888 set GITGUI_BCK_exists 0
2890 } elseif {$m} {
2891 catch {
2892 set fd [open [gitdir GITGUI_BCK] w]
2893 puts -nonewline $fd $msg
2894 close $fd
2895 set GITGUI_BCK_exists 1
2899 $ui_comm edit modified false
2902 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
2905 backup_commit_buffer
2907 # -- If the user has aspell available we can drive it
2908 # in pipe mode to spellcheck the commit message.
2910 set spell_cmd [list |]
2911 set spell_dict [get_config gui.spellingdictionary]
2912 lappend spell_cmd aspell
2913 if {$spell_dict ne {}} {
2914 lappend spell_cmd --master=$spell_dict
2916 lappend spell_cmd --mode=none
2917 lappend spell_cmd --encoding=utf-8
2918 lappend spell_cmd pipe
2919 if {$spell_dict eq {none}
2920 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
2921 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
2922 } else {
2923 set ui_comm_spell [spellcheck::init \
2924 $spell_fd \
2925 $ui_comm \
2926 $ui_comm_ctxm \
2929 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
2932 lock_index begin-read
2933 if {![winfo ismapped .]} {
2934 wm deiconify .
2936 after 1 do_rescan
2937 if {[is_enabled multicommit]} {
2938 after 1000 hint_gc