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 ######################################################################
47 ## enable verbose loading?
49 if {![catch
{set _verbose
$env(GITGUI_VERBOSE
)}]} {
51 rename auto_load real__auto_load
52 proc auto_load
{name args
} {
53 puts stderr
"auto_load $name"
54 return [uplevel
1 real__auto_load
$name $args]
56 rename
source real__source
58 puts stderr
"source $name"
59 uplevel
1 real__source
$name
63 ######################################################################
65 ## configure our library
67 set oguilib
{@@GITGUI_LIBDIR@@
}
68 set oguirel
{@@GITGUI_RELATIVE@@
}
69 if {$oguirel eq
{1}} {
70 set oguilib
[file dirname [file dirname [file normalize
$argv0]]]
71 set oguilib
[file join $oguilib share git-gui lib
]
72 } elseif
{[string match @@
* $oguirel]} {
73 set oguilib
[file join [file dirname [file normalize
$argv0]] lib
]
76 set idx
[file join $oguilib tclIndex
]
77 if {[catch
{set fd
[open
$idx r
]} err
]} {
82 -title "git-gui: fatal error" \
86 if {[gets
$fd] eq
{# Autogenerated by git-gui Makefile}} {
88 while {[gets
$fd n
] >= 0} {
89 if {$n ne
{} && ![string match
#* $n]} {
101 if {[lsearch
-exact $loaded $p] >= 0} continue
102 source [file join $oguilib $p]
107 set auto_path
[concat
[list
$oguilib] $auto_path]
109 unset -nocomplain oguirel idx fd
111 ######################################################################
115 set _appname
[lindex
[file split $argv0] end
]
132 return [eval [list
file join $_gitdir] $args]
135 proc gitexec
{args
} {
137 if {$_gitexec eq
{}} {
138 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
139 error
"Git not installed?\n\n$err"
142 set _gitexec
[exec cygpath \
147 set _gitexec
[file normalize
$_gitexec]
153 return [eval [list
file join $_gitexec] $args]
161 if {[tk windowingsystem
] eq
{aqua
}} {
168 if {$
::tcl_platform
(platform
) eq
{windows
}} {
176 if {$_iscygwin eq
{}} {
177 if {$
::tcl_platform
(platform
) eq
{windows
}} {
178 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
190 proc is_enabled
{option
} {
191 global enabled_options
192 if {[catch
{set on
$enabled_options($option)}]} {return 0}
196 proc enable_option
{option
} {
197 global enabled_options
198 set enabled_options
($option) 1
201 proc disable_option
{option
} {
202 global enabled_options
203 set enabled_options
($option) 0
206 ######################################################################
210 proc is_many_config
{name
} {
211 switch
-glob -- $name {
220 proc is_config_true
{name
} {
222 if {[catch
{set v
$repo_config($name)}]} {
224 } elseif
{$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes}} {
231 proc get_config
{name
} {
233 if {[catch
{set v
$repo_config($name)}]} {
240 proc load_config
{include_global
} {
241 global repo_config global_config default_config
243 array
unset global_config
244 if {$include_global} {
246 set fd_rc
[git_read config
--global --list]
247 while {[gets
$fd_rc line
] >= 0} {
248 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
249 if {[is_many_config
$name]} {
250 lappend global_config
($name) $value
252 set global_config
($name) $value
260 array
unset repo_config
262 set fd_rc
[git_read config
--list]
263 while {[gets
$fd_rc line
] >= 0} {
264 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
265 if {[is_many_config
$name]} {
266 lappend repo_config
($name) $value
268 set repo_config
($name) $value
275 foreach name
[array names default_config
] {
276 if {[catch
{set v
$global_config($name)}]} {
277 set global_config
($name) $default_config($name)
279 if {[catch
{set v
$repo_config($name)}]} {
280 set repo_config
($name) $default_config($name)
285 ######################################################################
289 proc _git_cmd
{name
} {
292 if {[catch
{set v
$_git_cmd_path($name)}]} {
296 --exec-path { return [list $
::_git
$name] }
299 set p
[gitexec git-
$name$
::_search_exe
]
300 if {[file exists
$p]} {
302 } elseif
{[is_Windows
] && [file exists
[gitexec git-
$name]]} {
303 # Try to determine what sort of magic will make
304 # git-$name go and do its thing, because native
305 # Tcl on Windows doesn't know it.
307 set p
[gitexec git-
$name]
314 #!*perl { set i perl }
315 #!*python { set i python }
316 default
{ error
"git-$name is not supported: $s" }
320 if {![info exists interp
]} {
321 set interp
[_which
$i]
324 error
"git-$name requires $i (not in PATH)"
326 set v
[list
$interp $p]
328 # Assume it is builtin to git somehow and we
329 # aren't actually able to see a file for it.
331 set v
[list $
::_git
$name]
333 set _git_cmd_path
($name) $v
339 global env _search_exe _search_path
341 if {$_search_path eq
{}} {
343 set _search_path
[split [exec cygpath \
349 } elseif
{[is_Windows
]} {
350 set _search_path
[split $env(PATH
) {;}]
353 set _search_path
[split $env(PATH
) :]
358 foreach p
$_search_path {
359 set p
[file join $p $what$_search_exe]
360 if {[file exists
$p]} {
361 return [file normalize
$p]
367 proc _lappend_nice
{cmd_var
} {
371 if {![info exists _nice
]} {
372 set _nice
[_which nice
]
383 switch
-- [lindex
$args 0] {
394 set args
[lrange
$args 1 end
]
397 set cmdp
[_git_cmd
[lindex
$args 0]]
398 set args
[lrange
$args 1 end
]
400 return [eval $opt $cmdp $args]
403 proc _open_stdout_stderr
{cmd
} {
407 if { [lindex
$cmd end
] eq
{2>@
1}
408 && $err eq
{can not
find channel named
"1"}
410 # Older versions of Tcl 8.4 don't have this 2>@1 IO
411 # redirect operator. Fallback to |& cat for those.
412 # The command was not actually started, so its safe
413 # to try to start it a second time.
415 set fd
[open
[concat \
416 [lrange
$cmd 0 end-1
] \
423 fconfigure
$fd -eofchar {}
427 proc git_read
{args
} {
431 switch
-- [lindex
$args 0] {
446 set args
[lrange
$args 1 end
]
449 set cmdp
[_git_cmd
[lindex
$args 0]]
450 set args
[lrange
$args 1 end
]
452 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
455 proc git_write
{args
} {
459 switch
-- [lindex
$args 0] {
470 set args
[lrange
$args 1 end
]
473 set cmdp
[_git_cmd
[lindex
$args 0]]
474 set args
[lrange
$args 1 end
]
476 return [open
[concat
$opt $cmdp $args] w
]
480 regsub
-all ' $value "'\\''" value
484 proc load_current_branch {} {
485 global current_branch is_detached
487 set fd [open [gitdir HEAD] r]
488 if {[gets $fd ref] < 1} {
493 set pfx {ref: refs/heads/}
494 set len [string length $pfx]
495 if {[string equal -length $len $pfx $ref]} {
496 # We're on a branch. It might not exist. But
497 # HEAD looks good enough to be a branch.
499 set current_branch [string range $ref $len end]
502 # Assume this is a detached head.
504 set current_branch HEAD
509 auto_load tk_optionMenu
510 rename tk_optionMenu real__tkOptionMenu
511 proc tk_optionMenu {w varName args} {
512 set m [eval real__tkOptionMenu $w $varName $args]
513 $m configure -font font_ui
514 $w configure -font font_ui
518 ######################################################################
522 set _git [_which git]
524 catch {wm withdraw .}
525 error_popup "Cannot
find git
in PATH.
"
529 ######################################################################
533 if {[catch {set _git_version [git --version]} err]} {
534 catch {wm withdraw .}
535 error_popup "Cannot determine Git version
:
539 [appname
] requires Git
1.5.0 or later.
"
542 if {![regsub {^git version } $_git_version {} _git_version]} {
543 catch {wm withdraw .}
544 error_popup "Cannot parse Git version string
:\n\n$_git_version"
548 set _real_git_version $_git_version
549 regsub -- {-dirty$} $_git_version {} _git_version
550 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
551 regsub {\.rc[0-9]+$} $_git_version {} _git_version
552 regsub {\.GIT$} $_git_version {} _git_version
554 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
555 catch {wm withdraw .}
560 -title "[appname
]: warning
" \
561 -message "Git version cannot be determined.
563 $_git claims it is version
'$_real_git_version'.
565 [appname
] requires
at least Git
1.5.0 or later.
567 Assume
'$_real_git_version' is version
1.5.0?
569 set _git_version 1.5.0
574 unset _real_git_version
576 proc git-version {args} {
579 switch [llength $args] {
585 set op [lindex $args 0]
586 set vr [lindex $args 1]
587 set cm [package vcompare $_git_version $vr]
588 return [expr $cm $op 0]
592 set type [lindex $args 0]
593 set name [lindex $args 1]
594 set parm [lindex $args 2]
595 set body [lindex $args 3]
597 if {($type ne {proc} && $type ne {method})} {
598 error "Invalid arguments to git-version
"
600 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
601 error "Last arm of
$type $name must be default
"
604 foreach {op vr cb} [lrange $body 0 end-2] {
605 if {[git-version $op $vr]} {
606 return [uplevel [list $type $name $parm $cb]]
610 return [uplevel [list $type $name $parm [lindex $body end]]]
614 error "git-version
>= x
"
620 if {[git-version < 1.5]} {
621 catch {wm withdraw .}
622 error_popup "[appname
] requires Git
1.5.0 or later.
624 You are using
[git-version
]:
630 ######################################################################
632 ## feature option selection
634 if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
639 if {$subcommand eq {gui.sh}} {
642 if {$subcommand eq {gui} && [llength $argv] > 0} {
643 set subcommand [lindex $argv 0]
644 set argv [lrange $argv 1 end]
647 enable_option multicommit
649 enable_option transport
652 switch -- $subcommand {
657 disable_option multicommit
658 disable_option branch
659 disable_option transport
662 enable_option singlecommit
664 disable_option multicommit
665 disable_option branch
666 disable_option transport
670 ######################################################################
675 set _gitdir $env(GIT_DIR)
679 set _gitdir [git rev-parse --git-dir]
680 set _prefix [git rev-parse --show-prefix]
682 catch {wm withdraw .}
683 error_popup "Cannot
find the git directory
:\n\n$err"
686 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
687 catch {set _gitdir [exec cygpath --unix $_gitdir]}
689 if {![file isdirectory $_gitdir]} {
690 catch {wm withdraw .}
691 error_popup "Git directory not found
:\n\n$_gitdir"
694 if {![is_enabled bare]} {
695 if {[lindex [file split $_gitdir] end] ne {.git}} {
696 catch {wm withdraw .}
697 error_popup "Cannot use funny .git directory
:\n\n$_gitdir"
700 if {[catch {cd [file dirname $_gitdir]} err]} {
701 catch {wm withdraw .}
702 error_popup "No working directory
[file dirname $_gitdir]:\n\n$err"
706 set _reponame [file split [file normalize $_gitdir]]
707 if {[lindex $_reponame end] eq {.git}} {
708 set _reponame [lindex $_reponame end-1]
710 set _reponame [lindex $_reponame end]
713 ######################################################################
717 set current_diff_path {}
718 set current_diff_side {}
719 set diff_actions [list]
723 set MERGE_HEAD [list]
726 set current_branch {}
728 set current_diff_path {}
729 set selected_commit_type new
731 ######################################################################
739 set disable_on_lock [list]
740 set index_lock_type none
742 proc lock_index {type} {
743 global index_lock_type disable_on_lock
745 if {$index_lock_type eq {none}} {
746 set index_lock_type $type
747 foreach w $disable_on_lock {
748 uplevel #0 $w disabled
751 } elseif {$index_lock_type eq "begin-
$type"} {
752 set index_lock_type $type
758 proc unlock_index {} {
759 global index_lock_type disable_on_lock
761 set index_lock_type none
762 foreach w $disable_on_lock {
767 ######################################################################
771 proc repository_state {ctvar hdvar mhvar} {
772 global current_branch
773 upvar $ctvar ct $hdvar hd $mhvar mh
778 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
784 set merge_head [gitdir MERGE_HEAD]
785 if {[file exists $merge_head]} {
787 set fd_mh [open $merge_head r]
788 while {[gets $fd_mh line] >= 0} {
799 global PARENT empty_tree
801 set p [lindex $PARENT 0]
805 if {$empty_tree eq {}} {
806 set empty_tree [git mktree << {}]
811 proc rescan {after {honor_trustmtime 1}} {
812 global HEAD PARENT MERGE_HEAD commit_type
813 global ui_index ui_workdir ui_comm
814 global rescan_active file_states
817 if {$rescan_active > 0 || ![lock_index read]} return
819 repository_state newType newHEAD newMERGE_HEAD
820 if {[string match amend* $commit_type]
821 && $newType eq {normal}
822 && $newHEAD eq $HEAD} {
826 set MERGE_HEAD $newMERGE_HEAD
827 set commit_type $newType
830 array unset file_states
832 if {!$::GITGUI_BCK_exists &&
833 (![$ui_comm edit modified]
834 || [string trim [$ui_comm get 0.0 end]] eq {})} {
835 if {[string match amend* $commit_type]} {
836 } elseif {[load_message GITGUI_MSG]} {
837 } elseif {[load_message MERGE_MSG]} {
838 } elseif {[load_message SQUASH_MSG]} {
841 $ui_comm edit modified false
844 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
845 rescan_stage2 {} $after
848 ui_status {Refreshing file status...}
849 set fd_rf [git_read update-index \
855 fconfigure $fd_rf -blocking 0 -translation binary
856 fileevent $fd_rf readable \
857 [list rescan_stage2 $fd_rf $after]
861 proc rescan_stage2 {fd after} {
862 global rescan_active buf_rdi buf_rdf buf_rlo
866 if {![eof $fd]} return
870 set ls_others [list --exclude-per-directory=.gitignore]
871 set info_exclude [gitdir info exclude]
872 if {[file readable $info_exclude]} {
873 lappend ls_others "--exclude-from=$info_exclude"
875 set user_exclude [get_config core.excludesfile]
876 if {$user_exclude ne {} && [file readable $user_exclude]} {
877 lappend ls_others "--exclude-from=$user_exclude"
885 ui_status {Scanning for modified files ...}
886 set fd_di [git_read diff-index --cached -z [PARENT]]
887 set fd_df [git_read diff-files -z]
888 set fd_lo [eval git_read ls-files --others -z $ls_others]
890 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
891 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
892 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
893 fileevent $fd_di readable [list read_diff_index $fd_di $after]
894 fileevent $fd_df readable [list read_diff_files $fd_df $after]
895 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
898 proc load_message {file} {
902 if {[file isfile $f]} {
903 if {[catch {set fd [open $f r]}]} {
906 fconfigure $fd -eofchar {}
907 set content [string trim [read $fd]]
909 regsub -all -line {[ \r\t]+$} $content {} content
910 $ui_comm delete 0.0 end
911 $ui_comm insert end $content
917 proc read_diff_index {fd after} {
920 append buf_rdi [read $fd]
922 set n [string length $buf_rdi]
924 set z1 [string first "\
0" $buf_rdi $c]
927 set z2 [string first "\
0" $buf_rdi $z1]
931 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
932 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
934 [encoding convertfrom $p] \
936 [list [lindex $i 0] [lindex $i 2]] \
942 set buf_rdi [string range $buf_rdi $c end]
947 rescan_done $fd buf_rdi $after
950 proc read_diff_files {fd after} {
953 append buf_rdf [read $fd]
955 set n [string length $buf_rdf]
957 set z1 [string first "\
0" $buf_rdf $c]
960 set z2 [string first "\
0" $buf_rdf $z1]
964 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
965 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
967 [encoding convertfrom $p] \
970 [list [lindex $i 0] [lindex $i 2]]
975 set buf_rdf [string range $buf_rdf $c end]
980 rescan_done $fd buf_rdf $after
983 proc read_ls_others {fd after} {
986 append buf_rlo [read $fd]
987 set pck [split $buf_rlo "\
0"]
988 set buf_rlo [lindex $pck end]
989 foreach p [lrange $pck 0 end-1] {
990 merge_state [encoding convertfrom $p] ?O
992 rescan_done $fd buf_rlo $after
995 proc rescan_done {fd buf after} {
996 global rescan_active current_diff_path
997 global file_states repo_config
1000 if {![eof $fd]} return
1003 if {[incr rescan_active -1] > 0} return
1008 if {$current_diff_path ne {}} reshow_diff
1012 proc prune_selection {} {
1013 global file_states selected_paths
1015 foreach path [array names selected_paths] {
1016 if {[catch {set still_here $file_states($path)}]} {
1017 unset selected_paths($path)
1022 ######################################################################
1026 proc mapicon {w state path} {
1029 if {[catch {set r $all_icons($state$w)}]} {
1030 puts "error
: no icon
for $w state
={$state} $path"
1036 proc mapdesc {state path} {
1039 if {[catch {set r $all_descs($state)}]} {
1040 puts "error
: no desc
for state
={$state} $path"
1046 proc ui_status {msg} {
1047 $::main_status show $msg
1050 proc ui_ready {{test {}}} {
1051 $::main_status show {Ready.} $test
1054 proc escape_path {path} {
1055 regsub -all {\\} $path "\\\\" path
1056 regsub -all "\n" $path "\\n
" path
1060 proc short_path {path} {
1061 return [escape_path [lindex [file split $path] end]]
1065 set null_sha1 [string repeat 0 40]
1067 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1068 global file_states next_icon_id null_sha1
1070 set s0 [string index $new_state 0]
1071 set s1 [string index $new_state 1]
1073 if {[catch {set info $file_states($path)}]} {
1075 set icon n[incr next_icon_id]
1077 set state [lindex $info 0]
1078 set icon [lindex $info 1]
1079 if {$head_info eq {}} {set head_info [lindex $info 2]}
1080 if {$index_info eq {}} {set index_info [lindex $info 3]}
1083 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1084 elseif {$s0 eq {_}} {set s0 _}
1086 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1087 elseif {$s1 eq {_}} {set s1 _}
1089 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1090 set head_info [list 0 $null_sha1]
1091 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1092 && $head_info eq {}} {
1093 set head_info $index_info
1096 set file_states($path) [list $s0$s1 $icon \
1097 $head_info $index_info \
1102 proc display_file_helper {w path icon_name old_m new_m} {
1105 if {$new_m eq {_}} {
1106 set lno [lsearch -sorted -exact $file_lists($w) $path]
1108 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1110 $w conf -state normal
1111 $w delete $lno.0 [expr {$lno + 1}].0
1112 $w conf -state disabled
1114 } elseif {$old_m eq {_} && $new_m ne {_}} {
1115 lappend file_lists($w) $path
1116 set file_lists($w) [lsort -unique $file_lists($w)]
1117 set lno [lsearch -sorted -exact $file_lists($w) $path]
1119 $w conf -state normal
1120 $w image create $lno.0 \
1121 -align center -padx 5 -pady 1 \
1123 -image [mapicon $w $new_m $path]
1124 $w insert $lno.1 "[escape_path
$path]\n"
1125 $w conf -state disabled
1126 } elseif {$old_m ne $new_m} {
1127 $w conf -state normal
1128 $w image conf $icon_name -image [mapicon $w $new_m $path]
1129 $w conf -state disabled
1133 proc display_file {path state} {
1134 global file_states selected_paths
1135 global ui_index ui_workdir
1137 set old_m [merge_state $path $state]
1138 set s $file_states($path)
1139 set new_m [lindex $s 0]
1140 set icon_name [lindex $s 1]
1142 set o [string index $old_m 0]
1143 set n [string index $new_m 0]
1150 display_file_helper $ui_index $path $icon_name $o $n
1152 if {[string index $old_m 0] eq {U}} {
1155 set o [string index $old_m 1]
1157 if {[string index $new_m 0] eq {U}} {
1160 set n [string index $new_m 1]
1162 display_file_helper $ui_workdir $path $icon_name $o $n
1164 if {$new_m eq {__}} {
1165 unset file_states($path)
1166 catch {unset selected_paths($path)}
1170 proc display_all_files_helper {w path icon_name m} {
1173 lappend file_lists($w) $path
1174 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1175 $w image create end \
1176 -align center -padx 5 -pady 1 \
1178 -image [mapicon $w $m $path]
1179 $w insert end "[escape_path
$path]\n"
1182 proc display_all_files {} {
1183 global ui_index ui_workdir
1184 global file_states file_lists
1187 $ui_index conf -state normal
1188 $ui_workdir conf -state normal
1190 $ui_index delete 0.0 end
1191 $ui_workdir delete 0.0 end
1194 set file_lists($ui_index) [list]
1195 set file_lists($ui_workdir) [list]
1197 foreach path [lsort [array names file_states]] {
1198 set s $file_states($path)
1200 set icon_name [lindex $s 1]
1202 set s [string index $m 0]
1203 if {$s ne {U} && $s ne {_}} {
1204 display_all_files_helper $ui_index $path \
1208 if {[string index $m 0] eq {U}} {
1211 set s [string index $m 1]
1214 display_all_files_helper $ui_workdir $path \
1219 $ui_index conf -state disabled
1220 $ui_workdir conf -state disabled
1223 ######################################################################
1228 #define mask_width 14
1229 #define mask_height 15
1230 static unsigned char mask_bits[] = {
1231 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1232 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1233 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1236 image create bitmap file_plain -background white -foreground black -data {
1237 #define plain_width 14
1238 #define plain_height 15
1239 static unsigned char plain_bits[] = {
1240 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1241 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1242 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1243 } -maskdata $filemask
1245 image create bitmap file_mod -background white -foreground blue -data {
1246 #define mod_width 14
1247 #define mod_height 15
1248 static unsigned char mod_bits[] = {
1249 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1250 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1251 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1252 } -maskdata $filemask
1254 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1255 #define file_fulltick_width 14
1256 #define file_fulltick_height 15
1257 static unsigned char file_fulltick_bits
[] = {
1258 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1259 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1260 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1261 } -maskdata $filemask
1263 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1264 #define parttick_width 14
1265 #define parttick_height 15
1266 static unsigned char parttick_bits
[] = {
1267 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1268 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1269 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1270 } -maskdata $filemask
1272 image create bitmap file_question
-background white
-foreground black
-data {
1273 #define file_question_width 14
1274 #define file_question_height 15
1275 static unsigned char file_question_bits
[] = {
1276 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1277 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1278 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1279 } -maskdata $filemask
1281 image create bitmap file_removed
-background white
-foreground red
-data {
1282 #define file_removed_width 14
1283 #define file_removed_height 15
1284 static unsigned char file_removed_bits
[] = {
1285 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1286 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1287 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1288 } -maskdata $filemask
1290 image create bitmap file_merge
-background white
-foreground blue
-data {
1291 #define file_merge_width 14
1292 #define file_merge_height 15
1293 static unsigned char file_merge_bits
[] = {
1294 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1295 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1296 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1297 } -maskdata $filemask
1299 set ui_index .vpane.files.index.list
1300 set ui_workdir .vpane.files.workdir.list
1302 set all_icons
(_
$ui_index) file_plain
1303 set all_icons
(A
$ui_index) file_fulltick
1304 set all_icons
(M
$ui_index) file_fulltick
1305 set all_icons
(D
$ui_index) file_removed
1306 set all_icons
(U
$ui_index) file_merge
1308 set all_icons
(_
$ui_workdir) file_plain
1309 set all_icons
(M
$ui_workdir) file_mod
1310 set all_icons
(D
$ui_workdir) file_question
1311 set all_icons
(U
$ui_workdir) file_merge
1312 set all_icons
(O
$ui_workdir) file_plain
1314 set max_status_desc
0
1318 {_M
"Modified, not staged"}
1319 {M_
"Staged for commit"}
1320 {MM
"Portions staged for commit"}
1321 {MD
"Staged for commit, missing"}
1323 {_O
"Untracked, not staged"}
1324 {A_
"Staged for commit"}
1325 {AM
"Portions staged for commit"}
1326 {AD
"Staged for commit, missing"}
1329 {D_
"Staged for removal"}
1330 {DO
"Staged for removal, still present"}
1332 {U_
"Requires merge resolution"}
1333 {UU
"Requires merge resolution"}
1334 {UM
"Requires merge resolution"}
1335 {UD
"Requires merge resolution"}
1337 if {$max_status_desc < [string length
[lindex
$i 1]]} {
1338 set max_status_desc
[string length
[lindex
$i 1]]
1340 set all_descs
([lindex
$i 0]) [lindex
$i 1]
1344 ######################################################################
1348 proc bind_button3
{w cmd
} {
1349 bind $w <Any-Button-3
> $cmd
1351 bind $w <Control-Button-1
> $cmd
1355 proc scrollbar2many
{list mode args
} {
1356 foreach w
$list {eval $w $mode $args}
1359 proc many2scrollbar
{list mode sb top bottom
} {
1360 $sb set $top $bottom
1361 foreach w
$list {$w $mode moveto
$top}
1364 proc incr_font_size
{font
{amt
1}} {
1365 set sz
[font configure
$font -size]
1367 font configure
$font -size $sz
1368 font configure
${font}bold
-size $sz
1369 font configure
${font}italic
-size $sz
1372 ######################################################################
1376 set starting_gitk_msg
{Starting gitk... please
wait...
}
1378 proc do_gitk
{revs
} {
1379 # -- Always start gitk through whatever we were loaded with. This
1380 # lets us bypass using shell process on Windows systems.
1382 set exe
[file join [file dirname $
::_git
] gitk
]
1383 set cmd
[list
[info nameofexecutable
] $exe]
1384 if {! [file exists
$exe]} {
1385 error_popup
"Unable to start gitk:\n\n$exe does not exist"
1387 eval exec $cmd $revs &
1388 ui_status $
::starting_gitk_msg
1390 ui_ready
$starting_gitk_msg
1398 global ui_comm is_quitting repo_config commit_type
1399 global GITGUI_BCK_exists GITGUI_BCK_i
1401 if {$is_quitting} return
1404 if {[winfo exists
$ui_comm]} {
1405 # -- Stash our current commit buffer.
1407 set save
[gitdir GITGUI_MSG
]
1408 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1409 file rename
-force [gitdir GITGUI_BCK
] $save
1410 set GITGUI_BCK_exists
0
1412 set msg
[string trim
[$ui_comm get
0.0 end
]]
1413 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1414 if {(![string match amend
* $commit_type]
1415 ||
[$ui_comm edit modified
])
1418 set fd
[open
$save w
]
1419 puts
-nonewline $fd $msg
1423 catch
{file delete
$save}
1427 # -- Remove our editor backup, its not needed.
1429 after cancel
$GITGUI_BCK_i
1430 if {$GITGUI_BCK_exists} {
1431 catch
{file delete
[gitdir GITGUI_BCK
]}
1434 # -- Stash our current window geometry into this repository.
1436 set cfg_geometry
[list
]
1437 lappend cfg_geometry
[wm geometry .
]
1438 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
1439 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
1440 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1443 if {$cfg_geometry ne
$rc_geometry} {
1444 catch
{git config gui.geometry
$cfg_geometry}
1459 proc toggle_or_diff
{w x y
} {
1460 global file_states file_lists current_diff_path ui_index ui_workdir
1461 global last_clicked selected_paths
1463 set pos
[split [$w index @
$x,$y] .
]
1464 set lno
[lindex
$pos 0]
1465 set col [lindex
$pos 1]
1466 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1472 set last_clicked
[list
$w $lno]
1473 array
unset selected_paths
1474 $ui_index tag remove in_sel
0.0 end
1475 $ui_workdir tag remove in_sel
0.0 end
1478 if {$current_diff_path eq
$path} {
1479 set after
{reshow_diff
;}
1483 if {$w eq
$ui_index} {
1485 "Unstaging [short_path $path] from commit" \
1487 [concat
$after [list ui_ready
]]
1488 } elseif
{$w eq
$ui_workdir} {
1490 "Adding [short_path $path]" \
1492 [concat
$after [list ui_ready
]]
1495 show_diff
$path $w $lno
1499 proc add_one_to_selection
{w x y
} {
1500 global file_lists last_clicked selected_paths
1502 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1503 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1509 if {$last_clicked ne
{}
1510 && [lindex
$last_clicked 0] ne
$w} {
1511 array
unset selected_paths
1512 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
1515 set last_clicked
[list
$w $lno]
1516 if {[catch
{set in_sel
$selected_paths($path)}]} {
1520 unset selected_paths
($path)
1521 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
1523 set selected_paths
($path) 1
1524 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1528 proc add_range_to_selection
{w x y
} {
1529 global file_lists last_clicked selected_paths
1531 if {[lindex
$last_clicked 0] ne
$w} {
1532 toggle_or_diff
$w $x $y
1536 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1537 set lc
[lindex
$last_clicked 1]
1546 foreach path
[lrange
$file_lists($w) \
1547 [expr {$begin - 1}] \
1548 [expr {$end - 1}]] {
1549 set selected_paths
($path) 1
1551 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
1554 ######################################################################
1558 set cursor_ptr arrow
1559 font create font_diff
-family Courier
-size 10
1563 eval font configure font_ui
[font actual
[.dummy cget
-font]]
1567 font create font_uiitalic
1568 font create font_uibold
1569 font create font_diffbold
1570 font create font_diffitalic
1572 foreach class
{Button Checkbutton Entry Label
1573 Labelframe Listbox Menu Message
1574 Radiobutton Spinbox Text
} {
1575 option add
*$class.font font_ui
1579 if {[is_Windows
] ||
[is_MacOSX
]} {
1580 option add
*Menu.tearOff
0
1591 proc apply_config
{} {
1592 global repo_config font_descs
1594 foreach option
$font_descs {
1595 set name
[lindex
$option 0]
1596 set font
[lindex
$option 1]
1598 foreach
{cn cv
} $repo_config(gui.
$name) {
1599 font configure
$font $cn $cv
1602 error_popup
"Invalid font specified in gui.$name:\n\n$err"
1604 foreach
{cn cv
} [font configure
$font] {
1605 font configure
${font}bold
$cn $cv
1606 font configure
${font}italic
$cn $cv
1608 font configure
${font}bold
-weight bold
1609 font configure
${font}italic
-slant italic
1613 set default_config
(merge.diffstat
) true
1614 set default_config
(merge.summary
) false
1615 set default_config
(merge.verbosity
) 2
1616 set default_config
(user.name
) {}
1617 set default_config
(user.email
) {}
1619 set default_config
(gui.matchtrackingbranch
) false
1620 set default_config
(gui.pruneduringfetch
) false
1621 set default_config
(gui.trustmtime
) false
1622 set default_config
(gui.diffcontext
) 5
1623 set default_config
(gui.newbranchtemplate
) {}
1624 set default_config
(gui.fontui
) [font configure font_ui
]
1625 set default_config
(gui.fontdiff
) [font configure font_diff
]
1627 {fontui font_ui
{Main Font
}}
1628 {fontdiff font_diff
{Diff
/Console Font
}}
1633 ######################################################################
1641 menu .mbar
-tearoff 0
1642 .mbar add cascade
-label Repository
-menu .mbar.repository
1643 .mbar add cascade
-label Edit
-menu .mbar.edit
1644 if {[is_enabled branch
]} {
1645 .mbar add cascade
-label Branch
-menu .mbar.branch
1647 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
1648 .mbar add cascade
-label Commit
-menu .mbar.commit
1650 if {[is_enabled transport
]} {
1651 .mbar add cascade
-label Merge
-menu .mbar.merge
1652 .mbar add cascade
-label Fetch
-menu .mbar.fetch
1653 .mbar add cascade
-label Push
-menu .mbar.push
1655 . configure
-menu .mbar
1657 # -- Repository Menu
1659 menu .mbar.repository
1661 .mbar.repository add
command \
1662 -label {Browse Current Branch
's Files} \
1663 -command {browser::new $current_branch}
1664 set ui_browse_current [.mbar.repository index last]
1665 .mbar.repository add command \
1666 -label {Browse Branch Files...} \
1667 -command browser_open::dialog
1668 .mbar.repository add separator
1670 .mbar.repository add command \
1671 -label {Visualize Current Branch's History
} \
1672 -command {do_gitk
$current_branch}
1673 set ui_visualize_current
[.mbar.repository index last
]
1674 .mbar.repository add
command \
1675 -label {Visualize All Branch History
} \
1676 -command {do_gitk
--all}
1677 .mbar.repository add separator
1679 proc current_branch_write
{args
} {
1680 global current_branch
1681 .mbar.repository entryconf $
::ui_browse_current \
1682 -label "Browse $current_branch's Files"
1683 .mbar.repository entryconf $
::ui_visualize_current \
1684 -label "Visualize $current_branch's History"
1686 trace add variable current_branch
write current_branch_write
1688 if {[is_enabled multicommit
]} {
1689 .mbar.repository add
command -label {Database Statistics
} \
1692 .mbar.repository add
command -label {Compress Database
} \
1695 .mbar.repository add
command -label {Verify Database
} \
1696 -command do_fsck_objects
1698 .mbar.repository add separator
1701 .mbar.repository add
command \
1702 -label {Create Desktop Icon
} \
1703 -command do_cygwin_shortcut
1704 } elseif
{[is_Windows
]} {
1705 .mbar.repository add
command \
1706 -label {Create Desktop Icon
} \
1707 -command do_windows_shortcut
1708 } elseif
{[is_MacOSX
]} {
1709 .mbar.repository add
command \
1710 -label {Create Desktop Icon
} \
1711 -command do_macosx_app
1715 .mbar.repository add
command -label Quit \
1722 .mbar.edit add
command -label Undo \
1723 -command {catch
{[focus
] edit undo
}} \
1725 .mbar.edit add
command -label Redo \
1726 -command {catch
{[focus
] edit redo
}} \
1728 .mbar.edit add separator
1729 .mbar.edit add
command -label Cut \
1730 -command {catch
{tk_textCut
[focus
]}} \
1732 .mbar.edit add
command -label Copy \
1733 -command {catch
{tk_textCopy
[focus
]}} \
1735 .mbar.edit add
command -label Paste \
1736 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
1738 .mbar.edit add
command -label Delete \
1739 -command {catch
{[focus
] delete sel.first sel.last
}} \
1741 .mbar.edit add separator
1742 .mbar.edit add
command -label {Select All
} \
1743 -command {catch
{[focus
] tag add sel
0.0 end
}} \
1748 if {[is_enabled branch
]} {
1751 .mbar.branch add
command -label {Create...
} \
1752 -command branch_create
::dialog \
1754 lappend disable_on_lock
[list .mbar.branch entryconf \
1755 [.mbar.branch index last
] -state]
1757 .mbar.branch add
command -label {Checkout...
} \
1758 -command branch_checkout
::dialog \
1760 lappend disable_on_lock
[list .mbar.branch entryconf \
1761 [.mbar.branch index last
] -state]
1763 .mbar.branch add
command -label {Rename...
} \
1764 -command branch_rename
::dialog
1765 lappend disable_on_lock
[list .mbar.branch entryconf \
1766 [.mbar.branch index last
] -state]
1768 .mbar.branch add
command -label {Delete...
} \
1769 -command branch_delete
::dialog
1770 lappend disable_on_lock
[list .mbar.branch entryconf \
1771 [.mbar.branch index last
] -state]
1773 .mbar.branch add
command -label {Reset...
} \
1774 -command merge
::reset_hard
1775 lappend disable_on_lock
[list .mbar.branch entryconf \
1776 [.mbar.branch index last
] -state]
1781 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
1784 .mbar.commit add radiobutton \
1785 -label {New Commit
} \
1786 -command do_select_commit_type \
1787 -variable selected_commit_type \
1789 lappend disable_on_lock \
1790 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1792 .mbar.commit add radiobutton \
1793 -label {Amend Last Commit
} \
1794 -command do_select_commit_type \
1795 -variable selected_commit_type \
1797 lappend disable_on_lock \
1798 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1800 .mbar.commit add separator
1802 .mbar.commit add
command -label Rescan \
1803 -command do_rescan \
1805 lappend disable_on_lock \
1806 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1808 .mbar.commit add
command -label {Stage To Commit
} \
1809 -command do_add_selection
1810 lappend disable_on_lock \
1811 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1813 .mbar.commit add
command -label {Stage Changed Files To Commit
} \
1814 -command do_add_all \
1816 lappend disable_on_lock \
1817 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1819 .mbar.commit add
command -label {Unstage From Commit
} \
1820 -command do_unstage_selection
1821 lappend disable_on_lock \
1822 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1824 .mbar.commit add
command -label {Revert Changes
} \
1825 -command do_revert_selection
1826 lappend disable_on_lock \
1827 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1829 .mbar.commit add separator
1831 .mbar.commit add
command -label {Sign Off
} \
1832 -command do_signoff \
1835 .mbar.commit add
command -label Commit \
1836 -command do_commit \
1837 -accelerator $M1T-Return
1838 lappend disable_on_lock \
1839 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1844 if {[is_enabled branch
]} {
1846 .mbar.merge add
command -label {Local Merge...
} \
1847 -command merge
::dialog \
1849 lappend disable_on_lock \
1850 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
1851 .mbar.merge add
command -label {Abort Merge...
} \
1852 -command merge
::reset_hard
1853 lappend disable_on_lock \
1854 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
1859 if {[is_enabled transport
]} {
1863 .mbar.push add
command -label {Push...
} \
1864 -command do_push_anywhere \
1866 .mbar.push add
command -label {Delete...
} \
1867 -command remote_branch_delete
::dialog
1871 # -- Apple Menu (Mac OS X only)
1873 .mbar add cascade
-label Apple
-menu .mbar.apple
1876 .mbar.apple add
command -label "About [appname]" \
1878 .mbar.apple add
command -label "Options..." \
1883 .mbar.edit add separator
1884 .mbar.edit add
command -label {Options...
} \
1890 .mbar add cascade
-label Help
-menu .mbar.
help
1894 .mbar.
help add
command -label "About [appname]" \
1899 catch
{set browser
$repo_config(instaweb.browser
)}
1900 set doc_path
[file dirname [gitexec
]]
1901 set doc_path
[file join $doc_path Documentation index.html
]
1904 set doc_path
[exec cygpath
--mixed $doc_path]
1907 if {$browser eq
{}} {
1910 } elseif
{[is_Cygwin
]} {
1911 set program_files
[file dirname [exec cygpath
--windir]]
1912 set program_files
[file join $program_files {Program Files
}]
1913 set firefox
[file join $program_files {Mozilla Firefox
} firefox.exe
]
1914 set ie
[file join $program_files {Internet Explorer
} IEXPLORE.EXE
]
1915 if {[file exists
$firefox]} {
1916 set browser
$firefox
1917 } elseif
{[file exists
$ie]} {
1920 unset program_files firefox ie
1924 if {[file isfile
$doc_path]} {
1925 set doc_url
"file:$doc_path"
1927 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
1930 if {$browser ne
{}} {
1931 .mbar.
help add
command -label {Online Documentation
} \
1932 -command [list
exec $browser $doc_url &]
1934 unset browser doc_path doc_url
1936 # -- Standard bindings
1938 wm protocol . WM_DELETE_WINDOW do_quit
1939 bind all
<$M1B-Key-q> do_quit
1940 bind all
<$M1B-Key-Q> do_quit
1941 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
1942 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
1944 set subcommand_args
{}
1946 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
1950 # -- Not a normal commit type invocation? Do that instead!
1952 switch
-- $subcommand {
1955 set subcommand_args
{rev? path
}
1956 if {$argv eq
{}} usage
1961 if {$is_path ||
[file exists
$_prefix$a]} {
1962 if {$path ne
{}} usage
1965 } elseif
{$a eq
{--}} {
1967 if {$head ne
{}} usage
1972 } elseif
{$head eq
{}} {
1973 if {$head ne
{}} usage
1982 if {$head ne
{} && $path eq
{}} {
1983 set path
$_prefix$head
1990 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
1992 set head [git rev-parse
--verify $head]
1998 set current_branch
$head
2001 switch
-- $subcommand {
2004 if {$path ne
{} && [file isdirectory
$path]} {
2005 set head $current_branch
2011 browser
::new
$head $path
2014 if {$head eq
{} && ![file exists
$path]} {
2015 puts stderr
"fatal: cannot stat path $path: No such file or directory"
2018 blame
::new
$head $path
2025 if {[llength
$argv] != 0} {
2026 puts
-nonewline stderr
"usage: $argv0"
2027 if {$subcommand ne
{gui
} && [appname
] ne
"git-$subcommand"} {
2028 puts
-nonewline stderr
" $subcommand"
2033 # fall through to setup UI for commits
2036 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2047 -text {Current Branch
:} \
2051 -textvariable current_branch \
2054 pack .branch.l1
-side left
2055 pack .branch.cb
-side left
-fill x
2056 pack .branch
-side top
-fill x
2058 # -- Main Window Layout
2060 panedwindow .vpane
-orient vertical
2061 panedwindow .vpane.files
-orient horizontal
2062 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2063 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2065 # -- Index File List
2067 frame .vpane.files.index
-height 100 -width 200
2068 label .vpane.files.index.title
-text {Staged Changes
(Will Be Committed
)} \
2069 -background lightgreen
2070 text
$ui_index -background white
-borderwidth 0 \
2071 -width 20 -height 10 \
2073 -cursor $cursor_ptr \
2074 -xscrollcommand {.vpane.files.index.sx
set} \
2075 -yscrollcommand {.vpane.files.index.sy
set} \
2077 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2078 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2079 pack .vpane.files.index.title
-side top
-fill x
2080 pack .vpane.files.index.sx
-side bottom
-fill x
2081 pack .vpane.files.index.sy
-side right
-fill y
2082 pack
$ui_index -side left
-fill both
-expand 1
2083 .vpane.files add .vpane.files.index
-sticky nsew
2085 # -- Working Directory File List
2087 frame .vpane.files.workdir
-height 100 -width 200
2088 label .vpane.files.workdir.title
-text {Unstaged Changes
(Will Not Be Committed
)} \
2089 -background lightsalmon
2090 text
$ui_workdir -background white
-borderwidth 0 \
2091 -width 20 -height 10 \
2093 -cursor $cursor_ptr \
2094 -xscrollcommand {.vpane.files.workdir.sx
set} \
2095 -yscrollcommand {.vpane.files.workdir.sy
set} \
2097 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2098 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2099 pack .vpane.files.workdir.title
-side top
-fill x
2100 pack .vpane.files.workdir.sx
-side bottom
-fill x
2101 pack .vpane.files.workdir.sy
-side right
-fill y
2102 pack
$ui_workdir -side left
-fill both
-expand 1
2103 .vpane.files add .vpane.files.workdir
-sticky nsew
2105 foreach i
[list
$ui_index $ui_workdir] {
2106 $i tag conf in_diff
-background lightgray
2107 $i tag conf in_sel
-background lightgray
2111 # -- Diff and Commit Area
2113 frame .vpane.lower
-height 300 -width 400
2114 frame .vpane.lower.commarea
2115 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2116 pack .vpane.lower.commarea
-side top
-fill x
2117 pack .vpane.lower.
diff -side bottom
-fill both
-expand 1
2118 .vpane add .vpane.lower
-sticky nsew
2120 # -- Commit Area Buttons
2122 frame .vpane.lower.commarea.buttons
2123 label .vpane.lower.commarea.buttons.l
-text {} \
2126 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2127 pack .vpane.lower.commarea.buttons
-side left
-fill y
2129 button .vpane.lower.commarea.buttons.rescan
-text {Rescan
} \
2131 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2132 lappend disable_on_lock \
2133 {.vpane.lower.commarea.buttons.rescan conf
-state}
2135 button .vpane.lower.commarea.buttons.incall
-text {Stage Changed
} \
2137 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2138 lappend disable_on_lock \
2139 {.vpane.lower.commarea.buttons.incall conf
-state}
2141 button .vpane.lower.commarea.buttons.signoff
-text {Sign Off
} \
2143 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2145 button .vpane.lower.commarea.buttons.commit
-text {Commit
} \
2147 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2148 lappend disable_on_lock \
2149 {.vpane.lower.commarea.buttons.commit conf
-state}
2151 button .vpane.lower.commarea.buttons.push
-text {Push
} \
2152 -command do_push_anywhere
2153 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2155 # -- Commit Message Buffer
2157 frame .vpane.lower.commarea.buffer
2158 frame .vpane.lower.commarea.buffer.header
2159 set ui_comm .vpane.lower.commarea.buffer.t
2160 set ui_coml .vpane.lower.commarea.buffer.header.l
2161 radiobutton .vpane.lower.commarea.buffer.header.new \
2162 -text {New Commit
} \
2163 -command do_select_commit_type \
2164 -variable selected_commit_type \
2166 lappend disable_on_lock \
2167 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2168 radiobutton .vpane.lower.commarea.buffer.header.amend \
2169 -text {Amend Last Commit
} \
2170 -command do_select_commit_type \
2171 -variable selected_commit_type \
2173 lappend disable_on_lock \
2174 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2178 proc trace_commit_type
{varname args
} {
2179 global ui_coml commit_type
2180 switch
-glob -- $commit_type {
2181 initial
{set txt
{Initial Commit Message
:}}
2182 amend
{set txt
{Amended Commit Message
:}}
2183 amend-initial
{set txt
{Amended Initial Commit Message
:}}
2184 amend-merge
{set txt
{Amended Merge Commit Message
:}}
2185 merge
{set txt
{Merge Commit Message
:}}
2186 * {set txt
{Commit Message
:}}
2188 $ui_coml conf
-text $txt
2190 trace add variable commit_type
write trace_commit_type
2191 pack
$ui_coml -side left
-fill x
2192 pack .vpane.lower.commarea.buffer.header.amend
-side right
2193 pack .vpane.lower.commarea.buffer.header.new
-side right
2195 text
$ui_comm -background white
-borderwidth 1 \
2198 -autoseparators true \
2200 -width 75 -height 9 -wrap none \
2202 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2203 scrollbar .vpane.lower.commarea.buffer.sby \
2204 -command [list
$ui_comm yview
]
2205 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2206 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2207 pack
$ui_comm -side left
-fill y
2208 pack .vpane.lower.commarea.buffer
-side left
-fill y
2210 # -- Commit Message Buffer Context Menu
2212 set ctxm .vpane.lower.commarea.buffer.ctxm
2213 menu
$ctxm -tearoff 0
2216 -command {tk_textCut
$ui_comm}
2219 -command {tk_textCopy
$ui_comm}
2222 -command {tk_textPaste
$ui_comm}
2225 -command {$ui_comm delete sel.first sel.last
}
2228 -label {Select All
} \
2229 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2233 $ui_comm tag add sel
0.0 end
2234 tk_textCopy
$ui_comm
2235 $ui_comm tag remove sel
0.0 end
2241 bind_button3
$ui_comm "tk_popup $ctxm %X %Y"
2245 proc trace_current_diff_path
{varname args
} {
2246 global current_diff_path diff_actions file_states
2247 if {$current_diff_path eq
{}} {
2253 set p
$current_diff_path
2254 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2256 set p
[escape_path
$p]
2260 .vpane.lower.
diff.header.status configure
-text $s
2261 .vpane.lower.
diff.header.
file configure
-text $f
2262 .vpane.lower.
diff.header.path configure
-text $p
2263 foreach w
$diff_actions {
2267 trace add variable current_diff_path
write trace_current_diff_path
2269 frame .vpane.lower.
diff.header
-background gold
2270 label .vpane.lower.
diff.header.status \
2272 -width $max_status_desc \
2275 label .vpane.lower.
diff.header.
file \
2279 label .vpane.lower.
diff.header.path \
2283 pack .vpane.lower.
diff.header.status
-side left
2284 pack .vpane.lower.
diff.header.
file -side left
2285 pack .vpane.lower.
diff.header.path
-fill x
2286 set ctxm .vpane.lower.
diff.header.ctxm
2287 menu
$ctxm -tearoff 0
2295 -- $current_diff_path
2297 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2298 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2302 frame .vpane.lower.
diff.body
2303 set ui_diff .vpane.lower.
diff.body.t
2304 text
$ui_diff -background white
-borderwidth 0 \
2305 -width 80 -height 15 -wrap none \
2307 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2308 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2310 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2311 -command [list
$ui_diff xview
]
2312 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2313 -command [list
$ui_diff yview
]
2314 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2315 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2316 pack
$ui_diff -side left
-fill both
-expand 1
2317 pack .vpane.lower.
diff.header
-side top
-fill x
2318 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2320 $ui_diff tag conf d_cr
-elide true
2321 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2322 $ui_diff tag conf d_
+ -foreground {#00a000}
2323 $ui_diff tag conf d_-
-foreground red
2325 $ui_diff tag conf d_
++ -foreground {#00a000}
2326 $ui_diff tag conf d_--
-foreground red
2327 $ui_diff tag conf d_
+s \
2328 -foreground {#00a000} \
2329 -background {#e2effa}
2330 $ui_diff tag conf d_-s \
2332 -background {#e2effa}
2333 $ui_diff tag conf d_s
+ \
2334 -foreground {#00a000} \
2336 $ui_diff tag conf d_s- \
2340 $ui_diff tag conf d
<<<<<<< \
2341 -foreground orange \
2343 $ui_diff tag conf d
======= \
2344 -foreground orange \
2346 $ui_diff tag conf d
>>>>>>> \
2347 -foreground orange \
2350 $ui_diff tag raise sel
2352 # -- Diff Body Context Menu
2354 set ctxm .vpane.lower.
diff.body.ctxm
2355 menu
$ctxm -tearoff 0
2358 -command reshow_diff
2359 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2362 -command {tk_textCopy
$ui_diff}
2363 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2365 -label {Select All
} \
2366 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
2367 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2371 $ui_diff tag add sel
0.0 end
2372 tk_textCopy
$ui_diff
2373 $ui_diff tag remove sel
0.0 end
2375 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2378 -label {Apply
/Reverse Hunk
} \
2379 -command {apply_hunk
$cursorX $cursorY}
2380 set ui_diff_applyhunk
[$ctxm index last
]
2381 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
2384 -label {Decrease Font Size
} \
2385 -command {incr_font_size font_diff
-1}
2386 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2388 -label {Increase Font Size
} \
2389 -command {incr_font_size font_diff
1}
2390 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2393 -label {Show Less Context
} \
2394 -command {if {$repo_config(gui.diffcontext
) >= 1} {
2395 incr repo_config
(gui.diffcontext
) -1
2398 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2400 -label {Show More Context
} \
2401 -command {if {$repo_config(gui.diffcontext
) < 99} {
2402 incr repo_config
(gui.diffcontext
)
2405 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2407 $ctxm add
command -label {Options...
} \
2409 proc popup_diff_menu
{ctxm x y X Y
} {
2412 if {$
::ui_index eq $
::current_diff_side
} {
2413 $ctxm entryconf $
::ui_diff_applyhunk \
2415 -label {Unstage Hunk From Commit
}
2416 } elseif
{{_O
} eq
[lindex $
::file_states
($
::current_diff_path
) 0]} {
2417 $ctxm entryconf $
::ui_diff_applyhunk \
2419 -label {Stage Hunk For Commit
}
2421 $ctxm entryconf $
::ui_diff_applyhunk \
2423 -label {Stage Hunk For Commit
}
2425 tk_popup
$ctxm $X $Y
2427 bind_button3
$ui_diff [list popup_diff_menu
$ctxm %x
%y
%X
%Y
]
2431 set main_status
[::status_bar
::new .status
]
2432 pack .status
-anchor w
-side bottom
-fill x
2433 $main_status show
{Initializing...
}
2438 set gm
$repo_config(gui.geometry
)
2439 wm geometry .
[lindex
$gm 0]
2440 .vpane sash place
0 \
2441 [lindex
[.vpane sash coord
0] 0] \
2443 .vpane.files sash place
0 \
2445 [lindex
[.vpane.files sash coord
0] 1]
2451 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
2452 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
2453 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
2454 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
2455 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
2456 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
2457 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
2458 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
2459 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
2460 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2461 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2463 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
2464 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
2465 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
2466 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
2467 bind $ui_diff <$M1B-Key-v> {break}
2468 bind $ui_diff <$M1B-Key-V> {break}
2469 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2470 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2471 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
2472 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
2473 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
2474 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
2475 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
2476 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
2477 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
2478 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
2479 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
2480 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
2481 bind $ui_diff <Button-1
> {focus
%W
}
2483 if {[is_enabled branch
]} {
2484 bind .
<$M1B-Key-n> branch_create
::dialog
2485 bind .
<$M1B-Key-N> branch_create
::dialog
2486 bind .
<$M1B-Key-o> branch_checkout
::dialog
2487 bind .
<$M1B-Key-O> branch_checkout
::dialog
2488 bind .
<$M1B-Key-m> merge
::dialog
2489 bind .
<$M1B-Key-M> merge
::dialog
2491 if {[is_enabled transport
]} {
2492 bind .
<$M1B-Key-p> do_push_anywhere
2493 bind .
<$M1B-Key-P> do_push_anywhere
2496 bind .
<Key-F5
> do_rescan
2497 bind .
<$M1B-Key-r> do_rescan
2498 bind .
<$M1B-Key-R> do_rescan
2499 bind .
<$M1B-Key-s> do_signoff
2500 bind .
<$M1B-Key-S> do_signoff
2501 bind .
<$M1B-Key-i> do_add_all
2502 bind .
<$M1B-Key-I> do_add_all
2503 bind .
<$M1B-Key-Return> do_commit
2504 foreach i
[list
$ui_index $ui_workdir] {
2505 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
2506 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2507 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
2511 set file_lists
($ui_index) [list
]
2512 set file_lists
($ui_workdir) [list
]
2514 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2515 focus
-force $ui_comm
2517 # -- Warn the user about environmental problems. Cygwin's Tcl
2518 # does *not* pass its env array onto any processes it spawns.
2519 # This means that git processes get none of our environment.
2524 set msg
"Possible environment issues exist.
2526 The following environment variables are probably
2527 going to be ignored by any Git subprocess run
2531 foreach name
[array names env
] {
2532 switch
-regexp -- $name {
2533 {^GIT_INDEX_FILE$
} -
2534 {^GIT_OBJECT_DIRECTORY$
} -
2535 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
2537 {^GIT_EXTERNAL_DIFF$
} -
2541 {^GIT_CONFIG_LOCAL$
} -
2542 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
2543 append msg
" - $name\n"
2546 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
2547 append msg
" - $name\n"
2549 set suggest_user
$name
2553 if {$ignored_env > 0} {
2555 This is due to a known issue with the
2556 Tcl binary distributed by Cygwin."
2558 if {$suggest_user ne
{}} {
2561 A good replacement for $suggest_user
2562 is placing values for the user.name and
2563 user.email settings into your personal
2569 unset ignored_env msg suggest_user name
2572 # -- Only initialize complex UI if we are going to stay running.
2574 if {[is_enabled transport
]} {
2581 if {[winfo exists
$ui_comm]} {
2582 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
2584 # -- If both our backup and message files exist use the
2585 # newer of the two files to initialize the buffer.
2587 if {$GITGUI_BCK_exists} {
2588 set m
[gitdir GITGUI_MSG
]
2589 if {[file isfile
$m]} {
2590 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
2591 catch
{file delete
[gitdir GITGUI_MSG
]}
2593 $ui_comm delete
0.0 end
2595 $ui_comm edit modified false
2596 catch
{file delete
[gitdir GITGUI_BCK
]}
2597 set GITGUI_BCK_exists
0
2603 proc backup_commit_buffer
{} {
2604 global ui_comm GITGUI_BCK_exists
2606 set m
[$ui_comm edit modified
]
2607 if {$m ||
$GITGUI_BCK_exists} {
2608 set msg
[string trim
[$ui_comm get
0.0 end
]]
2609 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2612 if {$GITGUI_BCK_exists} {
2613 catch
{file delete
[gitdir GITGUI_BCK
]}
2614 set GITGUI_BCK_exists
0
2618 set fd
[open
[gitdir GITGUI_BCK
] w
]
2619 puts
-nonewline $fd $msg
2621 set GITGUI_BCK_exists
1
2625 $ui_comm edit modified false
2628 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
2631 backup_commit_buffer
2634 lock_index begin-read
2635 if {![winfo ismapped .
]} {
2639 if {[is_enabled multicommit
]} {