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]
748 # TODO: this option should be added to the git-config documentation
749 set default_config(gui.maxfilesdisplayed) 5000
751 {fontui font_ui {mc "Main Font
"}}
752 {fontdiff font_diff {mc "Diff
/Console Font
"}}
755 ######################################################################
759 set _git [_which git]
761 catch {wm withdraw .}
765 -title [mc "git-gui
: fatal error
"] \
766 -message [mc "Cannot
find git
in PATH.
"]
770 ######################################################################
774 if {[catch {set _git_version [git --version]} err]} {
775 catch {wm withdraw .}
779 -title [mc "git-gui
: fatal error
"] \
780 -message "Cannot determine Git version
:
784 [appname
] requires Git
1.5.0 or later.
"
787 if {![regsub {^git version } $_git_version {} _git_version]} {
788 catch {wm withdraw .}
792 -title [mc "git-gui
: fatal error
"] \
793 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
797 set _real_git_version $_git_version
798 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
799 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
800 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
801 regsub {\.GIT$} $_git_version {} _git_version
802 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
804 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
805 catch {wm withdraw .}
810 -title "[appname
]: warning
" \
811 -message [mc "Git version cannot be determined.
813 %s claims it is version
'%s'.
815 %s requires
at least Git
1.5.0 or later.
817 Assume
'%s' is version
1.5.0?
818 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
819 set _git_version 1.5.0
824 unset _real_git_version
826 proc git-version {args} {
829 switch [llength $args] {
835 set op [lindex $args 0]
836 set vr [lindex $args 1]
837 set cm [package vcompare $_git_version $vr]
838 return [expr $cm $op 0]
842 set type [lindex $args 0]
843 set name [lindex $args 1]
844 set parm [lindex $args 2]
845 set body [lindex $args 3]
847 if {($type ne {proc} && $type ne {method})} {
848 error "Invalid arguments to git-version
"
850 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
851 error "Last arm of
$type $name must be default
"
854 foreach {op vr cb} [lrange $body 0 end-2] {
855 if {[git-version $op $vr]} {
856 return [uplevel [list $type $name $parm $cb]]
860 return [uplevel [list $type $name $parm [lindex $body end]]]
864 error "git-version
>= x
"
870 if {[git-version < 1.5]} {
871 catch {wm withdraw .}
875 -title [mc "git-gui
: fatal error
"] \
876 -message "[appname
] requires Git
1.5.0 or later.
878 You are using
[git-version
]:
884 ######################################################################
886 ## configure our library
888 set idx [file join $oguilib tclIndex]
889 if {[catch {set fd [open $idx r]} err]} {
890 catch {wm withdraw .}
894 -title [mc "git-gui
: fatal error
"] \
898 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
900 while {[gets $fd n] >= 0} {
901 if {$n ne {} && ![string match #* $n]} {
913 if {[lsearch -exact $loaded $p] >= 0} continue
914 source [file join $oguilib $p]
919 set auto_path [concat [list $oguilib] $auto_path]
921 unset -nocomplain idx fd
923 ######################################################################
925 ## config file parsing
927 git-version proc _parse_config {arr_name args} {
934 [list git_read config] \
936 [list --null --list]]
937 fconfigure $fd_rc -translation binary
938 set buf [read $fd_rc]
941 foreach line [split $buf "\
0"] {
942 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
943 if {[is_many_config $name]} {
944 lappend arr($name) $value
946 set arr($name) $value
955 set fd_rc [eval [list git_read config --list] $args]
956 while {[gets $fd_rc line] >= 0} {
957 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
958 if {[is_many_config $name]} {
959 lappend arr($name) $value
961 set arr($name) $value
970 proc load_config {include_global} {
971 global repo_config global_config system_config default_config
973 if {$include_global} {
974 _parse_config system_config --system
975 _parse_config global_config --global
977 _parse_config repo_config
979 foreach name [array names default_config] {
980 if {[catch {set v $system_config($name)}]} {
981 set system_config($name) $default_config($name)
984 foreach name [array names system_config] {
985 if {[catch {set v $global_config($name)}]} {
986 set global_config($name) $system_config($name)
988 if {[catch {set v $repo_config($name)}]} {
989 set repo_config($name) $system_config($name)
994 ######################################################################
996 ## feature option selection
998 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1003 if {$subcommand eq {gui.sh}} {
1006 if {$subcommand eq {gui} && [llength $argv] > 0} {
1007 set subcommand [lindex $argv 0]
1008 set argv [lrange $argv 1 end]
1011 enable_option multicommit
1012 enable_option branch
1013 enable_option transport
1016 switch -- $subcommand {
1021 disable_option multicommit
1022 disable_option branch
1023 disable_option transport
1026 enable_option singlecommit
1027 enable_option retcode
1029 disable_option multicommit
1030 disable_option branch
1031 disable_option transport
1033 while {[llength $argv] > 0} {
1034 set a [lindex $argv 0]
1037 enable_option initialamend
1040 enable_option nocommit
1041 enable_option nocommitmsg
1044 disable_option nocommitmsg
1051 set argv [lrange $argv 1 end]
1056 ######################################################################
1058 ## execution environment
1060 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1062 # Suggest our implementation of askpass, if none is set
1063 if {![info exists env(SSH_ASKPASS)]} {
1064 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1067 ######################################################################
1073 set _gitdir $env(GIT_DIR)
1077 # beware that from the .git dir this sets _gitdir to .
1078 # and _prefix to the empty string
1079 set _gitdir [git rev-parse --git-dir]
1080 set _prefix [git rev-parse --show-prefix]
1084 choose_repository::pick
1088 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1089 # run from the .git dir itself) lest the routines to find the worktree
1091 if {$_gitdir eq ".
"} {
1095 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1096 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1098 if {![file isdirectory $_gitdir]} {
1099 catch {wm withdraw .}
1100 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1103 if {$_prefix ne {}} {
1104 regsub -all {[^/]+/} $_prefix ../ cdup
1105 if {[catch {cd $cdup} err]} {
1106 catch {wm withdraw .}
1107 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1111 } elseif {![is_enabled bare]} {
1112 if {[lindex [file split $_gitdir] end] ne {.git}} {
1113 catch {wm withdraw .}
1114 error_popup [strcat [mc "Cannot use funny .git directory
:"] "\n\n$_gitdir"]
1117 if {[catch {cd [file dirname $_gitdir]} err]} {
1118 catch {wm withdraw .}
1119 error_popup [strcat [mc "No working directory
"] " [file dirname $_gitdir]:\n\n$err"]
1123 set _reponame [file split [file normalize $_gitdir]]
1124 if {[lindex $_reponame end] eq {.git}} {
1125 set _reponame [lindex $_reponame end-1]
1127 set _reponame [lindex $_reponame end]
1130 ######################################################################
1134 set current_diff_path {}
1135 set current_diff_side {}
1136 set diff_actions [list]
1140 set MERGE_HEAD [list]
1143 set current_branch {}
1145 set current_diff_path {}
1147 set is_submodule_diff 0
1148 set is_conflict_diff 0
1149 set selected_commit_type new
1150 set diff_empty_count 0
1152 set nullid "0000000000000000000000000000000000000000"
1153 set nullid2 "0000000000000000000000000000000000000001"
1155 ######################################################################
1163 set disable_on_lock [list]
1164 set index_lock_type none
1166 proc lock_index {type} {
1167 global index_lock_type disable_on_lock
1169 if {$index_lock_type eq {none}} {
1170 set index_lock_type $type
1171 foreach w $disable_on_lock {
1172 uplevel #0 $w disabled
1175 } elseif {$index_lock_type eq "begin-
$type"} {
1176 set index_lock_type $type
1182 proc unlock_index {} {
1183 global index_lock_type disable_on_lock
1185 set index_lock_type none
1186 foreach w $disable_on_lock {
1187 uplevel #0 $w normal
1191 ######################################################################
1195 proc repository_state {ctvar hdvar mhvar} {
1196 global current_branch
1197 upvar $ctvar ct $hdvar hd $mhvar mh
1202 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1208 set merge_head [gitdir MERGE_HEAD]
1209 if {[file exists $merge_head]} {
1211 set fd_mh [open $merge_head r]
1212 while {[gets $fd_mh line] >= 0} {
1223 global PARENT empty_tree
1225 set p [lindex $PARENT 0]
1229 if {$empty_tree eq {}} {
1230 set empty_tree [git mktree << {}]
1235 proc force_amend {} {
1236 global selected_commit_type
1237 global HEAD PARENT MERGE_HEAD commit_type
1239 repository_state newType newHEAD newMERGE_HEAD
1242 set MERGE_HEAD $newMERGE_HEAD
1243 set commit_type $newType
1245 set selected_commit_type amend
1246 do_select_commit_type
1249 proc rescan {after {honor_trustmtime 1}} {
1250 global HEAD PARENT MERGE_HEAD commit_type
1251 global ui_index ui_workdir ui_comm
1252 global rescan_active file_states
1255 if {$rescan_active > 0 || ![lock_index read]} return
1257 repository_state newType newHEAD newMERGE_HEAD
1258 if {[string match amend* $commit_type]
1259 && $newType eq {normal}
1260 && $newHEAD eq $HEAD} {
1264 set MERGE_HEAD $newMERGE_HEAD
1265 set commit_type $newType
1268 array unset file_states
1270 if {!$::GITGUI_BCK_exists &&
1271 (![$ui_comm edit modified]
1272 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1273 if {[string match amend* $commit_type]} {
1274 } elseif {[load_message GITGUI_MSG]} {
1275 } elseif {[run_prepare_commit_msg_hook]} {
1276 } elseif {[load_message MERGE_MSG]} {
1277 } elseif {[load_message SQUASH_MSG]} {
1280 $ui_comm edit modified false
1283 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1284 rescan_stage2 {} $after
1287 ui_status [mc "Refreshing
file status...
"]
1288 set fd_rf [git_read update-index \
1294 fconfigure $fd_rf -blocking 0 -translation binary
1295 fileevent $fd_rf readable \
1296 [list rescan_stage2 $fd_rf $after]
1301 set is_git_info_exclude {}
1302 proc have_info_exclude {} {
1303 global is_git_info_exclude
1305 if {$is_git_info_exclude eq {}} {
1306 if {[catch {exec test -f [gitdir info exclude]}]} {
1307 set is_git_info_exclude 0
1309 set is_git_info_exclude 1
1312 return $is_git_info_exclude
1315 proc have_info_exclude {} {
1316 return [file readable [gitdir info exclude]]
1320 proc rescan_stage2 {fd after} {
1321 global rescan_active buf_rdi buf_rdf buf_rlo
1325 if {![eof $fd]} return
1329 set ls_others [list --exclude-per-directory=.gitignore]
1330 if {[have_info_exclude]} {
1331 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1333 set user_exclude [get_config core.excludesfile]
1334 if {$user_exclude ne {} && [file readable $user_exclude]} {
1335 lappend ls_others "--exclude-from=$user_exclude"
1343 ui_status [mc "Scanning
for modified files ...
"]
1344 set fd_di [git_read diff-index --cached -z [PARENT]]
1345 set fd_df [git_read diff-files -z]
1346 set fd_lo [eval git_read ls-files --others -z $ls_others]
1348 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1349 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1350 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1351 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1352 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1353 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1356 proc load_message {file} {
1359 set f [gitdir $file]
1360 if {[file isfile $f]} {
1361 if {[catch {set fd [open $f r]}]} {
1364 fconfigure $fd -eofchar {}
1365 set content [string trim [read $fd]]
1367 regsub -all -line {[ \r\t]+$} $content {} content
1368 $ui_comm delete 0.0 end
1369 $ui_comm insert end $content
1375 proc run_prepare_commit_msg_hook {} {
1378 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1379 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1380 # empty file but existant file.
1382 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1384 if {[file isfile [gitdir MERGE_MSG]]} {
1385 set pcm_source "merge
"
1386 set fd_mm [open [gitdir MERGE_MSG] r]
1387 puts -nonewline $fd_pcm [read $fd_mm]
1389 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1390 set pcm_source "squash
"
1391 set fd_sm [open [gitdir SQUASH_MSG] r]
1392 puts -nonewline $fd_pcm [read $fd_sm]
1400 set fd_ph [githook_read prepare-commit-msg \
1401 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1403 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1407 ui_status [mc "Calling prepare-commit-msg hook...
"]
1410 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1411 fileevent $fd_ph readable \
1412 [list prepare_commit_msg_hook_wait $fd_ph]
1417 proc prepare_commit_msg_hook_wait {fd_ph} {
1420 append pch_error [read $fd_ph]
1421 fconfigure $fd_ph -blocking 1
1423 if {[catch {close $fd_ph}]} {
1424 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1425 hook_failed_popup prepare-commit-msg $pch_error
1426 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1429 load_message PREPARE_COMMIT_MSG
1432 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1435 fconfigure $fd_ph -blocking 0
1436 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1439 proc read_diff_index {fd after} {
1442 append buf_rdi [read $fd]
1444 set n [string length $buf_rdi]
1446 set z1 [string first "\
0" $buf_rdi $c]
1447 if {$z1 == -1} break
1449 set z2 [string first "\
0" $buf_rdi $z1]
1450 if {$z2 == -1} break
1453 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1454 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1456 [encoding convertfrom $p] \
1458 [list [lindex $i 0] [lindex $i 2]] \
1464 set buf_rdi [string range $buf_rdi $c end]
1469 rescan_done $fd buf_rdi $after
1472 proc read_diff_files {fd after} {
1475 append buf_rdf [read $fd]
1477 set n [string length $buf_rdf]
1479 set z1 [string first "\
0" $buf_rdf $c]
1480 if {$z1 == -1} break
1482 set z2 [string first "\
0" $buf_rdf $z1]
1483 if {$z2 == -1} break
1486 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1487 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1489 [encoding convertfrom $p] \
1492 [list [lindex $i 0] [lindex $i 2]]
1497 set buf_rdf [string range $buf_rdf $c end]
1502 rescan_done $fd buf_rdf $after
1505 proc read_ls_others {fd after} {
1508 append buf_rlo [read $fd]
1509 set pck [split $buf_rlo "\
0"]
1510 set buf_rlo [lindex $pck end]
1511 foreach p [lrange $pck 0 end-1] {
1512 set p [encoding convertfrom $p]
1513 if {[string index $p end] eq {/}} {
1514 set p [string range $p 0 end-1]
1518 rescan_done $fd buf_rlo $after
1521 proc rescan_done {fd buf after} {
1522 global rescan_active current_diff_path
1523 global file_states repo_config
1526 if {![eof $fd]} return
1529 if {[incr rescan_active -1] > 0} return
1534 if {$current_diff_path ne {}} { reshow_diff $after }
1535 if {$current_diff_path eq {}} { select_first_diff $after }
1538 proc prune_selection {} {
1539 global file_states selected_paths
1541 foreach path [array names selected_paths] {
1542 if {[catch {set still_here $file_states($path)}]} {
1543 unset selected_paths($path)
1548 ######################################################################
1552 proc mapicon {w state path} {
1555 if {[catch {set r $all_icons($state$w)}]} {
1556 puts "error
: no icon
for $w state
={$state} $path"
1562 proc mapdesc {state path} {
1565 if {[catch {set r $all_descs($state)}]} {
1566 puts "error
: no desc
for state
={$state} $path"
1572 proc ui_status {msg} {
1574 if {[info exists main_status]} {
1575 $main_status show $msg
1579 proc ui_ready {{test {}}} {
1581 if {[info exists main_status]} {
1582 $main_status show [mc "Ready.
"] $test
1586 proc escape_path {path} {
1587 regsub -all {\\} $path "\\\\" path
1588 regsub -all "\n" $path "\\n
" path
1592 proc short_path {path} {
1593 return [escape_path [lindex [file split $path] end]]
1597 set null_sha1 [string repeat 0 40]
1599 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1600 global file_states next_icon_id null_sha1
1602 set s0 [string index $new_state 0]
1603 set s1 [string index $new_state 1]
1605 if {[catch {set info $file_states($path)}]} {
1607 set icon n[incr next_icon_id]
1609 set state [lindex $info 0]
1610 set icon [lindex $info 1]
1611 if {$head_info eq {}} {set head_info [lindex $info 2]}
1612 if {$index_info eq {}} {set index_info [lindex $info 3]}
1615 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1616 elseif {$s0 eq {_}} {set s0 _}
1618 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1619 elseif {$s1 eq {_}} {set s1 _}
1621 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1622 set head_info [list 0 $null_sha1]
1623 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1624 && $head_info eq {}} {
1625 set head_info $index_info
1626 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1627 set index_info $head_info
1631 set file_states($path) [list $s0$s1 $icon \
1632 $head_info $index_info \
1637 proc display_file_helper {w path icon_name old_m new_m} {
1640 if {$new_m eq {_}} {
1641 set lno [lsearch -sorted -exact $file_lists($w) $path]
1643 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1645 $w conf -state normal
1646 $w delete $lno.0 [expr {$lno + 1}].0
1647 $w conf -state disabled
1649 } elseif {$old_m eq {_} && $new_m ne {_}} {
1650 lappend file_lists($w) $path
1651 set file_lists($w) [lsort -unique $file_lists($w)]
1652 set lno [lsearch -sorted -exact $file_lists($w) $path]
1654 $w conf -state normal
1655 $w image create $lno.0 \
1656 -align center -padx 5 -pady 1 \
1658 -image [mapicon $w $new_m $path]
1659 $w insert $lno.1 "[escape_path
$path]\n"
1660 $w conf -state disabled
1661 } elseif {$old_m ne $new_m} {
1662 $w conf -state normal
1663 $w image conf $icon_name -image [mapicon $w $new_m $path]
1664 $w conf -state disabled
1668 proc display_file {path state} {
1669 global file_states selected_paths
1670 global ui_index ui_workdir
1672 set old_m [merge_state $path $state]
1673 set s $file_states($path)
1674 set new_m [lindex $s 0]
1675 set icon_name [lindex $s 1]
1677 set o [string index $old_m 0]
1678 set n [string index $new_m 0]
1685 display_file_helper $ui_index $path $icon_name $o $n
1687 if {[string index $old_m 0] eq {U}} {
1690 set o [string index $old_m 1]
1692 if {[string index $new_m 0] eq {U}} {
1695 set n [string index $new_m 1]
1697 display_file_helper $ui_workdir $path $icon_name $o $n
1699 if {$new_m eq {__}} {
1700 unset file_states($path)
1701 catch {unset selected_paths($path)}
1705 proc display_all_files_helper {w path icon_name m} {
1708 lappend file_lists($w) $path
1709 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1710 $w image create end \
1711 -align center -padx 5 -pady 1 \
1713 -image [mapicon $w $m $path]
1714 $w insert end "[escape_path
$path]\n"
1718 proc display_all_files {} {
1719 global ui_index ui_workdir
1720 global file_states file_lists
1722 global files_warning
1724 $ui_index conf -state normal
1725 $ui_workdir conf -state normal
1727 $ui_index delete 0.0 end
1728 $ui_workdir delete 0.0 end
1731 set file_lists($ui_index) [list]
1732 set file_lists($ui_workdir) [list]
1734 set to_display [lsort [array names file_states]]
1735 set display_limit [get_config gui.maxfilesdisplayed]
1736 if {[llength $to_display] > $display_limit} {
1737 if {!$files_warning} {
1738 # do not repeatedly warn:
1740 info_popup [mc "Displaying only
%s of
%s files.
" \
1741 $display_limit [llength $to_display]]
1743 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1745 foreach path $to_display {
1746 set s $file_states($path)
1748 set icon_name [lindex $s 1]
1750 set s [string index $m 0]
1751 if {$s ne {U} && $s ne {_}} {
1752 display_all_files_helper $ui_index $path \
1756 if {[string index $m 0] eq {U}} {
1759 set s [string index $m 1]
1762 display_all_files_helper $ui_workdir $path \
1767 $ui_index conf -state disabled
1768 $ui_workdir conf -state disabled
1771 ######################################################################
1776 #define mask_width 14
1777 #define mask_height 15
1778 static unsigned char mask_bits[] = {
1779 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1780 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1781 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1784 image create bitmap file_plain -background white -foreground black -data {
1785 #define plain_width 14
1786 #define plain_height 15
1787 static unsigned char plain_bits[] = {
1788 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1789 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1790 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1791 } -maskdata $filemask
1793 image create bitmap file_mod -background white -foreground blue -data {
1794 #define mod_width 14
1795 #define mod_height 15
1796 static unsigned char mod_bits[] = {
1797 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1798 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1799 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1800 } -maskdata $filemask
1802 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1803 #define file_fulltick_width 14
1804 #define file_fulltick_height 15
1805 static unsigned char file_fulltick_bits
[] = {
1806 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1807 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1808 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1809 } -maskdata $filemask
1811 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1812 #define parttick_width 14
1813 #define parttick_height 15
1814 static unsigned char parttick_bits
[] = {
1815 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1816 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1817 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1818 } -maskdata $filemask
1820 image create bitmap file_question
-background white
-foreground black
-data {
1821 #define file_question_width 14
1822 #define file_question_height 15
1823 static unsigned char file_question_bits
[] = {
1824 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1825 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1826 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1827 } -maskdata $filemask
1829 image create bitmap file_removed
-background white
-foreground red
-data {
1830 #define file_removed_width 14
1831 #define file_removed_height 15
1832 static unsigned char file_removed_bits
[] = {
1833 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1834 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1835 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1836 } -maskdata $filemask
1838 image create bitmap file_merge
-background white
-foreground blue
-data {
1839 #define file_merge_width 14
1840 #define file_merge_height 15
1841 static unsigned char file_merge_bits
[] = {
1842 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1843 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1844 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1845 } -maskdata $filemask
1847 image create bitmap file_statechange
-background white
-foreground green
-data {
1848 #define file_merge_width 14
1849 #define file_merge_height 15
1850 static unsigned char file_statechange_bits
[] = {
1851 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1852 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1853 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1854 } -maskdata $filemask
1856 set ui_index .vpane.files.index.list
1857 set ui_workdir .vpane.files.workdir.list
1859 set all_icons
(_
$ui_index) file_plain
1860 set all_icons
(A
$ui_index) file_fulltick
1861 set all_icons
(M
$ui_index) file_fulltick
1862 set all_icons
(D
$ui_index) file_removed
1863 set all_icons
(U
$ui_index) file_merge
1864 set all_icons
(T
$ui_index) file_statechange
1866 set all_icons
(_
$ui_workdir) file_plain
1867 set all_icons
(M
$ui_workdir) file_mod
1868 set all_icons
(D
$ui_workdir) file_question
1869 set all_icons
(U
$ui_workdir) file_merge
1870 set all_icons
(O
$ui_workdir) file_plain
1871 set all_icons
(T
$ui_workdir) file_statechange
1873 set max_status_desc
0
1875 {__
{mc
"Unmodified"}}
1877 {_M
{mc
"Modified, not staged"}}
1878 {M_
{mc
"Staged for commit"}}
1879 {MM
{mc
"Portions staged for commit"}}
1880 {MD
{mc
"Staged for commit, missing"}}
1882 {_T
{mc
"File type changed, not staged"}}
1883 {T_
{mc
"File type changed, staged"}}
1885 {_O
{mc
"Untracked, not staged"}}
1886 {A_
{mc
"Staged for commit"}}
1887 {AM
{mc
"Portions staged for commit"}}
1888 {AD
{mc
"Staged for commit, missing"}}
1891 {D_
{mc
"Staged for removal"}}
1892 {DO
{mc
"Staged for removal, still present"}}
1894 {_U
{mc
"Requires merge resolution"}}
1895 {U_
{mc
"Requires merge resolution"}}
1896 {UU
{mc
"Requires merge resolution"}}
1897 {UM
{mc
"Requires merge resolution"}}
1898 {UD
{mc
"Requires merge resolution"}}
1899 {UT
{mc
"Requires merge resolution"}}
1901 set text
[eval [lindex
$i 1]]
1902 if {$max_status_desc < [string length
$text]} {
1903 set max_status_desc
[string length
$text]
1905 set all_descs
([lindex
$i 0]) $text
1909 ######################################################################
1913 proc scrollbar2many
{list mode args
} {
1914 foreach w
$list {eval $w $mode $args}
1917 proc many2scrollbar
{list mode sb top bottom
} {
1918 $sb set $top $bottom
1919 foreach w
$list {$w $mode moveto
$top}
1922 proc incr_font_size
{font
{amt
1}} {
1923 set sz
[font configure
$font -size]
1925 font configure
$font -size $sz
1926 font configure
${font}bold
-size $sz
1927 font configure
${font}italic
-size $sz
1930 ######################################################################
1934 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1936 proc do_gitk
{revs
} {
1937 # -- Always start gitk through whatever we were loaded with. This
1938 # lets us bypass using shell process on Windows systems.
1940 set exe
[_which gitk
-script]
1941 set cmd
[list
[info nameofexecutable
] $exe]
1943 error_popup
[mc
"Couldn't find gitk in PATH"]
1947 if {[info exists env
(GIT_DIR
)]} {
1948 set old_GIT_DIR
$env(GIT_DIR
)
1954 cd [file dirname [gitdir
]]
1955 set env
(GIT_DIR
) [file tail [gitdir
]]
1957 eval exec $cmd $revs "--" "--" &
1959 if {$old_GIT_DIR eq
{}} {
1962 set env
(GIT_DIR
) $old_GIT_DIR
1966 ui_status $
::starting_gitk_msg
1968 ui_ready
$starting_gitk_msg
1973 proc do_explore
{} {
1975 if {[is_Cygwin
] ||
[is_Windows
]} {
1976 set explorer
"explorer.exe"
1977 } elseif
{[is_MacOSX
]} {
1980 # freedesktop.org-conforming system is our best shot
1981 set explorer
"xdg-open"
1983 eval exec $explorer [list
[file nativename
[file dirname [gitdir
]]]] &
1989 proc terminate_me
{win
} {
1991 if {$win ne
{.
}} return
1995 proc do_quit
{{rc
{1}}} {
1996 global ui_comm is_quitting repo_config commit_type
1997 global GITGUI_BCK_exists GITGUI_BCK_i
1998 global ui_comm_spell
2001 if {$is_quitting} return
2004 if {[winfo exists
$ui_comm]} {
2005 # -- Stash our current commit buffer.
2007 set save
[gitdir GITGUI_MSG
]
2008 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2009 file rename
-force [gitdir GITGUI_BCK
] $save
2010 set GITGUI_BCK_exists
0
2012 set msg
[string trim
[$ui_comm get
0.0 end
]]
2013 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2014 if {(![string match amend
* $commit_type]
2015 ||
[$ui_comm edit modified
])
2018 set fd
[open
$save w
]
2019 puts
-nonewline $fd $msg
2023 catch
{file delete
$save}
2027 # -- Cancel our spellchecker if its running.
2029 if {[info exists ui_comm_spell
]} {
2033 # -- Remove our editor backup, its not needed.
2035 after cancel
$GITGUI_BCK_i
2036 if {$GITGUI_BCK_exists} {
2037 catch
{file delete
[gitdir GITGUI_BCK
]}
2040 # -- Stash our current window geometry into this repository.
2042 set cfg_wmstate
[wm state .
]
2043 if {[catch
{set rc_wmstate
$repo_config(gui.wmstate
)}]} {
2046 if {$cfg_wmstate ne
$rc_wmstate} {
2047 catch
{git config gui.wmstate
$cfg_wmstate}
2049 if {$cfg_wmstate eq
{zoomed
}} {
2050 # on Windows wm geometry will lie about window
2051 # position (but not size) when window is zoomed
2052 # restore the window before querying wm geometry
2055 set cfg_geometry
[list
]
2056 lappend cfg_geometry
[wm geometry .
]
2057 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2058 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2059 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2062 if {$cfg_geometry ne
$rc_geometry} {
2063 catch
{git config gui.geometry
$cfg_geometry}
2069 # Briefly enable send again, working around Tk bug
2070 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2071 tk appname
[appname
]
2080 proc ui_do_rescan
{} {
2081 rescan
{force_first_diff ui_ready
}
2088 proc next_diff
{{after
{}}} {
2089 global next_diff_p next_diff_w next_diff_i
2090 show_diff
$next_diff_p $next_diff_w {} {} $after
2093 proc find_anchor_pos
{lst name
} {
2094 set lid
[lsearch
-sorted -exact $lst $name]
2098 foreach lname
$lst {
2099 if {$lname >= $name} break
2107 proc find_file_from
{flist idx delta path mmask
} {
2110 set len
[llength
$flist]
2111 while {$idx >= 0 && $idx < $len} {
2112 set name
[lindex
$flist $idx]
2114 if {$name ne
$path && [info exists file_states
($name)]} {
2115 set state
[lindex
$file_states($name) 0]
2117 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2128 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2129 global next_diff_p next_diff_w next_diff_i
2130 global file_lists ui_index ui_workdir
2132 set flist
$file_lists($w)
2134 set lno
[find_anchor_pos
$flist $path]
2139 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2140 if {$w eq
$ui_index} {
2143 set mmask
"$mmask\$"
2147 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2150 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2155 set next_diff_p
[lindex
$flist $idx]
2156 set next_diff_i
[expr {$idx+1}]
2163 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2164 global current_diff_path
2166 if {$path ne
$current_diff_path} {
2168 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2171 return {reshow_diff
;}
2175 proc select_first_diff
{after
} {
2178 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2179 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2186 proc force_first_diff
{after
} {
2187 global ui_workdir current_diff_path file_states
2189 if {[info exists file_states
($current_diff_path)]} {
2190 set state
[lindex
$file_states($current_diff_path) 0]
2196 if {[string first
{U
} $state] >= 0} {
2197 # Already a conflict, do nothing
2198 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2200 } elseif
{[string index
$state 1] ne
{O
}} {
2201 # Already a diff & no conflicts, do nothing
2202 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2213 proc toggle_or_diff
{w x y
} {
2214 global file_states file_lists current_diff_path ui_index ui_workdir
2215 global last_clicked selected_paths
2217 set pos
[split [$w index @
$x,$y] .
]
2218 set lno
[lindex
$pos 0]
2219 set col [lindex
$pos 1]
2220 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2226 set last_clicked
[list
$w $lno]
2227 array
unset selected_paths
2228 $ui_index tag remove in_sel
0.0 end
2229 $ui_workdir tag remove in_sel
0.0 end
2231 # Determine the state of the file
2232 if {[info exists file_states
($path)]} {
2233 set state
[lindex
$file_states($path) 0]
2238 # Restage the file, or simply show the diff
2239 if {$col == 0 && $y > 1} {
2240 # Conflicts need special handling
2241 if {[string first
{U
} $state] >= 0} {
2242 # $w must always be $ui_workdir, but...
2243 if {$w ne
$ui_workdir} { set lno
{} }
2244 merge_stage_workdir
$path $lno
2248 if {[string index
$state 1] eq
{O
}} {
2254 set after
[next_diff_after_action
$w $path $lno $mmask]
2256 if {$w eq
$ui_index} {
2258 "Unstaging [short_path $path] from commit" \
2260 [concat
$after [list ui_ready
]]
2261 } elseif
{$w eq
$ui_workdir} {
2263 "Adding [short_path $path]" \
2265 [concat
$after [list ui_ready
]]
2268 show_diff
$path $w $lno
2272 proc add_one_to_selection
{w x y
} {
2273 global file_lists last_clicked selected_paths
2275 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2276 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2282 if {$last_clicked ne
{}
2283 && [lindex
$last_clicked 0] ne
$w} {
2284 array
unset selected_paths
2285 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2288 set last_clicked
[list
$w $lno]
2289 if {[catch
{set in_sel
$selected_paths($path)}]} {
2293 unset selected_paths
($path)
2294 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2296 set selected_paths
($path) 1
2297 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2301 proc add_range_to_selection
{w x y
} {
2302 global file_lists last_clicked selected_paths
2304 if {[lindex
$last_clicked 0] ne
$w} {
2305 toggle_or_diff
$w $x $y
2309 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2310 set lc
[lindex
$last_clicked 1]
2319 foreach path
[lrange
$file_lists($w) \
2320 [expr {$begin - 1}] \
2321 [expr {$end - 1}]] {
2322 set selected_paths
($path) 1
2324 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2327 proc show_more_context
{} {
2329 if {$repo_config(gui.diffcontext
) < 99} {
2330 incr repo_config
(gui.diffcontext
)
2335 proc show_less_context
{} {
2337 if {$repo_config(gui.diffcontext
) > 1} {
2338 incr repo_config
(gui.diffcontext
) -1
2343 ######################################################################
2353 menu .mbar
-tearoff 0
2355 # -- Apple Menu (Mac OS X only)
2357 .mbar add cascade
-label Apple
-menu .mbar.apple
2360 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2361 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2362 if {[is_enabled branch
]} {
2363 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2365 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2366 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2368 if {[is_enabled transport
]} {
2369 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2370 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2372 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2373 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2376 # -- Repository Menu
2378 menu .mbar.repository
2380 .mbar.repository add
command \
2381 -label [mc
"Explore Working Copy"] \
2382 -command {do_explore
}
2383 .mbar.repository add separator
2385 .mbar.repository add
command \
2386 -label [mc
"Browse Current Branch's Files"] \
2387 -command {browser
::new
$current_branch}
2388 set ui_browse_current
[.mbar.repository index last
]
2389 .mbar.repository add
command \
2390 -label [mc
"Browse Branch Files..."] \
2391 -command browser_open
::dialog
2392 .mbar.repository add separator
2394 .mbar.repository add
command \
2395 -label [mc
"Visualize Current Branch's History"] \
2396 -command {do_gitk
$current_branch}
2397 set ui_visualize_current
[.mbar.repository index last
]
2398 .mbar.repository add
command \
2399 -label [mc
"Visualize All Branch History"] \
2400 -command {do_gitk
--all}
2401 .mbar.repository add separator
2403 proc current_branch_write
{args
} {
2404 global current_branch
2405 .mbar.repository entryconf $
::ui_browse_current \
2406 -label [mc
"Browse %s's Files" $current_branch]
2407 .mbar.repository entryconf $
::ui_visualize_current \
2408 -label [mc
"Visualize %s's History" $current_branch]
2410 trace add variable current_branch
write current_branch_write
2412 if {[is_enabled multicommit
]} {
2413 .mbar.repository add
command -label [mc
"Database Statistics"] \
2416 .mbar.repository add
command -label [mc
"Compress Database"] \
2419 .mbar.repository add
command -label [mc
"Verify Database"] \
2420 -command do_fsck_objects
2422 .mbar.repository add separator
2425 .mbar.repository add
command \
2426 -label [mc
"Create Desktop Icon"] \
2427 -command do_cygwin_shortcut
2428 } elseif
{[is_Windows
]} {
2429 .mbar.repository add
command \
2430 -label [mc
"Create Desktop Icon"] \
2431 -command do_windows_shortcut
2432 } elseif
{[is_MacOSX
]} {
2433 .mbar.repository add
command \
2434 -label [mc
"Create Desktop Icon"] \
2435 -command do_macosx_app
2440 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2442 .mbar.repository add
command -label [mc Quit
] \
2450 .mbar.edit add
command -label [mc Undo
] \
2451 -command {catch
{[focus
] edit undo
}} \
2453 .mbar.edit add
command -label [mc Redo
] \
2454 -command {catch
{[focus
] edit redo
}} \
2456 .mbar.edit add separator
2457 .mbar.edit add
command -label [mc Cut
] \
2458 -command {catch
{tk_textCut
[focus
]}} \
2460 .mbar.edit add
command -label [mc Copy
] \
2461 -command {catch
{tk_textCopy
[focus
]}} \
2463 .mbar.edit add
command -label [mc Paste
] \
2464 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2466 .mbar.edit add
command -label [mc Delete
] \
2467 -command {catch
{[focus
] delete sel.first sel.last
}} \
2469 .mbar.edit add separator
2470 .mbar.edit add
command -label [mc
"Select All"] \
2471 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2476 if {[is_enabled branch
]} {
2479 .mbar.branch add
command -label [mc
"Create..."] \
2480 -command branch_create
::dialog \
2482 lappend disable_on_lock
[list .mbar.branch entryconf \
2483 [.mbar.branch index last
] -state]
2485 .mbar.branch add
command -label [mc
"Checkout..."] \
2486 -command branch_checkout
::dialog \
2488 lappend disable_on_lock
[list .mbar.branch entryconf \
2489 [.mbar.branch index last
] -state]
2491 .mbar.branch add
command -label [mc
"Rename..."] \
2492 -command branch_rename
::dialog
2493 lappend disable_on_lock
[list .mbar.branch entryconf \
2494 [.mbar.branch index last
] -state]
2496 .mbar.branch add
command -label [mc
"Delete..."] \
2497 -command branch_delete
::dialog
2498 lappend disable_on_lock
[list .mbar.branch entryconf \
2499 [.mbar.branch index last
] -state]
2501 .mbar.branch add
command -label [mc
"Reset..."] \
2502 -command merge
::reset_hard
2503 lappend disable_on_lock
[list .mbar.branch entryconf \
2504 [.mbar.branch index last
] -state]
2509 proc commit_btn_caption
{} {
2510 if {[is_enabled nocommit
]} {
2513 return [mc Commit@@verb
]
2517 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2520 if {![is_enabled nocommit
]} {
2521 .mbar.commit add radiobutton \
2522 -label [mc
"New Commit"] \
2523 -command do_select_commit_type \
2524 -variable selected_commit_type \
2526 lappend disable_on_lock \
2527 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2529 .mbar.commit add radiobutton \
2530 -label [mc
"Amend Last Commit"] \
2531 -command do_select_commit_type \
2532 -variable selected_commit_type \
2534 lappend disable_on_lock \
2535 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2537 .mbar.commit add separator
2540 .mbar.commit add
command -label [mc Rescan
] \
2541 -command ui_do_rescan \
2543 lappend disable_on_lock \
2544 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2546 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2547 -command do_add_selection \
2549 lappend disable_on_lock \
2550 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2552 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2553 -command do_add_all \
2555 lappend disable_on_lock \
2556 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2558 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2559 -command do_unstage_selection \
2561 lappend disable_on_lock \
2562 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2564 .mbar.commit add
command -label [mc
"Revert Changes"] \
2565 -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 5 -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
"Show Less Context"] \
3159 -command show_less_context
3160 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3162 -label [mc
"Show More Context"] \
3163 -command show_more_context
3164 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3167 -label [mc Refresh
] \
3168 -command reshow_diff
3169 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3172 -command {tk_textCopy
$ui_diff}
3173 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3175 -label [mc
"Select All"] \
3176 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3177 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3179 -label [mc
"Copy All"] \
3181 $ui_diff tag add sel
0.0 end
3182 tk_textCopy
$ui_diff
3183 $ui_diff tag remove sel
0.0 end
3185 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3188 -label [mc
"Decrease Font Size"] \
3189 -command {incr_font_size font_diff
-1}
3190 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3192 -label [mc
"Increase Font Size"] \
3193 -command {incr_font_size font_diff
1}
3194 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3198 build_encoding_menu
$emenu [list force_diff_encoding
]
3200 -label [mc
"Encoding"] \
3202 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3204 $ctxm add
command -label [mc
"Options..."] \
3208 set ctxm .vpane.lower.
diff.body.ctxm
3209 menu
$ctxm -tearoff 0
3211 -label [mc
"Apply/Reverse Hunk"] \
3212 -command {apply_hunk
$cursorX $cursorY}
3213 set ui_diff_applyhunk
[$ctxm index last
]
3214 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3216 -label [mc
"Apply/Reverse Line"] \
3217 -command {apply_line
$cursorX $cursorY; do_rescan
}
3218 set ui_diff_applyline
[$ctxm index last
]
3219 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -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 create_common_diff_popup
$ctxmmg
3245 proc popup_diff_menu
{ctxm ctxmmg x y X Y
} {
3246 global current_diff_path file_states
3249 if {[info exists file_states
($current_diff_path)]} {
3250 set state
[lindex
$file_states($current_diff_path) 0]
3254 if {[string first
{U
} $state] >= 0} {
3255 tk_popup
$ctxmmg $X $Y
3257 if {$
::ui_index eq $
::current_diff_side
} {
3258 set l
[mc
"Unstage Hunk From Commit"]
3259 set t
[mc
"Unstage Line From Commit"]
3261 set l
[mc
"Stage Hunk For Commit"]
3262 set t
[mc
"Stage Line For Commit"]
3264 if {$
::is_3way_diff || $
::is_submodule_diff
3265 ||
$current_diff_path eq
{}
3269 ||
{T_
} eq
$state} {
3274 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3275 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3276 tk_popup
$ctxm $X $Y
3279 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg %x
%y
%X
%Y
]
3283 set main_status
[::status_bar
::new .status
]
3284 pack .status
-anchor w
-side bottom
-fill x
3285 $main_status show
[mc
"Initializing..."]
3290 set gm
$repo_config(gui.geometry
)
3291 wm geometry .
[lindex
$gm 0]
3292 .vpane sash place
0 \
3294 [lindex
[.vpane sash coord
0] 1]
3295 .vpane.files sash place
0 \
3296 [lindex
[.vpane.files sash coord
0] 0] \
3301 # -- Load window state
3304 set gws
$repo_config(gui.wmstate
)
3311 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3312 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3313 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3314 bind $ui_comm <$M1B-Key-u> {do_unstage_selection
;break}
3315 bind $ui_comm <$M1B-Key-U> {do_unstage_selection
;break}
3316 bind $ui_comm <$M1B-Key-j> {do_revert_selection
;break}
3317 bind $ui_comm <$M1B-Key-J> {do_revert_selection
;break}
3318 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3319 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3320 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3321 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3322 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3323 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3324 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3325 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3326 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3327 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3328 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3329 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3330 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3331 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3332 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3334 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3335 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3336 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3337 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3338 bind $ui_diff <$M1B-Key-v> {break}
3339 bind $ui_diff <$M1B-Key-V> {break}
3340 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3341 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3342 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3343 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3344 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3345 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3346 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3347 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3348 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3349 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3350 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3351 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3352 bind $ui_diff <Button-1
> {focus
%W
}
3354 if {[is_enabled branch
]} {
3355 bind .
<$M1B-Key-n> branch_create
::dialog
3356 bind .
<$M1B-Key-N> branch_create
::dialog
3357 bind .
<$M1B-Key-o> branch_checkout
::dialog
3358 bind .
<$M1B-Key-O> branch_checkout
::dialog
3359 bind .
<$M1B-Key-m> merge
::dialog
3360 bind .
<$M1B-Key-M> merge
::dialog
3362 if {[is_enabled transport
]} {
3363 bind .
<$M1B-Key-p> do_push_anywhere
3364 bind .
<$M1B-Key-P> do_push_anywhere
3367 bind .
<Key-F5
> ui_do_rescan
3368 bind .
<$M1B-Key-r> ui_do_rescan
3369 bind .
<$M1B-Key-R> ui_do_rescan
3370 bind .
<$M1B-Key-s> do_signoff
3371 bind .
<$M1B-Key-S> do_signoff
3372 bind .
<$M1B-Key-t> do_add_selection
3373 bind .
<$M1B-Key-T> do_add_selection
3374 bind .
<$M1B-Key-i> do_add_all
3375 bind .
<$M1B-Key-I> do_add_all
3376 bind .
<$M1B-Key-minus> {show_less_context
;break}
3377 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3378 bind .
<$M1B-Key-equal> {show_more_context
;break}
3379 bind .
<$M1B-Key-plus> {show_more_context
;break}
3380 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3381 bind .
<$M1B-Key-Return> do_commit
3382 foreach i
[list
$ui_index $ui_workdir] {
3383 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3384 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3385 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3389 set file_lists
($ui_index) [list
]
3390 set file_lists
($ui_workdir) [list
]
3392 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
3393 focus
-force $ui_comm
3395 # -- Warn the user about environmental problems. Cygwin's Tcl
3396 # does *not* pass its env array onto any processes it spawns.
3397 # This means that git processes get none of our environment.
3402 set msg
[mc
"Possible environment issues exist.
3404 The following environment variables are probably
3405 going to be ignored by any Git subprocess run
3409 foreach name
[array names env
] {
3410 switch
-regexp -- $name {
3411 {^GIT_INDEX_FILE$
} -
3412 {^GIT_OBJECT_DIRECTORY$
} -
3413 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3415 {^GIT_EXTERNAL_DIFF$
} -
3419 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3420 append msg
" - $name\n"
3423 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3424 append msg
" - $name\n"
3426 set suggest_user
$name
3430 if {$ignored_env > 0} {
3432 This is due to a known issue with the
3433 Tcl binary distributed by Cygwin."]
3435 if {$suggest_user ne
{}} {
3438 A good replacement for %s
3439 is placing values for the user.name and
3440 user.email settings into your personal
3446 unset ignored_env msg suggest_user name
3449 # -- Only initialize complex UI if we are going to stay running.
3451 if {[is_enabled transport
]} {
3454 set n
[.mbar.remote index end
]
3455 populate_remotes_menu
3456 set n
[expr {[.mbar.remote index end
] - $n}]
3458 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3459 .mbar.remote insert
$n separator
3464 if {[winfo exists
$ui_comm]} {
3465 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3467 # -- If both our backup and message files exist use the
3468 # newer of the two files to initialize the buffer.
3470 if {$GITGUI_BCK_exists} {
3471 set m
[gitdir GITGUI_MSG
]
3472 if {[file isfile
$m]} {
3473 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3474 catch
{file delete
[gitdir GITGUI_MSG
]}
3476 $ui_comm delete
0.0 end
3478 $ui_comm edit modified false
3479 catch
{file delete
[gitdir GITGUI_BCK
]}
3480 set GITGUI_BCK_exists
0
3486 proc backup_commit_buffer
{} {
3487 global ui_comm GITGUI_BCK_exists
3489 set m
[$ui_comm edit modified
]
3490 if {$m ||
$GITGUI_BCK_exists} {
3491 set msg
[string trim
[$ui_comm get
0.0 end
]]
3492 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3495 if {$GITGUI_BCK_exists} {
3496 catch
{file delete
[gitdir GITGUI_BCK
]}
3497 set GITGUI_BCK_exists
0
3501 set fd
[open
[gitdir GITGUI_BCK
] w
]
3502 puts
-nonewline $fd $msg
3504 set GITGUI_BCK_exists
1
3508 $ui_comm edit modified false
3511 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3514 backup_commit_buffer
3516 # -- If the user has aspell available we can drive it
3517 # in pipe mode to spellcheck the commit message.
3519 set spell_cmd
[list |
]
3520 set spell_dict
[get_config gui.spellingdictionary
]
3521 lappend spell_cmd aspell
3522 if {$spell_dict ne
{}} {
3523 lappend spell_cmd
--master=$spell_dict
3525 lappend spell_cmd
--mode=none
3526 lappend spell_cmd
--encoding=utf-8
3527 lappend spell_cmd pipe
3528 if {$spell_dict eq
{none
}
3529 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3530 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3532 set ui_comm_spell
[spellcheck
::init \
3538 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3541 lock_index begin-read
3542 if {![winfo ismapped .
]} {
3546 if {[is_enabled initialamend
]} {
3552 if {[is_enabled nocommitmsg
]} {
3553 $ui_comm configure
-state disabled
-background gray
3556 if {[is_enabled multicommit
]} {
3559 if {[is_enabled retcode
]} {
3560 bind .
<Destroy
> {+terminate_me
%W
}
3562 if {$picked && [is_config_true gui.autoexplore
]} {