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_exclude {}
1131 proc have_info_exclude {} {
1132 global is_git_info_exclude
1134 if {$is_git_info_exclude eq {}} {
1135 if {[catch {exec test -f [gitdir info exclude]}]} {
1136 set is_git_info_exclude 0
1138 set is_git_info_exclude 1
1141 return $is_git_info_exclude
1144 proc have_info_exclude {} {
1145 return [file readable [gitdir info exclude]]
1149 proc rescan_stage2 {fd after} {
1150 global rescan_active buf_rdi buf_rdf buf_rlo
1154 if {![eof $fd]} return
1158 set ls_others [list --exclude-per-directory=.gitignore]
1159 if {[have_info_exclude]} {
1160 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1162 set user_exclude [get_config core.excludesfile]
1163 if {$user_exclude ne {} && [file readable $user_exclude]} {
1164 lappend ls_others "--exclude-from=$user_exclude"
1172 ui_status [mc "Scanning
for modified files ...
"]
1173 set fd_di [git_read diff-index --cached -z [PARENT]]
1174 set fd_df [git_read diff-files -z]
1175 set fd_lo [eval git_read ls-files --others -z $ls_others]
1177 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1178 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1179 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1180 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1181 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1182 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1185 proc load_message {file} {
1188 set f [gitdir $file]
1189 if {[file isfile $f]} {
1190 if {[catch {set fd [open $f r]}]} {
1193 fconfigure $fd -eofchar {}
1194 set content [string trim [read $fd]]
1196 regsub -all -line {[ \r\t]+$} $content {} content
1197 $ui_comm delete 0.0 end
1198 $ui_comm insert end $content
1204 proc read_diff_index {fd after} {
1207 append buf_rdi [read $fd]
1209 set n [string length $buf_rdi]
1211 set z1 [string first "\
0" $buf_rdi $c]
1212 if {$z1 == -1} break
1214 set z2 [string first "\
0" $buf_rdi $z1]
1215 if {$z2 == -1} break
1218 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1219 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1221 [encoding convertfrom $p] \
1223 [list [lindex $i 0] [lindex $i 2]] \
1229 set buf_rdi [string range $buf_rdi $c end]
1234 rescan_done $fd buf_rdi $after
1237 proc read_diff_files {fd after} {
1240 append buf_rdf [read $fd]
1242 set n [string length $buf_rdf]
1244 set z1 [string first "\
0" $buf_rdf $c]
1245 if {$z1 == -1} break
1247 set z2 [string first "\
0" $buf_rdf $z1]
1248 if {$z2 == -1} break
1251 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1252 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1254 [encoding convertfrom $p] \
1257 [list [lindex $i 0] [lindex $i 2]]
1262 set buf_rdf [string range $buf_rdf $c end]
1267 rescan_done $fd buf_rdf $after
1270 proc read_ls_others {fd after} {
1273 append buf_rlo [read $fd]
1274 set pck [split $buf_rlo "\
0"]
1275 set buf_rlo [lindex $pck end]
1276 foreach p [lrange $pck 0 end-1] {
1277 set p [encoding convertfrom $p]
1278 if {[string index $p end] eq {/}} {
1279 set p [string range $p 0 end-1]
1283 rescan_done $fd buf_rlo $after
1286 proc rescan_done {fd buf after} {
1287 global rescan_active current_diff_path
1288 global file_states repo_config
1291 if {![eof $fd]} return
1294 if {[incr rescan_active -1] > 0} return
1299 if {$current_diff_path ne {}} reshow_diff
1303 proc prune_selection {} {
1304 global file_states selected_paths
1306 foreach path [array names selected_paths] {
1307 if {[catch {set still_here $file_states($path)}]} {
1308 unset selected_paths($path)
1313 ######################################################################
1317 proc mapicon {w state path} {
1320 if {[catch {set r $all_icons($state$w)}]} {
1321 puts "error
: no icon
for $w state
={$state} $path"
1327 proc mapdesc {state path} {
1330 if {[catch {set r $all_descs($state)}]} {
1331 puts "error
: no desc
for state
={$state} $path"
1337 proc ui_status {msg} {
1339 if {[info exists main_status]} {
1340 $main_status show $msg
1344 proc ui_ready {{test {}}} {
1346 if {[info exists main_status]} {
1347 $main_status show [mc "Ready.
"] $test
1351 proc escape_path {path} {
1352 regsub -all {\\} $path "\\\\" path
1353 regsub -all "\n" $path "\\n
" path
1357 proc short_path {path} {
1358 return [escape_path [lindex [file split $path] end]]
1362 set null_sha1 [string repeat 0 40]
1364 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1365 global file_states next_icon_id null_sha1
1367 set s0 [string index $new_state 0]
1368 set s1 [string index $new_state 1]
1370 if {[catch {set info $file_states($path)}]} {
1372 set icon n[incr next_icon_id]
1374 set state [lindex $info 0]
1375 set icon [lindex $info 1]
1376 if {$head_info eq {}} {set head_info [lindex $info 2]}
1377 if {$index_info eq {}} {set index_info [lindex $info 3]}
1380 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1381 elseif {$s0 eq {_}} {set s0 _}
1383 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1384 elseif {$s1 eq {_}} {set s1 _}
1386 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1387 set head_info [list 0 $null_sha1]
1388 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1389 && $head_info eq {}} {
1390 set head_info $index_info
1393 set file_states($path) [list $s0$s1 $icon \
1394 $head_info $index_info \
1399 proc display_file_helper {w path icon_name old_m new_m} {
1402 if {$new_m eq {_}} {
1403 set lno [lsearch -sorted -exact $file_lists($w) $path]
1405 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1407 $w conf -state normal
1408 $w delete $lno.0 [expr {$lno + 1}].0
1409 $w conf -state disabled
1411 } elseif {$old_m eq {_} && $new_m ne {_}} {
1412 lappend file_lists($w) $path
1413 set file_lists($w) [lsort -unique $file_lists($w)]
1414 set lno [lsearch -sorted -exact $file_lists($w) $path]
1416 $w conf -state normal
1417 $w image create $lno.0 \
1418 -align center -padx 5 -pady 1 \
1420 -image [mapicon $w $new_m $path]
1421 $w insert $lno.1 "[escape_path
$path]\n"
1422 $w conf -state disabled
1423 } elseif {$old_m ne $new_m} {
1424 $w conf -state normal
1425 $w image conf $icon_name -image [mapicon $w $new_m $path]
1426 $w conf -state disabled
1430 proc display_file {path state} {
1431 global file_states selected_paths
1432 global ui_index ui_workdir
1434 set old_m [merge_state $path $state]
1435 set s $file_states($path)
1436 set new_m [lindex $s 0]
1437 set icon_name [lindex $s 1]
1439 set o [string index $old_m 0]
1440 set n [string index $new_m 0]
1447 display_file_helper $ui_index $path $icon_name $o $n
1449 if {[string index $old_m 0] eq {U}} {
1452 set o [string index $old_m 1]
1454 if {[string index $new_m 0] eq {U}} {
1457 set n [string index $new_m 1]
1459 display_file_helper $ui_workdir $path $icon_name $o $n
1461 if {$new_m eq {__}} {
1462 unset file_states($path)
1463 catch {unset selected_paths($path)}
1467 proc display_all_files_helper {w path icon_name m} {
1470 lappend file_lists($w) $path
1471 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1472 $w image create end \
1473 -align center -padx 5 -pady 1 \
1475 -image [mapicon $w $m $path]
1476 $w insert end "[escape_path
$path]\n"
1479 proc display_all_files {} {
1480 global ui_index ui_workdir
1481 global file_states file_lists
1484 $ui_index conf -state normal
1485 $ui_workdir conf -state normal
1487 $ui_index delete 0.0 end
1488 $ui_workdir delete 0.0 end
1491 set file_lists($ui_index) [list]
1492 set file_lists($ui_workdir) [list]
1494 foreach path [lsort [array names file_states]] {
1495 set s $file_states($path)
1497 set icon_name [lindex $s 1]
1499 set s [string index $m 0]
1500 if {$s ne {U} && $s ne {_}} {
1501 display_all_files_helper $ui_index $path \
1505 if {[string index $m 0] eq {U}} {
1508 set s [string index $m 1]
1511 display_all_files_helper $ui_workdir $path \
1516 $ui_index conf -state disabled
1517 $ui_workdir conf -state disabled
1520 ######################################################################
1525 #define mask_width 14
1526 #define mask_height 15
1527 static unsigned char mask_bits[] = {
1528 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1529 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1530 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1533 image create bitmap file_plain -background white -foreground black -data {
1534 #define plain_width 14
1535 #define plain_height 15
1536 static unsigned char plain_bits[] = {
1537 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1538 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1539 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1540 } -maskdata $filemask
1542 image create bitmap file_mod -background white -foreground blue -data {
1543 #define mod_width 14
1544 #define mod_height 15
1545 static unsigned char mod_bits[] = {
1546 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1547 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1548 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1549 } -maskdata $filemask
1551 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1552 #define file_fulltick_width 14
1553 #define file_fulltick_height 15
1554 static unsigned char file_fulltick_bits
[] = {
1555 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1556 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1557 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1558 } -maskdata $filemask
1560 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1561 #define parttick_width 14
1562 #define parttick_height 15
1563 static unsigned char parttick_bits
[] = {
1564 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1565 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1566 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1567 } -maskdata $filemask
1569 image create bitmap file_question
-background white
-foreground black
-data {
1570 #define file_question_width 14
1571 #define file_question_height 15
1572 static unsigned char file_question_bits
[] = {
1573 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1574 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1575 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1576 } -maskdata $filemask
1578 image create bitmap file_removed
-background white
-foreground red
-data {
1579 #define file_removed_width 14
1580 #define file_removed_height 15
1581 static unsigned char file_removed_bits
[] = {
1582 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1583 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1584 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1585 } -maskdata $filemask
1587 image create bitmap file_merge
-background white
-foreground blue
-data {
1588 #define file_merge_width 14
1589 #define file_merge_height 15
1590 static unsigned char file_merge_bits
[] = {
1591 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1592 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1593 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1594 } -maskdata $filemask
1596 set ui_index .vpane.files.index.list
1597 set ui_workdir .vpane.files.workdir.list
1599 set all_icons
(_
$ui_index) file_plain
1600 set all_icons
(A
$ui_index) file_fulltick
1601 set all_icons
(M
$ui_index) file_fulltick
1602 set all_icons
(D
$ui_index) file_removed
1603 set all_icons
(U
$ui_index) file_merge
1605 set all_icons
(_
$ui_workdir) file_plain
1606 set all_icons
(M
$ui_workdir) file_mod
1607 set all_icons
(D
$ui_workdir) file_question
1608 set all_icons
(U
$ui_workdir) file_merge
1609 set all_icons
(O
$ui_workdir) file_plain
1611 set max_status_desc
0
1613 {__
{mc
"Unmodified"}}
1615 {_M
{mc
"Modified, not staged"}}
1616 {M_
{mc
"Staged for commit"}}
1617 {MM
{mc
"Portions staged for commit"}}
1618 {MD
{mc
"Staged for commit, missing"}}
1620 {_O
{mc
"Untracked, not staged"}}
1621 {A_
{mc
"Staged for commit"}}
1622 {AM
{mc
"Portions staged for commit"}}
1623 {AD
{mc
"Staged for commit, missing"}}
1626 {D_
{mc
"Staged for removal"}}
1627 {DO
{mc
"Staged for removal, still present"}}
1629 {U_
{mc
"Requires merge resolution"}}
1630 {UU
{mc
"Requires merge resolution"}}
1631 {UM
{mc
"Requires merge resolution"}}
1632 {UD
{mc
"Requires merge resolution"}}
1634 set text
[eval [lindex
$i 1]]
1635 if {$max_status_desc < [string length
$text]} {
1636 set max_status_desc
[string length
$text]
1638 set all_descs
([lindex
$i 0]) $text
1642 ######################################################################
1646 proc scrollbar2many
{list mode args
} {
1647 foreach w
$list {eval $w $mode $args}
1650 proc many2scrollbar
{list mode sb top bottom
} {
1651 $sb set $top $bottom
1652 foreach w
$list {$w $mode moveto
$top}
1655 proc incr_font_size
{font
{amt
1}} {
1656 set sz
[font configure
$font -size]
1658 font configure
$font -size $sz
1659 font configure
${font}bold
-size $sz
1660 font configure
${font}italic
-size $sz
1663 ######################################################################
1667 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1669 proc do_gitk
{revs
} {
1670 # -- Always start gitk through whatever we were loaded with. This
1671 # lets us bypass using shell process on Windows systems.
1673 set exe
[file join [file dirname $
::_git
] gitk
]
1674 set cmd
[list
[info nameofexecutable
] $exe]
1675 if {! [file exists
$exe]} {
1676 error_popup
[mc
"Unable to start gitk:\n\n%s does not exist" $exe]
1680 if {[info exists env
(GIT_DIR
)]} {
1681 set old_GIT_DIR
$env(GIT_DIR
)
1687 cd [file dirname [gitdir
]]
1688 set env
(GIT_DIR
) [file tail [gitdir
]]
1690 eval exec $cmd $revs &
1692 if {$old_GIT_DIR eq
{}} {
1695 set env
(GIT_DIR
) $old_GIT_DIR
1699 ui_status $
::starting_gitk_msg
1701 ui_ready
$starting_gitk_msg
1709 global ui_comm is_quitting repo_config commit_type
1710 global GITGUI_BCK_exists GITGUI_BCK_i
1711 global ui_comm_spell
1713 if {$is_quitting} return
1716 if {[winfo exists
$ui_comm]} {
1717 # -- Stash our current commit buffer.
1719 set save
[gitdir GITGUI_MSG
]
1720 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1721 file rename
-force [gitdir GITGUI_BCK
] $save
1722 set GITGUI_BCK_exists
0
1724 set msg
[string trim
[$ui_comm get
0.0 end
]]
1725 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1726 if {(![string match amend
* $commit_type]
1727 ||
[$ui_comm edit modified
])
1730 set fd
[open
$save w
]
1731 puts
-nonewline $fd $msg
1735 catch
{file delete
$save}
1739 # -- Cancel our spellchecker if its running.
1741 if {[info exists ui_comm_spell
]} {
1745 # -- Remove our editor backup, its not needed.
1747 after cancel
$GITGUI_BCK_i
1748 if {$GITGUI_BCK_exists} {
1749 catch
{file delete
[gitdir GITGUI_BCK
]}
1752 # -- Stash our current window geometry into this repository.
1754 set cfg_geometry
[list
]
1755 lappend cfg_geometry
[wm geometry .
]
1756 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
1757 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
1758 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1761 if {$cfg_geometry ne
$rc_geometry} {
1762 catch
{git config gui.geometry
$cfg_geometry}
1778 global next_diff_p next_diff_w next_diff_i
1779 show_diff
$next_diff_p $next_diff_w $next_diff_i
1782 proc toggle_or_diff
{w x y
} {
1783 global file_states file_lists current_diff_path ui_index ui_workdir
1784 global last_clicked selected_paths
1786 set pos
[split [$w index @
$x,$y] .
]
1787 set lno
[lindex
$pos 0]
1788 set col [lindex
$pos 1]
1789 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1795 set last_clicked
[list
$w $lno]
1796 array
unset selected_paths
1797 $ui_index tag remove in_sel
0.0 end
1798 $ui_workdir tag remove in_sel
0.0 end
1801 set i
[expr {$lno-1}]
1802 set ll
[expr {[llength
$file_lists($w)]-1}]
1804 if {$i == $ll && $i == 0} {
1805 set after
{reshow_diff
;}
1807 global next_diff_p next_diff_w next_diff_i
1810 set i
[expr {$i + 1}]
1812 set i
[expr {$i - 1}]
1817 set next_diff_p
[lindex
$file_lists($w) $i]
1819 if {$next_diff_p ne
{} && $current_diff_path ne
{}} {
1820 set after
{next_diff
;}
1826 if {$w eq
$ui_index} {
1828 "Unstaging [short_path $path] from commit" \
1830 [concat
$after [list ui_ready
]]
1831 } elseif
{$w eq
$ui_workdir} {
1833 "Adding [short_path $path]" \
1835 [concat
$after [list ui_ready
]]
1838 show_diff
$path $w $lno
1842 proc add_one_to_selection
{w x y
} {
1843 global file_lists last_clicked selected_paths
1845 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1846 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1852 if {$last_clicked ne
{}
1853 && [lindex
$last_clicked 0] ne
$w} {
1854 array
unset selected_paths
1855 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
1858 set last_clicked
[list
$w $lno]
1859 if {[catch
{set in_sel
$selected_paths($path)}]} {
1863 unset selected_paths
($path)
1864 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
1866 set selected_paths
($path) 1
1867 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1871 proc add_range_to_selection
{w x y
} {
1872 global file_lists last_clicked selected_paths
1874 if {[lindex
$last_clicked 0] ne
$w} {
1875 toggle_or_diff
$w $x $y
1879 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1880 set lc
[lindex
$last_clicked 1]
1889 foreach path
[lrange
$file_lists($w) \
1890 [expr {$begin - 1}] \
1891 [expr {$end - 1}]] {
1892 set selected_paths
($path) 1
1894 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
1897 proc show_more_context
{} {
1899 if {$repo_config(gui.diffcontext
) < 99} {
1900 incr repo_config
(gui.diffcontext
)
1905 proc show_less_context
{} {
1907 if {$repo_config(gui.diffcontext
) >= 1} {
1908 incr repo_config
(gui.diffcontext
) -1
1913 ######################################################################
1923 menu .mbar
-tearoff 0
1924 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
1925 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
1926 if {[is_enabled branch
]} {
1927 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
1929 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
1930 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
1932 if {[is_enabled transport
]} {
1933 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
1934 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
1936 . configure
-menu .mbar
1938 # -- Repository Menu
1940 menu .mbar.repository
1942 .mbar.repository add
command \
1943 -label [mc
"Browse Current Branch's Files"] \
1944 -command {browser
::new
$current_branch}
1945 set ui_browse_current
[.mbar.repository index last
]
1946 .mbar.repository add
command \
1947 -label [mc
"Browse Branch Files..."] \
1948 -command browser_open
::dialog
1949 .mbar.repository add separator
1951 .mbar.repository add
command \
1952 -label [mc
"Visualize Current Branch's History"] \
1953 -command {do_gitk
$current_branch}
1954 set ui_visualize_current
[.mbar.repository index last
]
1955 .mbar.repository add
command \
1956 -label [mc
"Visualize All Branch History"] \
1957 -command {do_gitk
--all}
1958 .mbar.repository add separator
1960 proc current_branch_write
{args
} {
1961 global current_branch
1962 .mbar.repository entryconf $
::ui_browse_current \
1963 -label [mc
"Browse %s's Files" $current_branch]
1964 .mbar.repository entryconf $
::ui_visualize_current \
1965 -label [mc
"Visualize %s's History" $current_branch]
1967 trace add variable current_branch
write current_branch_write
1969 if {[is_enabled multicommit
]} {
1970 .mbar.repository add
command -label [mc
"Database Statistics"] \
1973 .mbar.repository add
command -label [mc
"Compress Database"] \
1976 .mbar.repository add
command -label [mc
"Verify Database"] \
1977 -command do_fsck_objects
1979 .mbar.repository add separator
1982 .mbar.repository add
command \
1983 -label [mc
"Create Desktop Icon"] \
1984 -command do_cygwin_shortcut
1985 } elseif
{[is_Windows
]} {
1986 .mbar.repository add
command \
1987 -label [mc
"Create Desktop Icon"] \
1988 -command do_windows_shortcut
1989 } elseif
{[is_MacOSX
]} {
1990 .mbar.repository add
command \
1991 -label [mc
"Create Desktop Icon"] \
1992 -command do_macosx_app
1996 .mbar.repository add
command -label [mc Quit
] \
2003 .mbar.edit add
command -label [mc Undo
] \
2004 -command {catch
{[focus
] edit undo
}} \
2006 .mbar.edit add
command -label [mc Redo
] \
2007 -command {catch
{[focus
] edit redo
}} \
2009 .mbar.edit add separator
2010 .mbar.edit add
command -label [mc Cut
] \
2011 -command {catch
{tk_textCut
[focus
]}} \
2013 .mbar.edit add
command -label [mc Copy
] \
2014 -command {catch
{tk_textCopy
[focus
]}} \
2016 .mbar.edit add
command -label [mc Paste
] \
2017 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2019 .mbar.edit add
command -label [mc Delete
] \
2020 -command {catch
{[focus
] delete sel.first sel.last
}} \
2022 .mbar.edit add separator
2023 .mbar.edit add
command -label [mc
"Select All"] \
2024 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2029 if {[is_enabled branch
]} {
2032 .mbar.branch add
command -label [mc
"Create..."] \
2033 -command branch_create
::dialog \
2035 lappend disable_on_lock
[list .mbar.branch entryconf \
2036 [.mbar.branch index last
] -state]
2038 .mbar.branch add
command -label [mc
"Checkout..."] \
2039 -command branch_checkout
::dialog \
2041 lappend disable_on_lock
[list .mbar.branch entryconf \
2042 [.mbar.branch index last
] -state]
2044 .mbar.branch add
command -label [mc
"Rename..."] \
2045 -command branch_rename
::dialog
2046 lappend disable_on_lock
[list .mbar.branch entryconf \
2047 [.mbar.branch index last
] -state]
2049 .mbar.branch add
command -label [mc
"Delete..."] \
2050 -command branch_delete
::dialog
2051 lappend disable_on_lock
[list .mbar.branch entryconf \
2052 [.mbar.branch index last
] -state]
2054 .mbar.branch add
command -label [mc
"Reset..."] \
2055 -command merge
::reset_hard
2056 lappend disable_on_lock
[list .mbar.branch entryconf \
2057 [.mbar.branch index last
] -state]
2062 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2065 .mbar.commit add radiobutton \
2066 -label [mc
"New Commit"] \
2067 -command do_select_commit_type \
2068 -variable selected_commit_type \
2070 lappend disable_on_lock \
2071 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2073 .mbar.commit add radiobutton \
2074 -label [mc
"Amend Last Commit"] \
2075 -command do_select_commit_type \
2076 -variable selected_commit_type \
2078 lappend disable_on_lock \
2079 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2081 .mbar.commit add separator
2083 .mbar.commit add
command -label [mc Rescan
] \
2084 -command do_rescan \
2086 lappend disable_on_lock \
2087 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2089 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2090 -command do_add_selection \
2092 lappend disable_on_lock \
2093 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2095 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2096 -command do_add_all \
2098 lappend disable_on_lock \
2099 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2101 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2102 -command do_unstage_selection
2103 lappend disable_on_lock \
2104 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2106 .mbar.commit add
command -label [mc
"Revert Changes"] \
2107 -command do_revert_selection
2108 lappend disable_on_lock \
2109 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2111 .mbar.commit add separator
2113 .mbar.commit add
command -label [mc
"Show Less Context"] \
2114 -command show_less_context \
2115 -accelerator $M1T-\
-
2117 .mbar.commit add
command -label [mc
"Show More Context"] \
2118 -command show_more_context \
2121 .mbar.commit add separator
2123 .mbar.commit add
command -label [mc
"Sign Off"] \
2124 -command do_signoff \
2127 .mbar.commit add
command -label [mc Commit@@verb
] \
2128 -command do_commit \
2129 -accelerator $M1T-Return
2130 lappend disable_on_lock \
2131 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2136 if {[is_enabled branch
]} {
2138 .mbar.merge add
command -label [mc
"Local Merge..."] \
2139 -command merge
::dialog \
2141 lappend disable_on_lock \
2142 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2143 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2144 -command merge
::reset_hard
2145 lappend disable_on_lock \
2146 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2151 if {[is_enabled transport
]} {
2154 .mbar.remote add
command \
2155 -label [mc
"Push..."] \
2156 -command do_push_anywhere \
2158 .mbar.remote add
command \
2159 -label [mc
"Delete..."] \
2160 -command remote_branch_delete
::dialog
2164 # -- Apple Menu (Mac OS X only)
2166 .mbar add cascade
-label Apple
-menu .mbar.apple
2169 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2171 .mbar.apple add separator
2172 .mbar.apple add
command \
2173 -label [mc
"Preferences..."] \
2174 -command do_options \
2176 bind .
<$M1B-,> do_options
2180 .mbar.edit add separator
2181 .mbar.edit add
command -label [mc
"Options..."] \
2187 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2191 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2196 catch
{set browser
$repo_config(instaweb.browser
)}
2197 set doc_path
[file dirname [gitexec
]]
2198 set doc_path
[file join $doc_path Documentation index.html
]
2201 set doc_path
[exec cygpath
--mixed $doc_path]
2204 if {$browser eq
{}} {
2207 } elseif
{[is_Cygwin
]} {
2208 set program_files
[file dirname [exec cygpath
--windir]]
2209 set program_files
[file join $program_files {Program Files
}]
2210 set firefox
[file join $program_files {Mozilla Firefox
} firefox.exe
]
2211 set ie
[file join $program_files {Internet Explorer
} IEXPLORE.EXE
]
2212 if {[file exists
$firefox]} {
2213 set browser
$firefox
2214 } elseif
{[file exists
$ie]} {
2217 unset program_files firefox ie
2221 if {[file isfile
$doc_path]} {
2222 set doc_url
"file:$doc_path"
2224 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2227 if {$browser ne
{}} {
2228 .mbar.
help add
command -label [mc
"Online Documentation"] \
2229 -command [list
exec $browser $doc_url &]
2231 unset browser doc_path doc_url
2233 # -- Standard bindings
2235 wm protocol . WM_DELETE_WINDOW do_quit
2236 bind all
<$M1B-Key-q> do_quit
2237 bind all
<$M1B-Key-Q> do_quit
2238 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2239 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2241 set subcommand_args
{}
2243 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2247 # -- Not a normal commit type invocation? Do that instead!
2249 switch
-- $subcommand {
2252 set subcommand_args
{rev? path
}
2253 if {$argv eq
{}} usage
2258 if {$is_path ||
[file exists
$_prefix$a]} {
2259 if {$path ne
{}} usage
2262 } elseif
{$a eq
{--}} {
2264 if {$head ne
{}} usage
2269 } elseif
{$head eq
{}} {
2270 if {$head ne
{}} usage
2279 if {$head ne
{} && $path eq
{}} {
2280 set path
$_prefix$head
2287 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2289 set head [git rev-parse
--verify $head]
2295 set current_branch
$head
2298 switch
-- $subcommand {
2301 if {$path ne
{} && [file isdirectory
$path]} {
2302 set head $current_branch
2308 browser
::new
$head $path
2311 if {$head eq
{} && ![file exists
$path]} {
2312 puts stderr
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
2315 blame
::new
$head $path
2322 if {[llength
$argv] != 0} {
2323 puts
-nonewline stderr
"usage: $argv0"
2324 if {$subcommand ne
{gui
}
2325 && [file tail $argv0] ne
"git-$subcommand"} {
2326 puts
-nonewline stderr
" $subcommand"
2331 # fall through to setup UI for commits
2334 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2345 -text [mc
"Current Branch:"] \
2349 -textvariable current_branch \
2352 pack .branch.l1
-side left
2353 pack .branch.cb
-side left
-fill x
2354 pack .branch
-side top
-fill x
2356 # -- Main Window Layout
2358 panedwindow .vpane
-orient horizontal
2359 panedwindow .vpane.files
-orient vertical
2360 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2361 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2363 # -- Index File List
2365 frame .vpane.files.index
-height 100 -width 200
2366 label .vpane.files.index.title
-text [mc
"Staged Changes (Will Commit)"] \
2367 -background lightgreen
-foreground black
2368 text
$ui_index -background white
-foreground black \
2370 -width 20 -height 10 \
2372 -cursor $cursor_ptr \
2373 -xscrollcommand {.vpane.files.index.sx
set} \
2374 -yscrollcommand {.vpane.files.index.sy
set} \
2376 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2377 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2378 pack .vpane.files.index.title
-side top
-fill x
2379 pack .vpane.files.index.sx
-side bottom
-fill x
2380 pack .vpane.files.index.sy
-side right
-fill y
2381 pack
$ui_index -side left
-fill both
-expand 1
2383 # -- Working Directory File List
2385 frame .vpane.files.workdir
-height 100 -width 200
2386 label .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
2387 -background lightsalmon
-foreground black
2388 text
$ui_workdir -background white
-foreground black \
2390 -width 20 -height 10 \
2392 -cursor $cursor_ptr \
2393 -xscrollcommand {.vpane.files.workdir.sx
set} \
2394 -yscrollcommand {.vpane.files.workdir.sy
set} \
2396 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2397 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2398 pack .vpane.files.workdir.title
-side top
-fill x
2399 pack .vpane.files.workdir.sx
-side bottom
-fill x
2400 pack .vpane.files.workdir.sy
-side right
-fill y
2401 pack
$ui_workdir -side left
-fill both
-expand 1
2403 .vpane.files add .vpane.files.workdir
-sticky nsew
2404 .vpane.files add .vpane.files.index
-sticky nsew
2406 foreach i
[list
$ui_index $ui_workdir] {
2408 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2412 # -- Diff and Commit Area
2414 frame .vpane.lower
-height 300 -width 400
2415 frame .vpane.lower.commarea
2416 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2417 pack .vpane.lower.
diff -fill both
-expand 1
2418 pack .vpane.lower.commarea
-side bottom
-fill x
2419 .vpane add .vpane.lower
-sticky nsew
2421 # -- Commit Area Buttons
2423 frame .vpane.lower.commarea.buttons
2424 label .vpane.lower.commarea.buttons.l
-text {} \
2427 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2428 pack .vpane.lower.commarea.buttons
-side left
-fill y
2430 button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
2432 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2433 lappend disable_on_lock \
2434 {.vpane.lower.commarea.buttons.rescan conf
-state}
2436 button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
2438 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2439 lappend disable_on_lock \
2440 {.vpane.lower.commarea.buttons.incall conf
-state}
2442 button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
2444 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2446 button .vpane.lower.commarea.buttons.commit
-text [mc Commit@@verb
] \
2448 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2449 lappend disable_on_lock \
2450 {.vpane.lower.commarea.buttons.commit conf
-state}
2452 button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
2453 -command do_push_anywhere
2454 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2456 # -- Commit Message Buffer
2458 frame .vpane.lower.commarea.buffer
2459 frame .vpane.lower.commarea.buffer.header
2460 set ui_comm .vpane.lower.commarea.buffer.t
2461 set ui_coml .vpane.lower.commarea.buffer.header.l
2462 radiobutton .vpane.lower.commarea.buffer.header.new \
2463 -text [mc
"New Commit"] \
2464 -command do_select_commit_type \
2465 -variable selected_commit_type \
2467 lappend disable_on_lock \
2468 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2469 radiobutton .vpane.lower.commarea.buffer.header.amend \
2470 -text [mc
"Amend Last Commit"] \
2471 -command do_select_commit_type \
2472 -variable selected_commit_type \
2474 lappend disable_on_lock \
2475 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2479 proc trace_commit_type
{varname args
} {
2480 global ui_coml commit_type
2481 switch
-glob -- $commit_type {
2482 initial
{set txt
[mc
"Initial Commit Message:"]}
2483 amend
{set txt
[mc
"Amended Commit Message:"]}
2484 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
2485 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
2486 merge
{set txt
[mc
"Merge Commit Message:"]}
2487 * {set txt
[mc
"Commit Message:"]}
2489 $ui_coml conf
-text $txt
2491 trace add variable commit_type
write trace_commit_type
2492 pack
$ui_coml -side left
-fill x
2493 pack .vpane.lower.commarea.buffer.header.amend
-side right
2494 pack .vpane.lower.commarea.buffer.header.new
-side right
2496 text
$ui_comm -background white
-foreground black \
2500 -autoseparators true \
2502 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
2504 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2505 scrollbar .vpane.lower.commarea.buffer.sby \
2506 -command [list
$ui_comm yview
]
2507 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2508 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2509 pack
$ui_comm -side left
-fill y
2510 pack .vpane.lower.commarea.buffer
-side left
-fill y
2512 # -- Commit Message Buffer Context Menu
2514 set ctxm .vpane.lower.commarea.buffer.ctxm
2515 menu
$ctxm -tearoff 0
2518 -command {tk_textCut
$ui_comm}
2521 -command {tk_textCopy
$ui_comm}
2524 -command {tk_textPaste
$ui_comm}
2526 -label [mc Delete
] \
2527 -command {$ui_comm delete sel.first sel.last
}
2530 -label [mc
"Select All"] \
2531 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2533 -label [mc
"Copy All"] \
2535 $ui_comm tag add sel
0.0 end
2536 tk_textCopy
$ui_comm
2537 $ui_comm tag remove sel
0.0 end
2541 -label [mc
"Sign Off"] \
2543 set ui_comm_ctxm
$ctxm
2547 proc trace_current_diff_path
{varname args
} {
2548 global current_diff_path diff_actions file_states
2549 if {$current_diff_path eq
{}} {
2555 set p
$current_diff_path
2556 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2558 set p
[escape_path
$p]
2562 .vpane.lower.
diff.header.status configure
-text $s
2563 .vpane.lower.
diff.header.
file configure
-text $f
2564 .vpane.lower.
diff.header.path configure
-text $p
2565 foreach w
$diff_actions {
2569 trace add variable current_diff_path
write trace_current_diff_path
2571 frame .vpane.lower.
diff.header
-background gold
2572 label .vpane.lower.
diff.header.status \
2575 -width $max_status_desc \
2578 label .vpane.lower.
diff.header.
file \
2583 label .vpane.lower.
diff.header.path \
2588 pack .vpane.lower.
diff.header.status
-side left
2589 pack .vpane.lower.
diff.header.
file -side left
2590 pack .vpane.lower.
diff.header.path
-fill x
2591 set ctxm .vpane.lower.
diff.header.ctxm
2592 menu
$ctxm -tearoff 0
2600 -- $current_diff_path
2602 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2603 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2607 frame .vpane.lower.
diff.body
2608 set ui_diff .vpane.lower.
diff.body.t
2609 text
$ui_diff -background white
-foreground black \
2611 -width 80 -height 15 -wrap none \
2613 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2614 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2616 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2617 -command [list
$ui_diff xview
]
2618 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2619 -command [list
$ui_diff yview
]
2620 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2621 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2622 pack
$ui_diff -side left
-fill both
-expand 1
2623 pack .vpane.lower.
diff.header
-side top
-fill x
2624 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2626 $ui_diff tag conf d_cr
-elide true
2627 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2628 $ui_diff tag conf d_
+ -foreground {#00a000}
2629 $ui_diff tag conf d_-
-foreground red
2631 $ui_diff tag conf d_
++ -foreground {#00a000}
2632 $ui_diff tag conf d_--
-foreground red
2633 $ui_diff tag conf d_
+s \
2634 -foreground {#00a000} \
2635 -background {#e2effa}
2636 $ui_diff tag conf d_-s \
2638 -background {#e2effa}
2639 $ui_diff tag conf d_s
+ \
2640 -foreground {#00a000} \
2642 $ui_diff tag conf d_s- \
2646 $ui_diff tag conf d
<<<<<<< \
2647 -foreground orange \
2649 $ui_diff tag conf d
======= \
2650 -foreground orange \
2652 $ui_diff tag conf d
>>>>>>> \
2653 -foreground orange \
2656 $ui_diff tag raise sel
2658 # -- Diff Body Context Menu
2660 set ctxm .vpane.lower.
diff.body.ctxm
2661 menu
$ctxm -tearoff 0
2663 -label [mc
"Apply/Reverse Hunk"] \
2664 -command {apply_hunk
$cursorX $cursorY}
2665 set ui_diff_applyhunk
[$ctxm index last
]
2666 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
2669 -label [mc
"Show Less Context"] \
2670 -command show_less_context
2671 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2673 -label [mc
"Show More Context"] \
2674 -command show_more_context
2675 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2678 -label [mc Refresh
] \
2679 -command reshow_diff
2680 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2683 -command {tk_textCopy
$ui_diff}
2684 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2686 -label [mc
"Select All"] \
2687 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
2688 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2690 -label [mc
"Copy All"] \
2692 $ui_diff tag add sel
0.0 end
2693 tk_textCopy
$ui_diff
2694 $ui_diff tag remove sel
0.0 end
2696 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2699 -label [mc
"Decrease Font Size"] \
2700 -command {incr_font_size font_diff
-1}
2701 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2703 -label [mc
"Increase Font Size"] \
2704 -command {incr_font_size font_diff
1}
2705 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2707 $ctxm add
command -label [mc
"Options..."] \
2709 proc popup_diff_menu
{ctxm x y X Y
} {
2710 global current_diff_path file_states
2713 if {$
::ui_index eq $
::current_diff_side
} {
2714 set l
[mc
"Unstage Hunk From Commit"]
2716 set l
[mc
"Stage Hunk For Commit"]
2719 ||
$current_diff_path eq
{}
2720 ||
![info exists file_states
($current_diff_path)]
2721 ||
{_O
} eq
[lindex
$file_states($current_diff_path) 0]} {
2726 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
2727 tk_popup
$ctxm $X $Y
2729 bind_button3
$ui_diff [list popup_diff_menu
$ctxm %x
%y
%X
%Y
]
2733 set main_status
[::status_bar
::new .status
]
2734 pack .status
-anchor w
-side bottom
-fill x
2735 $main_status show
[mc
"Initializing..."]
2740 set gm
$repo_config(gui.geometry
)
2741 wm geometry .
[lindex
$gm 0]
2742 .vpane sash place
0 \
2744 [lindex
[.vpane sash coord
0] 1]
2745 .vpane.files sash place
0 \
2746 [lindex
[.vpane.files sash coord
0] 0] \
2753 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
2754 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
2755 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
2756 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
2757 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
2758 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
2759 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
2760 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
2761 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
2762 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
2763 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
2764 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2765 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2766 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
2767 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
2768 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
2769 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
2770 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
2772 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
2773 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
2774 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
2775 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
2776 bind $ui_diff <$M1B-Key-v> {break}
2777 bind $ui_diff <$M1B-Key-V> {break}
2778 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2779 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2780 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
2781 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
2782 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
2783 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
2784 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
2785 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
2786 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
2787 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
2788 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
2789 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
2790 bind $ui_diff <Button-1
> {focus
%W
}
2792 if {[is_enabled branch
]} {
2793 bind .
<$M1B-Key-n> branch_create
::dialog
2794 bind .
<$M1B-Key-N> branch_create
::dialog
2795 bind .
<$M1B-Key-o> branch_checkout
::dialog
2796 bind .
<$M1B-Key-O> branch_checkout
::dialog
2797 bind .
<$M1B-Key-m> merge
::dialog
2798 bind .
<$M1B-Key-M> merge
::dialog
2800 if {[is_enabled transport
]} {
2801 bind .
<$M1B-Key-p> do_push_anywhere
2802 bind .
<$M1B-Key-P> do_push_anywhere
2805 bind .
<Key-F5
> do_rescan
2806 bind .
<$M1B-Key-r> do_rescan
2807 bind .
<$M1B-Key-R> do_rescan
2808 bind .
<$M1B-Key-s> do_signoff
2809 bind .
<$M1B-Key-S> do_signoff
2810 bind .
<$M1B-Key-t> do_add_selection
2811 bind .
<$M1B-Key-T> do_add_selection
2812 bind .
<$M1B-Key-i> do_add_all
2813 bind .
<$M1B-Key-I> do_add_all
2814 bind .
<$M1B-Key-minus> {show_less_context
;break}
2815 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
2816 bind .
<$M1B-Key-equal> {show_more_context
;break}
2817 bind .
<$M1B-Key-plus> {show_more_context
;break}
2818 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
2819 bind .
<$M1B-Key-Return> do_commit
2820 foreach i
[list
$ui_index $ui_workdir] {
2821 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
2822 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2823 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
2827 set file_lists
($ui_index) [list
]
2828 set file_lists
($ui_workdir) [list
]
2830 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2831 focus
-force $ui_comm
2833 # -- Warn the user about environmental problems. Cygwin's Tcl
2834 # does *not* pass its env array onto any processes it spawns.
2835 # This means that git processes get none of our environment.
2840 set msg
[mc
"Possible environment issues exist.
2842 The following environment variables are probably
2843 going to be ignored by any Git subprocess run
2847 foreach name
[array names env
] {
2848 switch
-regexp -- $name {
2849 {^GIT_INDEX_FILE$
} -
2850 {^GIT_OBJECT_DIRECTORY$
} -
2851 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
2853 {^GIT_EXTERNAL_DIFF$
} -
2857 {^GIT_CONFIG_LOCAL$
} -
2858 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
2859 append msg
" - $name\n"
2862 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
2863 append msg
" - $name\n"
2865 set suggest_user
$name
2869 if {$ignored_env > 0} {
2871 This is due to a known issue with the
2872 Tcl binary distributed by Cygwin."]
2874 if {$suggest_user ne
{}} {
2877 A good replacement for %s
2878 is placing values for the user.name and
2879 user.email settings into your personal
2885 unset ignored_env msg suggest_user name
2888 # -- Only initialize complex UI if we are going to stay running.
2890 if {[is_enabled transport
]} {
2893 set n
[.mbar.remote index end
]
2896 set n
[expr {[.mbar.remote index end
] - $n}]
2898 .mbar.remote insert
$n separator
2903 if {[winfo exists
$ui_comm]} {
2904 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
2906 # -- If both our backup and message files exist use the
2907 # newer of the two files to initialize the buffer.
2909 if {$GITGUI_BCK_exists} {
2910 set m
[gitdir GITGUI_MSG
]
2911 if {[file isfile
$m]} {
2912 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
2913 catch
{file delete
[gitdir GITGUI_MSG
]}
2915 $ui_comm delete
0.0 end
2917 $ui_comm edit modified false
2918 catch
{file delete
[gitdir GITGUI_BCK
]}
2919 set GITGUI_BCK_exists
0
2925 proc backup_commit_buffer
{} {
2926 global ui_comm GITGUI_BCK_exists
2928 set m
[$ui_comm edit modified
]
2929 if {$m ||
$GITGUI_BCK_exists} {
2930 set msg
[string trim
[$ui_comm get
0.0 end
]]
2931 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2934 if {$GITGUI_BCK_exists} {
2935 catch
{file delete
[gitdir GITGUI_BCK
]}
2936 set GITGUI_BCK_exists
0
2940 set fd
[open
[gitdir GITGUI_BCK
] w
]
2941 puts
-nonewline $fd $msg
2943 set GITGUI_BCK_exists
1
2947 $ui_comm edit modified false
2950 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
2953 backup_commit_buffer
2955 # -- If the user has aspell available we can drive it
2956 # in pipe mode to spellcheck the commit message.
2958 set spell_cmd
[list |
]
2959 set spell_dict
[get_config gui.spellingdictionary
]
2960 lappend spell_cmd aspell
2961 if {$spell_dict ne
{}} {
2962 lappend spell_cmd
--master=$spell_dict
2964 lappend spell_cmd
--mode=none
2965 lappend spell_cmd
--encoding=utf-8
2966 lappend spell_cmd pipe
2967 if {$spell_dict eq
{none
}
2968 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
2969 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
2971 set ui_comm_spell
[spellcheck
::init \
2977 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
2980 lock_index begin-read
2981 if {![winfo ismapped .
]} {
2985 if {[is_enabled multicommit
]} {