2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 ||
test "z$*" = z--version
; \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
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
]
41 -title [mc
"git-gui: fatal error"] \
46 catch
{rename send
{}} ; # What an evil concept...
48 ######################################################################
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
]
62 set oguimsg
[file join $oguilib msgs
]
66 ######################################################################
68 ## enable verbose loading?
70 if {![catch
{set _verbose
$env(GITGUI_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
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
92 set cmk
[string first @@
$fmt]
94 return [string range
$fmt 0 [expr {$cmk - 1}]]
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]
108 return [join $args {}]
111 ::msgcat
::mcload
$oguimsg
114 ######################################################################
118 set _appname
{Git Gui
}
125 set _trace
[lsearch
-exact $argv --trace]
127 set argv
[lreplace
$argv $_trace $_trace]
143 return [eval [list
file join $_gitdir] $args]
146 proc gitexec
{args
} {
148 if {$_gitexec eq
{}} {
149 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
150 error
"Git not installed?\n\n$err"
153 set _gitexec
[exec cygpath \
158 set _gitexec
[file normalize
$_gitexec]
164 return [eval [list
file join $_gitexec] $args]
172 if {[tk windowingsystem
] eq
{aqua
}} {
179 if {$
::tcl_platform
(platform
) eq
{windows
}} {
187 if {$_iscygwin eq
{}} {
188 if {$
::tcl_platform
(platform
) eq
{windows
}} {
189 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
201 proc is_enabled
{option
} {
202 global enabled_options
203 if {[catch
{set on
$enabled_options($option)}]} {return 0}
207 proc enable_option
{option
} {
208 global enabled_options
209 set enabled_options
($option) 1
212 proc disable_option
{option
} {
213 global enabled_options
214 set enabled_options
($option) 0
217 ######################################################################
221 proc is_many_config
{name
} {
222 switch
-glob -- $name {
232 proc is_config_true
{name
} {
234 if {[catch
{set v
$repo_config($name)}]} {
236 } elseif
{$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes}} {
243 proc get_config
{name
} {
245 if {[catch
{set v
$repo_config($name)}]} {
252 ######################################################################
256 proc _trace_exec
{cmd
} {
257 if {!$
::_trace
} return
263 if {[regexp
{[ \t\r\n'"$?*]} $v]} {
271 proc _git_cmd {name} {
274 if {[catch {set v $_git_cmd_path($name)}]} {
278 --exec-path { return [list $::_git $name] }
281 set p [gitexec git-$name$::_search_exe]
282 if {[file exists $p]} {
284 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
285 # Try to determine what sort of magic will make
286 # git-$name go and do its thing, because native
287 # Tcl on Windows doesn't know it.
289 set p
[gitexec git-
$name]
294 switch
-glob -- [lindex
$s 0] {
296 #!*perl { set i perl }
297 #!*python { set i python }
298 default
{ error
"git-$name is not supported: $s" }
302 if {![info exists interp
]} {
303 set interp
[_which
$i]
306 error
"git-$name requires $i (not in PATH)"
308 set v
[concat
[list
$interp] [lrange
$s 1 end
] [list
$p]]
310 # Assume it is builtin to git somehow and we
311 # aren't actually able to see a file for it.
313 set v
[list $
::_git
$name]
315 set _git_cmd_path
($name) $v
321 global env _search_exe _search_path
323 if {$_search_path eq
{}} {
324 if {[is_Cygwin
] && [regexp
{^
(/|\.
:)} $env(PATH
)]} {
325 set _search_path
[split [exec cygpath \
331 } elseif
{[is_Windows
]} {
332 set gitguidir
[file dirname [info
script]]
333 regsub
-all ";" $gitguidir "\\;" gitguidir
334 set env
(PATH
) "$gitguidir;$env(PATH)"
335 set _search_path
[split $env(PATH
) {;}]
338 set _search_path
[split $env(PATH
) :]
343 foreach p
$_search_path {
344 set p
[file join $p $what$_search_exe]
345 if {[file exists
$p]} {
346 return [file normalize
$p]
352 proc _lappend_nice
{cmd_var
} {
356 if {![info exists _nice
]} {
357 set _nice
[_which nice
]
368 switch
-- [lindex
$args 0] {
379 set args
[lrange
$args 1 end
]
382 set cmdp
[_git_cmd
[lindex
$args 0]]
383 set args
[lrange
$args 1 end
]
385 _trace_exec
[concat
$opt $cmdp $args]
386 set result
[eval exec $opt $cmdp $args]
388 puts stderr
"< $result"
393 proc _open_stdout_stderr
{cmd
} {
396 set fd
[open
[concat
[list |
] $cmd] r
]
398 if { [lindex
$cmd end
] eq
{2>@
1}
399 && $err eq
{can not
find channel named
"1"}
401 # Older versions of Tcl 8.4 don't have this 2>@1 IO
402 # redirect operator. Fallback to |& cat for those.
403 # The command was not actually started, so its safe
404 # to try to start it a second time.
406 set fd
[open
[concat \
408 [lrange
$cmd 0 end-1
] \
415 fconfigure
$fd -eofchar {}
419 proc git_read
{args
} {
423 switch
-- [lindex
$args 0] {
438 set args
[lrange
$args 1 end
]
441 set cmdp
[_git_cmd
[lindex
$args 0]]
442 set args
[lrange
$args 1 end
]
444 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
447 proc git_write
{args
} {
451 switch
-- [lindex
$args 0] {
462 set args
[lrange
$args 1 end
]
465 set cmdp
[_git_cmd
[lindex
$args 0]]
466 set args
[lrange
$args 1 end
]
468 _trace_exec
[concat
$opt $cmdp $args]
469 return [open
[concat
[list |
] $opt $cmdp $args] w
]
472 proc githook_read
{hook_name args
} {
473 set pchook
[gitdir hooks
$hook_name]
476 # On Cygwin [file executable] might lie so we need to ask
477 # the shell if the hook is executable. Yes that's annoying.
481 if {![info exists interp
]} {
482 set interp
[_which sh
]
485 error
"hook execution requires sh (not in PATH)"
488 set scr
{if test -x "$1";then exec "$@";fi}
489 set sh_c
[list
$interp -c $scr $interp $pchook]
490 return [_open_stdout_stderr
[concat
$sh_c $args]]
493 if {[file executable
$pchook]} {
494 return [_open_stdout_stderr
[concat
[list
$pchook] $args]]
501 regsub
-all ' $value "'\\''" value
505 proc load_current_branch {} {
506 global current_branch is_detached
508 set fd [open [gitdir HEAD] r]
509 if {[gets $fd ref] < 1} {
514 set pfx {ref: refs/heads/}
515 set len [string length $pfx]
516 if {[string equal -length $len $pfx $ref]} {
517 # We're on a branch. It might not exist. But
518 # HEAD looks good enough to be a branch.
520 set current_branch [string range $ref $len end]
523 # Assume this is a detached head.
525 set current_branch HEAD
530 auto_load tk_optionMenu
531 rename tk_optionMenu real__tkOptionMenu
532 proc tk_optionMenu {w varName args} {
533 set m [eval real__tkOptionMenu $w $varName $args]
534 $m configure -font font_ui
535 $w configure -font font_ui
539 proc rmsel_tag {text} {
541 -background [$text cget -background] \
542 -foreground [$text cget -foreground] \
544 $text tag conf in_sel -background lightgray
545 bind $text <Motion> break
550 bind . <Visibility> {
551 bind . <Visibility> {}
556 wm iconbitmap . -default $oguilib/git-gui.ico
559 ######################################################################
564 font create font_diff -family Courier -size 10
568 eval font configure font_ui [font actual [.dummy cget -font]]
572 font create font_uiitalic
573 font create font_uibold
574 font create font_diffbold
575 font create font_diffitalic
577 foreach class {Button Checkbutton Entry Label
578 Labelframe Listbox Menu Message
579 Radiobutton Spinbox Text} {
580 option add *$class.font font_ui
584 if {[is_Windows] || [is_MacOSX]} {
585 option add *Menu.tearOff 0
596 proc bind_button3 {w cmd} {
597 bind $w <Any-Button-3> $cmd
599 # Mac OS X sends Button-2 on right click through three-button mouse,
600 # or through trackpad right-clicking (two-finger touch + click).
601 bind $w <Any-Button-2> $cmd
602 bind $w <Control-Button-1> $cmd
606 proc apply_config {} {
607 global repo_config font_descs
609 foreach option $font_descs {
610 set name [lindex $option 0]
611 set font [lindex $option 1]
614 foreach {cn cv} $repo_config(gui.$name) {
615 if {$cn eq {-weight}} {
618 font configure $font $cn $cv
621 font configure $font -weight normal
624 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
626 foreach {cn cv} [font configure $font] {
627 font configure ${font}bold $cn $cv
628 font configure ${font}italic $cn $cv
630 font configure ${font}bold -weight bold
631 font configure ${font}italic -slant italic
635 set default_config(branch.autosetupmerge) true
636 set default_config(merge.diffstat) true
637 set default_config(merge.summary) false
638 set default_config(merge.verbosity) 2
639 set default_config(user.name) {}
640 set default_config(user.email) {}
642 set default_config(gui.matchtrackingbranch) false
643 set default_config(gui.pruneduringfetch) false
644 set default_config(gui.trustmtime) false
645 set default_config(gui.diffcontext) 5
646 set default_config(gui.commitmsgwidth) 75
647 set default_config(gui.newbranchtemplate) {}
648 set default_config(gui.spellingdictionary) {}
649 set default_config(gui.fontui) [font configure font_ui]
650 set default_config(gui.fontdiff) [font configure font_diff]
652 {fontui font_ui {mc "Main Font
"}}
653 {fontdiff font_diff {mc "Diff
/Console Font
"}}
656 ######################################################################
660 set _git [_which git]
662 catch {wm withdraw .}
666 -title [mc "git-gui
: fatal error
"] \
667 -message [mc "Cannot
find git
in PATH.
"]
671 ######################################################################
675 if {[catch {set _git_version [git --version]} err]} {
676 catch {wm withdraw .}
680 -title [mc "git-gui
: fatal error
"] \
681 -message "Cannot determine Git version
:
685 [appname
] requires Git
1.5.0 or later.
"
688 if {![regsub {^git version } $_git_version {} _git_version]} {
689 catch {wm withdraw .}
693 -title [mc "git-gui
: fatal error
"] \
694 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
698 set _real_git_version $_git_version
699 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
700 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
701 regsub {\.rc[0-9]+$} $_git_version {} _git_version
702 regsub {\.GIT$} $_git_version {} _git_version
703 regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
705 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
706 catch {wm withdraw .}
711 -title "[appname
]: warning
" \
712 -message [mc "Git version cannot be determined.
714 %s claims it is version
'%s'.
716 %s requires
at least Git
1.5.0 or later.
718 Assume
'%s' is version
1.5.0?
719 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
720 set _git_version 1.5.0
725 unset _real_git_version
727 proc git-version {args} {
730 switch [llength $args] {
736 set op [lindex $args 0]
737 set vr [lindex $args 1]
738 set cm [package vcompare $_git_version $vr]
739 return [expr $cm $op 0]
743 set type [lindex $args 0]
744 set name [lindex $args 1]
745 set parm [lindex $args 2]
746 set body [lindex $args 3]
748 if {($type ne {proc} && $type ne {method})} {
749 error "Invalid arguments to git-version
"
751 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
752 error "Last arm of
$type $name must be default
"
755 foreach {op vr cb} [lrange $body 0 end-2] {
756 if {[git-version $op $vr]} {
757 return [uplevel [list $type $name $parm $cb]]
761 return [uplevel [list $type $name $parm [lindex $body end]]]
765 error "git-version
>= x
"
771 if {[git-version < 1.5]} {
772 catch {wm withdraw .}
776 -title [mc "git-gui
: fatal error
"] \
777 -message "[appname
] requires Git
1.5.0 or later.
779 You are using
[git-version
]:
785 ######################################################################
787 ## configure our library
789 set idx [file join $oguilib tclIndex]
790 if {[catch {set fd [open $idx r]} err]} {
791 catch {wm withdraw .}
795 -title [mc "git-gui
: fatal error
"] \
799 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
801 while {[gets $fd n] >= 0} {
802 if {$n ne {} && ![string match #* $n]} {
814 if {[lsearch -exact $loaded $p] >= 0} continue
815 source [file join $oguilib $p]
820 set auto_path [concat [list $oguilib] $auto_path]
822 unset -nocomplain idx fd
824 ######################################################################
826 ## config file parsing
828 git-version proc _parse_config {arr_name args} {
835 [list git_read config] \
837 [list --null --list]]
838 fconfigure $fd_rc -translation binary
839 set buf [read $fd_rc]
842 foreach line [split $buf "\
0"] {
843 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
844 if {[is_many_config $name]} {
845 lappend arr($name) $value
847 set arr($name) $value
856 set fd_rc [eval [list git_read config --list] $args]
857 while {[gets $fd_rc line] >= 0} {
858 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
859 if {[is_many_config $name]} {
860 lappend arr($name) $value
862 set arr($name) $value
871 proc load_config {include_global} {
872 global repo_config global_config default_config
874 if {$include_global} {
875 _parse_config global_config --global
877 _parse_config repo_config
879 foreach name [array names default_config] {
880 if {[catch {set v $global_config($name)}]} {
881 set global_config($name) $default_config($name)
883 if {[catch {set v $repo_config($name)}]} {
884 set repo_config($name) $default_config($name)
889 ######################################################################
891 ## feature option selection
893 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
898 if {$subcommand eq {gui.sh}} {
901 if {$subcommand eq {gui} && [llength $argv] > 0} {
902 set subcommand [lindex $argv 0]
903 set argv [lrange $argv 1 end]
906 enable_option multicommit
908 enable_option transport
911 switch -- $subcommand {
916 disable_option multicommit
917 disable_option branch
918 disable_option transport
921 enable_option singlecommit
923 disable_option multicommit
924 disable_option branch
925 disable_option transport
929 ######################################################################
934 set _gitdir $env(GIT_DIR)
938 set _gitdir [git rev-parse --git-dir]
939 set _prefix [git rev-parse --show-prefix]
943 choose_repository::pick
945 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
946 catch {set _gitdir [exec cygpath --windows $_gitdir]}
948 if {![file isdirectory $_gitdir]} {
949 catch {wm withdraw .}
950 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
953 if {$_prefix ne {}} {
954 regsub -all {[^/]+/} $_prefix ../ cdup
955 if {[catch {cd $cdup} err]} {
956 catch {wm withdraw .}
957 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
961 } elseif {![is_enabled bare]} {
962 if {[lindex [file split $_gitdir] end] ne {.git}} {
963 catch {wm withdraw .}
964 error_popup [strcat [mc "Cannot use funny .git directory
:"] "\n\n$_gitdir"]
967 if {[catch {cd [file dirname $_gitdir]} err]} {
968 catch {wm withdraw .}
969 error_popup [strcat [mc "No working directory
"] " [file dirname $_gitdir]:\n\n$err"]
973 set _reponame [file split [file normalize $_gitdir]]
974 if {[lindex $_reponame end] eq {.git}} {
975 set _reponame [lindex $_reponame end-1]
977 set _reponame [lindex $_reponame end]
980 ######################################################################
984 set current_diff_path {}
985 set current_diff_side {}
986 set diff_actions [list]
990 set MERGE_HEAD [list]
993 set current_branch {}
995 set current_diff_path {}
997 set selected_commit_type new
999 ######################################################################
1007 set disable_on_lock [list]
1008 set index_lock_type none
1010 proc lock_index {type} {
1011 global index_lock_type disable_on_lock
1013 if {$index_lock_type eq {none}} {
1014 set index_lock_type $type
1015 foreach w $disable_on_lock {
1016 uplevel #0 $w disabled
1019 } elseif {$index_lock_type eq "begin-
$type"} {
1020 set index_lock_type $type
1026 proc unlock_index {} {
1027 global index_lock_type disable_on_lock
1029 set index_lock_type none
1030 foreach w $disable_on_lock {
1031 uplevel #0 $w normal
1035 ######################################################################
1039 proc repository_state {ctvar hdvar mhvar} {
1040 global current_branch
1041 upvar $ctvar ct $hdvar hd $mhvar mh
1046 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1052 set merge_head [gitdir MERGE_HEAD]
1053 if {[file exists $merge_head]} {
1055 set fd_mh [open $merge_head r]
1056 while {[gets $fd_mh line] >= 0} {
1067 global PARENT empty_tree
1069 set p [lindex $PARENT 0]
1073 if {$empty_tree eq {}} {
1074 set empty_tree [git mktree << {}]
1079 proc rescan {after {honor_trustmtime 1}} {
1080 global HEAD PARENT MERGE_HEAD commit_type
1081 global ui_index ui_workdir ui_comm
1082 global rescan_active file_states
1085 if {$rescan_active > 0 || ![lock_index read]} return
1087 repository_state newType newHEAD newMERGE_HEAD
1088 if {[string match amend* $commit_type]
1089 && $newType eq {normal}
1090 && $newHEAD eq $HEAD} {
1094 set MERGE_HEAD $newMERGE_HEAD
1095 set commit_type $newType
1098 array unset file_states
1100 if {!$::GITGUI_BCK_exists &&
1101 (![$ui_comm edit modified]
1102 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1103 if {[string match amend* $commit_type]} {
1104 } elseif {[load_message GITGUI_MSG]} {
1105 } elseif {[load_message MERGE_MSG]} {
1106 } elseif {[load_message SQUASH_MSG]} {
1109 $ui_comm edit modified false
1112 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1113 rescan_stage2 {} $after
1116 ui_status [mc "Refreshing
file status...
"]
1117 set fd_rf [git_read update-index \
1123 fconfigure $fd_rf -blocking 0 -translation binary
1124 fileevent $fd_rf readable \
1125 [list rescan_stage2 $fd_rf $after]
1130 set is_git_info_link {}
1131 set is_git_info_exclude {}
1132 proc have_info_exclude {} {
1133 global is_git_info_link is_git_info_exclude
1135 if {$is_git_info_link eq {}} {
1136 set is_git_info_link [file isfile [gitdir info.lnk]]
1139 if {$is_git_info_link} {
1140 if {$is_git_info_exclude eq {}} {
1141 if {[catch {exec test -f [gitdir info exclude]}]} {
1142 set is_git_info_exclude 0
1144 set is_git_info_exclude 1
1147 return $is_git_info_exclude
1149 return [file readable [gitdir info exclude]]
1153 proc have_info_exclude {} {
1154 return [file readable [gitdir info exclude]]
1158 proc rescan_stage2 {fd after} {
1159 global rescan_active buf_rdi buf_rdf buf_rlo
1163 if {![eof $fd]} return
1167 set ls_others [list --exclude-per-directory=.gitignore]
1168 if {[have_info_exclude]} {
1169 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1171 set user_exclude [get_config core.excludesfile]
1172 if {$user_exclude ne {} && [file readable $user_exclude]} {
1173 lappend ls_others "--exclude-from=$user_exclude"
1181 ui_status [mc "Scanning
for modified files ...
"]
1182 set fd_di [git_read diff-index --cached -z [PARENT]]
1183 set fd_df [git_read diff-files -z]
1184 set fd_lo [eval git_read ls-files --others -z $ls_others]
1186 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1187 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1188 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1189 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1190 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1191 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1194 proc load_message {file} {
1197 set f [gitdir $file]
1198 if {[file isfile $f]} {
1199 if {[catch {set fd [open $f r]}]} {
1202 fconfigure $fd -eofchar {}
1203 set content [string trim [read $fd]]
1205 regsub -all -line {[ \r\t]+$} $content {} content
1206 $ui_comm delete 0.0 end
1207 $ui_comm insert end $content
1213 proc read_diff_index {fd after} {
1216 append buf_rdi [read $fd]
1218 set n [string length $buf_rdi]
1220 set z1 [string first "\
0" $buf_rdi $c]
1221 if {$z1 == -1} break
1223 set z2 [string first "\
0" $buf_rdi $z1]
1224 if {$z2 == -1} break
1227 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1228 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1230 [encoding convertfrom $p] \
1232 [list [lindex $i 0] [lindex $i 2]] \
1238 set buf_rdi [string range $buf_rdi $c end]
1243 rescan_done $fd buf_rdi $after
1246 proc read_diff_files {fd after} {
1249 append buf_rdf [read $fd]
1251 set n [string length $buf_rdf]
1253 set z1 [string first "\
0" $buf_rdf $c]
1254 if {$z1 == -1} break
1256 set z2 [string first "\
0" $buf_rdf $z1]
1257 if {$z2 == -1} break
1260 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1261 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1263 [encoding convertfrom $p] \
1266 [list [lindex $i 0] [lindex $i 2]]
1271 set buf_rdf [string range $buf_rdf $c end]
1276 rescan_done $fd buf_rdf $after
1279 proc read_ls_others {fd after} {
1282 append buf_rlo [read $fd]
1283 set pck [split $buf_rlo "\
0"]
1284 set buf_rlo [lindex $pck end]
1285 foreach p [lrange $pck 0 end-1] {
1286 set p [encoding convertfrom $p]
1287 if {[string index $p end] eq {/}} {
1288 set p [string range $p 0 end-1]
1292 rescan_done $fd buf_rlo $after
1295 proc rescan_done {fd buf after} {
1296 global rescan_active current_diff_path
1297 global file_states repo_config
1300 if {![eof $fd]} return
1303 if {[incr rescan_active -1] > 0} return
1308 if {$current_diff_path ne {}} reshow_diff
1312 proc prune_selection {} {
1313 global file_states selected_paths
1315 foreach path [array names selected_paths] {
1316 if {[catch {set still_here $file_states($path)}]} {
1317 unset selected_paths($path)
1322 ######################################################################
1326 proc mapicon {w state path} {
1329 if {[catch {set r $all_icons($state$w)}]} {
1330 puts "error
: no icon
for $w state
={$state} $path"
1336 proc mapdesc {state path} {
1339 if {[catch {set r $all_descs($state)}]} {
1340 puts "error
: no desc
for state
={$state} $path"
1346 proc ui_status {msg} {
1348 if {[info exists main_status]} {
1349 $main_status show $msg
1353 proc ui_ready {{test {}}} {
1355 if {[info exists main_status]} {
1356 $main_status show [mc "Ready.
"] $test
1360 proc escape_path {path} {
1361 regsub -all {\\} $path "\\\\" path
1362 regsub -all "\n" $path "\\n
" path
1366 proc short_path {path} {
1367 return [escape_path [lindex [file split $path] end]]
1371 set null_sha1 [string repeat 0 40]
1373 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1374 global file_states next_icon_id null_sha1
1376 set s0 [string index $new_state 0]
1377 set s1 [string index $new_state 1]
1379 if {[catch {set info $file_states($path)}]} {
1381 set icon n[incr next_icon_id]
1383 set state [lindex $info 0]
1384 set icon [lindex $info 1]
1385 if {$head_info eq {}} {set head_info [lindex $info 2]}
1386 if {$index_info eq {}} {set index_info [lindex $info 3]}
1389 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1390 elseif {$s0 eq {_}} {set s0 _}
1392 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1393 elseif {$s1 eq {_}} {set s1 _}
1395 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1396 set head_info [list 0 $null_sha1]
1397 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1398 && $head_info eq {}} {
1399 set head_info $index_info
1402 set file_states($path) [list $s0$s1 $icon \
1403 $head_info $index_info \
1408 proc display_file_helper {w path icon_name old_m new_m} {
1411 if {$new_m eq {_}} {
1412 set lno [lsearch -sorted -exact $file_lists($w) $path]
1414 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1416 $w conf -state normal
1417 $w delete $lno.0 [expr {$lno + 1}].0
1418 $w conf -state disabled
1420 } elseif {$old_m eq {_} && $new_m ne {_}} {
1421 lappend file_lists($w) $path
1422 set file_lists($w) [lsort -unique $file_lists($w)]
1423 set lno [lsearch -sorted -exact $file_lists($w) $path]
1425 $w conf -state normal
1426 $w image create $lno.0 \
1427 -align center -padx 5 -pady 1 \
1429 -image [mapicon $w $new_m $path]
1430 $w insert $lno.1 "[escape_path
$path]\n"
1431 $w conf -state disabled
1432 } elseif {$old_m ne $new_m} {
1433 $w conf -state normal
1434 $w image conf $icon_name -image [mapicon $w $new_m $path]
1435 $w conf -state disabled
1439 proc display_file {path state} {
1440 global file_states selected_paths
1441 global ui_index ui_workdir
1443 set old_m [merge_state $path $state]
1444 set s $file_states($path)
1445 set new_m [lindex $s 0]
1446 set icon_name [lindex $s 1]
1448 set o [string index $old_m 0]
1449 set n [string index $new_m 0]
1456 display_file_helper $ui_index $path $icon_name $o $n
1458 if {[string index $old_m 0] eq {U}} {
1461 set o [string index $old_m 1]
1463 if {[string index $new_m 0] eq {U}} {
1466 set n [string index $new_m 1]
1468 display_file_helper $ui_workdir $path $icon_name $o $n
1470 if {$new_m eq {__}} {
1471 unset file_states($path)
1472 catch {unset selected_paths($path)}
1476 proc display_all_files_helper {w path icon_name m} {
1479 lappend file_lists($w) $path
1480 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1481 $w image create end \
1482 -align center -padx 5 -pady 1 \
1484 -image [mapicon $w $m $path]
1485 $w insert end "[escape_path
$path]\n"
1488 proc display_all_files {} {
1489 global ui_index ui_workdir
1490 global file_states file_lists
1493 $ui_index conf -state normal
1494 $ui_workdir conf -state normal
1496 $ui_index delete 0.0 end
1497 $ui_workdir delete 0.0 end
1500 set file_lists($ui_index) [list]
1501 set file_lists($ui_workdir) [list]
1503 foreach path [lsort [array names file_states]] {
1504 set s $file_states($path)
1506 set icon_name [lindex $s 1]
1508 set s [string index $m 0]
1509 if {$s ne {U} && $s ne {_}} {
1510 display_all_files_helper $ui_index $path \
1514 if {[string index $m 0] eq {U}} {
1517 set s [string index $m 1]
1520 display_all_files_helper $ui_workdir $path \
1525 $ui_index conf -state disabled
1526 $ui_workdir conf -state disabled
1529 ######################################################################
1534 #define mask_width 14
1535 #define mask_height 15
1536 static unsigned char mask_bits[] = {
1537 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1538 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1539 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1542 image create bitmap file_plain -background white -foreground black -data {
1543 #define plain_width 14
1544 #define plain_height 15
1545 static unsigned char plain_bits[] = {
1546 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1547 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1548 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1549 } -maskdata $filemask
1551 image create bitmap file_mod -background white -foreground blue -data {
1552 #define mod_width 14
1553 #define mod_height 15
1554 static unsigned char mod_bits[] = {
1555 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1556 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1557 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1558 } -maskdata $filemask
1560 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1561 #define file_fulltick_width 14
1562 #define file_fulltick_height 15
1563 static unsigned char file_fulltick_bits
[] = {
1564 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1565 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1566 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1567 } -maskdata $filemask
1569 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1570 #define parttick_width 14
1571 #define parttick_height 15
1572 static unsigned char parttick_bits
[] = {
1573 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1574 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1575 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1576 } -maskdata $filemask
1578 image create bitmap file_question
-background white
-foreground black
-data {
1579 #define file_question_width 14
1580 #define file_question_height 15
1581 static unsigned char file_question_bits
[] = {
1582 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1583 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1584 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1585 } -maskdata $filemask
1587 image create bitmap file_removed
-background white
-foreground red
-data {
1588 #define file_removed_width 14
1589 #define file_removed_height 15
1590 static unsigned char file_removed_bits
[] = {
1591 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1592 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1593 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1594 } -maskdata $filemask
1596 image create bitmap file_merge
-background white
-foreground blue
-data {
1597 #define file_merge_width 14
1598 #define file_merge_height 15
1599 static unsigned char file_merge_bits
[] = {
1600 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1601 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1602 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1603 } -maskdata $filemask
1605 set ui_index .vpane.files.index.list
1606 set ui_workdir .vpane.files.workdir.list
1608 set all_icons
(_
$ui_index) file_plain
1609 set all_icons
(A
$ui_index) file_fulltick
1610 set all_icons
(M
$ui_index) file_fulltick
1611 set all_icons
(D
$ui_index) file_removed
1612 set all_icons
(U
$ui_index) file_merge
1614 set all_icons
(_
$ui_workdir) file_plain
1615 set all_icons
(M
$ui_workdir) file_mod
1616 set all_icons
(D
$ui_workdir) file_question
1617 set all_icons
(U
$ui_workdir) file_merge
1618 set all_icons
(O
$ui_workdir) file_plain
1620 set max_status_desc
0
1622 {__
{mc
"Unmodified"}}
1624 {_M
{mc
"Modified, not staged"}}
1625 {M_
{mc
"Staged for commit"}}
1626 {MM
{mc
"Portions staged for commit"}}
1627 {MD
{mc
"Staged for commit, missing"}}
1629 {_O
{mc
"Untracked, not staged"}}
1630 {A_
{mc
"Staged for commit"}}
1631 {AM
{mc
"Portions staged for commit"}}
1632 {AD
{mc
"Staged for commit, missing"}}
1635 {D_
{mc
"Staged for removal"}}
1636 {DO
{mc
"Staged for removal, still present"}}
1638 {U_
{mc
"Requires merge resolution"}}
1639 {UU
{mc
"Requires merge resolution"}}
1640 {UM
{mc
"Requires merge resolution"}}
1641 {UD
{mc
"Requires merge resolution"}}
1643 set text
[eval [lindex
$i 1]]
1644 if {$max_status_desc < [string length
$text]} {
1645 set max_status_desc
[string length
$text]
1647 set all_descs
([lindex
$i 0]) $text
1651 ######################################################################
1655 proc scrollbar2many
{list mode args
} {
1656 foreach w
$list {eval $w $mode $args}
1659 proc many2scrollbar
{list mode sb top bottom
} {
1660 $sb set $top $bottom
1661 foreach w
$list {$w $mode moveto
$top}
1664 proc incr_font_size
{font
{amt
1}} {
1665 set sz
[font configure
$font -size]
1667 font configure
$font -size $sz
1668 font configure
${font}bold
-size $sz
1669 font configure
${font}italic
-size $sz
1672 ######################################################################
1676 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1678 proc do_gitk
{revs
} {
1679 # -- Always start gitk through whatever we were loaded with. This
1680 # lets us bypass using shell process on Windows systems.
1682 set exe
[file join [file dirname $
::_git
] gitk
]
1683 set cmd
[list
[info nameofexecutable
] $exe]
1684 if {! [file exists
$exe]} {
1685 error_popup
[mc
"Unable to start gitk:\n\n%s does not exist" $exe]
1689 if {[info exists env
(GIT_DIR
)]} {
1690 set old_GIT_DIR
$env(GIT_DIR
)
1696 cd [file dirname [gitdir
]]
1697 set env
(GIT_DIR
) [file tail [gitdir
]]
1699 eval exec $cmd $revs &
1701 if {$old_GIT_DIR eq
{}} {
1704 set env
(GIT_DIR
) $old_GIT_DIR
1708 ui_status $
::starting_gitk_msg
1710 ui_ready
$starting_gitk_msg
1718 global ui_comm is_quitting repo_config commit_type
1719 global GITGUI_BCK_exists GITGUI_BCK_i
1720 global ui_comm_spell
1722 if {$is_quitting} return
1725 if {[winfo exists
$ui_comm]} {
1726 # -- Stash our current commit buffer.
1728 set save
[gitdir GITGUI_MSG
]
1729 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1730 file rename
-force [gitdir GITGUI_BCK
] $save
1731 set GITGUI_BCK_exists
0
1733 set msg
[string trim
[$ui_comm get
0.0 end
]]
1734 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1735 if {(![string match amend
* $commit_type]
1736 ||
[$ui_comm edit modified
])
1739 set fd
[open
$save w
]
1740 puts
-nonewline $fd $msg
1744 catch
{file delete
$save}
1748 # -- Cancel our spellchecker if its running.
1750 if {[info exists ui_comm_spell
]} {
1754 # -- Remove our editor backup, its not needed.
1756 after cancel
$GITGUI_BCK_i
1757 if {$GITGUI_BCK_exists} {
1758 catch
{file delete
[gitdir GITGUI_BCK
]}
1761 # -- Stash our current window geometry into this repository.
1763 set cfg_geometry
[list
]
1764 lappend cfg_geometry
[wm geometry .
]
1765 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
1766 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
1767 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1770 if {$cfg_geometry ne
$rc_geometry} {
1771 catch
{git config gui.geometry
$cfg_geometry}
1786 proc toggle_or_diff
{w x y
} {
1787 global file_states file_lists current_diff_path ui_index ui_workdir
1788 global last_clicked selected_paths
1790 set pos
[split [$w index @
$x,$y] .
]
1791 set lno
[lindex
$pos 0]
1792 set col [lindex
$pos 1]
1793 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1799 set last_clicked
[list
$w $lno]
1800 array
unset selected_paths
1801 $ui_index tag remove in_sel
0.0 end
1802 $ui_workdir tag remove in_sel
0.0 end
1805 if {$current_diff_path eq
$path} {
1806 set after
{reshow_diff
;}
1810 if {$w eq
$ui_index} {
1812 "Unstaging [short_path $path] from commit" \
1814 [concat
$after [list ui_ready
]]
1815 } elseif
{$w eq
$ui_workdir} {
1817 "Adding [short_path $path]" \
1819 [concat
$after [list ui_ready
]]
1822 show_diff
$path $w $lno
1826 proc add_one_to_selection
{w x y
} {
1827 global file_lists last_clicked selected_paths
1829 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1830 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1836 if {$last_clicked ne
{}
1837 && [lindex
$last_clicked 0] ne
$w} {
1838 array
unset selected_paths
1839 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
1842 set last_clicked
[list
$w $lno]
1843 if {[catch
{set in_sel
$selected_paths($path)}]} {
1847 unset selected_paths
($path)
1848 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
1850 set selected_paths
($path) 1
1851 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1855 proc add_range_to_selection
{w x y
} {
1856 global file_lists last_clicked selected_paths
1858 if {[lindex
$last_clicked 0] ne
$w} {
1859 toggle_or_diff
$w $x $y
1863 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1864 set lc
[lindex
$last_clicked 1]
1873 foreach path
[lrange
$file_lists($w) \
1874 [expr {$begin - 1}] \
1875 [expr {$end - 1}]] {
1876 set selected_paths
($path) 1
1878 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
1881 proc show_more_context
{} {
1883 if {$repo_config(gui.diffcontext
) < 99} {
1884 incr repo_config
(gui.diffcontext
)
1889 proc show_less_context
{} {
1891 if {$repo_config(gui.diffcontext
) >= 1} {
1892 incr repo_config
(gui.diffcontext
) -1
1897 ######################################################################
1907 menu .mbar
-tearoff 0
1908 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
1909 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
1910 if {[is_enabled branch
]} {
1911 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
1913 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
1914 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
1916 if {[is_enabled transport
]} {
1917 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
1918 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
1920 . configure
-menu .mbar
1922 # -- Repository Menu
1924 menu .mbar.repository
1926 .mbar.repository add
command \
1927 -label [mc
"Browse Current Branch's Files"] \
1928 -command {browser
::new
$current_branch}
1929 set ui_browse_current
[.mbar.repository index last
]
1930 .mbar.repository add
command \
1931 -label [mc
"Browse Branch Files..."] \
1932 -command browser_open
::dialog
1933 .mbar.repository add separator
1935 .mbar.repository add
command \
1936 -label [mc
"Visualize Current Branch's History"] \
1937 -command {do_gitk
$current_branch}
1938 set ui_visualize_current
[.mbar.repository index last
]
1939 .mbar.repository add
command \
1940 -label [mc
"Visualize All Branch History"] \
1941 -command {do_gitk
--all}
1942 .mbar.repository add separator
1944 proc current_branch_write
{args
} {
1945 global current_branch
1946 .mbar.repository entryconf $
::ui_browse_current \
1947 -label [mc
"Browse %s's Files" $current_branch]
1948 .mbar.repository entryconf $
::ui_visualize_current \
1949 -label [mc
"Visualize %s's History" $current_branch]
1951 trace add variable current_branch
write current_branch_write
1953 if {[is_enabled multicommit
]} {
1954 .mbar.repository add
command -label [mc
"Database Statistics"] \
1957 .mbar.repository add
command -label [mc
"Compress Database"] \
1960 .mbar.repository add
command -label [mc
"Verify Database"] \
1961 -command do_fsck_objects
1963 .mbar.repository add separator
1966 .mbar.repository add
command \
1967 -label [mc
"Create Desktop Icon"] \
1968 -command do_cygwin_shortcut
1969 } elseif
{[is_Windows
]} {
1970 .mbar.repository add
command \
1971 -label [mc
"Create Desktop Icon"] \
1972 -command do_windows_shortcut
1973 } elseif
{[is_MacOSX
]} {
1974 .mbar.repository add
command \
1975 -label [mc
"Create Desktop Icon"] \
1976 -command do_macosx_app
1980 .mbar.repository add
command -label [mc Quit
] \
1987 .mbar.edit add
command -label [mc Undo
] \
1988 -command {catch
{[focus
] edit undo
}} \
1990 .mbar.edit add
command -label [mc Redo
] \
1991 -command {catch
{[focus
] edit redo
}} \
1993 .mbar.edit add separator
1994 .mbar.edit add
command -label [mc Cut
] \
1995 -command {catch
{tk_textCut
[focus
]}} \
1997 .mbar.edit add
command -label [mc Copy
] \
1998 -command {catch
{tk_textCopy
[focus
]}} \
2000 .mbar.edit add
command -label [mc Paste
] \
2001 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2003 .mbar.edit add
command -label [mc Delete
] \
2004 -command {catch
{[focus
] delete sel.first sel.last
}} \
2006 .mbar.edit add separator
2007 .mbar.edit add
command -label [mc
"Select All"] \
2008 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2013 if {[is_enabled branch
]} {
2016 .mbar.branch add
command -label [mc
"Create..."] \
2017 -command branch_create
::dialog \
2019 lappend disable_on_lock
[list .mbar.branch entryconf \
2020 [.mbar.branch index last
] -state]
2022 .mbar.branch add
command -label [mc
"Checkout..."] \
2023 -command branch_checkout
::dialog \
2025 lappend disable_on_lock
[list .mbar.branch entryconf \
2026 [.mbar.branch index last
] -state]
2028 .mbar.branch add
command -label [mc
"Rename..."] \
2029 -command branch_rename
::dialog
2030 lappend disable_on_lock
[list .mbar.branch entryconf \
2031 [.mbar.branch index last
] -state]
2033 .mbar.branch add
command -label [mc
"Delete..."] \
2034 -command branch_delete
::dialog
2035 lappend disable_on_lock
[list .mbar.branch entryconf \
2036 [.mbar.branch index last
] -state]
2038 .mbar.branch add
command -label [mc
"Reset..."] \
2039 -command merge
::reset_hard
2040 lappend disable_on_lock
[list .mbar.branch entryconf \
2041 [.mbar.branch index last
] -state]
2046 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2049 .mbar.commit add radiobutton \
2050 -label [mc
"New Commit"] \
2051 -command do_select_commit_type \
2052 -variable selected_commit_type \
2054 lappend disable_on_lock \
2055 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2057 .mbar.commit add radiobutton \
2058 -label [mc
"Amend Last Commit"] \
2059 -command do_select_commit_type \
2060 -variable selected_commit_type \
2062 lappend disable_on_lock \
2063 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2065 .mbar.commit add separator
2067 .mbar.commit add
command -label [mc Rescan
] \
2068 -command do_rescan \
2070 lappend disable_on_lock \
2071 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2073 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2074 -command do_add_selection \
2076 lappend disable_on_lock \
2077 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2079 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2080 -command do_add_all \
2082 lappend disable_on_lock \
2083 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2085 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2086 -command do_unstage_selection
2087 lappend disable_on_lock \
2088 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2090 .mbar.commit add
command -label [mc
"Revert Changes"] \
2091 -command do_revert_selection
2092 lappend disable_on_lock \
2093 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2095 .mbar.commit add separator
2097 .mbar.commit add
command -label [mc
"Show Less Context"] \
2098 -command show_less_context \
2099 -accelerator $M1T-\
-
2101 .mbar.commit add
command -label [mc
"Show More Context"] \
2102 -command show_more_context \
2105 .mbar.commit add separator
2107 .mbar.commit add
command -label [mc
"Sign Off"] \
2108 -command do_signoff \
2111 .mbar.commit add
command -label [mc Commit@@verb
] \
2112 -command do_commit \
2113 -accelerator $M1T-Return
2114 lappend disable_on_lock \
2115 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2120 if {[is_enabled branch
]} {
2122 .mbar.merge add
command -label [mc
"Local Merge..."] \
2123 -command merge
::dialog \
2125 lappend disable_on_lock \
2126 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2127 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2128 -command merge
::reset_hard
2129 lappend disable_on_lock \
2130 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2135 if {[is_enabled transport
]} {
2138 .mbar.remote add
command \
2139 -label [mc
"Push..."] \
2140 -command do_push_anywhere \
2142 .mbar.remote add
command \
2143 -label [mc
"Delete..."] \
2144 -command remote_branch_delete
::dialog
2148 # -- Apple Menu (Mac OS X only)
2150 .mbar add cascade
-label Apple
-menu .mbar.apple
2153 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2155 .mbar.apple add separator
2156 .mbar.apple add
command \
2157 -label [mc
"Preferences..."] \
2158 -command do_options \
2160 bind .
<$M1B-,> do_options
2164 .mbar.edit add separator
2165 .mbar.edit add
command -label [mc
"Options..."] \
2171 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2175 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2180 catch
{set browser
$repo_config(instaweb.browser
)}
2181 set doc_path
[file dirname [gitexec
]]
2182 set doc_path
[file join $doc_path Documentation index.html
]
2185 set doc_path
[exec cygpath
--mixed $doc_path]
2188 if {$browser eq
{}} {
2191 } elseif
{[is_Cygwin
]} {
2192 set program_files
[file dirname [exec cygpath
--windir]]
2193 set program_files
[file join $program_files {Program Files
}]
2194 set firefox
[file join $program_files {Mozilla Firefox
} firefox.exe
]
2195 set ie
[file join $program_files {Internet Explorer
} IEXPLORE.EXE
]
2196 if {[file exists
$firefox]} {
2197 set browser
$firefox
2198 } elseif
{[file exists
$ie]} {
2201 unset program_files firefox ie
2205 if {[file isfile
$doc_path]} {
2206 set doc_url
"file:$doc_path"
2208 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2211 if {$browser ne
{}} {
2212 .mbar.
help add
command -label [mc
"Online Documentation"] \
2213 -command [list
exec $browser $doc_url &]
2215 unset browser doc_path doc_url
2217 # -- Standard bindings
2219 wm protocol . WM_DELETE_WINDOW do_quit
2220 bind all
<$M1B-Key-q> do_quit
2221 bind all
<$M1B-Key-Q> do_quit
2222 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2223 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2225 set subcommand_args
{}
2227 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2231 # -- Not a normal commit type invocation? Do that instead!
2233 switch
-- $subcommand {
2236 set subcommand_args
{rev? path
}
2237 if {$argv eq
{}} usage
2242 if {$is_path ||
[file exists
$_prefix$a]} {
2243 if {$path ne
{}} usage
2246 } elseif
{$a eq
{--}} {
2248 if {$head ne
{}} usage
2253 } elseif
{$head eq
{}} {
2254 if {$head ne
{}} usage
2263 if {$head ne
{} && $path eq
{}} {
2264 set path
$_prefix$head
2271 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2273 set head [git rev-parse
--verify $head]
2279 set current_branch
$head
2282 switch
-- $subcommand {
2285 if {$path ne
{} && [file isdirectory
$path]} {
2286 set head $current_branch
2292 browser
::new
$head $path
2295 if {$head eq
{} && ![file exists
$path]} {
2296 puts stderr
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
2299 blame
::new
$head $path
2306 if {[llength
$argv] != 0} {
2307 puts
-nonewline stderr
"usage: $argv0"
2308 if {$subcommand ne
{gui
}
2309 && [file tail $argv0] ne
"git-$subcommand"} {
2310 puts
-nonewline stderr
" $subcommand"
2315 # fall through to setup UI for commits
2318 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2329 -text [mc
"Current Branch:"] \
2333 -textvariable current_branch \
2336 pack .branch.l1
-side left
2337 pack .branch.cb
-side left
-fill x
2338 pack .branch
-side top
-fill x
2340 # -- Main Window Layout
2342 panedwindow .vpane
-orient horizontal
2343 panedwindow .vpane.files
-orient vertical
2344 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2345 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2347 # -- Index File List
2349 frame .vpane.files.index
-height 100 -width 200
2350 label .vpane.files.index.title
-text [mc
"Staged Changes (Will Commit)"] \
2351 -background lightgreen
-foreground black
2352 text
$ui_index -background white
-foreground black \
2354 -width 20 -height 10 \
2356 -cursor $cursor_ptr \
2357 -xscrollcommand {.vpane.files.index.sx
set} \
2358 -yscrollcommand {.vpane.files.index.sy
set} \
2360 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2361 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2362 pack .vpane.files.index.title
-side top
-fill x
2363 pack .vpane.files.index.sx
-side bottom
-fill x
2364 pack .vpane.files.index.sy
-side right
-fill y
2365 pack
$ui_index -side left
-fill both
-expand 1
2367 # -- Working Directory File List
2369 frame .vpane.files.workdir
-height 100 -width 200
2370 label .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
2371 -background lightsalmon
-foreground black
2372 text
$ui_workdir -background white
-foreground black \
2374 -width 20 -height 10 \
2376 -cursor $cursor_ptr \
2377 -xscrollcommand {.vpane.files.workdir.sx
set} \
2378 -yscrollcommand {.vpane.files.workdir.sy
set} \
2380 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2381 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2382 pack .vpane.files.workdir.title
-side top
-fill x
2383 pack .vpane.files.workdir.sx
-side bottom
-fill x
2384 pack .vpane.files.workdir.sy
-side right
-fill y
2385 pack
$ui_workdir -side left
-fill both
-expand 1
2387 .vpane.files add .vpane.files.workdir
-sticky nsew
2388 .vpane.files add .vpane.files.index
-sticky nsew
2390 foreach i
[list
$ui_index $ui_workdir] {
2392 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2396 # -- Diff and Commit Area
2398 frame .vpane.lower
-height 300 -width 400
2399 frame .vpane.lower.commarea
2400 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2401 pack .vpane.lower.
diff -fill both
-expand 1
2402 pack .vpane.lower.commarea
-side bottom
-fill x
2403 .vpane add .vpane.lower
-sticky nsew
2405 # -- Commit Area Buttons
2407 frame .vpane.lower.commarea.buttons
2408 label .vpane.lower.commarea.buttons.l
-text {} \
2411 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2412 pack .vpane.lower.commarea.buttons
-side left
-fill y
2414 button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
2416 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2417 lappend disable_on_lock \
2418 {.vpane.lower.commarea.buttons.rescan conf
-state}
2420 button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
2422 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2423 lappend disable_on_lock \
2424 {.vpane.lower.commarea.buttons.incall conf
-state}
2426 button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
2428 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2430 button .vpane.lower.commarea.buttons.commit
-text [mc Commit@@verb
] \
2432 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2433 lappend disable_on_lock \
2434 {.vpane.lower.commarea.buttons.commit conf
-state}
2436 button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
2437 -command do_push_anywhere
2438 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2440 # -- Commit Message Buffer
2442 frame .vpane.lower.commarea.buffer
2443 frame .vpane.lower.commarea.buffer.header
2444 set ui_comm .vpane.lower.commarea.buffer.t
2445 set ui_coml .vpane.lower.commarea.buffer.header.l
2446 radiobutton .vpane.lower.commarea.buffer.header.new \
2447 -text [mc
"New Commit"] \
2448 -command do_select_commit_type \
2449 -variable selected_commit_type \
2451 lappend disable_on_lock \
2452 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2453 radiobutton .vpane.lower.commarea.buffer.header.amend \
2454 -text [mc
"Amend Last Commit"] \
2455 -command do_select_commit_type \
2456 -variable selected_commit_type \
2458 lappend disable_on_lock \
2459 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2463 proc trace_commit_type
{varname args
} {
2464 global ui_coml commit_type
2465 switch
-glob -- $commit_type {
2466 initial
{set txt
[mc
"Initial Commit Message:"]}
2467 amend
{set txt
[mc
"Amended Commit Message:"]}
2468 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
2469 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
2470 merge
{set txt
[mc
"Merge Commit Message:"]}
2471 * {set txt
[mc
"Commit Message:"]}
2473 $ui_coml conf
-text $txt
2475 trace add variable commit_type
write trace_commit_type
2476 pack
$ui_coml -side left
-fill x
2477 pack .vpane.lower.commarea.buffer.header.amend
-side right
2478 pack .vpane.lower.commarea.buffer.header.new
-side right
2480 text
$ui_comm -background white
-foreground black \
2484 -autoseparators true \
2486 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
2488 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2489 scrollbar .vpane.lower.commarea.buffer.sby \
2490 -command [list
$ui_comm yview
]
2491 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2492 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2493 pack
$ui_comm -side left
-fill y
2494 pack .vpane.lower.commarea.buffer
-side left
-fill y
2496 # -- Commit Message Buffer Context Menu
2498 set ctxm .vpane.lower.commarea.buffer.ctxm
2499 menu
$ctxm -tearoff 0
2502 -command {tk_textCut
$ui_comm}
2505 -command {tk_textCopy
$ui_comm}
2508 -command {tk_textPaste
$ui_comm}
2510 -label [mc Delete
] \
2511 -command {$ui_comm delete sel.first sel.last
}
2514 -label [mc
"Select All"] \
2515 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2517 -label [mc
"Copy All"] \
2519 $ui_comm tag add sel
0.0 end
2520 tk_textCopy
$ui_comm
2521 $ui_comm tag remove sel
0.0 end
2525 -label [mc
"Sign Off"] \
2527 set ui_comm_ctxm
$ctxm
2531 proc trace_current_diff_path
{varname args
} {
2532 global current_diff_path diff_actions file_states
2533 if {$current_diff_path eq
{}} {
2539 set p
$current_diff_path
2540 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2542 set p
[escape_path
$p]
2546 .vpane.lower.
diff.header.status configure
-text $s
2547 .vpane.lower.
diff.header.
file configure
-text $f
2548 .vpane.lower.
diff.header.path configure
-text $p
2549 foreach w
$diff_actions {
2553 trace add variable current_diff_path
write trace_current_diff_path
2555 frame .vpane.lower.
diff.header
-background gold
2556 label .vpane.lower.
diff.header.status \
2559 -width $max_status_desc \
2562 label .vpane.lower.
diff.header.
file \
2567 label .vpane.lower.
diff.header.path \
2572 pack .vpane.lower.
diff.header.status
-side left
2573 pack .vpane.lower.
diff.header.
file -side left
2574 pack .vpane.lower.
diff.header.path
-fill x
2575 set ctxm .vpane.lower.
diff.header.ctxm
2576 menu
$ctxm -tearoff 0
2584 -- $current_diff_path
2586 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2587 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2591 frame .vpane.lower.
diff.body
2592 set ui_diff .vpane.lower.
diff.body.t
2593 text
$ui_diff -background white
-foreground black \
2595 -width 80 -height 15 -wrap none \
2597 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2598 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2600 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2601 -command [list
$ui_diff xview
]
2602 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2603 -command [list
$ui_diff yview
]
2604 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2605 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2606 pack
$ui_diff -side left
-fill both
-expand 1
2607 pack .vpane.lower.
diff.header
-side top
-fill x
2608 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2610 $ui_diff tag conf d_cr
-elide true
2611 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2612 $ui_diff tag conf d_
+ -foreground {#00a000}
2613 $ui_diff tag conf d_-
-foreground red
2615 $ui_diff tag conf d_
++ -foreground {#00a000}
2616 $ui_diff tag conf d_--
-foreground red
2617 $ui_diff tag conf d_
+s \
2618 -foreground {#00a000} \
2619 -background {#e2effa}
2620 $ui_diff tag conf d_-s \
2622 -background {#e2effa}
2623 $ui_diff tag conf d_s
+ \
2624 -foreground {#00a000} \
2626 $ui_diff tag conf d_s- \
2630 $ui_diff tag conf d
<<<<<<< \
2631 -foreground orange \
2633 $ui_diff tag conf d
======= \
2634 -foreground orange \
2636 $ui_diff tag conf d
>>>>>>> \
2637 -foreground orange \
2640 $ui_diff tag raise sel
2642 # -- Diff Body Context Menu
2644 set ctxm .vpane.lower.
diff.body.ctxm
2645 menu
$ctxm -tearoff 0
2647 -label [mc
"Apply/Reverse Hunk"] \
2648 -command {apply_hunk
$cursorX $cursorY}
2649 set ui_diff_applyhunk
[$ctxm index last
]
2650 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
2653 -label [mc
"Show Less Context"] \
2654 -command show_less_context
2655 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2657 -label [mc
"Show More Context"] \
2658 -command show_more_context
2659 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2662 -label [mc Refresh
] \
2663 -command reshow_diff
2664 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2667 -command {tk_textCopy
$ui_diff}
2668 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2670 -label [mc
"Select All"] \
2671 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
2672 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2674 -label [mc
"Copy All"] \
2676 $ui_diff tag add sel
0.0 end
2677 tk_textCopy
$ui_diff
2678 $ui_diff tag remove sel
0.0 end
2680 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2683 -label [mc
"Decrease Font Size"] \
2684 -command {incr_font_size font_diff
-1}
2685 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2687 -label [mc
"Increase Font Size"] \
2688 -command {incr_font_size font_diff
1}
2689 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2691 $ctxm add
command -label [mc
"Options..."] \
2693 proc popup_diff_menu
{ctxm x y X Y
} {
2694 global current_diff_path file_states
2697 if {$
::ui_index eq $
::current_diff_side
} {
2698 set l
[mc
"Unstage Hunk From Commit"]
2700 set l
[mc
"Stage Hunk For Commit"]
2703 ||
$current_diff_path eq
{}
2704 ||
![info exists file_states
($current_diff_path)]
2705 ||
{_O
} eq
[lindex
$file_states($current_diff_path) 0]} {
2710 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
2711 tk_popup
$ctxm $X $Y
2713 bind_button3
$ui_diff [list popup_diff_menu
$ctxm %x
%y
%X
%Y
]
2717 set main_status
[::status_bar
::new .status
]
2718 pack .status
-anchor w
-side bottom
-fill x
2719 $main_status show
[mc
"Initializing..."]
2724 set gm
$repo_config(gui.geometry
)
2725 wm geometry .
[lindex
$gm 0]
2726 .vpane sash place
0 \
2728 [lindex
[.vpane sash coord
0] 1]
2729 .vpane.files sash place
0 \
2730 [lindex
[.vpane.files sash coord
0] 0] \
2737 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
2738 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
2739 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
2740 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
2741 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
2742 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
2743 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
2744 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
2745 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
2746 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
2747 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
2748 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2749 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2750 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
2751 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
2752 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
2753 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
2754 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
2756 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
2757 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
2758 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
2759 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
2760 bind $ui_diff <$M1B-Key-v> {break}
2761 bind $ui_diff <$M1B-Key-V> {break}
2762 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2763 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2764 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
2765 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
2766 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
2767 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
2768 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
2769 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
2770 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
2771 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
2772 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
2773 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
2774 bind $ui_diff <Button-1
> {focus
%W
}
2776 if {[is_enabled branch
]} {
2777 bind .
<$M1B-Key-n> branch_create
::dialog
2778 bind .
<$M1B-Key-N> branch_create
::dialog
2779 bind .
<$M1B-Key-o> branch_checkout
::dialog
2780 bind .
<$M1B-Key-O> branch_checkout
::dialog
2781 bind .
<$M1B-Key-m> merge
::dialog
2782 bind .
<$M1B-Key-M> merge
::dialog
2784 if {[is_enabled transport
]} {
2785 bind .
<$M1B-Key-p> do_push_anywhere
2786 bind .
<$M1B-Key-P> do_push_anywhere
2789 bind .
<Key-F5
> do_rescan
2790 bind .
<$M1B-Key-r> do_rescan
2791 bind .
<$M1B-Key-R> do_rescan
2792 bind .
<$M1B-Key-s> do_signoff
2793 bind .
<$M1B-Key-S> do_signoff
2794 bind .
<$M1B-Key-t> do_add_selection
2795 bind .
<$M1B-Key-T> do_add_selection
2796 bind .
<$M1B-Key-i> do_add_all
2797 bind .
<$M1B-Key-I> do_add_all
2798 bind .
<$M1B-Key-minus> {show_less_context
;break}
2799 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
2800 bind .
<$M1B-Key-equal> {show_more_context
;break}
2801 bind .
<$M1B-Key-plus> {show_more_context
;break}
2802 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
2803 bind .
<$M1B-Key-Return> do_commit
2804 foreach i
[list
$ui_index $ui_workdir] {
2805 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
2806 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2807 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
2811 set file_lists
($ui_index) [list
]
2812 set file_lists
($ui_workdir) [list
]
2814 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2815 focus
-force $ui_comm
2817 # -- Warn the user about environmental problems. Cygwin's Tcl
2818 # does *not* pass its env array onto any processes it spawns.
2819 # This means that git processes get none of our environment.
2824 set msg
[mc
"Possible environment issues exist.
2826 The following environment variables are probably
2827 going to be ignored by any Git subprocess run
2831 foreach name
[array names env
] {
2832 switch
-regexp -- $name {
2833 {^GIT_INDEX_FILE$
} -
2834 {^GIT_OBJECT_DIRECTORY$
} -
2835 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
2837 {^GIT_EXTERNAL_DIFF$
} -
2841 {^GIT_CONFIG_LOCAL$
} -
2842 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
2843 append msg
" - $name\n"
2846 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
2847 append msg
" - $name\n"
2849 set suggest_user
$name
2853 if {$ignored_env > 0} {
2855 This is due to a known issue with the
2856 Tcl binary distributed by Cygwin."]
2858 if {$suggest_user ne
{}} {
2861 A good replacement for %s
2862 is placing values for the user.name and
2863 user.email settings into your personal
2869 unset ignored_env msg suggest_user name
2872 # -- Only initialize complex UI if we are going to stay running.
2874 if {[is_enabled transport
]} {
2877 set n
[.mbar.remote index end
]
2880 set n
[expr {[.mbar.remote index end
] - $n}]
2882 .mbar.remote insert
$n separator
2887 if {[winfo exists
$ui_comm]} {
2888 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
2890 # -- If both our backup and message files exist use the
2891 # newer of the two files to initialize the buffer.
2893 if {$GITGUI_BCK_exists} {
2894 set m
[gitdir GITGUI_MSG
]
2895 if {[file isfile
$m]} {
2896 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
2897 catch
{file delete
[gitdir GITGUI_MSG
]}
2899 $ui_comm delete
0.0 end
2901 $ui_comm edit modified false
2902 catch
{file delete
[gitdir GITGUI_BCK
]}
2903 set GITGUI_BCK_exists
0
2909 proc backup_commit_buffer
{} {
2910 global ui_comm GITGUI_BCK_exists
2912 set m
[$ui_comm edit modified
]
2913 if {$m ||
$GITGUI_BCK_exists} {
2914 set msg
[string trim
[$ui_comm get
0.0 end
]]
2915 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2918 if {$GITGUI_BCK_exists} {
2919 catch
{file delete
[gitdir GITGUI_BCK
]}
2920 set GITGUI_BCK_exists
0
2924 set fd
[open
[gitdir GITGUI_BCK
] w
]
2925 puts
-nonewline $fd $msg
2927 set GITGUI_BCK_exists
1
2931 $ui_comm edit modified false
2934 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
2937 backup_commit_buffer
2939 # -- If the user has aspell available we can drive it
2940 # in pipe mode to spellcheck the commit message.
2942 set spell_cmd
[list |
]
2943 set spell_dict
[get_config gui.spellingdictionary
]
2944 lappend spell_cmd aspell
2945 if {$spell_dict ne
{}} {
2946 lappend spell_cmd
--master=$spell_dict
2948 lappend spell_cmd
--mode=none
2949 lappend spell_cmd
--encoding=utf-8
2950 lappend spell_cmd pipe
2951 if {$spell_dict eq
{none
}
2952 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
2953 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
2955 set ui_comm_spell
[spellcheck
::init \
2961 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
2964 lock_index begin-read
2965 if {![winfo ismapped .
]} {
2969 if {[is_enabled multicommit
]} {