2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 ||
test "z$*" = z--version
; \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
11 set appvers
{@@GITGUI_VERSION@@
}
13 Copyright ©
2006, 2007 Shawn Pearce
, et. al.
15 This program is free software
; you can redistribute it and
/or modify
16 it under the terms of the GNU General Public License as published by
17 the Free Software Foundation
; either version
2 of the License
, or
18 (at your option
) any later version.
20 This program is distributed
in the hope that it will be useful
,
21 but WITHOUT ANY WARRANTY
; without even the implied warranty of
22 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23 GNU General Public License
for more details.
25 You should have received a copy of the GNU General Public License
26 along with this program
; if not
, write to the Free Software
27 Foundation
, Inc.
, 59 Temple Place
, Suite
330, Boston
, MA
02111-1307 USA
}
29 ######################################################################
31 ## Tcl/Tk sanity check
33 if {[catch
{package require Tcl
8.4} err
]
34 ||
[catch
{package require Tk
8.4} err
]
40 -title "git-gui: fatal error" \
45 catch
{rename send
{}} ; # What an evil concept...
47 ######################################################################
49 ## enable verbose loading?
51 if {![catch
{set _verbose
$env(GITGUI_VERBOSE
)}]} {
53 rename auto_load real__auto_load
54 proc auto_load
{name args
} {
55 puts stderr
"auto_load $name"
56 return [uplevel
1 real__auto_load
$name $args]
58 rename
source real__source
60 puts stderr
"source $name"
61 uplevel
1 real__source
$name
65 ######################################################################
67 ## Fake internationalization to ease backporting of changes.
70 set cmk
[string first @@
$fmt]
72 set fmt [string range
$fmt 0 [expr {$cmk - 1}]]
74 return [eval [list format
$fmt] $args]
77 ######################################################################
81 set _appname
[lindex
[file split $argv0] end
]
98 return [eval [list
file join $_gitdir] $args]
101 proc gitexec
{args
} {
103 if {$_gitexec eq
{}} {
104 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
105 error
"Git not installed?\n\n$err"
108 set _gitexec
[exec cygpath \
113 set _gitexec
[file normalize
$_gitexec]
119 return [eval [list
file join $_gitexec] $args]
127 if {[tk windowingsystem
] eq
{aqua
}} {
134 if {$
::tcl_platform
(platform
) eq
{windows
}} {
142 if {$_iscygwin eq
{}} {
143 if {$
::tcl_platform
(platform
) eq
{windows
}} {
144 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
156 proc is_enabled
{option
} {
157 global enabled_options
158 if {[catch
{set on
$enabled_options($option)}]} {return 0}
162 proc enable_option
{option
} {
163 global enabled_options
164 set enabled_options
($option) 1
167 proc disable_option
{option
} {
168 global enabled_options
169 set enabled_options
($option) 0
172 ######################################################################
176 proc is_many_config
{name
} {
177 switch
-glob -- $name {
186 proc is_config_true
{name
} {
188 if {[catch
{set v
$repo_config($name)}]} {
190 } elseif
{$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes}} {
197 proc get_config
{name
} {
199 if {[catch
{set v
$repo_config($name)}]} {
206 proc load_config
{include_global
} {
207 global repo_config global_config default_config
209 array
unset global_config
210 if {$include_global} {
212 set fd_rc
[git_read config
--global --list]
213 while {[gets
$fd_rc line
] >= 0} {
214 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
215 if {[is_many_config
$name]} {
216 lappend global_config
($name) $value
218 set global_config
($name) $value
226 array
unset repo_config
228 set fd_rc
[git_read config
--list]
229 while {[gets
$fd_rc line
] >= 0} {
230 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
231 if {[is_many_config
$name]} {
232 lappend repo_config
($name) $value
234 set repo_config
($name) $value
241 foreach name
[array names default_config
] {
242 if {[catch
{set v
$global_config($name)}]} {
243 set global_config
($name) $default_config($name)
245 if {[catch
{set v
$repo_config($name)}]} {
246 set repo_config
($name) $default_config($name)
251 ######################################################################
255 proc _git_cmd
{name
} {
258 if {[catch
{set v
$_git_cmd_path($name)}]} {
262 --exec-path { return [list $
::_git
$name] }
265 set p
[gitexec git-
$name$
::_search_exe
]
266 if {[file exists
$p]} {
268 } elseif
{[is_Windows
] && [file exists
[gitexec git-
$name]]} {
269 # Try to determine what sort of magic will make
270 # git-$name go and do its thing, because native
271 # Tcl on Windows doesn't know it.
273 set p
[gitexec git-
$name]
278 switch
-glob -- [lindex
$s 0] {
280 #!*perl { set i perl }
281 #!*python { set i python }
282 default
{ error
"git-$name is not supported: $s" }
286 if {![info exists interp
]} {
287 set interp
[_which
$i]
290 error
"git-$name requires $i (not in PATH)"
292 set v
[concat
[list
$interp] [lrange
$s 1 end
] [list
$p]]
294 # Assume it is builtin to git somehow and we
295 # aren't actually able to see a file for it.
297 set v
[list $
::_git
$name]
299 set _git_cmd_path
($name) $v
305 global env _search_exe _search_path
307 if {$_search_path eq
{}} {
309 set _search_path
[split [exec cygpath \
315 } elseif
{[is_Windows
]} {
316 set _search_path
[split $env(PATH
) {;}]
319 set _search_path
[split $env(PATH
) :]
324 foreach p
$_search_path {
325 set p
[file join $p $what$_search_exe]
326 if {[file exists
$p]} {
327 return [file normalize
$p]
333 proc _lappend_nice
{cmd_var
} {
337 if {![info exists _nice
]} {
338 set _nice
[_which nice
]
349 switch
-- [lindex
$args 0] {
360 set args
[lrange
$args 1 end
]
363 set cmdp
[_git_cmd
[lindex
$args 0]]
364 set args
[lrange
$args 1 end
]
366 return [eval $opt $cmdp $args]
369 proc _open_stdout_stderr
{cmd
} {
373 if { [lindex
$cmd end
] eq
{2>@
1}
374 && $err eq
{can not
find channel named
"1"}
376 # Older versions of Tcl 8.4 don't have this 2>@1 IO
377 # redirect operator. Fallback to |& cat for those.
378 # The command was not actually started, so its safe
379 # to try to start it a second time.
381 set fd
[open
[concat \
382 [lrange
$cmd 0 end-1
] \
389 fconfigure
$fd -eofchar {}
393 proc git_read
{args
} {
397 switch
-- [lindex
$args 0] {
412 set args
[lrange
$args 1 end
]
415 set cmdp
[_git_cmd
[lindex
$args 0]]
416 set args
[lrange
$args 1 end
]
418 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
421 proc git_write
{args
} {
425 switch
-- [lindex
$args 0] {
436 set args
[lrange
$args 1 end
]
439 set cmdp
[_git_cmd
[lindex
$args 0]]
440 set args
[lrange
$args 1 end
]
442 return [open
[concat
$opt $cmdp $args] w
]
446 regsub
-all ' $value "'\\''" value
450 proc load_current_branch {} {
451 global current_branch is_detached
453 set fd [open [gitdir HEAD] r]
454 if {[gets $fd ref] < 1} {
459 set pfx {ref: refs/heads/}
460 set len [string length $pfx]
461 if {[string equal -length $len $pfx $ref]} {
462 # We're on a branch. It might not exist. But
463 # HEAD looks good enough to be a branch.
465 set current_branch [string range $ref $len end]
468 # Assume this is a detached head.
470 set current_branch HEAD
475 auto_load tk_optionMenu
476 rename tk_optionMenu real__tkOptionMenu
477 proc tk_optionMenu {w varName args} {
478 set m [eval real__tkOptionMenu $w $varName $args]
479 $m configure -font font_ui
480 $w configure -font font_ui
484 proc rmsel_tag {text} {
486 -background [$text cget -background] \
487 -foreground [$text cget -foreground] \
489 $text tag conf in_sel -background lightgray
490 bind $text <Motion> break
494 ######################################################################
498 set _git [_which git]
500 catch {wm withdraw .}
504 -title [mc "git-gui
: fatal error
"] \
505 -message [mc "Cannot
find git
in PATH.
"]
509 ######################################################################
513 if {[catch {set _git_version [git --version]} err]} {
514 catch {wm withdraw .}
518 -title "git-gui
: fatal error
" \
519 -message "Cannot determine Git version
:
523 [appname
] requires Git
1.5.0 or later.
"
526 if {![regsub {^git version } $_git_version {} _git_version]} {
527 catch {wm withdraw .}
531 -title "git-gui
: fatal error
" \
532 -message "Cannot parse Git version string
:\n\n$_git_version"
536 set _real_git_version $_git_version
537 regsub -- {-dirty$} $_git_version {} _git_version
538 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
539 regsub {\.rc[0-9]+$} $_git_version {} _git_version
540 regsub {\.GIT$} $_git_version {} _git_version
542 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
543 catch {wm withdraw .}
548 -title "[appname
]: warning
" \
549 -message "Git version cannot be determined.
551 $_git claims it is version
'$_real_git_version'.
553 [appname
] requires
at least Git
1.5.0 or later.
555 Assume
'$_real_git_version' is version
1.5.0?
557 set _git_version 1.5.0
562 unset _real_git_version
564 proc git-version {args} {
567 switch [llength $args] {
573 set op [lindex $args 0]
574 set vr [lindex $args 1]
575 set cm [package vcompare $_git_version $vr]
576 return [expr $cm $op 0]
580 set type [lindex $args 0]
581 set name [lindex $args 1]
582 set parm [lindex $args 2]
583 set body [lindex $args 3]
585 if {($type ne {proc} && $type ne {method})} {
586 error "Invalid arguments to git-version
"
588 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
589 error "Last arm of
$type $name must be default
"
592 foreach {op vr cb} [lrange $body 0 end-2] {
593 if {[git-version $op $vr]} {
594 return [uplevel [list $type $name $parm $cb]]
598 return [uplevel [list $type $name $parm [lindex $body end]]]
602 error "git-version
>= x
"
608 if {[git-version < 1.5]} {
609 catch {wm withdraw .}
613 -title "git-gui
: fatal error
" \
614 -message "[appname
] requires Git
1.5.0 or later.
616 You are using
[git-version
]:
622 ######################################################################
624 ## configure our library
626 set oguilib {@@GITGUI_LIBDIR@@}
627 set oguirel {@@GITGUI_RELATIVE@@}
628 if {$oguirel eq {1}} {
629 set oguilib [file dirname [file dirname [file normalize $argv0]]]
630 set oguilib [file join $oguilib share git-gui lib]
631 } elseif {[string match @@* $oguirel]} {
632 set oguilib [file join [file dirname [file normalize $argv0]] lib]
635 set idx [file join $oguilib tclIndex]
636 if {[catch {set fd [open $idx r]} err]} {
637 catch {wm withdraw .}
641 -title "git-gui
: fatal error
" \
645 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
647 while {[gets $fd n] >= 0} {
648 if {$n ne {} && ![string match #* $n]} {
660 if {[lsearch -exact $loaded $p] >= 0} continue
661 source [file join $oguilib $p]
666 set auto_path [concat [list $oguilib] $auto_path]
668 unset -nocomplain oguirel idx fd
670 ######################################################################
672 ## feature option selection
674 if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
679 if {$subcommand eq {gui.sh}} {
682 if {$subcommand eq {gui} && [llength $argv] > 0} {
683 set subcommand [lindex $argv 0]
684 set argv [lrange $argv 1 end]
687 enable_option multicommit
689 enable_option transport
692 switch -- $subcommand {
697 disable_option multicommit
698 disable_option branch
699 disable_option transport
702 enable_option singlecommit
704 disable_option multicommit
705 disable_option branch
706 disable_option transport
710 ######################################################################
715 set _gitdir $env(GIT_DIR)
719 set _gitdir [git rev-parse --git-dir]
720 set _prefix [git rev-parse --show-prefix]
722 catch {wm withdraw .}
723 error_popup "Cannot
find the git directory
:\n\n$err"
726 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
727 catch {set _gitdir [exec cygpath --unix $_gitdir]}
729 if {![file isdirectory $_gitdir]} {
730 catch {wm withdraw .}
731 error_popup "Git directory not found
:\n\n$_gitdir"
734 if {$_prefix ne {}} {
735 regsub -all {[^/]+/} $_prefix ../ cdup
736 if {[catch {cd $cdup} err]} {
737 catch {wm withdraw .}
738 error_popup "Cannot move to top of working directory
:\n\n$err"
742 } elseif {![is_enabled bare]} {
743 if {[lindex [file split $_gitdir] end] ne {.git}} {
744 catch {wm withdraw .}
745 error_popup "Cannot use funny .git directory
:\n\n$_gitdir"
748 if {[catch {cd [file dirname $_gitdir]} err]} {
749 catch {wm withdraw .}
750 error_popup "No working directory
[file dirname $_gitdir]:\n\n$err"
754 set _reponame [file split [file normalize $_gitdir]]
755 if {[lindex $_reponame end] eq {.git}} {
756 set _reponame [lindex $_reponame end-1]
758 set _reponame [lindex $_reponame end]
761 ######################################################################
765 set current_diff_path {}
766 set current_diff_side {}
767 set diff_actions [list]
771 set MERGE_HEAD [list]
774 set current_branch {}
776 set current_diff_path {}
778 set selected_commit_type new
780 ######################################################################
788 set disable_on_lock [list]
789 set index_lock_type none
791 proc lock_index {type} {
792 global index_lock_type disable_on_lock
794 if {$index_lock_type eq {none}} {
795 set index_lock_type $type
796 foreach w $disable_on_lock {
797 uplevel #0 $w disabled
800 } elseif {$index_lock_type eq "begin-
$type"} {
801 set index_lock_type $type
807 proc unlock_index {} {
808 global index_lock_type disable_on_lock
810 set index_lock_type none
811 foreach w $disable_on_lock {
816 ######################################################################
820 proc repository_state {ctvar hdvar mhvar} {
821 global current_branch
822 upvar $ctvar ct $hdvar hd $mhvar mh
827 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
833 set merge_head [gitdir MERGE_HEAD]
834 if {[file exists $merge_head]} {
836 set fd_mh [open $merge_head r]
837 while {[gets $fd_mh line] >= 0} {
848 global PARENT empty_tree
850 set p [lindex $PARENT 0]
854 if {$empty_tree eq {}} {
855 set empty_tree [git mktree << {}]
860 proc rescan {after {honor_trustmtime 1}} {
861 global HEAD PARENT MERGE_HEAD commit_type
862 global ui_index ui_workdir ui_comm
863 global rescan_active file_states
866 if {$rescan_active > 0 || ![lock_index read]} return
868 repository_state newType newHEAD newMERGE_HEAD
869 if {[string match amend* $commit_type]
870 && $newType eq {normal}
871 && $newHEAD eq $HEAD} {
875 set MERGE_HEAD $newMERGE_HEAD
876 set commit_type $newType
879 array unset file_states
881 if {!$::GITGUI_BCK_exists &&
882 (![$ui_comm edit modified]
883 || [string trim [$ui_comm get 0.0 end]] eq {})} {
884 if {[string match amend* $commit_type]} {
885 } elseif {[load_message GITGUI_MSG]} {
886 } elseif {[load_message MERGE_MSG]} {
887 } elseif {[load_message SQUASH_MSG]} {
890 $ui_comm edit modified false
893 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
894 rescan_stage2 {} $after
897 ui_status {Refreshing file status...}
898 set fd_rf [git_read update-index \
904 fconfigure $fd_rf -blocking 0 -translation binary
905 fileevent $fd_rf readable \
906 [list rescan_stage2 $fd_rf $after]
910 proc rescan_stage2 {fd after} {
911 global rescan_active buf_rdi buf_rdf buf_rlo
915 if {![eof $fd]} return
919 set ls_others [list --exclude-per-directory=.gitignore]
920 set info_exclude [gitdir info exclude]
921 if {[file readable $info_exclude]} {
922 lappend ls_others "--exclude-from=$info_exclude"
924 set user_exclude [get_config core.excludesfile]
925 if {$user_exclude ne {} && [file readable $user_exclude]} {
926 lappend ls_others "--exclude-from=$user_exclude"
934 ui_status {Scanning for modified files ...}
935 set fd_di [git_read diff-index --cached -z [PARENT]]
936 set fd_df [git_read diff-files -z]
937 set fd_lo [eval git_read ls-files --others -z $ls_others]
939 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
940 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
941 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
942 fileevent $fd_di readable [list read_diff_index $fd_di $after]
943 fileevent $fd_df readable [list read_diff_files $fd_df $after]
944 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
947 proc load_message {file} {
951 if {[file isfile $f]} {
952 if {[catch {set fd [open $f r]}]} {
955 fconfigure $fd -eofchar {}
956 set content [string trim [read $fd]]
958 regsub -all -line {[ \r\t]+$} $content {} content
959 $ui_comm delete 0.0 end
960 $ui_comm insert end $content
966 proc read_diff_index {fd after} {
969 append buf_rdi [read $fd]
971 set n [string length $buf_rdi]
973 set z1 [string first "\
0" $buf_rdi $c]
976 set z2 [string first "\
0" $buf_rdi $z1]
980 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
981 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
983 [encoding convertfrom $p] \
985 [list [lindex $i 0] [lindex $i 2]] \
991 set buf_rdi [string range $buf_rdi $c end]
996 rescan_done $fd buf_rdi $after
999 proc read_diff_files {fd after} {
1002 append buf_rdf [read $fd]
1004 set n [string length $buf_rdf]
1006 set z1 [string first "\
0" $buf_rdf $c]
1007 if {$z1 == -1} break
1009 set z2 [string first "\
0" $buf_rdf $z1]
1010 if {$z2 == -1} break
1013 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1014 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1016 [encoding convertfrom $p] \
1019 [list [lindex $i 0] [lindex $i 2]]
1024 set buf_rdf [string range $buf_rdf $c end]
1029 rescan_done $fd buf_rdf $after
1032 proc read_ls_others {fd after} {
1035 append buf_rlo [read $fd]
1036 set pck [split $buf_rlo "\
0"]
1037 set buf_rlo [lindex $pck end]
1038 foreach p [lrange $pck 0 end-1] {
1039 set p [encoding convertfrom $p]
1040 if {[string index $p end] eq {/}} {
1041 set p [string range $p 0 end-1]
1045 rescan_done $fd buf_rlo $after
1048 proc rescan_done {fd buf after} {
1049 global rescan_active current_diff_path
1050 global file_states repo_config
1053 if {![eof $fd]} return
1056 if {[incr rescan_active -1] > 0} return
1061 if {$current_diff_path ne {}} reshow_diff
1065 proc prune_selection {} {
1066 global file_states selected_paths
1068 foreach path [array names selected_paths] {
1069 if {[catch {set still_here $file_states($path)}]} {
1070 unset selected_paths($path)
1075 ######################################################################
1079 proc mapicon {w state path} {
1082 if {[catch {set r $all_icons($state$w)}]} {
1083 puts "error
: no icon
for $w state
={$state} $path"
1089 proc mapdesc {state path} {
1092 if {[catch {set r $all_descs($state)}]} {
1093 puts "error
: no desc
for state
={$state} $path"
1099 proc ui_status {msg} {
1100 $::main_status show $msg
1103 proc ui_ready {{test {}}} {
1104 $::main_status show {Ready.} $test
1107 proc escape_path {path} {
1108 regsub -all {\\} $path "\\\\" path
1109 regsub -all "\n" $path "\\n
" path
1113 proc short_path {path} {
1114 return [escape_path [lindex [file split $path] end]]
1118 set null_sha1 [string repeat 0 40]
1120 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1121 global file_states next_icon_id null_sha1
1123 set s0 [string index $new_state 0]
1124 set s1 [string index $new_state 1]
1126 if {[catch {set info $file_states($path)}]} {
1128 set icon n[incr next_icon_id]
1130 set state [lindex $info 0]
1131 set icon [lindex $info 1]
1132 if {$head_info eq {}} {set head_info [lindex $info 2]}
1133 if {$index_info eq {}} {set index_info [lindex $info 3]}
1136 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1137 elseif {$s0 eq {_}} {set s0 _}
1139 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1140 elseif {$s1 eq {_}} {set s1 _}
1142 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1143 set head_info [list 0 $null_sha1]
1144 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1145 && $head_info eq {}} {
1146 set head_info $index_info
1149 set file_states($path) [list $s0$s1 $icon \
1150 $head_info $index_info \
1155 proc display_file_helper {w path icon_name old_m new_m} {
1158 if {$new_m eq {_}} {
1159 set lno [lsearch -sorted -exact $file_lists($w) $path]
1161 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1163 $w conf -state normal
1164 $w delete $lno.0 [expr {$lno + 1}].0
1165 $w conf -state disabled
1167 } elseif {$old_m eq {_} && $new_m ne {_}} {
1168 lappend file_lists($w) $path
1169 set file_lists($w) [lsort -unique $file_lists($w)]
1170 set lno [lsearch -sorted -exact $file_lists($w) $path]
1172 $w conf -state normal
1173 $w image create $lno.0 \
1174 -align center -padx 5 -pady 1 \
1176 -image [mapicon $w $new_m $path]
1177 $w insert $lno.1 "[escape_path
$path]\n"
1178 $w conf -state disabled
1179 } elseif {$old_m ne $new_m} {
1180 $w conf -state normal
1181 $w image conf $icon_name -image [mapicon $w $new_m $path]
1182 $w conf -state disabled
1186 proc display_file {path state} {
1187 global file_states selected_paths
1188 global ui_index ui_workdir
1190 set old_m [merge_state $path $state]
1191 set s $file_states($path)
1192 set new_m [lindex $s 0]
1193 set icon_name [lindex $s 1]
1195 set o [string index $old_m 0]
1196 set n [string index $new_m 0]
1203 display_file_helper $ui_index $path $icon_name $o $n
1205 if {[string index $old_m 0] eq {U}} {
1208 set o [string index $old_m 1]
1210 if {[string index $new_m 0] eq {U}} {
1213 set n [string index $new_m 1]
1215 display_file_helper $ui_workdir $path $icon_name $o $n
1217 if {$new_m eq {__}} {
1218 unset file_states($path)
1219 catch {unset selected_paths($path)}
1223 proc display_all_files_helper {w path icon_name m} {
1226 lappend file_lists($w) $path
1227 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1228 $w image create end \
1229 -align center -padx 5 -pady 1 \
1231 -image [mapicon $w $m $path]
1232 $w insert end "[escape_path
$path]\n"
1235 proc display_all_files {} {
1236 global ui_index ui_workdir
1237 global file_states file_lists
1240 $ui_index conf -state normal
1241 $ui_workdir conf -state normal
1243 $ui_index delete 0.0 end
1244 $ui_workdir delete 0.0 end
1247 set file_lists($ui_index) [list]
1248 set file_lists($ui_workdir) [list]
1250 foreach path [lsort [array names file_states]] {
1251 set s $file_states($path)
1253 set icon_name [lindex $s 1]
1255 set s [string index $m 0]
1256 if {$s ne {U} && $s ne {_}} {
1257 display_all_files_helper $ui_index $path \
1261 if {[string index $m 0] eq {U}} {
1264 set s [string index $m 1]
1267 display_all_files_helper $ui_workdir $path \
1272 $ui_index conf -state disabled
1273 $ui_workdir conf -state disabled
1276 ######################################################################
1281 #define mask_width 14
1282 #define mask_height 15
1283 static unsigned char mask_bits[] = {
1284 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1285 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1286 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1289 image create bitmap file_plain -background white -foreground black -data {
1290 #define plain_width 14
1291 #define plain_height 15
1292 static unsigned char plain_bits[] = {
1293 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1294 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1295 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1296 } -maskdata $filemask
1298 image create bitmap file_mod -background white -foreground blue -data {
1299 #define mod_width 14
1300 #define mod_height 15
1301 static unsigned char mod_bits[] = {
1302 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1303 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1304 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1305 } -maskdata $filemask
1307 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1308 #define file_fulltick_width 14
1309 #define file_fulltick_height 15
1310 static unsigned char file_fulltick_bits
[] = {
1311 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1312 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1313 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1314 } -maskdata $filemask
1316 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1317 #define parttick_width 14
1318 #define parttick_height 15
1319 static unsigned char parttick_bits
[] = {
1320 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1321 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1322 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1323 } -maskdata $filemask
1325 image create bitmap file_question
-background white
-foreground black
-data {
1326 #define file_question_width 14
1327 #define file_question_height 15
1328 static unsigned char file_question_bits
[] = {
1329 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1330 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1331 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1332 } -maskdata $filemask
1334 image create bitmap file_removed
-background white
-foreground red
-data {
1335 #define file_removed_width 14
1336 #define file_removed_height 15
1337 static unsigned char file_removed_bits
[] = {
1338 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1339 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1340 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1341 } -maskdata $filemask
1343 image create bitmap file_merge
-background white
-foreground blue
-data {
1344 #define file_merge_width 14
1345 #define file_merge_height 15
1346 static unsigned char file_merge_bits
[] = {
1347 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1348 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1349 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1350 } -maskdata $filemask
1352 set ui_index .vpane.files.index.list
1353 set ui_workdir .vpane.files.workdir.list
1355 set all_icons
(_
$ui_index) file_plain
1356 set all_icons
(A
$ui_index) file_fulltick
1357 set all_icons
(M
$ui_index) file_fulltick
1358 set all_icons
(D
$ui_index) file_removed
1359 set all_icons
(U
$ui_index) file_merge
1361 set all_icons
(_
$ui_workdir) file_plain
1362 set all_icons
(M
$ui_workdir) file_mod
1363 set all_icons
(D
$ui_workdir) file_question
1364 set all_icons
(U
$ui_workdir) file_merge
1365 set all_icons
(O
$ui_workdir) file_plain
1367 set max_status_desc
0
1371 {_M
"Modified, not staged"}
1372 {M_
"Staged for commit"}
1373 {MM
"Portions staged for commit"}
1374 {MD
"Staged for commit, missing"}
1376 {_O
"Untracked, not staged"}
1377 {A_
"Staged for commit"}
1378 {AM
"Portions staged for commit"}
1379 {AD
"Staged for commit, missing"}
1382 {D_
"Staged for removal"}
1383 {DO
"Staged for removal, still present"}
1385 {U_
"Requires merge resolution"}
1386 {UU
"Requires merge resolution"}
1387 {UM
"Requires merge resolution"}
1388 {UD
"Requires merge resolution"}
1390 if {$max_status_desc < [string length
[lindex
$i 1]]} {
1391 set max_status_desc
[string length
[lindex
$i 1]]
1393 set all_descs
([lindex
$i 0]) [lindex
$i 1]
1397 ######################################################################
1401 proc bind_button3
{w cmd
} {
1402 bind $w <Any-Button-3
> $cmd
1404 # Mac OS X sends Button-2 on right click through three-button mouse,
1405 # or through trackpad right-clicking (two-finger touch + click).
1406 bind $w <Any-Button-2
> $cmd
1407 bind $w <Control-Button-1
> $cmd
1411 proc scrollbar2many
{list mode args
} {
1412 foreach w
$list {eval $w $mode $args}
1415 proc many2scrollbar
{list mode sb top bottom
} {
1416 $sb set $top $bottom
1417 foreach w
$list {$w $mode moveto
$top}
1420 proc incr_font_size
{font
{amt
1}} {
1421 set sz
[font configure
$font -size]
1423 font configure
$font -size $sz
1424 font configure
${font}bold
-size $sz
1425 font configure
${font}italic
-size $sz
1428 ######################################################################
1432 set starting_gitk_msg
{Starting gitk... please
wait...
}
1434 proc do_gitk
{revs
} {
1435 # -- Always start gitk through whatever we were loaded with. This
1436 # lets us bypass using shell process on Windows systems.
1438 set exe
[file join [file dirname $
::_git
] gitk
]
1439 set cmd
[list
[info nameofexecutable
] $exe]
1440 if {! [file exists
$exe]} {
1441 error_popup
"Unable to start gitk:\n\n$exe does not exist"
1443 eval exec $cmd $revs &
1444 ui_status $
::starting_gitk_msg
1446 ui_ready
$starting_gitk_msg
1454 global ui_comm is_quitting repo_config commit_type
1455 global GITGUI_BCK_exists GITGUI_BCK_i
1457 if {$is_quitting} return
1460 if {[winfo exists
$ui_comm]} {
1461 # -- Stash our current commit buffer.
1463 set save
[gitdir GITGUI_MSG
]
1464 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1465 file rename
-force [gitdir GITGUI_BCK
] $save
1466 set GITGUI_BCK_exists
0
1468 set msg
[string trim
[$ui_comm get
0.0 end
]]
1469 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1470 if {(![string match amend
* $commit_type]
1471 ||
[$ui_comm edit modified
])
1474 set fd
[open
$save w
]
1475 puts
-nonewline $fd $msg
1479 catch
{file delete
$save}
1483 # -- Remove our editor backup, its not needed.
1485 after cancel
$GITGUI_BCK_i
1486 if {$GITGUI_BCK_exists} {
1487 catch
{file delete
[gitdir GITGUI_BCK
]}
1490 # -- Stash our current window geometry into this repository.
1492 set cfg_geometry
[list
]
1493 lappend cfg_geometry
[wm geometry .
]
1494 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
1495 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
1496 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1499 if {$cfg_geometry ne
$rc_geometry} {
1500 catch
{git config gui.geometry
$cfg_geometry}
1515 proc toggle_or_diff
{w x y
} {
1516 global file_states file_lists current_diff_path ui_index ui_workdir
1517 global last_clicked selected_paths
1519 set pos
[split [$w index @
$x,$y] .
]
1520 set lno
[lindex
$pos 0]
1521 set col [lindex
$pos 1]
1522 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1528 set last_clicked
[list
$w $lno]
1529 array
unset selected_paths
1530 $ui_index tag remove in_sel
0.0 end
1531 $ui_workdir tag remove in_sel
0.0 end
1534 if {$current_diff_path eq
$path} {
1535 set after
{reshow_diff
;}
1539 if {$w eq
$ui_index} {
1541 "Unstaging [short_path $path] from commit" \
1543 [concat
$after [list ui_ready
]]
1544 } elseif
{$w eq
$ui_workdir} {
1546 "Adding [short_path $path]" \
1548 [concat
$after [list ui_ready
]]
1551 show_diff
$path $w $lno
1555 proc add_one_to_selection
{w x y
} {
1556 global file_lists last_clicked selected_paths
1558 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1559 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1565 if {$last_clicked ne
{}
1566 && [lindex
$last_clicked 0] ne
$w} {
1567 array
unset selected_paths
1568 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
1571 set last_clicked
[list
$w $lno]
1572 if {[catch
{set in_sel
$selected_paths($path)}]} {
1576 unset selected_paths
($path)
1577 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
1579 set selected_paths
($path) 1
1580 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1584 proc add_range_to_selection
{w x y
} {
1585 global file_lists last_clicked selected_paths
1587 if {[lindex
$last_clicked 0] ne
$w} {
1588 toggle_or_diff
$w $x $y
1592 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1593 set lc
[lindex
$last_clicked 1]
1602 foreach path
[lrange
$file_lists($w) \
1603 [expr {$begin - 1}] \
1604 [expr {$end - 1}]] {
1605 set selected_paths
($path) 1
1607 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
1610 ######################################################################
1614 set cursor_ptr arrow
1615 font create font_diff
-family Courier
-size 10
1619 eval font configure font_ui
[font actual
[.dummy cget
-font]]
1623 font create font_uiitalic
1624 font create font_uibold
1625 font create font_diffbold
1626 font create font_diffitalic
1628 foreach class
{Button Checkbutton Entry Label
1629 Labelframe Listbox Menu Message
1630 Radiobutton Spinbox Text
} {
1631 option add
*$class.font font_ui
1635 if {[is_Windows
] ||
[is_MacOSX
]} {
1636 option add
*Menu.tearOff
0
1647 proc apply_config
{} {
1648 global repo_config font_descs
1650 foreach option
$font_descs {
1651 set name
[lindex
$option 0]
1652 set font
[lindex
$option 1]
1654 foreach
{cn cv
} $repo_config(gui.
$name) {
1655 font configure
$font $cn $cv -weight normal
1658 error_popup
"Invalid font specified in gui.$name:\n\n$err"
1660 foreach
{cn cv
} [font configure
$font] {
1661 font configure
${font}bold
$cn $cv
1662 font configure
${font}italic
$cn $cv
1664 font configure
${font}bold
-weight bold
1665 font configure
${font}italic
-slant italic
1669 set default_config
(merge.diffstat
) true
1670 set default_config
(merge.summary
) false
1671 set default_config
(merge.verbosity
) 2
1672 set default_config
(user.name
) {}
1673 set default_config
(user.email
) {}
1675 set default_config
(gui.matchtrackingbranch
) false
1676 set default_config
(gui.pruneduringfetch
) false
1677 set default_config
(gui.trustmtime
) false
1678 set default_config
(gui.diffcontext
) 5
1679 set default_config
(gui.newbranchtemplate
) {}
1680 set default_config
(gui.fontui
) [font configure font_ui
]
1681 set default_config
(gui.fontdiff
) [font configure font_diff
]
1683 {fontui font_ui
{Main Font
}}
1684 {fontdiff font_diff
{Diff
/Console Font
}}
1689 ######################################################################
1697 menu .mbar
-tearoff 0
1698 .mbar add cascade
-label Repository
-menu .mbar.repository
1699 .mbar add cascade
-label Edit
-menu .mbar.edit
1700 if {[is_enabled branch
]} {
1701 .mbar add cascade
-label Branch
-menu .mbar.branch
1703 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
1704 .mbar add cascade
-label Commit
-menu .mbar.commit
1706 if {[is_enabled transport
]} {
1707 .mbar add cascade
-label Merge
-menu .mbar.merge
1708 .mbar add cascade
-label Fetch
-menu .mbar.fetch
1709 .mbar add cascade
-label Push
-menu .mbar.push
1711 . configure
-menu .mbar
1713 # -- Repository Menu
1715 menu .mbar.repository
1717 .mbar.repository add
command \
1718 -label {Browse Current Branch
's Files} \
1719 -command {browser::new $current_branch}
1720 set ui_browse_current [.mbar.repository index last]
1721 .mbar.repository add command \
1722 -label {Browse Branch Files...} \
1723 -command browser_open::dialog
1724 .mbar.repository add separator
1726 .mbar.repository add command \
1727 -label {Visualize Current Branch's History
} \
1728 -command {do_gitk
$current_branch}
1729 set ui_visualize_current
[.mbar.repository index last
]
1730 .mbar.repository add
command \
1731 -label {Visualize All Branch History
} \
1732 -command {do_gitk
--all}
1733 .mbar.repository add separator
1735 proc current_branch_write
{args
} {
1736 global current_branch
1737 .mbar.repository entryconf $
::ui_browse_current \
1738 -label "Browse $current_branch's Files"
1739 .mbar.repository entryconf $
::ui_visualize_current \
1740 -label "Visualize $current_branch's History"
1742 trace add variable current_branch
write current_branch_write
1744 if {[is_enabled multicommit
]} {
1745 .mbar.repository add
command -label {Database Statistics
} \
1748 .mbar.repository add
command -label {Compress Database
} \
1751 .mbar.repository add
command -label {Verify Database
} \
1752 -command do_fsck_objects
1754 .mbar.repository add separator
1757 .mbar.repository add
command \
1758 -label {Create Desktop Icon
} \
1759 -command do_cygwin_shortcut
1760 } elseif
{[is_Windows
]} {
1761 .mbar.repository add
command \
1762 -label {Create Desktop Icon
} \
1763 -command do_windows_shortcut
1764 } elseif
{[is_MacOSX
]} {
1765 .mbar.repository add
command \
1766 -label {Create Desktop Icon
} \
1767 -command do_macosx_app
1771 .mbar.repository add
command -label Quit \
1778 .mbar.edit add
command -label Undo \
1779 -command {catch
{[focus
] edit undo
}} \
1781 .mbar.edit add
command -label Redo \
1782 -command {catch
{[focus
] edit redo
}} \
1784 .mbar.edit add separator
1785 .mbar.edit add
command -label Cut \
1786 -command {catch
{tk_textCut
[focus
]}} \
1788 .mbar.edit add
command -label Copy \
1789 -command {catch
{tk_textCopy
[focus
]}} \
1791 .mbar.edit add
command -label Paste \
1792 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
1794 .mbar.edit add
command -label Delete \
1795 -command {catch
{[focus
] delete sel.first sel.last
}} \
1797 .mbar.edit add separator
1798 .mbar.edit add
command -label {Select All
} \
1799 -command {catch
{[focus
] tag add sel
0.0 end
}} \
1804 if {[is_enabled branch
]} {
1807 .mbar.branch add
command -label {Create...
} \
1808 -command branch_create
::dialog \
1810 lappend disable_on_lock
[list .mbar.branch entryconf \
1811 [.mbar.branch index last
] -state]
1813 .mbar.branch add
command -label {Checkout...
} \
1814 -command branch_checkout
::dialog \
1816 lappend disable_on_lock
[list .mbar.branch entryconf \
1817 [.mbar.branch index last
] -state]
1819 .mbar.branch add
command -label {Rename...
} \
1820 -command branch_rename
::dialog
1821 lappend disable_on_lock
[list .mbar.branch entryconf \
1822 [.mbar.branch index last
] -state]
1824 .mbar.branch add
command -label {Delete...
} \
1825 -command branch_delete
::dialog
1826 lappend disable_on_lock
[list .mbar.branch entryconf \
1827 [.mbar.branch index last
] -state]
1829 .mbar.branch add
command -label {Reset...
} \
1830 -command merge
::reset_hard
1831 lappend disable_on_lock
[list .mbar.branch entryconf \
1832 [.mbar.branch index last
] -state]
1837 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
1840 .mbar.commit add radiobutton \
1841 -label {New Commit
} \
1842 -command do_select_commit_type \
1843 -variable selected_commit_type \
1845 lappend disable_on_lock \
1846 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1848 .mbar.commit add radiobutton \
1849 -label {Amend Last Commit
} \
1850 -command do_select_commit_type \
1851 -variable selected_commit_type \
1853 lappend disable_on_lock \
1854 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1856 .mbar.commit add separator
1858 .mbar.commit add
command -label Rescan \
1859 -command do_rescan \
1861 lappend disable_on_lock \
1862 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1864 .mbar.commit add
command -label {Stage To Commit
} \
1865 -command do_add_selection
1866 lappend disable_on_lock \
1867 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1869 .mbar.commit add
command -label {Stage Changed Files To Commit
} \
1870 -command do_add_all \
1872 lappend disable_on_lock \
1873 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1875 .mbar.commit add
command -label {Unstage From Commit
} \
1876 -command do_unstage_selection
1877 lappend disable_on_lock \
1878 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1880 .mbar.commit add
command -label {Revert Changes
} \
1881 -command do_revert_selection
1882 lappend disable_on_lock \
1883 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1885 .mbar.commit add separator
1887 .mbar.commit add
command -label {Sign Off
} \
1888 -command do_signoff \
1891 .mbar.commit add
command -label Commit \
1892 -command do_commit \
1893 -accelerator $M1T-Return
1894 lappend disable_on_lock \
1895 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1900 if {[is_enabled branch
]} {
1902 .mbar.merge add
command -label {Local Merge...
} \
1903 -command merge
::dialog \
1905 lappend disable_on_lock \
1906 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
1907 .mbar.merge add
command -label {Abort Merge...
} \
1908 -command merge
::reset_hard
1909 lappend disable_on_lock \
1910 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
1915 if {[is_enabled transport
]} {
1919 .mbar.push add
command -label {Push...
} \
1920 -command do_push_anywhere \
1922 .mbar.push add
command -label {Delete...
} \
1923 -command remote_branch_delete
::dialog
1927 # -- Apple Menu (Mac OS X only)
1929 .mbar add cascade
-label Apple
-menu .mbar.apple
1932 .mbar.apple add
command -label "About [appname]" \
1934 .mbar.apple add
command -label "Options..." \
1939 .mbar.edit add separator
1940 .mbar.edit add
command -label {Options...
} \
1946 .mbar add cascade
-label Help
-menu .mbar.
help
1950 .mbar.
help add
command -label "About [appname]" \
1955 catch
{set browser
$repo_config(instaweb.browser
)}
1956 set doc_path
[file dirname [gitexec
]]
1957 set doc_path
[file join $doc_path Documentation index.html
]
1960 set doc_path
[exec cygpath
--mixed $doc_path]
1963 if {$browser eq
{}} {
1966 } elseif
{[is_Cygwin
]} {
1967 set program_files
[file dirname [exec cygpath
--windir]]
1968 set program_files
[file join $program_files {Program Files
}]
1969 set firefox
[file join $program_files {Mozilla Firefox
} firefox.exe
]
1970 set ie
[file join $program_files {Internet Explorer
} IEXPLORE.EXE
]
1971 if {[file exists
$firefox]} {
1972 set browser
$firefox
1973 } elseif
{[file exists
$ie]} {
1976 unset program_files firefox ie
1980 if {[file isfile
$doc_path]} {
1981 set doc_url
"file:$doc_path"
1983 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
1986 if {$browser ne
{}} {
1987 .mbar.
help add
command -label {Online Documentation
} \
1988 -command [list
exec $browser $doc_url &]
1990 unset browser doc_path doc_url
1993 bind .
<Visibility
> {
1994 bind .
<Visibility
> {}
1998 # -- Standard bindings
2000 wm protocol . WM_DELETE_WINDOW do_quit
2001 bind all
<$M1B-Key-q> do_quit
2002 bind all
<$M1B-Key-Q> do_quit
2003 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2004 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2006 set subcommand_args
{}
2008 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2012 # -- Not a normal commit type invocation? Do that instead!
2014 switch
-- $subcommand {
2017 set subcommand_args
{rev? path
}
2018 if {$argv eq
{}} usage
2023 if {$is_path ||
[file exists
$_prefix$a]} {
2024 if {$path ne
{}} usage
2027 } elseif
{$a eq
{--}} {
2029 if {$head ne
{}} usage
2034 } elseif
{$head eq
{}} {
2035 if {$head ne
{}} usage
2044 if {$head ne
{} && $path eq
{}} {
2045 set path
$_prefix$head
2052 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2054 set head [git rev-parse
--verify $head]
2060 set current_branch
$head
2063 switch
-- $subcommand {
2066 if {$path ne
{} && [file isdirectory
$path]} {
2067 set head $current_branch
2073 browser
::new
$head $path
2076 if {$head eq
{} && ![file exists
$path]} {
2077 puts stderr
"fatal: cannot stat path $path: No such file or directory"
2080 blame
::new
$head $path
2087 if {[llength
$argv] != 0} {
2088 puts
-nonewline stderr
"usage: $argv0"
2089 if {$subcommand ne
{gui
} && [appname
] ne
"git-$subcommand"} {
2090 puts
-nonewline stderr
" $subcommand"
2095 # fall through to setup UI for commits
2098 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2109 -text {Current Branch
:} \
2113 -textvariable current_branch \
2116 pack .branch.l1
-side left
2117 pack .branch.cb
-side left
-fill x
2118 pack .branch
-side top
-fill x
2120 # -- Main Window Layout
2122 panedwindow .vpane
-orient vertical
2123 panedwindow .vpane.files
-orient horizontal
2124 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2125 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2127 # -- Index File List
2129 frame .vpane.files.index
-height 100 -width 200
2130 label .vpane.files.index.title
-text {Staged Changes
(Will Be Committed
)} \
2131 -background lightgreen
2132 text
$ui_index -background white
-borderwidth 0 \
2133 -width 20 -height 10 \
2135 -cursor $cursor_ptr \
2136 -xscrollcommand {.vpane.files.index.sx
set} \
2137 -yscrollcommand {.vpane.files.index.sy
set} \
2139 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2140 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2141 pack .vpane.files.index.title
-side top
-fill x
2142 pack .vpane.files.index.sx
-side bottom
-fill x
2143 pack .vpane.files.index.sy
-side right
-fill y
2144 pack
$ui_index -side left
-fill both
-expand 1
2145 .vpane.files add .vpane.files.index
-sticky nsew
2147 # -- Working Directory File List
2149 frame .vpane.files.workdir
-height 100 -width 200
2150 label .vpane.files.workdir.title
-text {Unstaged Changes
(Will Not Be Committed
)} \
2151 -background lightsalmon
2152 text
$ui_workdir -background white
-borderwidth 0 \
2153 -width 20 -height 10 \
2155 -cursor $cursor_ptr \
2156 -xscrollcommand {.vpane.files.workdir.sx
set} \
2157 -yscrollcommand {.vpane.files.workdir.sy
set} \
2159 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2160 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2161 pack .vpane.files.workdir.title
-side top
-fill x
2162 pack .vpane.files.workdir.sx
-side bottom
-fill x
2163 pack .vpane.files.workdir.sy
-side right
-fill y
2164 pack
$ui_workdir -side left
-fill both
-expand 1
2165 .vpane.files add .vpane.files.workdir
-sticky nsew
2167 foreach i
[list
$ui_index $ui_workdir] {
2169 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2173 # -- Diff and Commit Area
2175 frame .vpane.lower
-height 300 -width 400
2176 frame .vpane.lower.commarea
2177 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2178 pack .vpane.lower.commarea
-side top
-fill x
2179 pack .vpane.lower.
diff -side bottom
-fill both
-expand 1
2180 .vpane add .vpane.lower
-sticky nsew
2182 # -- Commit Area Buttons
2184 frame .vpane.lower.commarea.buttons
2185 label .vpane.lower.commarea.buttons.l
-text {} \
2188 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2189 pack .vpane.lower.commarea.buttons
-side left
-fill y
2191 button .vpane.lower.commarea.buttons.rescan
-text {Rescan
} \
2193 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2194 lappend disable_on_lock \
2195 {.vpane.lower.commarea.buttons.rescan conf
-state}
2197 button .vpane.lower.commarea.buttons.incall
-text {Stage Changed
} \
2199 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2200 lappend disable_on_lock \
2201 {.vpane.lower.commarea.buttons.incall conf
-state}
2203 button .vpane.lower.commarea.buttons.signoff
-text {Sign Off
} \
2205 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2207 button .vpane.lower.commarea.buttons.commit
-text {Commit
} \
2209 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2210 lappend disable_on_lock \
2211 {.vpane.lower.commarea.buttons.commit conf
-state}
2213 button .vpane.lower.commarea.buttons.push
-text {Push
} \
2214 -command do_push_anywhere
2215 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2217 # -- Commit Message Buffer
2219 frame .vpane.lower.commarea.buffer
2220 frame .vpane.lower.commarea.buffer.header
2221 set ui_comm .vpane.lower.commarea.buffer.t
2222 set ui_coml .vpane.lower.commarea.buffer.header.l
2223 radiobutton .vpane.lower.commarea.buffer.header.new \
2224 -text {New Commit
} \
2225 -command do_select_commit_type \
2226 -variable selected_commit_type \
2228 lappend disable_on_lock \
2229 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2230 radiobutton .vpane.lower.commarea.buffer.header.amend \
2231 -text {Amend Last Commit
} \
2232 -command do_select_commit_type \
2233 -variable selected_commit_type \
2235 lappend disable_on_lock \
2236 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2240 proc trace_commit_type
{varname args
} {
2241 global ui_coml commit_type
2242 switch
-glob -- $commit_type {
2243 initial
{set txt
{Initial Commit Message
:}}
2244 amend
{set txt
{Amended Commit Message
:}}
2245 amend-initial
{set txt
{Amended Initial Commit Message
:}}
2246 amend-merge
{set txt
{Amended Merge Commit Message
:}}
2247 merge
{set txt
{Merge Commit Message
:}}
2248 * {set txt
{Commit Message
:}}
2250 $ui_coml conf
-text $txt
2252 trace add variable commit_type
write trace_commit_type
2253 pack
$ui_coml -side left
-fill x
2254 pack .vpane.lower.commarea.buffer.header.amend
-side right
2255 pack .vpane.lower.commarea.buffer.header.new
-side right
2257 text
$ui_comm -background white
-borderwidth 1 \
2260 -autoseparators true \
2262 -width 75 -height 9 -wrap none \
2264 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2265 scrollbar .vpane.lower.commarea.buffer.sby \
2266 -command [list
$ui_comm yview
]
2267 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2268 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2269 pack
$ui_comm -side left
-fill y
2270 pack .vpane.lower.commarea.buffer
-side left
-fill y
2272 # -- Commit Message Buffer Context Menu
2274 set ctxm .vpane.lower.commarea.buffer.ctxm
2275 menu
$ctxm -tearoff 0
2278 -command {tk_textCut
$ui_comm}
2281 -command {tk_textCopy
$ui_comm}
2284 -command {tk_textPaste
$ui_comm}
2287 -command {$ui_comm delete sel.first sel.last
}
2290 -label {Select All
} \
2291 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2295 $ui_comm tag add sel
0.0 end
2296 tk_textCopy
$ui_comm
2297 $ui_comm tag remove sel
0.0 end
2303 bind_button3
$ui_comm "tk_popup $ctxm %X %Y"
2307 proc trace_current_diff_path
{varname args
} {
2308 global current_diff_path diff_actions file_states
2309 if {$current_diff_path eq
{}} {
2315 set p
$current_diff_path
2316 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2318 set p
[escape_path
$p]
2322 .vpane.lower.
diff.header.status configure
-text $s
2323 .vpane.lower.
diff.header.
file configure
-text $f
2324 .vpane.lower.
diff.header.path configure
-text $p
2325 foreach w
$diff_actions {
2329 trace add variable current_diff_path
write trace_current_diff_path
2331 frame .vpane.lower.
diff.header
-background gold
2332 label .vpane.lower.
diff.header.status \
2334 -width $max_status_desc \
2337 label .vpane.lower.
diff.header.
file \
2341 label .vpane.lower.
diff.header.path \
2345 pack .vpane.lower.
diff.header.status
-side left
2346 pack .vpane.lower.
diff.header.
file -side left
2347 pack .vpane.lower.
diff.header.path
-fill x
2348 set ctxm .vpane.lower.
diff.header.ctxm
2349 menu
$ctxm -tearoff 0
2357 -- $current_diff_path
2359 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2360 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2364 frame .vpane.lower.
diff.body
2365 set ui_diff .vpane.lower.
diff.body.t
2366 text
$ui_diff -background white
-borderwidth 0 \
2367 -width 80 -height 15 -wrap none \
2369 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2370 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2372 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2373 -command [list
$ui_diff xview
]
2374 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2375 -command [list
$ui_diff yview
]
2376 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2377 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2378 pack
$ui_diff -side left
-fill both
-expand 1
2379 pack .vpane.lower.
diff.header
-side top
-fill x
2380 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2382 $ui_diff tag conf d_cr
-elide true
2383 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2384 $ui_diff tag conf d_
+ -foreground {#00a000}
2385 $ui_diff tag conf d_-
-foreground red
2387 $ui_diff tag conf d_
++ -foreground {#00a000}
2388 $ui_diff tag conf d_--
-foreground red
2389 $ui_diff tag conf d_
+s \
2390 -foreground {#00a000} \
2391 -background {#e2effa}
2392 $ui_diff tag conf d_-s \
2394 -background {#e2effa}
2395 $ui_diff tag conf d_s
+ \
2396 -foreground {#00a000} \
2398 $ui_diff tag conf d_s- \
2402 $ui_diff tag conf d
<<<<<<< \
2403 -foreground orange \
2405 $ui_diff tag conf d
======= \
2406 -foreground orange \
2408 $ui_diff tag conf d
>>>>>>> \
2409 -foreground orange \
2412 $ui_diff tag raise sel
2414 # -- Diff Body Context Menu
2416 set ctxm .vpane.lower.
diff.body.ctxm
2417 menu
$ctxm -tearoff 0
2420 -command reshow_diff
2421 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2424 -command {tk_textCopy
$ui_diff}
2425 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2427 -label {Select All
} \
2428 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
2429 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2433 $ui_diff tag add sel
0.0 end
2434 tk_textCopy
$ui_diff
2435 $ui_diff tag remove sel
0.0 end
2437 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2440 -label {Apply
/Reverse Hunk
} \
2441 -command {apply_hunk
$cursorX $cursorY}
2442 set ui_diff_applyhunk
[$ctxm index last
]
2443 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
2446 -label {Decrease Font Size
} \
2447 -command {incr_font_size font_diff
-1}
2448 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2450 -label {Increase Font Size
} \
2451 -command {incr_font_size font_diff
1}
2452 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2455 -label {Show Less Context
} \
2456 -command {if {$repo_config(gui.diffcontext
) >= 1} {
2457 incr repo_config
(gui.diffcontext
) -1
2460 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2462 -label {Show More Context
} \
2463 -command {if {$repo_config(gui.diffcontext
) < 99} {
2464 incr repo_config
(gui.diffcontext
)
2467 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2469 $ctxm add
command -label {Options...
} \
2471 proc popup_diff_menu
{ctxm x y X Y
} {
2472 global current_diff_path file_states
2475 if {$
::ui_index eq $
::current_diff_side
} {
2476 set l
"Unstage Hunk From Commit"
2478 set l
"Stage Hunk For Commit"
2481 ||
$current_diff_path eq
{}
2482 ||
![info exists file_states
($current_diff_path)]
2483 ||
{_O
} eq
[lindex
$file_states($current_diff_path) 0]} {
2488 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
2489 tk_popup
$ctxm $X $Y
2491 bind_button3
$ui_diff [list popup_diff_menu
$ctxm %x
%y
%X
%Y
]
2495 set main_status
[::status_bar
::new .status
]
2496 pack .status
-anchor w
-side bottom
-fill x
2497 $main_status show
{Initializing...
}
2502 set gm
$repo_config(gui.geometry
)
2503 wm geometry .
[lindex
$gm 0]
2504 .vpane sash place
0 \
2505 [lindex
[.vpane sash coord
0] 0] \
2507 .vpane.files sash place
0 \
2509 [lindex
[.vpane.files sash coord
0] 1]
2515 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
2516 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
2517 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
2518 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
2519 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
2520 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
2521 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
2522 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
2523 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
2524 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2525 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2527 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
2528 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
2529 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
2530 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
2531 bind $ui_diff <$M1B-Key-v> {break}
2532 bind $ui_diff <$M1B-Key-V> {break}
2533 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2534 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2535 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
2536 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
2537 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
2538 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
2539 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
2540 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
2541 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
2542 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
2543 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
2544 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
2545 bind $ui_diff <Button-1
> {focus
%W
}
2547 if {[is_enabled branch
]} {
2548 bind .
<$M1B-Key-n> branch_create
::dialog
2549 bind .
<$M1B-Key-N> branch_create
::dialog
2550 bind .
<$M1B-Key-o> branch_checkout
::dialog
2551 bind .
<$M1B-Key-O> branch_checkout
::dialog
2552 bind .
<$M1B-Key-m> merge
::dialog
2553 bind .
<$M1B-Key-M> merge
::dialog
2555 if {[is_enabled transport
]} {
2556 bind .
<$M1B-Key-p> do_push_anywhere
2557 bind .
<$M1B-Key-P> do_push_anywhere
2560 bind .
<Key-F5
> do_rescan
2561 bind .
<$M1B-Key-r> do_rescan
2562 bind .
<$M1B-Key-R> do_rescan
2563 bind .
<$M1B-Key-s> do_signoff
2564 bind .
<$M1B-Key-S> do_signoff
2565 bind .
<$M1B-Key-i> do_add_all
2566 bind .
<$M1B-Key-I> do_add_all
2567 bind .
<$M1B-Key-Return> do_commit
2568 foreach i
[list
$ui_index $ui_workdir] {
2569 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
2570 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2571 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
2575 set file_lists
($ui_index) [list
]
2576 set file_lists
($ui_workdir) [list
]
2578 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2579 focus
-force $ui_comm
2581 # -- Warn the user about environmental problems. Cygwin's Tcl
2582 # does *not* pass its env array onto any processes it spawns.
2583 # This means that git processes get none of our environment.
2588 set msg
"Possible environment issues exist.
2590 The following environment variables are probably
2591 going to be ignored by any Git subprocess run
2595 foreach name
[array names env
] {
2596 switch
-regexp -- $name {
2597 {^GIT_INDEX_FILE$
} -
2598 {^GIT_OBJECT_DIRECTORY$
} -
2599 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
2601 {^GIT_EXTERNAL_DIFF$
} -
2605 {^GIT_CONFIG_LOCAL$
} -
2606 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
2607 append msg
" - $name\n"
2610 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
2611 append msg
" - $name\n"
2613 set suggest_user
$name
2617 if {$ignored_env > 0} {
2619 This is due to a known issue with the
2620 Tcl binary distributed by Cygwin."
2622 if {$suggest_user ne
{}} {
2625 A good replacement for $suggest_user
2626 is placing values for the user.name and
2627 user.email settings into your personal
2633 unset ignored_env msg suggest_user name
2636 # -- Only initialize complex UI if we are going to stay running.
2638 if {[is_enabled transport
]} {
2645 if {[winfo exists
$ui_comm]} {
2646 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
2648 # -- If both our backup and message files exist use the
2649 # newer of the two files to initialize the buffer.
2651 if {$GITGUI_BCK_exists} {
2652 set m
[gitdir GITGUI_MSG
]
2653 if {[file isfile
$m]} {
2654 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
2655 catch
{file delete
[gitdir GITGUI_MSG
]}
2657 $ui_comm delete
0.0 end
2659 $ui_comm edit modified false
2660 catch
{file delete
[gitdir GITGUI_BCK
]}
2661 set GITGUI_BCK_exists
0
2667 proc backup_commit_buffer
{} {
2668 global ui_comm GITGUI_BCK_exists
2670 set m
[$ui_comm edit modified
]
2671 if {$m ||
$GITGUI_BCK_exists} {
2672 set msg
[string trim
[$ui_comm get
0.0 end
]]
2673 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2676 if {$GITGUI_BCK_exists} {
2677 catch
{file delete
[gitdir GITGUI_BCK
]}
2678 set GITGUI_BCK_exists
0
2682 set fd
[open
[gitdir GITGUI_BCK
] w
]
2683 puts
-nonewline $fd $msg
2685 set GITGUI_BCK_exists
1
2689 $ui_comm edit modified false
2692 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
2695 backup_commit_buffer
2698 lock_index begin-read
2699 if {![winfo ismapped .
]} {
2703 if {[is_enabled multicommit
]} {