2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 ||
test "z$*" = z--version
; \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
10 exec wish
"$argv0" -- "$@"
12 set appvers
{@@GITGUI_VERSION@@
}
13 set copyright
[encoding convertfrom utf-8
{
14 Copyright ©
2006, 2007 Shawn Pearce
, et. al.
16 This program is free software
; you can redistribute it and
/or modify
17 it under the terms of the GNU General Public License as published by
18 the Free Software Foundation
; either version
2 of the License
, or
19 (at your option
) any later version.
21 This program is distributed
in the hope that it will be useful
,
22 but WITHOUT ANY WARRANTY
; without even the implied warranty of
23 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 GNU General Public License
for more details.
26 You should have received a copy of the GNU General Public License
27 along with this program
; if not
, write to the Free Software
28 Foundation
, Inc.
, 59 Temple Place
, Suite
330, Boston
, MA
02111-1307 USA
}]
30 ######################################################################
32 ## Tcl/Tk sanity check
34 if {[catch
{package require Tcl
8.4} err
]
35 ||
[catch
{package require Tk
8.4} err
]
41 -title [mc
"git-gui: fatal error"] \
46 catch
{rename send
{}} ; # What an evil concept...
48 ######################################################################
52 set oguilib
{@@GITGUI_LIBDIR@@
}
53 set oguirel
{@@GITGUI_RELATIVE@@
}
54 if {$oguirel eq
{1}} {
55 set oguilib
[file dirname [file normalize
$argv0]]
56 if {[file tail $oguilib] eq
{git-core
}} {
57 set oguilib
[file dirname $oguilib]
59 set oguilib
[file dirname $oguilib]
60 set oguilib
[file join $oguilib share git-gui lib
]
61 set oguimsg
[file join $oguilib msgs
]
62 } elseif
{[string match @@
* $oguirel]} {
63 set oguilib
[file join [file dirname [file normalize
$argv0]] lib
]
64 set oguimsg
[file join [file dirname [file normalize
$argv0]] po
]
66 set oguimsg
[file join $oguilib msgs
]
70 ######################################################################
72 ## enable verbose loading?
74 if {![catch
{set _verbose
$env(GITGUI_VERBOSE
)}]} {
76 rename auto_load real__auto_load
77 proc auto_load
{name args
} {
78 puts stderr
"auto_load $name"
79 return [uplevel
1 real__auto_load
$name $args]
81 rename
source real__source
83 puts stderr
"source $name"
84 uplevel
1 real__source
$name
88 ######################################################################
90 ## Internationalization (i18n) through msgcat and gettext. See
91 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
93 package require msgcat
96 set cmk
[string first @@
$fmt]
98 return [string range
$fmt 0 [expr {$cmk - 1}]]
103 proc mc
{en_fmt args
} {
104 set fmt [_mc_trim
[::msgcat
::mc
$en_fmt]]
105 if {[catch
{set msg
[eval [list format
$fmt] $args]} err
]} {
106 set msg
[eval [list format
[_mc_trim
$en_fmt]] $args]
112 return [join $args {}]
115 ::msgcat
::mcload
$oguimsg
118 ######################################################################
122 set _appname
{Git Gui
}
130 set _trace
[lsearch
-exact $argv --trace]
132 set argv
[lreplace
$argv $_trace $_trace]
148 return [eval [list
file join $_gitdir] $args]
151 proc gitexec
{args
} {
153 if {$_gitexec eq
{}} {
154 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
155 error
"Git not installed?\n\n$err"
158 set _gitexec
[exec cygpath \
163 set _gitexec
[file normalize
$_gitexec]
169 return [eval [list
file join $_gitexec] $args]
172 proc githtmldir
{args
} {
174 if {$_githtmldir eq
{}} {
175 if {[catch
{set _githtmldir
[git
--html-path]}]} {
176 # Git not installed or option not yet supported
180 set _githtmldir
[exec cygpath \
185 set _githtmldir
[file normalize
$_githtmldir]
191 return [eval [list
file join $_githtmldir] $args]
199 if {[tk windowingsystem
] eq
{aqua
}} {
206 if {$
::tcl_platform
(platform
) eq
{windows
}} {
214 if {$_iscygwin eq
{}} {
215 if {$
::tcl_platform
(platform
) eq
{windows
}} {
216 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
228 proc is_enabled
{option
} {
229 global enabled_options
230 if {[catch
{set on
$enabled_options($option)}]} {return 0}
234 proc enable_option
{option
} {
235 global enabled_options
236 set enabled_options
($option) 1
239 proc disable_option
{option
} {
240 global enabled_options
241 set enabled_options
($option) 0
244 ######################################################################
248 proc is_many_config
{name
} {
249 switch
-glob -- $name {
259 proc is_config_true
{name
} {
261 if {[catch
{set v
$repo_config($name)}]} {
263 } elseif
{$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes}} {
270 proc get_config
{name
} {
272 if {[catch
{set v
$repo_config($name)}]} {
279 ######################################################################
283 proc _trace_exec
{cmd
} {
284 if {!$
::_trace
} return
290 if {[regexp
{[ \t\r\n'"$?*]} $v]} {
298 proc _git_cmd {name} {
301 if {[catch {set v $_git_cmd_path($name)}]} {
305 --exec-path { return [list $::_git $name] }
308 set p [gitexec git-$name$::_search_exe]
309 if {[file exists $p]} {
311 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
312 # Try to determine what sort of magic will make
313 # git-$name go and do its thing, because native
314 # Tcl on Windows doesn't know it.
316 set p
[gitexec git-
$name]
321 switch
-glob -- [lindex
$s 0] {
323 #!*perl { set i perl }
324 #!*python { set i python }
325 default
{ error
"git-$name is not supported: $s" }
329 if {![info exists interp
]} {
330 set interp
[_which
$i]
333 error
"git-$name requires $i (not in PATH)"
335 set v
[concat
[list
$interp] [lrange
$s 1 end
] [list
$p]]
337 # Assume it is builtin to git somehow and we
338 # aren't actually able to see a file for it.
340 set v
[list $
::_git
$name]
342 set _git_cmd_path
($name) $v
347 proc _which
{what args
} {
348 global env _search_exe _search_path
350 if {$_search_path eq
{}} {
351 if {[is_Cygwin
] && [regexp
{^
(/|\.
:)} $env(PATH
)]} {
352 set _search_path
[split [exec cygpath \
358 } elseif
{[is_Windows
]} {
359 set gitguidir
[file dirname [info
script]]
360 regsub
-all ";" $gitguidir "\\;" gitguidir
361 set env
(PATH
) "$gitguidir;$env(PATH)"
362 set _search_path
[split $env(PATH
) {;}]
365 set _search_path
[split $env(PATH
) :]
370 if {[is_Windows
] && [lsearch
-exact $args -script] >= 0} {
373 set suffix
$_search_exe
376 foreach p
$_search_path {
377 set p
[file join $p $what$suffix]
378 if {[file exists
$p]} {
379 return [file normalize
$p]
385 proc _lappend_nice
{cmd_var
} {
389 if {![info exists _nice
]} {
390 set _nice
[_which nice
]
401 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 _trace_exec
[concat
$opt $cmdp $args]
419 set result
[eval exec $opt $cmdp $args]
421 puts stderr
"< $result"
426 proc _open_stdout_stderr
{cmd
} {
429 set fd
[open
[concat
[list |
] $cmd] r
]
431 if { [lindex
$cmd end
] eq
{2>@
1}
432 && $err eq
{can not
find channel named
"1"}
434 # Older versions of Tcl 8.4 don't have this 2>@1 IO
435 # redirect operator. Fallback to |& cat for those.
436 # The command was not actually started, so its safe
437 # to try to start it a second time.
439 set fd
[open
[concat \
441 [lrange
$cmd 0 end-1
] \
448 fconfigure
$fd -eofchar {}
452 proc git_read
{args
} {
456 switch
-- [lindex
$args 0] {
471 set args
[lrange
$args 1 end
]
474 set cmdp
[_git_cmd
[lindex
$args 0]]
475 set args
[lrange
$args 1 end
]
477 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
480 proc git_write
{args
} {
484 switch
-- [lindex
$args 0] {
495 set args
[lrange
$args 1 end
]
498 set cmdp
[_git_cmd
[lindex
$args 0]]
499 set args
[lrange
$args 1 end
]
501 _trace_exec
[concat
$opt $cmdp $args]
502 return [open
[concat
[list |
] $opt $cmdp $args] w
]
505 proc githook_read
{hook_name args
} {
506 set pchook
[gitdir hooks
$hook_name]
509 # On Windows [file executable] might lie so we need to ask
510 # the shell if the hook is executable. Yes that's annoying.
514 if {![info exists interp
]} {
515 set interp
[_which sh
]
518 error
"hook execution requires sh (not in PATH)"
521 set scr
{if test -x "$1";then exec "$@";fi}
522 set sh_c
[list
$interp -c $scr $interp $pchook]
523 return [_open_stdout_stderr
[concat
$sh_c $args]]
526 if {[file executable
$pchook]} {
527 return [_open_stdout_stderr
[concat
[list
$pchook] $args]]
533 proc kill_file_process
{fd
} {
534 set process
[pid
$fd]
538 # Use a Cygwin-specific flag to allow killing
539 # native Windows processes
540 exec kill -f $process
547 proc gitattr
{path attr default
} {
548 if {[catch
{set r
[git check-attr
$attr -- $path]}]} {
551 set r
[join [lrange
[split $r :] 2 end
] :]
554 if {$r eq
{unspecified
}} {
561 regsub
-all ' $value "'\\''" value
565 proc load_current_branch {} {
566 global current_branch is_detached
568 set fd [open [gitdir HEAD] r]
569 if {[gets $fd ref] < 1} {
574 set pfx {ref: refs/heads/}
575 set len [string length $pfx]
576 if {[string equal -length $len $pfx $ref]} {
577 # We're on a branch. It might not exist. But
578 # HEAD looks good enough to be a branch.
580 set current_branch [string range $ref $len end]
583 # Assume this is a detached head.
585 set current_branch HEAD
590 auto_load tk_optionMenu
591 rename tk_optionMenu real__tkOptionMenu
592 proc tk_optionMenu {w varName args} {
593 set m [eval real__tkOptionMenu $w $varName $args]
594 $m configure -font font_ui
595 $w configure -font font_ui
599 proc rmsel_tag {text} {
601 -background [$text cget -background] \
602 -foreground [$text cget -foreground] \
604 $text tag conf in_sel -background lightgray
605 bind $text <Motion> break
610 bind . <Visibility> {
611 bind . <Visibility> {}
616 wm iconbitmap . -default $oguilib/git-gui.ico
617 set ::tk::AlwaysShowSelection 1
619 # Spoof an X11 display for SSH
620 if {![info exists env(DISPLAY)]} {
621 set env(DISPLAY) :9999
625 image create photo gitlogo -width 16 -height 16
627 gitlogo put #33CC33 -to 7 0 9 2
628 gitlogo put #33CC33 -to 4 2 12 4
629 gitlogo put #33CC33 -to 7 4 9 6
630 gitlogo put #CC3333 -to 4 6 12 8
631 gitlogo put gray26 -to 4 9 6 10
632 gitlogo put gray26 -to 3 10 6 12
633 gitlogo put gray26 -to 8 9 13 11
634 gitlogo put gray26 -to 8 11 10 12
635 gitlogo put gray26 -to 11 11 13 14
636 gitlogo put gray26 -to 3 12 5 14
637 gitlogo put gray26 -to 5 13
638 gitlogo put gray26 -to 10 13
639 gitlogo put gray26 -to 4 14 12 15
640 gitlogo put gray26 -to 5 15 11 16
643 wm iconphoto . -default gitlogo
647 ######################################################################
652 font create font_diff -family Courier -size 10
656 eval font configure font_ui [font actual [.dummy cget -font]]
660 font create font_uiitalic
661 font create font_uibold
662 font create font_diffbold
663 font create font_diffitalic
665 foreach class {Button Checkbutton Entry Label
666 Labelframe Listbox Message
667 Radiobutton Spinbox Text} {
668 option add *$class.font font_ui
671 option add *Menu.font font_ui
675 if {[is_Windows] || [is_MacOSX]} {
676 option add *Menu.tearOff 0
687 proc bind_button3 {w cmd} {
688 bind $w <Any-Button-3> $cmd
690 # Mac OS X sends Button-2 on right click through three-button mouse,
691 # or through trackpad right-clicking (two-finger touch + click).
692 bind $w <Any-Button-2> $cmd
693 bind $w <Control-Button-1> $cmd
697 proc apply_config {} {
698 global repo_config font_descs
700 foreach option $font_descs {
701 set name [lindex $option 0]
702 set font [lindex $option 1]
705 foreach {cn cv} $repo_config(gui.$name) {
706 if {$cn eq {-weight}} {
709 font configure $font $cn $cv
712 font configure $font -weight normal
715 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
717 foreach {cn cv} [font configure $font] {
718 font configure ${font}bold $cn $cv
719 font configure ${font}italic $cn $cv
721 font configure ${font}bold -weight bold
722 font configure ${font}italic -slant italic
726 set default_config(branch.autosetupmerge) true
727 set default_config(merge.tool) {}
728 set default_config(mergetool.keepbackup) true
729 set default_config(merge.diffstat) true
730 set default_config(merge.summary) false
731 set default_config(merge.verbosity) 2
732 set default_config(user.name) {}
733 set default_config(user.email) {}
735 set default_config(gui.encoding) [encoding system]
736 set default_config(gui.matchtrackingbranch) false
737 set default_config(gui.pruneduringfetch) false
738 set default_config(gui.trustmtime) false
739 set default_config(gui.fastcopyblame) false
740 set default_config(gui.copyblamethreshold) 40
741 set default_config(gui.blamehistoryctx) 7
742 set default_config(gui.diffcontext) 5
743 set default_config(gui.commitmsgwidth) 75
744 set default_config(gui.newbranchtemplate) {}
745 set default_config(gui.spellingdictionary) {}
746 set default_config(gui.fontui) [font configure font_ui]
747 set default_config(gui.fontdiff) [font configure font_diff]
749 {fontui font_ui {mc "Main Font
"}}
750 {fontdiff font_diff {mc "Diff
/Console Font
"}}
753 ######################################################################
757 set _git [_which git]
759 catch {wm withdraw .}
763 -title [mc "git-gui
: fatal error
"] \
764 -message [mc "Cannot
find git
in PATH.
"]
768 ######################################################################
772 if {[catch {set _git_version [git --version]} err]} {
773 catch {wm withdraw .}
777 -title [mc "git-gui
: fatal error
"] \
778 -message "Cannot determine Git version
:
782 [appname
] requires Git
1.5.0 or later.
"
785 if {![regsub {^git version } $_git_version {} _git_version]} {
786 catch {wm withdraw .}
790 -title [mc "git-gui
: fatal error
"] \
791 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
795 set _real_git_version $_git_version
796 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
797 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
798 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
799 regsub {\.GIT$} $_git_version {} _git_version
800 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
802 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
803 catch {wm withdraw .}
808 -title "[appname
]: warning
" \
809 -message [mc "Git version cannot be determined.
811 %s claims it is version
'%s'.
813 %s requires
at least Git
1.5.0 or later.
815 Assume
'%s' is version
1.5.0?
816 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
817 set _git_version 1.5.0
822 unset _real_git_version
824 proc git-version {args} {
827 switch [llength $args] {
833 set op [lindex $args 0]
834 set vr [lindex $args 1]
835 set cm [package vcompare $_git_version $vr]
836 return [expr $cm $op 0]
840 set type [lindex $args 0]
841 set name [lindex $args 1]
842 set parm [lindex $args 2]
843 set body [lindex $args 3]
845 if {($type ne {proc} && $type ne {method})} {
846 error "Invalid arguments to git-version
"
848 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
849 error "Last arm of
$type $name must be default
"
852 foreach {op vr cb} [lrange $body 0 end-2] {
853 if {[git-version $op $vr]} {
854 return [uplevel [list $type $name $parm $cb]]
858 return [uplevel [list $type $name $parm [lindex $body end]]]
862 error "git-version
>= x
"
868 if {[git-version < 1.5]} {
869 catch {wm withdraw .}
873 -title [mc "git-gui
: fatal error
"] \
874 -message "[appname
] requires Git
1.5.0 or later.
876 You are using
[git-version
]:
882 ######################################################################
884 ## configure our library
886 set idx [file join $oguilib tclIndex]
887 if {[catch {set fd [open $idx r]} err]} {
888 catch {wm withdraw .}
892 -title [mc "git-gui
: fatal error
"] \
896 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
898 while {[gets $fd n] >= 0} {
899 if {$n ne {} && ![string match #* $n]} {
911 if {[lsearch -exact $loaded $p] >= 0} continue
912 source [file join $oguilib $p]
917 set auto_path [concat [list $oguilib] $auto_path]
919 unset -nocomplain idx fd
921 ######################################################################
923 ## config file parsing
925 git-version proc _parse_config {arr_name args} {
932 [list git_read config] \
934 [list --null --list]]
935 fconfigure $fd_rc -translation binary
936 set buf [read $fd_rc]
939 foreach line [split $buf "\
0"] {
940 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
941 if {[is_many_config $name]} {
942 lappend arr($name) $value
944 set arr($name) $value
953 set fd_rc [eval [list git_read config --list] $args]
954 while {[gets $fd_rc line] >= 0} {
955 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
956 if {[is_many_config $name]} {
957 lappend arr($name) $value
959 set arr($name) $value
968 proc load_config {include_global} {
969 global repo_config global_config system_config default_config
971 if {$include_global} {
972 _parse_config system_config --system
973 _parse_config global_config --global
975 _parse_config repo_config
977 foreach name [array names default_config] {
978 if {[catch {set v $system_config($name)}]} {
979 set system_config($name) $default_config($name)
982 foreach name [array names system_config] {
983 if {[catch {set v $global_config($name)}]} {
984 set global_config($name) $system_config($name)
986 if {[catch {set v $repo_config($name)}]} {
987 set repo_config($name) $system_config($name)
992 ######################################################################
994 ## feature option selection
996 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1001 if {$subcommand eq {gui.sh}} {
1004 if {$subcommand eq {gui} && [llength $argv] > 0} {
1005 set subcommand [lindex $argv 0]
1006 set argv [lrange $argv 1 end]
1009 enable_option multicommit
1010 enable_option branch
1011 enable_option transport
1014 switch -- $subcommand {
1019 disable_option multicommit
1020 disable_option branch
1021 disable_option transport
1024 enable_option singlecommit
1025 enable_option retcode
1027 disable_option multicommit
1028 disable_option branch
1029 disable_option transport
1031 while {[llength $argv] > 0} {
1032 set a [lindex $argv 0]
1035 enable_option initialamend
1038 enable_option nocommit
1039 enable_option nocommitmsg
1042 disable_option nocommitmsg
1049 set argv [lrange $argv 1 end]
1054 ######################################################################
1056 ## execution environment
1058 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1060 # Suggest our implementation of askpass, if none is set
1061 if {![info exists env(SSH_ASKPASS)]} {
1062 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1065 ######################################################################
1071 set _gitdir $env(GIT_DIR)
1075 set _gitdir [git rev-parse --git-dir]
1076 set _prefix [git rev-parse --show-prefix]
1080 choose_repository::pick
1083 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1084 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1086 if {![file isdirectory $_gitdir]} {
1087 catch {wm withdraw .}
1088 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1091 if {$_prefix ne {}} {
1092 regsub -all {[^/]+/} $_prefix ../ cdup
1093 if {[catch {cd $cdup} err]} {
1094 catch {wm withdraw .}
1095 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1099 } elseif {![is_enabled bare]} {
1100 if {[lindex [file split $_gitdir] end] ne {.git}} {
1101 catch {wm withdraw .}
1102 error_popup [strcat [mc "Cannot use funny .git directory
:"] "\n\n$_gitdir"]
1105 if {[catch {cd [file dirname $_gitdir]} err]} {
1106 catch {wm withdraw .}
1107 error_popup [strcat [mc "No working directory
"] " [file dirname $_gitdir]:\n\n$err"]
1111 set _reponame [file split [file normalize $_gitdir]]
1112 if {[lindex $_reponame end] eq {.git}} {
1113 set _reponame [lindex $_reponame end-1]
1115 set _reponame [lindex $_reponame end]
1118 ######################################################################
1122 set current_diff_path {}
1123 set current_diff_side {}
1124 set diff_actions [list]
1128 set MERGE_HEAD [list]
1131 set current_branch {}
1133 set current_diff_path {}
1135 set is_submodule_diff 0
1136 set is_conflict_diff 0
1137 set selected_commit_type new
1138 set diff_empty_count 0
1140 set nullid "0000000000000000000000000000000000000000"
1141 set nullid2 "0000000000000000000000000000000000000001"
1143 ######################################################################
1151 set disable_on_lock [list]
1152 set index_lock_type none
1154 proc lock_index {type} {
1155 global index_lock_type disable_on_lock
1157 if {$index_lock_type eq {none}} {
1158 set index_lock_type $type
1159 foreach w $disable_on_lock {
1160 uplevel #0 $w disabled
1163 } elseif {$index_lock_type eq "begin-
$type"} {
1164 set index_lock_type $type
1170 proc unlock_index {} {
1171 global index_lock_type disable_on_lock
1173 set index_lock_type none
1174 foreach w $disable_on_lock {
1175 uplevel #0 $w normal
1179 ######################################################################
1183 proc repository_state {ctvar hdvar mhvar} {
1184 global current_branch
1185 upvar $ctvar ct $hdvar hd $mhvar mh
1190 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1196 set merge_head [gitdir MERGE_HEAD]
1197 if {[file exists $merge_head]} {
1199 set fd_mh [open $merge_head r]
1200 while {[gets $fd_mh line] >= 0} {
1211 global PARENT empty_tree
1213 set p [lindex $PARENT 0]
1217 if {$empty_tree eq {}} {
1218 set empty_tree [git mktree << {}]
1223 proc force_amend {} {
1224 global selected_commit_type
1225 global HEAD PARENT MERGE_HEAD commit_type
1227 repository_state newType newHEAD newMERGE_HEAD
1230 set MERGE_HEAD $newMERGE_HEAD
1231 set commit_type $newType
1233 set selected_commit_type amend
1234 do_select_commit_type
1237 proc rescan {after {honor_trustmtime 1}} {
1238 global HEAD PARENT MERGE_HEAD commit_type
1239 global ui_index ui_workdir ui_comm
1240 global rescan_active file_states
1243 if {$rescan_active > 0 || ![lock_index read]} return
1245 repository_state newType newHEAD newMERGE_HEAD
1246 if {[string match amend* $commit_type]
1247 && $newType eq {normal}
1248 && $newHEAD eq $HEAD} {
1252 set MERGE_HEAD $newMERGE_HEAD
1253 set commit_type $newType
1256 array unset file_states
1258 if {!$::GITGUI_BCK_exists &&
1259 (![$ui_comm edit modified]
1260 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1261 if {[string match amend* $commit_type]} {
1262 } elseif {[load_message GITGUI_MSG]} {
1263 } elseif {[run_prepare_commit_msg_hook]} {
1264 } elseif {[load_message MERGE_MSG]} {
1265 } elseif {[load_message SQUASH_MSG]} {
1268 $ui_comm edit modified false
1271 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1272 rescan_stage2 {} $after
1275 ui_status [mc "Refreshing
file status...
"]
1276 set fd_rf [git_read update-index \
1282 fconfigure $fd_rf -blocking 0 -translation binary
1283 fileevent $fd_rf readable \
1284 [list rescan_stage2 $fd_rf $after]
1289 set is_git_info_exclude {}
1290 proc have_info_exclude {} {
1291 global is_git_info_exclude
1293 if {$is_git_info_exclude eq {}} {
1294 if {[catch {exec test -f [gitdir info exclude]}]} {
1295 set is_git_info_exclude 0
1297 set is_git_info_exclude 1
1300 return $is_git_info_exclude
1303 proc have_info_exclude {} {
1304 return [file readable [gitdir info exclude]]
1308 proc rescan_stage2 {fd after} {
1309 global rescan_active buf_rdi buf_rdf buf_rlo
1313 if {![eof $fd]} return
1317 set ls_others [list --exclude-per-directory=.gitignore]
1318 if {[have_info_exclude]} {
1319 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1321 set user_exclude [get_config core.excludesfile]
1322 if {$user_exclude ne {} && [file readable $user_exclude]} {
1323 lappend ls_others "--exclude-from=$user_exclude"
1331 ui_status [mc "Scanning
for modified files ...
"]
1332 set fd_di [git_read diff-index --cached -z [PARENT]]
1333 set fd_df [git_read diff-files -z]
1334 set fd_lo [eval git_read ls-files --others -z $ls_others]
1336 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1337 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1338 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1339 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1340 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1341 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1344 proc load_message {file} {
1347 set f [gitdir $file]
1348 if {[file isfile $f]} {
1349 if {[catch {set fd [open $f r]}]} {
1352 fconfigure $fd -eofchar {}
1353 set content [string trim [read $fd]]
1355 regsub -all -line {[ \r\t]+$} $content {} content
1356 $ui_comm delete 0.0 end
1357 $ui_comm insert end $content
1363 proc run_prepare_commit_msg_hook {} {
1366 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1367 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1368 # empty file but existant file.
1370 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1372 if {[file isfile [gitdir MERGE_MSG]]} {
1373 set pcm_source "merge
"
1374 set fd_mm [open [gitdir MERGE_MSG] r]
1375 puts -nonewline $fd_pcm [read $fd_mm]
1377 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1378 set pcm_source "squash
"
1379 set fd_sm [open [gitdir SQUASH_MSG] r]
1380 puts -nonewline $fd_pcm [read $fd_sm]
1388 set fd_ph [githook_read prepare-commit-msg \
1389 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1391 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1395 ui_status [mc "Calling prepare-commit-msg hook...
"]
1398 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1399 fileevent $fd_ph readable \
1400 [list prepare_commit_msg_hook_wait $fd_ph]
1405 proc prepare_commit_msg_hook_wait {fd_ph} {
1408 append pch_error [read $fd_ph]
1409 fconfigure $fd_ph -blocking 1
1411 if {[catch {close $fd_ph}]} {
1412 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1413 hook_failed_popup prepare-commit-msg $pch_error
1414 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1417 load_message PREPARE_COMMIT_MSG
1420 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1423 fconfigure $fd_ph -blocking 0
1424 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1427 proc read_diff_index {fd after} {
1430 append buf_rdi [read $fd]
1432 set n [string length $buf_rdi]
1434 set z1 [string first "\
0" $buf_rdi $c]
1435 if {$z1 == -1} break
1437 set z2 [string first "\
0" $buf_rdi $z1]
1438 if {$z2 == -1} break
1441 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1442 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1444 [encoding convertfrom $p] \
1446 [list [lindex $i 0] [lindex $i 2]] \
1452 set buf_rdi [string range $buf_rdi $c end]
1457 rescan_done $fd buf_rdi $after
1460 proc read_diff_files {fd after} {
1463 append buf_rdf [read $fd]
1465 set n [string length $buf_rdf]
1467 set z1 [string first "\
0" $buf_rdf $c]
1468 if {$z1 == -1} break
1470 set z2 [string first "\
0" $buf_rdf $z1]
1471 if {$z2 == -1} break
1474 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1475 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1477 [encoding convertfrom $p] \
1480 [list [lindex $i 0] [lindex $i 2]]
1485 set buf_rdf [string range $buf_rdf $c end]
1490 rescan_done $fd buf_rdf $after
1493 proc read_ls_others {fd after} {
1496 append buf_rlo [read $fd]
1497 set pck [split $buf_rlo "\
0"]
1498 set buf_rlo [lindex $pck end]
1499 foreach p [lrange $pck 0 end-1] {
1500 set p [encoding convertfrom $p]
1501 if {[string index $p end] eq {/}} {
1502 set p [string range $p 0 end-1]
1506 rescan_done $fd buf_rlo $after
1509 proc rescan_done {fd buf after} {
1510 global rescan_active current_diff_path
1511 global file_states repo_config
1514 if {![eof $fd]} return
1517 if {[incr rescan_active -1] > 0} return
1522 if {$current_diff_path ne {}} { reshow_diff $after }
1523 if {$current_diff_path eq {}} { select_first_diff $after }
1526 proc prune_selection {} {
1527 global file_states selected_paths
1529 foreach path [array names selected_paths] {
1530 if {[catch {set still_here $file_states($path)}]} {
1531 unset selected_paths($path)
1536 ######################################################################
1540 proc mapicon {w state path} {
1543 if {[catch {set r $all_icons($state$w)}]} {
1544 puts "error
: no icon
for $w state
={$state} $path"
1550 proc mapdesc {state path} {
1553 if {[catch {set r $all_descs($state)}]} {
1554 puts "error
: no desc
for state
={$state} $path"
1560 proc ui_status {msg} {
1562 if {[info exists main_status]} {
1563 $main_status show $msg
1567 proc ui_ready {{test {}}} {
1569 if {[info exists main_status]} {
1570 $main_status show [mc "Ready.
"] $test
1574 proc escape_path {path} {
1575 regsub -all {\\} $path "\\\\" path
1576 regsub -all "\n" $path "\\n
" path
1580 proc short_path {path} {
1581 return [escape_path [lindex [file split $path] end]]
1585 set null_sha1 [string repeat 0 40]
1587 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1588 global file_states next_icon_id null_sha1
1590 set s0 [string index $new_state 0]
1591 set s1 [string index $new_state 1]
1593 if {[catch {set info $file_states($path)}]} {
1595 set icon n[incr next_icon_id]
1597 set state [lindex $info 0]
1598 set icon [lindex $info 1]
1599 if {$head_info eq {}} {set head_info [lindex $info 2]}
1600 if {$index_info eq {}} {set index_info [lindex $info 3]}
1603 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1604 elseif {$s0 eq {_}} {set s0 _}
1606 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1607 elseif {$s1 eq {_}} {set s1 _}
1609 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1610 set head_info [list 0 $null_sha1]
1611 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1612 && $head_info eq {}} {
1613 set head_info $index_info
1616 set file_states($path) [list $s0$s1 $icon \
1617 $head_info $index_info \
1622 proc display_file_helper {w path icon_name old_m new_m} {
1625 if {$new_m eq {_}} {
1626 set lno [lsearch -sorted -exact $file_lists($w) $path]
1628 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1630 $w conf -state normal
1631 $w delete $lno.0 [expr {$lno + 1}].0
1632 $w conf -state disabled
1634 } elseif {$old_m eq {_} && $new_m ne {_}} {
1635 lappend file_lists($w) $path
1636 set file_lists($w) [lsort -unique $file_lists($w)]
1637 set lno [lsearch -sorted -exact $file_lists($w) $path]
1639 $w conf -state normal
1640 $w image create $lno.0 \
1641 -align center -padx 5 -pady 1 \
1643 -image [mapicon $w $new_m $path]
1644 $w insert $lno.1 "[escape_path
$path]\n"
1645 $w conf -state disabled
1646 } elseif {$old_m ne $new_m} {
1647 $w conf -state normal
1648 $w image conf $icon_name -image [mapicon $w $new_m $path]
1649 $w conf -state disabled
1653 proc display_file {path state} {
1654 global file_states selected_paths
1655 global ui_index ui_workdir
1657 set old_m [merge_state $path $state]
1658 set s $file_states($path)
1659 set new_m [lindex $s 0]
1660 set icon_name [lindex $s 1]
1662 set o [string index $old_m 0]
1663 set n [string index $new_m 0]
1670 display_file_helper $ui_index $path $icon_name $o $n
1672 if {[string index $old_m 0] eq {U}} {
1675 set o [string index $old_m 1]
1677 if {[string index $new_m 0] eq {U}} {
1680 set n [string index $new_m 1]
1682 display_file_helper $ui_workdir $path $icon_name $o $n
1684 if {$new_m eq {__}} {
1685 unset file_states($path)
1686 catch {unset selected_paths($path)}
1690 proc display_all_files_helper {w path icon_name m} {
1693 lappend file_lists($w) $path
1694 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1695 $w image create end \
1696 -align center -padx 5 -pady 1 \
1698 -image [mapicon $w $m $path]
1699 $w insert end "[escape_path
$path]\n"
1702 proc display_all_files {} {
1703 global ui_index ui_workdir
1704 global file_states file_lists
1707 $ui_index conf -state normal
1708 $ui_workdir conf -state normal
1710 $ui_index delete 0.0 end
1711 $ui_workdir delete 0.0 end
1714 set file_lists($ui_index) [list]
1715 set file_lists($ui_workdir) [list]
1717 foreach path [lsort [array names file_states]] {
1718 set s $file_states($path)
1720 set icon_name [lindex $s 1]
1722 set s [string index $m 0]
1723 if {$s ne {U} && $s ne {_}} {
1724 display_all_files_helper $ui_index $path \
1728 if {[string index $m 0] eq {U}} {
1731 set s [string index $m 1]
1734 display_all_files_helper $ui_workdir $path \
1739 $ui_index conf -state disabled
1740 $ui_workdir conf -state disabled
1743 ######################################################################
1748 #define mask_width 14
1749 #define mask_height 15
1750 static unsigned char mask_bits[] = {
1751 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1752 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1753 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1756 image create bitmap file_plain -background white -foreground black -data {
1757 #define plain_width 14
1758 #define plain_height 15
1759 static unsigned char plain_bits[] = {
1760 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1761 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1762 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1763 } -maskdata $filemask
1765 image create bitmap file_mod -background white -foreground blue -data {
1766 #define mod_width 14
1767 #define mod_height 15
1768 static unsigned char mod_bits[] = {
1769 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1770 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1771 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1772 } -maskdata $filemask
1774 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1775 #define file_fulltick_width 14
1776 #define file_fulltick_height 15
1777 static unsigned char file_fulltick_bits
[] = {
1778 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1779 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1780 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1781 } -maskdata $filemask
1783 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1784 #define parttick_width 14
1785 #define parttick_height 15
1786 static unsigned char parttick_bits
[] = {
1787 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1788 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1789 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1790 } -maskdata $filemask
1792 image create bitmap file_question
-background white
-foreground black
-data {
1793 #define file_question_width 14
1794 #define file_question_height 15
1795 static unsigned char file_question_bits
[] = {
1796 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1797 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1798 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1799 } -maskdata $filemask
1801 image create bitmap file_removed
-background white
-foreground red
-data {
1802 #define file_removed_width 14
1803 #define file_removed_height 15
1804 static unsigned char file_removed_bits
[] = {
1805 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1806 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1807 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1808 } -maskdata $filemask
1810 image create bitmap file_merge
-background white
-foreground blue
-data {
1811 #define file_merge_width 14
1812 #define file_merge_height 15
1813 static unsigned char file_merge_bits
[] = {
1814 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1815 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1816 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1817 } -maskdata $filemask
1819 image create bitmap file_statechange
-background white
-foreground green
-data {
1820 #define file_merge_width 14
1821 #define file_merge_height 15
1822 static unsigned char file_statechange_bits
[] = {
1823 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1824 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1825 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1826 } -maskdata $filemask
1828 set ui_index .vpane.files.index.list
1829 set ui_workdir .vpane.files.workdir.list
1831 set all_icons
(_
$ui_index) file_plain
1832 set all_icons
(A
$ui_index) file_fulltick
1833 set all_icons
(M
$ui_index) file_fulltick
1834 set all_icons
(D
$ui_index) file_removed
1835 set all_icons
(U
$ui_index) file_merge
1836 set all_icons
(T
$ui_index) file_statechange
1838 set all_icons
(_
$ui_workdir) file_plain
1839 set all_icons
(M
$ui_workdir) file_mod
1840 set all_icons
(D
$ui_workdir) file_question
1841 set all_icons
(U
$ui_workdir) file_merge
1842 set all_icons
(O
$ui_workdir) file_plain
1843 set all_icons
(T
$ui_workdir) file_statechange
1845 set max_status_desc
0
1847 {__
{mc
"Unmodified"}}
1849 {_M
{mc
"Modified, not staged"}}
1850 {M_
{mc
"Staged for commit"}}
1851 {MM
{mc
"Portions staged for commit"}}
1852 {MD
{mc
"Staged for commit, missing"}}
1854 {_T
{mc
"File type changed, not staged"}}
1855 {T_
{mc
"File type changed, staged"}}
1857 {_O
{mc
"Untracked, not staged"}}
1858 {A_
{mc
"Staged for commit"}}
1859 {AM
{mc
"Portions staged for commit"}}
1860 {AD
{mc
"Staged for commit, missing"}}
1863 {D_
{mc
"Staged for removal"}}
1864 {DO
{mc
"Staged for removal, still present"}}
1866 {_U
{mc
"Requires merge resolution"}}
1867 {U_
{mc
"Requires merge resolution"}}
1868 {UU
{mc
"Requires merge resolution"}}
1869 {UM
{mc
"Requires merge resolution"}}
1870 {UD
{mc
"Requires merge resolution"}}
1871 {UT
{mc
"Requires merge resolution"}}
1873 set text
[eval [lindex
$i 1]]
1874 if {$max_status_desc < [string length
$text]} {
1875 set max_status_desc
[string length
$text]
1877 set all_descs
([lindex
$i 0]) $text
1881 ######################################################################
1885 proc scrollbar2many
{list mode args
} {
1886 foreach w
$list {eval $w $mode $args}
1889 proc many2scrollbar
{list mode sb top bottom
} {
1890 $sb set $top $bottom
1891 foreach w
$list {$w $mode moveto
$top}
1894 proc incr_font_size
{font
{amt
1}} {
1895 set sz
[font configure
$font -size]
1897 font configure
$font -size $sz
1898 font configure
${font}bold
-size $sz
1899 font configure
${font}italic
-size $sz
1902 ######################################################################
1906 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1908 proc do_gitk
{revs is_submodule
} {
1909 global current_diff_path old_submod_sha1 new_submod_sha1
1911 # -- Always start gitk through whatever we were loaded with. This
1912 # lets us bypass using shell process on Windows systems.
1914 set exe
[_which gitk
-script]
1915 set cmd
[list
[info nameofexecutable
] $exe]
1917 error_popup
[mc
"Couldn't find gitk in PATH"]
1921 if {[info exists env
(GIT_DIR
)]} {
1922 set old_GIT_DIR
$env(GIT_DIR
)
1928 if {!$is_submodule} {
1929 cd [file dirname [gitdir
]]
1930 set env
(GIT_DIR
) [file tail [gitdir
]]
1932 cd $current_diff_path
1934 set revs
$old_submod_sha1...
$new_submod_sha1
1935 } elseif
{$revs eq
{--}} {
1936 set revs
$new_submod_sha1
1938 if {[info exists env
(GIT_DIR
)]} {
1943 eval exec $cmd $revs &
1945 if {$old_GIT_DIR ne
{}} {
1946 set env
(GIT_DIR
) $old_GIT_DIR
1950 ui_status $
::starting_gitk_msg
1952 ui_ready
$starting_gitk_msg
1957 proc do_git_gui
{} {
1958 global current_diff_path
1960 # -- Always start git gui through whatever we were loaded with. This
1961 # lets us bypass using shell process on Windows systems.
1963 set exe
[_which git
]
1965 error_popup
[mc
"Couldn't find git gui in PATH"]
1969 if {[info exists env
(GIT_DIR
)]} {
1970 set old_GIT_DIR
$env(GIT_DIR
)
1977 cd $current_diff_path
1979 eval exec $exe gui
&
1981 if {$old_GIT_DIR ne
{}} {
1982 set env
(GIT_DIR
) $old_GIT_DIR
1986 ui_status $
::starting_gitk_msg
1988 ui_ready
$starting_gitk_msg
1993 proc do_explore
{} {
1995 if {[is_Cygwin
] ||
[is_Windows
]} {
1996 set explorer
"explorer.exe"
1997 } elseif
{[is_MacOSX
]} {
2000 # freedesktop.org-conforming system is our best shot
2001 set explorer
"xdg-open"
2003 eval exec $explorer [list
[file nativename
[file dirname [gitdir
]]]] &
2009 proc terminate_me
{win
} {
2011 if {$win ne
{.
}} return
2015 proc do_quit
{{rc
{1}}} {
2016 global ui_comm is_quitting repo_config commit_type
2017 global GITGUI_BCK_exists GITGUI_BCK_i
2018 global ui_comm_spell
2021 if {$is_quitting} return
2024 if {[winfo exists
$ui_comm]} {
2025 # -- Stash our current commit buffer.
2027 set save
[gitdir GITGUI_MSG
]
2028 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2029 file rename
-force [gitdir GITGUI_BCK
] $save
2030 set GITGUI_BCK_exists
0
2032 set msg
[string trim
[$ui_comm get
0.0 end
]]
2033 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2034 if {(![string match amend
* $commit_type]
2035 ||
[$ui_comm edit modified
])
2038 set fd
[open
$save w
]
2039 puts
-nonewline $fd $msg
2043 catch
{file delete
$save}
2047 # -- Cancel our spellchecker if its running.
2049 if {[info exists ui_comm_spell
]} {
2053 # -- Remove our editor backup, its not needed.
2055 after cancel
$GITGUI_BCK_i
2056 if {$GITGUI_BCK_exists} {
2057 catch
{file delete
[gitdir GITGUI_BCK
]}
2060 # -- Stash our current window geometry into this repository.
2062 set cfg_geometry
[list
]
2063 lappend cfg_geometry
[wm geometry .
]
2064 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2065 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2066 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2069 if {$cfg_geometry ne
$rc_geometry} {
2070 catch
{git config gui.geometry
$cfg_geometry}
2082 proc ui_do_rescan
{} {
2083 rescan
{force_first_diff ui_ready
}
2090 proc next_diff
{{after
{}}} {
2091 global next_diff_p next_diff_w next_diff_i
2092 show_diff
$next_diff_p $next_diff_w {} {} $after
2095 proc find_anchor_pos
{lst name
} {
2096 set lid
[lsearch
-sorted -exact $lst $name]
2100 foreach lname
$lst {
2101 if {$lname >= $name} break
2109 proc find_file_from
{flist idx delta path mmask
} {
2112 set len
[llength
$flist]
2113 while {$idx >= 0 && $idx < $len} {
2114 set name
[lindex
$flist $idx]
2116 if {$name ne
$path && [info exists file_states
($name)]} {
2117 set state
[lindex
$file_states($name) 0]
2119 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2130 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2131 global next_diff_p next_diff_w next_diff_i
2132 global file_lists ui_index ui_workdir
2134 set flist
$file_lists($w)
2136 set lno
[find_anchor_pos
$flist $path]
2141 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2142 if {$w eq
$ui_index} {
2145 set mmask
"$mmask\$"
2149 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2152 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2157 set next_diff_p
[lindex
$flist $idx]
2158 set next_diff_i
[expr {$idx+1}]
2165 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2166 global current_diff_path
2168 if {$path ne
$current_diff_path} {
2170 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2173 return {reshow_diff
;}
2177 proc select_first_diff
{after
} {
2180 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2181 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2188 proc force_first_diff
{after
} {
2189 global ui_workdir current_diff_path file_states
2191 if {[info exists file_states
($current_diff_path)]} {
2192 set state
[lindex
$file_states($current_diff_path) 0]
2198 if {[string first
{U
} $state] >= 0} {
2199 # Already a conflict, do nothing
2200 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2202 } elseif
{[string index
$state 1] ne
{O
}} {
2203 # Already a diff & no conflicts, do nothing
2204 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2215 proc toggle_or_diff
{w x y
} {
2216 global file_states file_lists current_diff_path ui_index ui_workdir
2217 global last_clicked selected_paths
2219 set pos
[split [$w index @
$x,$y] .
]
2220 set lno
[lindex
$pos 0]
2221 set col [lindex
$pos 1]
2222 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2228 set last_clicked
[list
$w $lno]
2229 array
unset selected_paths
2230 $ui_index tag remove in_sel
0.0 end
2231 $ui_workdir tag remove in_sel
0.0 end
2233 # Determine the state of the file
2234 if {[info exists file_states
($path)]} {
2235 set state
[lindex
$file_states($path) 0]
2240 # Restage the file, or simply show the diff
2241 if {$col == 0 && $y > 1} {
2242 # Conflicts need special handling
2243 if {[string first
{U
} $state] >= 0} {
2244 # $w must always be $ui_workdir, but...
2245 if {$w ne
$ui_workdir} { set lno
{} }
2246 merge_stage_workdir
$path $lno
2250 if {[string index
$state 1] eq
{O
}} {
2256 set after
[next_diff_after_action
$w $path $lno $mmask]
2258 if {$w eq
$ui_index} {
2260 "Unstaging [short_path $path] from commit" \
2262 [concat
$after [list ui_ready
]]
2263 } elseif
{$w eq
$ui_workdir} {
2265 "Adding [short_path $path]" \
2267 [concat
$after [list ui_ready
]]
2270 show_diff
$path $w $lno
2274 proc add_one_to_selection
{w x y
} {
2275 global file_lists last_clicked selected_paths
2277 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2278 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2284 if {$last_clicked ne
{}
2285 && [lindex
$last_clicked 0] ne
$w} {
2286 array
unset selected_paths
2287 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2290 set last_clicked
[list
$w $lno]
2291 if {[catch
{set in_sel
$selected_paths($path)}]} {
2295 unset selected_paths
($path)
2296 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2298 set selected_paths
($path) 1
2299 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2303 proc add_range_to_selection
{w x y
} {
2304 global file_lists last_clicked selected_paths
2306 if {[lindex
$last_clicked 0] ne
$w} {
2307 toggle_or_diff
$w $x $y
2311 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2312 set lc
[lindex
$last_clicked 1]
2321 foreach path
[lrange
$file_lists($w) \
2322 [expr {$begin - 1}] \
2323 [expr {$end - 1}]] {
2324 set selected_paths
($path) 1
2326 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2329 proc show_more_context
{} {
2331 if {$repo_config(gui.diffcontext
) < 99} {
2332 incr repo_config
(gui.diffcontext
)
2337 proc show_less_context
{} {
2339 if {$repo_config(gui.diffcontext
) > 1} {
2340 incr repo_config
(gui.diffcontext
) -1
2345 ######################################################################
2355 menu .mbar
-tearoff 0
2357 # -- Apple Menu (Mac OS X only)
2359 .mbar add cascade
-label Apple
-menu .mbar.apple
2362 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2363 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2364 if {[is_enabled branch
]} {
2365 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2367 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2368 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2370 if {[is_enabled transport
]} {
2371 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2372 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2374 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2375 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2378 # -- Repository Menu
2380 menu .mbar.repository
2382 .mbar.repository add
command \
2383 -label [mc
"Explore Working Copy"] \
2384 -command {do_explore
}
2385 .mbar.repository add separator
2387 .mbar.repository add
command \
2388 -label [mc
"Browse Current Branch's Files"] \
2389 -command {browser
::new
$current_branch}
2390 set ui_browse_current
[.mbar.repository index last
]
2391 .mbar.repository add
command \
2392 -label [mc
"Browse Branch Files..."] \
2393 -command browser_open
::dialog
2394 .mbar.repository add separator
2396 .mbar.repository add
command \
2397 -label [mc
"Visualize Current Branch's History"] \
2398 -command {do_gitk
$current_branch false
}
2399 set ui_visualize_current
[.mbar.repository index last
]
2400 .mbar.repository add
command \
2401 -label [mc
"Visualize All Branch History"] \
2402 -command {do_gitk
--all false
}
2403 .mbar.repository add separator
2405 proc current_branch_write
{args
} {
2406 global current_branch
2407 .mbar.repository entryconf $
::ui_browse_current \
2408 -label [mc
"Browse %s's Files" $current_branch]
2409 .mbar.repository entryconf $
::ui_visualize_current \
2410 -label [mc
"Visualize %s's History" $current_branch]
2412 trace add variable current_branch
write current_branch_write
2414 if {[is_enabled multicommit
]} {
2415 .mbar.repository add
command -label [mc
"Database Statistics"] \
2418 .mbar.repository add
command -label [mc
"Compress Database"] \
2421 .mbar.repository add
command -label [mc
"Verify Database"] \
2422 -command do_fsck_objects
2424 .mbar.repository add separator
2427 .mbar.repository add
command \
2428 -label [mc
"Create Desktop Icon"] \
2429 -command do_cygwin_shortcut
2430 } elseif
{[is_Windows
]} {
2431 .mbar.repository add
command \
2432 -label [mc
"Create Desktop Icon"] \
2433 -command do_windows_shortcut
2434 } elseif
{[is_MacOSX
]} {
2435 .mbar.repository add
command \
2436 -label [mc
"Create Desktop Icon"] \
2437 -command do_macosx_app
2442 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2444 .mbar.repository add
command -label [mc Quit
] \
2452 .mbar.edit add
command -label [mc Undo
] \
2453 -command {catch
{[focus
] edit undo
}} \
2455 .mbar.edit add
command -label [mc Redo
] \
2456 -command {catch
{[focus
] edit redo
}} \
2458 .mbar.edit add separator
2459 .mbar.edit add
command -label [mc Cut
] \
2460 -command {catch
{tk_textCut
[focus
]}} \
2462 .mbar.edit add
command -label [mc Copy
] \
2463 -command {catch
{tk_textCopy
[focus
]}} \
2465 .mbar.edit add
command -label [mc Paste
] \
2466 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2468 .mbar.edit add
command -label [mc Delete
] \
2469 -command {catch
{[focus
] delete sel.first sel.last
}} \
2471 .mbar.edit add separator
2472 .mbar.edit add
command -label [mc
"Select All"] \
2473 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2478 if {[is_enabled branch
]} {
2481 .mbar.branch add
command -label [mc
"Create..."] \
2482 -command branch_create
::dialog \
2484 lappend disable_on_lock
[list .mbar.branch entryconf \
2485 [.mbar.branch index last
] -state]
2487 .mbar.branch add
command -label [mc
"Checkout..."] \
2488 -command branch_checkout
::dialog \
2490 lappend disable_on_lock
[list .mbar.branch entryconf \
2491 [.mbar.branch index last
] -state]
2493 .mbar.branch add
command -label [mc
"Rename..."] \
2494 -command branch_rename
::dialog
2495 lappend disable_on_lock
[list .mbar.branch entryconf \
2496 [.mbar.branch index last
] -state]
2498 .mbar.branch add
command -label [mc
"Delete..."] \
2499 -command branch_delete
::dialog
2500 lappend disable_on_lock
[list .mbar.branch entryconf \
2501 [.mbar.branch index last
] -state]
2503 .mbar.branch add
command -label [mc
"Reset..."] \
2504 -command merge
::reset_hard
2505 lappend disable_on_lock
[list .mbar.branch entryconf \
2506 [.mbar.branch index last
] -state]
2511 proc commit_btn_caption
{} {
2512 if {[is_enabled nocommit
]} {
2515 return [mc Commit@@verb
]
2519 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2522 if {![is_enabled nocommit
]} {
2523 .mbar.commit add radiobutton \
2524 -label [mc
"New Commit"] \
2525 -command do_select_commit_type \
2526 -variable selected_commit_type \
2528 lappend disable_on_lock \
2529 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2531 .mbar.commit add radiobutton \
2532 -label [mc
"Amend Last Commit"] \
2533 -command do_select_commit_type \
2534 -variable selected_commit_type \
2536 lappend disable_on_lock \
2537 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2539 .mbar.commit add separator
2542 .mbar.commit add
command -label [mc Rescan
] \
2543 -command ui_do_rescan \
2545 lappend disable_on_lock \
2546 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2548 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2549 -command do_add_selection \
2551 lappend disable_on_lock \
2552 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2554 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2555 -command do_add_all \
2557 lappend disable_on_lock \
2558 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2560 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2561 -command do_unstage_selection
2562 lappend disable_on_lock \
2563 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2565 .mbar.commit add
command -label [mc
"Revert Changes"] \
2566 -command do_revert_selection
2567 lappend disable_on_lock \
2568 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2570 .mbar.commit add separator
2572 .mbar.commit add
command -label [mc
"Show Less Context"] \
2573 -command show_less_context \
2574 -accelerator $M1T-\
-
2576 .mbar.commit add
command -label [mc
"Show More Context"] \
2577 -command show_more_context \
2580 .mbar.commit add separator
2582 if {![is_enabled nocommitmsg
]} {
2583 .mbar.commit add
command -label [mc
"Sign Off"] \
2584 -command do_signoff \
2588 .mbar.commit add
command -label [commit_btn_caption
] \
2589 -command do_commit \
2590 -accelerator $M1T-Return
2591 lappend disable_on_lock \
2592 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2597 if {[is_enabled branch
]} {
2599 .mbar.merge add
command -label [mc
"Local Merge..."] \
2600 -command merge
::dialog \
2602 lappend disable_on_lock \
2603 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2604 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2605 -command merge
::reset_hard
2606 lappend disable_on_lock \
2607 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2612 if {[is_enabled transport
]} {
2615 .mbar.remote add
command \
2616 -label [mc
"Add..."] \
2617 -command remote_add
::dialog \
2619 .mbar.remote add
command \
2620 -label [mc
"Push..."] \
2621 -command do_push_anywhere \
2623 .mbar.remote add
command \
2624 -label [mc
"Delete Branch..."] \
2625 -command remote_branch_delete
::dialog
2629 proc
::tk
::mac
::ShowPreferences
{} {do_options
}
2633 .mbar.edit add separator
2634 .mbar.edit add
command -label [mc
"Options..."] \
2640 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2641 set tools_menubar .mbar.tools
2643 $tools_menubar add separator
2644 $tools_menubar add
command -label [mc
"Add..."] -command tools_add
::dialog
2645 $tools_menubar add
command -label [mc
"Remove..."] -command tools_remove
::dialog
2647 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
2654 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2658 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2660 .mbar.apple add separator
2662 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2665 . configure
-menu .mbar
2667 set doc_path
[githtmldir
]
2668 if {$doc_path ne
{}} {
2669 set doc_path
[file join $doc_path index.html
]
2672 set doc_path
[exec cygpath
--mixed $doc_path]
2676 if {[file isfile
$doc_path]} {
2677 set doc_url
"file:$doc_path"
2679 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2682 proc start_browser
{url
} {
2683 git
"web--browse" $url
2686 .mbar.
help add
command -label [mc
"Online Documentation"] \
2687 -command [list start_browser
$doc_url]
2689 .mbar.
help add
command -label [mc
"Show SSH Key"] \
2692 unset doc_path doc_url
2694 # -- Standard bindings
2696 wm protocol . WM_DELETE_WINDOW do_quit
2697 bind all
<$M1B-Key-q> do_quit
2698 bind all
<$M1B-Key-Q> do_quit
2699 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2700 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2702 set subcommand_args
{}
2704 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2708 proc normalize_relpath
{path
} {
2710 foreach item
[file split $path] {
2711 if {$item eq
{.
}} continue
2712 if {$item eq
{..
} && [llength
$elements] > 0
2713 && [lindex
$elements end
] ne
{..
}} {
2714 set elements
[lrange
$elements 0 end-1
]
2717 lappend elements
$item
2719 return [eval file join $elements]
2722 # -- Not a normal commit type invocation? Do that instead!
2724 switch
-- $subcommand {
2727 if {$subcommand eq
"blame"} {
2728 set subcommand_args
{[--line=<num
>] rev? path
}
2730 set subcommand_args
{rev? path
}
2732 if {$argv eq
{}} usage
2738 if {$is_path ||
[file exists
$_prefix$a]} {
2739 if {$path ne
{}} usage
2740 set path
[normalize_relpath
$_prefix$a]
2742 } elseif
{$a eq
{--}} {
2744 if {$head ne
{}} usage
2749 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
2750 if {$jump_spec ne
{} ||
$head ne
{}} usage
2751 set jump_spec
[list
$lnum]
2752 } elseif
{$head eq
{}} {
2753 if {$head ne
{}} usage
2762 if {$head ne
{} && $path eq
{}} {
2763 set path
[normalize_relpath
$_prefix$head]
2770 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2772 set head [git rev-parse
--verify $head]
2778 set current_branch
$head
2781 switch
-- $subcommand {
2783 if {$jump_spec ne
{}} usage
2785 if {$path ne
{} && [file isdirectory
$path]} {
2786 set head $current_branch
2792 browser
::new
$head $path
2795 if {$head eq
{} && ![file exists
$path]} {
2796 puts stderr
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
2799 blame
::new
$head $path $jump_spec
2806 if {[llength
$argv] != 0} {
2807 puts
-nonewline stderr
"usage: $argv0"
2808 if {$subcommand ne
{gui
}
2809 && [file tail $argv0] ne
"git-$subcommand"} {
2810 puts
-nonewline stderr
" $subcommand"
2815 # fall through to setup UI for commits
2818 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2829 -text [mc
"Current Branch:"] \
2833 -textvariable current_branch \
2836 pack .branch.l1
-side left
2837 pack .branch.cb
-side left
-fill x
2838 pack .branch
-side top
-fill x
2840 # -- Main Window Layout
2842 panedwindow .vpane
-orient horizontal
2843 panedwindow .vpane.files
-orient vertical
2844 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2845 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2847 # -- Index File List
2849 frame .vpane.files.index
-height 100 -width 200
2850 label .vpane.files.index.title
-text [mc
"Staged Changes (Will Commit)"] \
2851 -background lightgreen
-foreground black
2852 text
$ui_index -background white
-foreground black \
2854 -width 20 -height 10 \
2856 -cursor $cursor_ptr \
2857 -xscrollcommand {.vpane.files.index.sx
set} \
2858 -yscrollcommand {.vpane.files.index.sy
set} \
2860 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2861 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2862 pack .vpane.files.index.title
-side top
-fill x
2863 pack .vpane.files.index.sx
-side bottom
-fill x
2864 pack .vpane.files.index.sy
-side right
-fill y
2865 pack
$ui_index -side left
-fill both
-expand 1
2867 # -- Working Directory File List
2869 frame .vpane.files.workdir
-height 100 -width 200
2870 label .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
2871 -background lightsalmon
-foreground black
2872 text
$ui_workdir -background white
-foreground black \
2874 -width 20 -height 10 \
2876 -cursor $cursor_ptr \
2877 -xscrollcommand {.vpane.files.workdir.sx
set} \
2878 -yscrollcommand {.vpane.files.workdir.sy
set} \
2880 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2881 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2882 pack .vpane.files.workdir.title
-side top
-fill x
2883 pack .vpane.files.workdir.sx
-side bottom
-fill x
2884 pack .vpane.files.workdir.sy
-side right
-fill y
2885 pack
$ui_workdir -side left
-fill both
-expand 1
2887 .vpane.files add .vpane.files.workdir
-sticky nsew
2888 .vpane.files add .vpane.files.index
-sticky nsew
2890 foreach i
[list
$ui_index $ui_workdir] {
2892 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2896 # -- Diff and Commit Area
2898 frame .vpane.lower
-height 300 -width 400
2899 frame .vpane.lower.commarea
2900 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2901 pack .vpane.lower.
diff -fill both
-expand 1
2902 pack .vpane.lower.commarea
-side bottom
-fill x
2903 .vpane add .vpane.lower
-sticky nsew
2905 # -- Commit Area Buttons
2907 frame .vpane.lower.commarea.buttons
2908 label .vpane.lower.commarea.buttons.l
-text {} \
2911 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2912 pack .vpane.lower.commarea.buttons
-side left
-fill y
2914 button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
2915 -command ui_do_rescan
2916 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2917 lappend disable_on_lock \
2918 {.vpane.lower.commarea.buttons.rescan conf
-state}
2920 button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
2922 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2923 lappend disable_on_lock \
2924 {.vpane.lower.commarea.buttons.incall conf
-state}
2926 if {![is_enabled nocommitmsg
]} {
2927 button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
2929 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2932 button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
2934 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2935 lappend disable_on_lock \
2936 {.vpane.lower.commarea.buttons.commit conf
-state}
2938 if {![is_enabled nocommit
]} {
2939 button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
2940 -command do_push_anywhere
2941 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2944 # -- Commit Message Buffer
2946 frame .vpane.lower.commarea.buffer
2947 frame .vpane.lower.commarea.buffer.header
2948 set ui_comm .vpane.lower.commarea.buffer.t
2949 set ui_coml .vpane.lower.commarea.buffer.header.l
2951 if {![is_enabled nocommit
]} {
2952 radiobutton .vpane.lower.commarea.buffer.header.new \
2953 -text [mc
"New Commit"] \
2954 -command do_select_commit_type \
2955 -variable selected_commit_type \
2957 lappend disable_on_lock \
2958 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2959 radiobutton .vpane.lower.commarea.buffer.header.amend \
2960 -text [mc
"Amend Last Commit"] \
2961 -command do_select_commit_type \
2962 -variable selected_commit_type \
2964 lappend disable_on_lock \
2965 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2971 proc trace_commit_type
{varname args
} {
2972 global ui_coml commit_type
2973 switch
-glob -- $commit_type {
2974 initial
{set txt
[mc
"Initial Commit Message:"]}
2975 amend
{set txt
[mc
"Amended Commit Message:"]}
2976 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
2977 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
2978 merge
{set txt
[mc
"Merge Commit Message:"]}
2979 * {set txt
[mc
"Commit Message:"]}
2981 $ui_coml conf
-text $txt
2983 trace add variable commit_type
write trace_commit_type
2984 pack
$ui_coml -side left
-fill x
2986 if {![is_enabled nocommit
]} {
2987 pack .vpane.lower.commarea.buffer.header.amend
-side right
2988 pack .vpane.lower.commarea.buffer.header.new
-side right
2991 text
$ui_comm -background white
-foreground black \
2995 -autoseparators true \
2997 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
2999 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
3000 scrollbar .vpane.lower.commarea.buffer.sby \
3001 -command [list
$ui_comm yview
]
3002 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
3003 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
3004 pack
$ui_comm -side left
-fill y
3005 pack .vpane.lower.commarea.buffer
-side left
-fill y
3007 # -- Commit Message Buffer Context Menu
3009 set ctxm .vpane.lower.commarea.buffer.ctxm
3010 menu
$ctxm -tearoff 0
3013 -command {tk_textCut
$ui_comm}
3016 -command {tk_textCopy
$ui_comm}
3019 -command {tk_textPaste
$ui_comm}
3021 -label [mc Delete
] \
3022 -command {catch
{$ui_comm delete sel.first sel.last
}}
3025 -label [mc
"Select All"] \
3026 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
3028 -label [mc
"Copy All"] \
3030 $ui_comm tag add sel
0.0 end
3031 tk_textCopy
$ui_comm
3032 $ui_comm tag remove sel
0.0 end
3036 -label [mc
"Sign Off"] \
3038 set ui_comm_ctxm
$ctxm
3042 proc trace_current_diff_path
{varname args
} {
3043 global current_diff_path diff_actions file_states
3044 if {$current_diff_path eq
{}} {
3050 set p
$current_diff_path
3051 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3053 set p
[escape_path
$p]
3057 .vpane.lower.
diff.header.status configure
-text $s
3058 .vpane.lower.
diff.header.
file configure
-text $f
3059 .vpane.lower.
diff.header.path configure
-text $p
3060 foreach w
$diff_actions {
3064 trace add variable current_diff_path
write trace_current_diff_path
3066 frame .vpane.lower.
diff.header
-background gold
3067 label .vpane.lower.
diff.header.status \
3070 -width $max_status_desc \
3073 label .vpane.lower.
diff.header.
file \
3078 label .vpane.lower.
diff.header.path \
3083 pack .vpane.lower.
diff.header.status
-side left
3084 pack .vpane.lower.
diff.header.
file -side left
3085 pack .vpane.lower.
diff.header.path
-fill x
3086 set ctxm .vpane.lower.
diff.header.ctxm
3087 menu
$ctxm -tearoff 0
3095 -- $current_diff_path
3097 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3098 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3102 frame .vpane.lower.
diff.body
3103 set ui_diff .vpane.lower.
diff.body.t
3104 text
$ui_diff -background white
-foreground black \
3106 -width 80 -height 15 -wrap none \
3108 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
3109 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
3111 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3112 -command [list
$ui_diff xview
]
3113 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3114 -command [list
$ui_diff yview
]
3115 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3116 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3117 pack
$ui_diff -side left
-fill both
-expand 1
3118 pack .vpane.lower.
diff.header
-side top
-fill x
3119 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3121 $ui_diff tag conf d_cr
-elide true
3122 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
3123 $ui_diff tag conf d_
+ -foreground {#00a000}
3124 $ui_diff tag conf d_-
-foreground red
3126 $ui_diff tag conf d_
++ -foreground {#00a000}
3127 $ui_diff tag conf d_--
-foreground red
3128 $ui_diff tag conf d_
+s \
3129 -foreground {#00a000} \
3130 -background {#e2effa}
3131 $ui_diff tag conf d_-s \
3133 -background {#e2effa}
3134 $ui_diff tag conf d_s
+ \
3135 -foreground {#00a000} \
3137 $ui_diff tag conf d_s- \
3141 $ui_diff tag conf d
<<<<<<< \
3142 -foreground orange \
3144 $ui_diff tag conf d
======= \
3145 -foreground orange \
3147 $ui_diff tag conf d
>>>>>>> \
3148 -foreground orange \
3151 $ui_diff tag raise sel
3153 # -- Diff Body Context Menu
3156 proc create_common_diff_popup
{ctxm
} {
3158 -label [mc Refresh
] \
3159 -command reshow_diff
3160 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3163 -command {tk_textCopy
$ui_diff}
3164 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3166 -label [mc
"Select All"] \
3167 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3168 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3170 -label [mc
"Copy All"] \
3172 $ui_diff tag add sel
0.0 end
3173 tk_textCopy
$ui_diff
3174 $ui_diff tag remove sel
0.0 end
3176 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3179 -label [mc
"Decrease Font Size"] \
3180 -command {incr_font_size font_diff
-1}
3181 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3183 -label [mc
"Increase Font Size"] \
3184 -command {incr_font_size font_diff
1}
3185 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3189 build_encoding_menu
$emenu [list force_diff_encoding
]
3191 -label [mc
"Encoding"] \
3193 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3195 $ctxm add
command -label [mc
"Options..."] \
3199 set ctxm .vpane.lower.
diff.body.ctxm
3200 menu
$ctxm -tearoff 0
3202 -label [mc
"Apply/Reverse Hunk"] \
3203 -command {apply_hunk
$cursorX $cursorY}
3204 set ui_diff_applyhunk
[$ctxm index last
]
3205 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3207 -label [mc
"Apply/Reverse Line"] \
3208 -command {apply_line
$cursorX $cursorY; do_rescan
}
3209 set ui_diff_applyline
[$ctxm index last
]
3210 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3213 -label [mc
"Show Less Context"] \
3214 -command show_less_context
3215 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3217 -label [mc
"Show More Context"] \
3218 -command show_more_context
3219 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3221 create_common_diff_popup
$ctxm
3223 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3224 menu
$ctxmmg -tearoff 0
3225 $ctxmmg add
command \
3226 -label [mc
"Run Merge Tool"] \
3227 -command {merge_resolve_tool
}
3228 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3229 $ctxmmg add separator
3230 $ctxmmg add
command \
3231 -label [mc
"Use Remote Version"] \
3232 -command {merge_resolve_one
3}
3233 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3234 $ctxmmg add
command \
3235 -label [mc
"Use Local Version"] \
3236 -command {merge_resolve_one
2}
3237 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3238 $ctxmmg add
command \
3239 -label [mc
"Revert To Base"] \
3240 -command {merge_resolve_one
1}
3241 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3242 $ctxmmg add separator
3243 $ctxmmg add
command \
3244 -label [mc
"Show Less Context"] \
3245 -command show_less_context
3246 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3247 $ctxmmg add
command \
3248 -label [mc
"Show More Context"] \
3249 -command show_more_context
3250 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3251 $ctxmmg add separator
3252 create_common_diff_popup
$ctxmmg
3254 set ctxmsm .vpane.lower.
diff.body.ctxmsm
3255 menu
$ctxmsm -tearoff 0
3256 $ctxmsm add
command \
3257 -label [mc
"Start git gui In The Submodule"] \
3258 -command {do_git_gui
}
3259 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3260 $ctxmsm add
command \
3261 -label [mc
"Visualize These Changes In The Submodule"] \
3262 -command {do_gitk
{} true
}
3263 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3264 $ctxmsm add
command \
3265 -label [mc
"Visualize This Commits History In The Submodule"] \
3266 -command {do_gitk
-- true
}
3267 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3268 $ctxmsm add
command \
3269 -label [mc
"Visualize All Branch History In The Submodule"] \
3270 -command {do_gitk
--all true
}
3271 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3272 $ctxmsm add separator
3273 create_common_diff_popup
$ctxmsm
3275 proc popup_diff_menu
{ctxm ctxmmg ctxmsm x y X Y
} {
3276 global current_diff_path file_states
3279 if {[info exists file_states
($current_diff_path)]} {
3280 set state
[lindex
$file_states($current_diff_path) 0]
3284 if {[string first
{U
} $state] >= 0} {
3285 tk_popup
$ctxmmg $X $Y
3286 } elseif
{$
::is_submodule_diff
} {
3287 tk_popup
$ctxmsm $X $Y
3289 if {$
::ui_index eq $
::current_diff_side
} {
3290 set l
[mc
"Unstage Hunk From Commit"]
3291 set t
[mc
"Unstage Line From Commit"]
3293 set l
[mc
"Stage Hunk For Commit"]
3294 set t
[mc
"Stage Line For Commit"]
3297 ||
$current_diff_path eq
{}
3301 ||
{T_
} eq
$state} {
3306 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3307 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3308 tk_popup
$ctxm $X $Y
3311 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg $ctxmsm %x
%y
%X
%Y
]
3315 set main_status
[::status_bar
::new .status
]
3316 pack .status
-anchor w
-side bottom
-fill x
3317 $main_status show
[mc
"Initializing..."]
3322 set gm
$repo_config(gui.geometry
)
3323 wm geometry .
[lindex
$gm 0]
3324 .vpane sash place
0 \
3326 [lindex
[.vpane sash coord
0] 1]
3327 .vpane.files sash place
0 \
3328 [lindex
[.vpane.files sash coord
0] 0] \
3335 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3336 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3337 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3338 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3339 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3340 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3341 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3342 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3343 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3344 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3345 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3346 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3347 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3348 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3349 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3350 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3351 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3352 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3354 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3355 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3356 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3357 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3358 bind $ui_diff <$M1B-Key-v> {break}
3359 bind $ui_diff <$M1B-Key-V> {break}
3360 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3361 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3362 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3363 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3364 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3365 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3366 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3367 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3368 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3369 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3370 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3371 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3372 bind $ui_diff <Button-1
> {focus
%W
}
3374 if {[is_enabled branch
]} {
3375 bind .
<$M1B-Key-n> branch_create
::dialog
3376 bind .
<$M1B-Key-N> branch_create
::dialog
3377 bind .
<$M1B-Key-o> branch_checkout
::dialog
3378 bind .
<$M1B-Key-O> branch_checkout
::dialog
3379 bind .
<$M1B-Key-m> merge
::dialog
3380 bind .
<$M1B-Key-M> merge
::dialog
3382 if {[is_enabled transport
]} {
3383 bind .
<$M1B-Key-p> do_push_anywhere
3384 bind .
<$M1B-Key-P> do_push_anywhere
3387 bind .
<Key-F5
> ui_do_rescan
3388 bind .
<$M1B-Key-r> ui_do_rescan
3389 bind .
<$M1B-Key-R> ui_do_rescan
3390 bind .
<$M1B-Key-s> do_signoff
3391 bind .
<$M1B-Key-S> do_signoff
3392 bind .
<$M1B-Key-t> do_add_selection
3393 bind .
<$M1B-Key-T> do_add_selection
3394 bind .
<$M1B-Key-i> do_add_all
3395 bind .
<$M1B-Key-I> do_add_all
3396 bind .
<$M1B-Key-minus> {show_less_context
;break}
3397 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3398 bind .
<$M1B-Key-equal> {show_more_context
;break}
3399 bind .
<$M1B-Key-plus> {show_more_context
;break}
3400 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3401 bind .
<$M1B-Key-Return> do_commit
3402 foreach i
[list
$ui_index $ui_workdir] {
3403 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3404 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3405 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3409 set file_lists
($ui_index) [list
]
3410 set file_lists
($ui_workdir) [list
]
3412 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
3413 focus
-force $ui_comm
3415 # -- Warn the user about environmental problems. Cygwin's Tcl
3416 # does *not* pass its env array onto any processes it spawns.
3417 # This means that git processes get none of our environment.
3422 set msg
[mc
"Possible environment issues exist.
3424 The following environment variables are probably
3425 going to be ignored by any Git subprocess run
3429 foreach name
[array names env
] {
3430 switch
-regexp -- $name {
3431 {^GIT_INDEX_FILE$
} -
3432 {^GIT_OBJECT_DIRECTORY$
} -
3433 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3435 {^GIT_EXTERNAL_DIFF$
} -
3439 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3440 append msg
" - $name\n"
3443 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3444 append msg
" - $name\n"
3446 set suggest_user
$name
3450 if {$ignored_env > 0} {
3452 This is due to a known issue with the
3453 Tcl binary distributed by Cygwin."]
3455 if {$suggest_user ne
{}} {
3458 A good replacement for %s
3459 is placing values for the user.name and
3460 user.email settings into your personal
3466 unset ignored_env msg suggest_user name
3469 # -- Only initialize complex UI if we are going to stay running.
3471 if {[is_enabled transport
]} {
3474 set n
[.mbar.remote index end
]
3475 populate_remotes_menu
3476 set n
[expr {[.mbar.remote index end
] - $n}]
3478 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3479 .mbar.remote insert
$n separator
3484 if {[winfo exists
$ui_comm]} {
3485 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3487 # -- If both our backup and message files exist use the
3488 # newer of the two files to initialize the buffer.
3490 if {$GITGUI_BCK_exists} {
3491 set m
[gitdir GITGUI_MSG
]
3492 if {[file isfile
$m]} {
3493 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3494 catch
{file delete
[gitdir GITGUI_MSG
]}
3496 $ui_comm delete
0.0 end
3498 $ui_comm edit modified false
3499 catch
{file delete
[gitdir GITGUI_BCK
]}
3500 set GITGUI_BCK_exists
0
3506 proc backup_commit_buffer
{} {
3507 global ui_comm GITGUI_BCK_exists
3509 set m
[$ui_comm edit modified
]
3510 if {$m ||
$GITGUI_BCK_exists} {
3511 set msg
[string trim
[$ui_comm get
0.0 end
]]
3512 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3515 if {$GITGUI_BCK_exists} {
3516 catch
{file delete
[gitdir GITGUI_BCK
]}
3517 set GITGUI_BCK_exists
0
3521 set fd
[open
[gitdir GITGUI_BCK
] w
]
3522 puts
-nonewline $fd $msg
3524 set GITGUI_BCK_exists
1
3528 $ui_comm edit modified false
3531 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3534 backup_commit_buffer
3536 # -- If the user has aspell available we can drive it
3537 # in pipe mode to spellcheck the commit message.
3539 set spell_cmd
[list |
]
3540 set spell_dict
[get_config gui.spellingdictionary
]
3541 lappend spell_cmd aspell
3542 if {$spell_dict ne
{}} {
3543 lappend spell_cmd
--master=$spell_dict
3545 lappend spell_cmd
--mode=none
3546 lappend spell_cmd
--encoding=utf-8
3547 lappend spell_cmd pipe
3548 if {$spell_dict eq
{none
}
3549 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3550 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3552 set ui_comm_spell
[spellcheck
::init \
3558 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3561 lock_index begin-read
3562 if {![winfo ismapped .
]} {
3566 if {[is_enabled initialamend
]} {
3572 if {[is_enabled nocommitmsg
]} {
3573 $ui_comm configure
-state disabled
-background gray
3576 if {[is_enabled multicommit
]} {
3579 if {[is_enabled retcode
]} {
3580 bind .
<Destroy
> {+terminate_me
%W
}
3582 if {$picked && [is_config_true gui.autoexplore
]} {