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 Menu Message
667 Radiobutton Spinbox Text} {
668 option add *$class.font font_ui
672 if {[is_Windows] || [is_MacOSX]} {
673 option add *Menu.tearOff 0
684 proc bind_button3 {w cmd} {
685 bind $w <Any-Button-3> $cmd
687 # Mac OS X sends Button-2 on right click through three-button mouse,
688 # or through trackpad right-clicking (two-finger touch + click).
689 bind $w <Any-Button-2> $cmd
690 bind $w <Control-Button-1> $cmd
694 proc apply_config {} {
695 global repo_config font_descs
697 foreach option $font_descs {
698 set name [lindex $option 0]
699 set font [lindex $option 1]
702 foreach {cn cv} $repo_config(gui.$name) {
703 if {$cn eq {-weight}} {
706 font configure $font $cn $cv
709 font configure $font -weight normal
712 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
714 foreach {cn cv} [font configure $font] {
715 font configure ${font}bold $cn $cv
716 font configure ${font}italic $cn $cv
718 font configure ${font}bold -weight bold
719 font configure ${font}italic -slant italic
723 set default_config(branch.autosetupmerge) true
724 set default_config(merge.tool) {}
725 set default_config(merge.keepbackup) true
726 set default_config(merge.diffstat) true
727 set default_config(merge.summary) false
728 set default_config(merge.verbosity) 2
729 set default_config(user.name) {}
730 set default_config(user.email) {}
732 set default_config(gui.encoding) [encoding system]
733 set default_config(gui.matchtrackingbranch) false
734 set default_config(gui.pruneduringfetch) false
735 set default_config(gui.trustmtime) false
736 set default_config(gui.fastcopyblame) false
737 set default_config(gui.copyblamethreshold) 40
738 set default_config(gui.blamehistoryctx) 7
739 set default_config(gui.diffcontext) 5
740 set default_config(gui.commitmsgwidth) 75
741 set default_config(gui.newbranchtemplate) {}
742 set default_config(gui.spellingdictionary) {}
743 set default_config(gui.fontui) [font configure font_ui]
744 set default_config(gui.fontdiff) [font configure font_diff]
746 {fontui font_ui {mc "Main Font
"}}
747 {fontdiff font_diff {mc "Diff
/Console Font
"}}
750 ######################################################################
754 set _git [_which git]
756 catch {wm withdraw .}
760 -title [mc "git-gui
: fatal error
"] \
761 -message [mc "Cannot
find git
in PATH.
"]
765 ######################################################################
769 if {[catch {set _git_version [git --version]} err]} {
770 catch {wm withdraw .}
774 -title [mc "git-gui
: fatal error
"] \
775 -message "Cannot determine Git version
:
779 [appname
] requires Git
1.5.0 or later.
"
782 if {![regsub {^git version } $_git_version {} _git_version]} {
783 catch {wm withdraw .}
787 -title [mc "git-gui
: fatal error
"] \
788 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
792 set _real_git_version $_git_version
793 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
794 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
795 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
796 regsub {\.GIT$} $_git_version {} _git_version
797 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
799 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
800 catch {wm withdraw .}
805 -title "[appname
]: warning
" \
806 -message [mc "Git version cannot be determined.
808 %s claims it is version
'%s'.
810 %s requires
at least Git
1.5.0 or later.
812 Assume
'%s' is version
1.5.0?
813 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
814 set _git_version 1.5.0
819 unset _real_git_version
821 proc git-version {args} {
824 switch [llength $args] {
830 set op [lindex $args 0]
831 set vr [lindex $args 1]
832 set cm [package vcompare $_git_version $vr]
833 return [expr $cm $op 0]
837 set type [lindex $args 0]
838 set name [lindex $args 1]
839 set parm [lindex $args 2]
840 set body [lindex $args 3]
842 if {($type ne {proc} && $type ne {method})} {
843 error "Invalid arguments to git-version
"
845 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
846 error "Last arm of
$type $name must be default
"
849 foreach {op vr cb} [lrange $body 0 end-2] {
850 if {[git-version $op $vr]} {
851 return [uplevel [list $type $name $parm $cb]]
855 return [uplevel [list $type $name $parm [lindex $body end]]]
859 error "git-version
>= x
"
865 if {[git-version < 1.5]} {
866 catch {wm withdraw .}
870 -title [mc "git-gui
: fatal error
"] \
871 -message "[appname
] requires Git
1.5.0 or later.
873 You are using
[git-version
]:
879 ######################################################################
881 ## configure our library
883 set idx [file join $oguilib tclIndex]
884 if {[catch {set fd [open $idx r]} err]} {
885 catch {wm withdraw .}
889 -title [mc "git-gui
: fatal error
"] \
893 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
895 while {[gets $fd n] >= 0} {
896 if {$n ne {} && ![string match #* $n]} {
908 if {[lsearch -exact $loaded $p] >= 0} continue
909 source [file join $oguilib $p]
914 set auto_path [concat [list $oguilib] $auto_path]
916 unset -nocomplain idx fd
918 ######################################################################
920 ## config file parsing
922 git-version proc _parse_config {arr_name args} {
929 [list git_read config] \
931 [list --null --list]]
932 fconfigure $fd_rc -translation binary
933 set buf [read $fd_rc]
936 foreach line [split $buf "\
0"] {
937 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
938 if {[is_many_config $name]} {
939 lappend arr($name) $value
941 set arr($name) $value
950 set fd_rc [eval [list git_read config --list] $args]
951 while {[gets $fd_rc line] >= 0} {
952 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
953 if {[is_many_config $name]} {
954 lappend arr($name) $value
956 set arr($name) $value
965 proc load_config {include_global} {
966 global repo_config global_config system_config default_config
968 if {$include_global} {
969 _parse_config system_config --system
970 _parse_config global_config --global
972 _parse_config repo_config
974 foreach name [array names default_config] {
975 if {[catch {set v $system_config($name)}]} {
976 set system_config($name) $default_config($name)
979 foreach name [array names system_config] {
980 if {[catch {set v $global_config($name)}]} {
981 set global_config($name) $system_config($name)
983 if {[catch {set v $repo_config($name)}]} {
984 set repo_config($name) $system_config($name)
989 ######################################################################
991 ## feature option selection
993 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
998 if {$subcommand eq {gui.sh}} {
1001 if {$subcommand eq {gui} && [llength $argv] > 0} {
1002 set subcommand [lindex $argv 0]
1003 set argv [lrange $argv 1 end]
1006 enable_option multicommit
1007 enable_option branch
1008 enable_option transport
1011 switch -- $subcommand {
1016 disable_option multicommit
1017 disable_option branch
1018 disable_option transport
1021 enable_option singlecommit
1022 enable_option retcode
1024 disable_option multicommit
1025 disable_option branch
1026 disable_option transport
1028 while {[llength $argv] > 0} {
1029 set a [lindex $argv 0]
1032 enable_option initialamend
1035 enable_option nocommit
1036 enable_option nocommitmsg
1039 disable_option nocommitmsg
1046 set argv [lrange $argv 1 end]
1051 ######################################################################
1053 ## execution environment
1055 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1057 # Suggest our implementation of askpass, if none is set
1058 if {![info exists env(SSH_ASKPASS)]} {
1059 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1062 ######################################################################
1068 set _gitdir $env(GIT_DIR)
1072 set _gitdir [git rev-parse --git-dir]
1073 set _prefix [git rev-parse --show-prefix]
1077 choose_repository::pick
1080 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1081 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1083 if {![file isdirectory $_gitdir]} {
1084 catch {wm withdraw .}
1085 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1088 if {$_prefix ne {}} {
1089 regsub -all {[^/]+/} $_prefix ../ cdup
1090 if {[catch {cd $cdup} err]} {
1091 catch {wm withdraw .}
1092 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1096 } elseif {![is_enabled bare]} {
1097 if {[lindex [file split $_gitdir] end] ne {.git}} {
1098 catch {wm withdraw .}
1099 error_popup [strcat [mc "Cannot use funny .git directory
:"] "\n\n$_gitdir"]
1102 if {[catch {cd [file dirname $_gitdir]} err]} {
1103 catch {wm withdraw .}
1104 error_popup [strcat [mc "No working directory
"] " [file dirname $_gitdir]:\n\n$err"]
1108 set _reponame [file split [file normalize $_gitdir]]
1109 if {[lindex $_reponame end] eq {.git}} {
1110 set _reponame [lindex $_reponame end-1]
1112 set _reponame [lindex $_reponame end]
1115 ######################################################################
1119 set current_diff_path {}
1120 set current_diff_side {}
1121 set diff_actions [list]
1125 set MERGE_HEAD [list]
1128 set current_branch {}
1130 set current_diff_path {}
1132 set is_conflict_diff 0
1133 set selected_commit_type new
1135 set nullid "0000000000000000000000000000000000000000"
1136 set nullid2 "0000000000000000000000000000000000000001"
1138 ######################################################################
1146 set disable_on_lock [list]
1147 set index_lock_type none
1149 proc lock_index {type} {
1150 global index_lock_type disable_on_lock
1152 if {$index_lock_type eq {none}} {
1153 set index_lock_type $type
1154 foreach w $disable_on_lock {
1155 uplevel #0 $w disabled
1158 } elseif {$index_lock_type eq "begin-
$type"} {
1159 set index_lock_type $type
1165 proc unlock_index {} {
1166 global index_lock_type disable_on_lock
1168 set index_lock_type none
1169 foreach w $disable_on_lock {
1170 uplevel #0 $w normal
1174 ######################################################################
1178 proc repository_state {ctvar hdvar mhvar} {
1179 global current_branch
1180 upvar $ctvar ct $hdvar hd $mhvar mh
1185 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1191 set merge_head [gitdir MERGE_HEAD]
1192 if {[file exists $merge_head]} {
1194 set fd_mh [open $merge_head r]
1195 while {[gets $fd_mh line] >= 0} {
1206 global PARENT empty_tree
1208 set p [lindex $PARENT 0]
1212 if {$empty_tree eq {}} {
1213 set empty_tree [git mktree << {}]
1218 proc force_amend {} {
1219 global selected_commit_type
1220 global HEAD PARENT MERGE_HEAD commit_type
1222 repository_state newType newHEAD newMERGE_HEAD
1225 set MERGE_HEAD $newMERGE_HEAD
1226 set commit_type $newType
1228 set selected_commit_type amend
1229 do_select_commit_type
1232 proc rescan {after {honor_trustmtime 1}} {
1233 global HEAD PARENT MERGE_HEAD commit_type
1234 global ui_index ui_workdir ui_comm
1235 global rescan_active file_states
1238 if {$rescan_active > 0 || ![lock_index read]} return
1240 repository_state newType newHEAD newMERGE_HEAD
1241 if {[string match amend* $commit_type]
1242 && $newType eq {normal}
1243 && $newHEAD eq $HEAD} {
1247 set MERGE_HEAD $newMERGE_HEAD
1248 set commit_type $newType
1251 array unset file_states
1253 if {!$::GITGUI_BCK_exists &&
1254 (![$ui_comm edit modified]
1255 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1256 if {[string match amend* $commit_type]} {
1257 } elseif {[load_message GITGUI_MSG]} {
1258 } elseif {[run_prepare_commit_msg_hook]} {
1259 } elseif {[load_message MERGE_MSG]} {
1260 } elseif {[load_message SQUASH_MSG]} {
1263 $ui_comm edit modified false
1266 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1267 rescan_stage2 {} $after
1270 ui_status [mc "Refreshing
file status...
"]
1271 set fd_rf [git_read update-index \
1277 fconfigure $fd_rf -blocking 0 -translation binary
1278 fileevent $fd_rf readable \
1279 [list rescan_stage2 $fd_rf $after]
1284 set is_git_info_exclude {}
1285 proc have_info_exclude {} {
1286 global is_git_info_exclude
1288 if {$is_git_info_exclude eq {}} {
1289 if {[catch {exec test -f [gitdir info exclude]}]} {
1290 set is_git_info_exclude 0
1292 set is_git_info_exclude 1
1295 return $is_git_info_exclude
1298 proc have_info_exclude {} {
1299 return [file readable [gitdir info exclude]]
1303 proc rescan_stage2 {fd after} {
1304 global rescan_active buf_rdi buf_rdf buf_rlo
1308 if {![eof $fd]} return
1312 set ls_others [list --exclude-per-directory=.gitignore]
1313 if {[have_info_exclude]} {
1314 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1316 set user_exclude [get_config core.excludesfile]
1317 if {$user_exclude ne {} && [file readable $user_exclude]} {
1318 lappend ls_others "--exclude-from=$user_exclude"
1326 ui_status [mc "Scanning
for modified files ...
"]
1327 set fd_di [git_read diff-index --cached -z [PARENT]]
1328 set fd_df [git_read diff-files -z]
1329 set fd_lo [eval git_read ls-files --others -z $ls_others]
1331 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1332 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1333 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1334 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1335 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1336 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1339 proc load_message {file} {
1342 set f [gitdir $file]
1343 if {[file isfile $f]} {
1344 if {[catch {set fd [open $f r]}]} {
1347 fconfigure $fd -eofchar {}
1348 set content [string trim [read $fd]]
1350 regsub -all -line {[ \r\t]+$} $content {} content
1351 $ui_comm delete 0.0 end
1352 $ui_comm insert end $content
1358 proc run_prepare_commit_msg_hook {} {
1361 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1362 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1363 # empty file but existant file.
1365 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1367 if {[file isfile [gitdir MERGE_MSG]]} {
1368 set pcm_source "merge
"
1369 set fd_mm [open [gitdir MERGE_MSG] r]
1370 puts -nonewline $fd_pcm [read $fd_mm]
1372 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1373 set pcm_source "squash
"
1374 set fd_sm [open [gitdir SQUASH_MSG] r]
1375 puts -nonewline $fd_pcm [read $fd_sm]
1383 set fd_ph [githook_read prepare-commit-msg \
1384 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1386 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1390 ui_status [mc "Calling prepare-commit-msg hook...
"]
1393 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1394 fileevent $fd_ph readable \
1395 [list prepare_commit_msg_hook_wait $fd_ph]
1400 proc prepare_commit_msg_hook_wait {fd_ph} {
1403 append pch_error [read $fd_ph]
1404 fconfigure $fd_ph -blocking 1
1406 if {[catch {close $fd_ph}]} {
1407 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1408 hook_failed_popup prepare-commit-msg $pch_error
1409 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1412 load_message PREPARE_COMMIT_MSG
1415 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1418 fconfigure $fd_ph -blocking 0
1419 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1422 proc read_diff_index {fd after} {
1425 append buf_rdi [read $fd]
1427 set n [string length $buf_rdi]
1429 set z1 [string first "\
0" $buf_rdi $c]
1430 if {$z1 == -1} break
1432 set z2 [string first "\
0" $buf_rdi $z1]
1433 if {$z2 == -1} break
1436 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1437 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1439 [encoding convertfrom $p] \
1441 [list [lindex $i 0] [lindex $i 2]] \
1447 set buf_rdi [string range $buf_rdi $c end]
1452 rescan_done $fd buf_rdi $after
1455 proc read_diff_files {fd after} {
1458 append buf_rdf [read $fd]
1460 set n [string length $buf_rdf]
1462 set z1 [string first "\
0" $buf_rdf $c]
1463 if {$z1 == -1} break
1465 set z2 [string first "\
0" $buf_rdf $z1]
1466 if {$z2 == -1} break
1469 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1470 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1472 [encoding convertfrom $p] \
1475 [list [lindex $i 0] [lindex $i 2]]
1480 set buf_rdf [string range $buf_rdf $c end]
1485 rescan_done $fd buf_rdf $after
1488 proc read_ls_others {fd after} {
1491 append buf_rlo [read $fd]
1492 set pck [split $buf_rlo "\
0"]
1493 set buf_rlo [lindex $pck end]
1494 foreach p [lrange $pck 0 end-1] {
1495 set p [encoding convertfrom $p]
1496 if {[string index $p end] eq {/}} {
1497 set p [string range $p 0 end-1]
1501 rescan_done $fd buf_rlo $after
1504 proc rescan_done {fd buf after} {
1505 global rescan_active current_diff_path
1506 global file_states repo_config
1509 if {![eof $fd]} return
1512 if {[incr rescan_active -1] > 0} return
1517 if {$current_diff_path ne {}} { reshow_diff $after }
1518 if {$current_diff_path eq {}} { select_first_diff $after }
1521 proc prune_selection {} {
1522 global file_states selected_paths
1524 foreach path [array names selected_paths] {
1525 if {[catch {set still_here $file_states($path)}]} {
1526 unset selected_paths($path)
1531 ######################################################################
1535 proc mapicon {w state path} {
1538 if {[catch {set r $all_icons($state$w)}]} {
1539 puts "error
: no icon
for $w state
={$state} $path"
1545 proc mapdesc {state path} {
1548 if {[catch {set r $all_descs($state)}]} {
1549 puts "error
: no desc
for state
={$state} $path"
1555 proc ui_status {msg} {
1557 if {[info exists main_status]} {
1558 $main_status show $msg
1562 proc ui_ready {{test {}}} {
1564 if {[info exists main_status]} {
1565 $main_status show [mc "Ready.
"] $test
1569 proc escape_path {path} {
1570 regsub -all {\\} $path "\\\\" path
1571 regsub -all "\n" $path "\\n
" path
1575 proc short_path {path} {
1576 return [escape_path [lindex [file split $path] end]]
1580 set null_sha1 [string repeat 0 40]
1582 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1583 global file_states next_icon_id null_sha1
1585 set s0 [string index $new_state 0]
1586 set s1 [string index $new_state 1]
1588 if {[catch {set info $file_states($path)}]} {
1590 set icon n[incr next_icon_id]
1592 set state [lindex $info 0]
1593 set icon [lindex $info 1]
1594 if {$head_info eq {}} {set head_info [lindex $info 2]}
1595 if {$index_info eq {}} {set index_info [lindex $info 3]}
1598 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1599 elseif {$s0 eq {_}} {set s0 _}
1601 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1602 elseif {$s1 eq {_}} {set s1 _}
1604 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1605 set head_info [list 0 $null_sha1]
1606 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1607 && $head_info eq {}} {
1608 set head_info $index_info
1611 set file_states($path) [list $s0$s1 $icon \
1612 $head_info $index_info \
1617 proc display_file_helper {w path icon_name old_m new_m} {
1620 if {$new_m eq {_}} {
1621 set lno [lsearch -sorted -exact $file_lists($w) $path]
1623 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1625 $w conf -state normal
1626 $w delete $lno.0 [expr {$lno + 1}].0
1627 $w conf -state disabled
1629 } elseif {$old_m eq {_} && $new_m ne {_}} {
1630 lappend file_lists($w) $path
1631 set file_lists($w) [lsort -unique $file_lists($w)]
1632 set lno [lsearch -sorted -exact $file_lists($w) $path]
1634 $w conf -state normal
1635 $w image create $lno.0 \
1636 -align center -padx 5 -pady 1 \
1638 -image [mapicon $w $new_m $path]
1639 $w insert $lno.1 "[escape_path
$path]\n"
1640 $w conf -state disabled
1641 } elseif {$old_m ne $new_m} {
1642 $w conf -state normal
1643 $w image conf $icon_name -image [mapicon $w $new_m $path]
1644 $w conf -state disabled
1648 proc display_file {path state} {
1649 global file_states selected_paths
1650 global ui_index ui_workdir
1652 set old_m [merge_state $path $state]
1653 set s $file_states($path)
1654 set new_m [lindex $s 0]
1655 set icon_name [lindex $s 1]
1657 set o [string index $old_m 0]
1658 set n [string index $new_m 0]
1665 display_file_helper $ui_index $path $icon_name $o $n
1667 if {[string index $old_m 0] eq {U}} {
1670 set o [string index $old_m 1]
1672 if {[string index $new_m 0] eq {U}} {
1675 set n [string index $new_m 1]
1677 display_file_helper $ui_workdir $path $icon_name $o $n
1679 if {$new_m eq {__}} {
1680 unset file_states($path)
1681 catch {unset selected_paths($path)}
1685 proc display_all_files_helper {w path icon_name m} {
1688 lappend file_lists($w) $path
1689 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1690 $w image create end \
1691 -align center -padx 5 -pady 1 \
1693 -image [mapicon $w $m $path]
1694 $w insert end "[escape_path
$path]\n"
1697 proc display_all_files {} {
1698 global ui_index ui_workdir
1699 global file_states file_lists
1702 $ui_index conf -state normal
1703 $ui_workdir conf -state normal
1705 $ui_index delete 0.0 end
1706 $ui_workdir delete 0.0 end
1709 set file_lists($ui_index) [list]
1710 set file_lists($ui_workdir) [list]
1712 foreach path [lsort [array names file_states]] {
1713 set s $file_states($path)
1715 set icon_name [lindex $s 1]
1717 set s [string index $m 0]
1718 if {$s ne {U} && $s ne {_}} {
1719 display_all_files_helper $ui_index $path \
1723 if {[string index $m 0] eq {U}} {
1726 set s [string index $m 1]
1729 display_all_files_helper $ui_workdir $path \
1734 $ui_index conf -state disabled
1735 $ui_workdir conf -state disabled
1738 ######################################################################
1743 #define mask_width 14
1744 #define mask_height 15
1745 static unsigned char mask_bits[] = {
1746 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1747 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1748 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1751 image create bitmap file_plain -background white -foreground black -data {
1752 #define plain_width 14
1753 #define plain_height 15
1754 static unsigned char plain_bits[] = {
1755 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1756 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1757 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1758 } -maskdata $filemask
1760 image create bitmap file_mod -background white -foreground blue -data {
1761 #define mod_width 14
1762 #define mod_height 15
1763 static unsigned char mod_bits[] = {
1764 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1765 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1766 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1767 } -maskdata $filemask
1769 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1770 #define file_fulltick_width 14
1771 #define file_fulltick_height 15
1772 static unsigned char file_fulltick_bits
[] = {
1773 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1774 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1775 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1776 } -maskdata $filemask
1778 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1779 #define parttick_width 14
1780 #define parttick_height 15
1781 static unsigned char parttick_bits
[] = {
1782 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1783 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1784 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1785 } -maskdata $filemask
1787 image create bitmap file_question
-background white
-foreground black
-data {
1788 #define file_question_width 14
1789 #define file_question_height 15
1790 static unsigned char file_question_bits
[] = {
1791 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1792 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1793 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1794 } -maskdata $filemask
1796 image create bitmap file_removed
-background white
-foreground red
-data {
1797 #define file_removed_width 14
1798 #define file_removed_height 15
1799 static unsigned char file_removed_bits
[] = {
1800 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1801 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1802 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1803 } -maskdata $filemask
1805 image create bitmap file_merge
-background white
-foreground blue
-data {
1806 #define file_merge_width 14
1807 #define file_merge_height 15
1808 static unsigned char file_merge_bits
[] = {
1809 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1810 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1811 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1812 } -maskdata $filemask
1814 image create bitmap file_statechange
-background white
-foreground green
-data {
1815 #define file_merge_width 14
1816 #define file_merge_height 15
1817 static unsigned char file_statechange_bits
[] = {
1818 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1819 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1820 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1821 } -maskdata $filemask
1823 set ui_index .vpane.files.index.list
1824 set ui_workdir .vpane.files.workdir.list
1826 set all_icons
(_
$ui_index) file_plain
1827 set all_icons
(A
$ui_index) file_fulltick
1828 set all_icons
(M
$ui_index) file_fulltick
1829 set all_icons
(D
$ui_index) file_removed
1830 set all_icons
(U
$ui_index) file_merge
1831 set all_icons
(T
$ui_index) file_statechange
1833 set all_icons
(_
$ui_workdir) file_plain
1834 set all_icons
(M
$ui_workdir) file_mod
1835 set all_icons
(D
$ui_workdir) file_question
1836 set all_icons
(U
$ui_workdir) file_merge
1837 set all_icons
(O
$ui_workdir) file_plain
1838 set all_icons
(T
$ui_workdir) file_statechange
1840 set max_status_desc
0
1842 {__
{mc
"Unmodified"}}
1844 {_M
{mc
"Modified, not staged"}}
1845 {M_
{mc
"Staged for commit"}}
1846 {MM
{mc
"Portions staged for commit"}}
1847 {MD
{mc
"Staged for commit, missing"}}
1849 {_T
{mc
"File type changed, not staged"}}
1850 {T_
{mc
"File type changed, staged"}}
1852 {_O
{mc
"Untracked, not staged"}}
1853 {A_
{mc
"Staged for commit"}}
1854 {AM
{mc
"Portions staged for commit"}}
1855 {AD
{mc
"Staged for commit, missing"}}
1858 {D_
{mc
"Staged for removal"}}
1859 {DO
{mc
"Staged for removal, still present"}}
1861 {_U
{mc
"Requires merge resolution"}}
1862 {U_
{mc
"Requires merge resolution"}}
1863 {UU
{mc
"Requires merge resolution"}}
1864 {UM
{mc
"Requires merge resolution"}}
1865 {UD
{mc
"Requires merge resolution"}}
1866 {UT
{mc
"Requires merge resolution"}}
1868 set text
[eval [lindex
$i 1]]
1869 if {$max_status_desc < [string length
$text]} {
1870 set max_status_desc
[string length
$text]
1872 set all_descs
([lindex
$i 0]) $text
1876 ######################################################################
1880 proc scrollbar2many
{list mode args
} {
1881 foreach w
$list {eval $w $mode $args}
1884 proc many2scrollbar
{list mode sb top bottom
} {
1885 $sb set $top $bottom
1886 foreach w
$list {$w $mode moveto
$top}
1889 proc incr_font_size
{font
{amt
1}} {
1890 set sz
[font configure
$font -size]
1892 font configure
$font -size $sz
1893 font configure
${font}bold
-size $sz
1894 font configure
${font}italic
-size $sz
1897 ######################################################################
1901 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1903 proc do_gitk
{revs
} {
1904 # -- Always start gitk through whatever we were loaded with. This
1905 # lets us bypass using shell process on Windows systems.
1907 set exe
[_which gitk
-script]
1908 set cmd
[list
[info nameofexecutable
] $exe]
1910 error_popup
[mc
"Couldn't find gitk in PATH"]
1914 if {[info exists env
(GIT_DIR
)]} {
1915 set old_GIT_DIR
$env(GIT_DIR
)
1921 cd [file dirname [gitdir
]]
1922 set env
(GIT_DIR
) [file tail [gitdir
]]
1924 eval exec $cmd $revs &
1926 if {$old_GIT_DIR eq
{}} {
1929 set env
(GIT_DIR
) $old_GIT_DIR
1933 ui_status $
::starting_gitk_msg
1935 ui_ready
$starting_gitk_msg
1940 proc do_explore
{} {
1942 if {[is_Cygwin
] ||
[is_Windows
]} {
1943 set explorer
"explorer.exe"
1944 } elseif
{[is_MacOSX
]} {
1947 # freedesktop.org-conforming system is our best shot
1948 set explorer
"xdg-open"
1950 eval exec $explorer [list
[file nativename
[file dirname [gitdir
]]]] &
1956 proc terminate_me
{win
} {
1958 if {$win ne
{.
}} return
1962 proc do_quit
{{rc
{1}}} {
1963 global ui_comm is_quitting repo_config commit_type
1964 global GITGUI_BCK_exists GITGUI_BCK_i
1965 global ui_comm_spell
1968 if {$is_quitting} return
1971 if {[winfo exists
$ui_comm]} {
1972 # -- Stash our current commit buffer.
1974 set save
[gitdir GITGUI_MSG
]
1975 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1976 file rename
-force [gitdir GITGUI_BCK
] $save
1977 set GITGUI_BCK_exists
0
1979 set msg
[string trim
[$ui_comm get
0.0 end
]]
1980 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1981 if {(![string match amend
* $commit_type]
1982 ||
[$ui_comm edit modified
])
1985 set fd
[open
$save w
]
1986 puts
-nonewline $fd $msg
1990 catch
{file delete
$save}
1994 # -- Cancel our spellchecker if its running.
1996 if {[info exists ui_comm_spell
]} {
2000 # -- Remove our editor backup, its not needed.
2002 after cancel
$GITGUI_BCK_i
2003 if {$GITGUI_BCK_exists} {
2004 catch
{file delete
[gitdir GITGUI_BCK
]}
2007 # -- Stash our current window geometry into this repository.
2009 set cfg_geometry
[list
]
2010 lappend cfg_geometry
[wm geometry .
]
2011 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2012 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2013 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2016 if {$cfg_geometry ne
$rc_geometry} {
2017 catch
{git config gui.geometry
$cfg_geometry}
2029 proc ui_do_rescan
{} {
2030 rescan
{force_first_diff ui_ready
}
2037 proc next_diff
{{after
{}}} {
2038 global next_diff_p next_diff_w next_diff_i
2039 show_diff
$next_diff_p $next_diff_w {} {} $after
2042 proc find_anchor_pos
{lst name
} {
2043 set lid
[lsearch
-sorted -exact $lst $name]
2047 foreach lname
$lst {
2048 if {$lname >= $name} break
2056 proc find_file_from
{flist idx delta path mmask
} {
2059 set len
[llength
$flist]
2060 while {$idx >= 0 && $idx < $len} {
2061 set name
[lindex
$flist $idx]
2063 if {$name ne
$path && [info exists file_states
($name)]} {
2064 set state
[lindex
$file_states($name) 0]
2066 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2077 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2078 global next_diff_p next_diff_w next_diff_i
2079 global file_lists ui_index ui_workdir
2081 set flist
$file_lists($w)
2083 set lno
[find_anchor_pos
$flist $path]
2088 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2089 if {$w eq
$ui_index} {
2092 set mmask
"$mmask\$"
2096 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2099 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2104 set next_diff_p
[lindex
$flist $idx]
2105 set next_diff_i
[expr {$idx+1}]
2112 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2113 global current_diff_path
2115 if {$path ne
$current_diff_path} {
2117 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2120 return {reshow_diff
;}
2124 proc select_first_diff
{after
} {
2127 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2128 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2135 proc force_first_diff
{after
} {
2136 global ui_workdir current_diff_path file_states
2138 if {[info exists file_states
($current_diff_path)]} {
2139 set state
[lindex
$file_states($current_diff_path) 0]
2145 if {[string first
{U
} $state] >= 0} {
2146 # Already a conflict, do nothing
2147 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2149 } elseif
{[string index
$state 1] ne
{O
}} {
2150 # Already a diff & no conflicts, do nothing
2151 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2162 proc toggle_or_diff
{w x y
} {
2163 global file_states file_lists current_diff_path ui_index ui_workdir
2164 global last_clicked selected_paths
2166 set pos
[split [$w index @
$x,$y] .
]
2167 set lno
[lindex
$pos 0]
2168 set col [lindex
$pos 1]
2169 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2175 set last_clicked
[list
$w $lno]
2176 array
unset selected_paths
2177 $ui_index tag remove in_sel
0.0 end
2178 $ui_workdir tag remove in_sel
0.0 end
2180 # Determine the state of the file
2181 if {[info exists file_states
($path)]} {
2182 set state
[lindex
$file_states($path) 0]
2187 # Restage the file, or simply show the diff
2188 if {$col == 0 && $y > 1} {
2189 # Conflicts need special handling
2190 if {[string first
{U
} $state] >= 0} {
2191 # $w must always be $ui_workdir, but...
2192 if {$w ne
$ui_workdir} { set lno
{} }
2193 merge_stage_workdir
$path $lno
2197 if {[string index
$state 1] eq
{O
}} {
2203 set after
[next_diff_after_action
$w $path $lno $mmask]
2205 if {$w eq
$ui_index} {
2207 "Unstaging [short_path $path] from commit" \
2209 [concat
$after [list ui_ready
]]
2210 } elseif
{$w eq
$ui_workdir} {
2212 "Adding [short_path $path]" \
2214 [concat
$after [list ui_ready
]]
2217 show_diff
$path $w $lno
2221 proc add_one_to_selection
{w x y
} {
2222 global file_lists last_clicked selected_paths
2224 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2225 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2231 if {$last_clicked ne
{}
2232 && [lindex
$last_clicked 0] ne
$w} {
2233 array
unset selected_paths
2234 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2237 set last_clicked
[list
$w $lno]
2238 if {[catch
{set in_sel
$selected_paths($path)}]} {
2242 unset selected_paths
($path)
2243 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2245 set selected_paths
($path) 1
2246 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2250 proc add_range_to_selection
{w x y
} {
2251 global file_lists last_clicked selected_paths
2253 if {[lindex
$last_clicked 0] ne
$w} {
2254 toggle_or_diff
$w $x $y
2258 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2259 set lc
[lindex
$last_clicked 1]
2268 foreach path
[lrange
$file_lists($w) \
2269 [expr {$begin - 1}] \
2270 [expr {$end - 1}]] {
2271 set selected_paths
($path) 1
2273 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2276 proc show_more_context
{} {
2278 if {$repo_config(gui.diffcontext
) < 99} {
2279 incr repo_config
(gui.diffcontext
)
2284 proc show_less_context
{} {
2286 if {$repo_config(gui.diffcontext
) > 1} {
2287 incr repo_config
(gui.diffcontext
) -1
2292 ######################################################################
2302 menu .mbar
-tearoff 0
2303 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2304 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2305 if {[is_enabled branch
]} {
2306 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2308 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2309 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2311 if {[is_enabled transport
]} {
2312 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2313 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2315 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2316 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2318 . configure
-menu .mbar
2320 # -- Repository Menu
2322 menu .mbar.repository
2324 .mbar.repository add
command \
2325 -label [mc
"Explore Working Copy"] \
2326 -command {do_explore
}
2327 .mbar.repository add separator
2329 .mbar.repository add
command \
2330 -label [mc
"Browse Current Branch's Files"] \
2331 -command {browser
::new
$current_branch}
2332 set ui_browse_current
[.mbar.repository index last
]
2333 .mbar.repository add
command \
2334 -label [mc
"Browse Branch Files..."] \
2335 -command browser_open
::dialog
2336 .mbar.repository add separator
2338 .mbar.repository add
command \
2339 -label [mc
"Visualize Current Branch's History"] \
2340 -command {do_gitk
$current_branch}
2341 set ui_visualize_current
[.mbar.repository index last
]
2342 .mbar.repository add
command \
2343 -label [mc
"Visualize All Branch History"] \
2344 -command {do_gitk
--all}
2345 .mbar.repository add separator
2347 proc current_branch_write
{args
} {
2348 global current_branch
2349 .mbar.repository entryconf $
::ui_browse_current \
2350 -label [mc
"Browse %s's Files" $current_branch]
2351 .mbar.repository entryconf $
::ui_visualize_current \
2352 -label [mc
"Visualize %s's History" $current_branch]
2354 trace add variable current_branch
write current_branch_write
2356 if {[is_enabled multicommit
]} {
2357 .mbar.repository add
command -label [mc
"Database Statistics"] \
2360 .mbar.repository add
command -label [mc
"Compress Database"] \
2363 .mbar.repository add
command -label [mc
"Verify Database"] \
2364 -command do_fsck_objects
2366 .mbar.repository add separator
2369 .mbar.repository add
command \
2370 -label [mc
"Create Desktop Icon"] \
2371 -command do_cygwin_shortcut
2372 } elseif
{[is_Windows
]} {
2373 .mbar.repository add
command \
2374 -label [mc
"Create Desktop Icon"] \
2375 -command do_windows_shortcut
2376 } elseif
{[is_MacOSX
]} {
2377 .mbar.repository add
command \
2378 -label [mc
"Create Desktop Icon"] \
2379 -command do_macosx_app
2384 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2386 .mbar.repository add
command -label [mc Quit
] \
2394 .mbar.edit add
command -label [mc Undo
] \
2395 -command {catch
{[focus
] edit undo
}} \
2397 .mbar.edit add
command -label [mc Redo
] \
2398 -command {catch
{[focus
] edit redo
}} \
2400 .mbar.edit add separator
2401 .mbar.edit add
command -label [mc Cut
] \
2402 -command {catch
{tk_textCut
[focus
]}} \
2404 .mbar.edit add
command -label [mc Copy
] \
2405 -command {catch
{tk_textCopy
[focus
]}} \
2407 .mbar.edit add
command -label [mc Paste
] \
2408 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2410 .mbar.edit add
command -label [mc Delete
] \
2411 -command {catch
{[focus
] delete sel.first sel.last
}} \
2413 .mbar.edit add separator
2414 .mbar.edit add
command -label [mc
"Select All"] \
2415 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2420 if {[is_enabled branch
]} {
2423 .mbar.branch add
command -label [mc
"Create..."] \
2424 -command branch_create
::dialog \
2426 lappend disable_on_lock
[list .mbar.branch entryconf \
2427 [.mbar.branch index last
] -state]
2429 .mbar.branch add
command -label [mc
"Checkout..."] \
2430 -command branch_checkout
::dialog \
2432 lappend disable_on_lock
[list .mbar.branch entryconf \
2433 [.mbar.branch index last
] -state]
2435 .mbar.branch add
command -label [mc
"Rename..."] \
2436 -command branch_rename
::dialog
2437 lappend disable_on_lock
[list .mbar.branch entryconf \
2438 [.mbar.branch index last
] -state]
2440 .mbar.branch add
command -label [mc
"Delete..."] \
2441 -command branch_delete
::dialog
2442 lappend disable_on_lock
[list .mbar.branch entryconf \
2443 [.mbar.branch index last
] -state]
2445 .mbar.branch add
command -label [mc
"Reset..."] \
2446 -command merge
::reset_hard
2447 lappend disable_on_lock
[list .mbar.branch entryconf \
2448 [.mbar.branch index last
] -state]
2453 proc commit_btn_caption
{} {
2454 if {[is_enabled nocommit
]} {
2457 return [mc Commit@@verb
]
2461 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2464 if {![is_enabled nocommit
]} {
2465 .mbar.commit add radiobutton \
2466 -label [mc
"New Commit"] \
2467 -command do_select_commit_type \
2468 -variable selected_commit_type \
2470 lappend disable_on_lock \
2471 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2473 .mbar.commit add radiobutton \
2474 -label [mc
"Amend Last Commit"] \
2475 -command do_select_commit_type \
2476 -variable selected_commit_type \
2478 lappend disable_on_lock \
2479 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2481 .mbar.commit add separator
2484 .mbar.commit add
command -label [mc Rescan
] \
2485 -command ui_do_rescan \
2487 lappend disable_on_lock \
2488 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2490 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2491 -command do_add_selection \
2493 lappend disable_on_lock \
2494 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2496 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2497 -command do_add_all \
2499 lappend disable_on_lock \
2500 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2502 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2503 -command do_unstage_selection
2504 lappend disable_on_lock \
2505 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2507 .mbar.commit add
command -label [mc
"Revert Changes"] \
2508 -command do_revert_selection
2509 lappend disable_on_lock \
2510 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2512 .mbar.commit add separator
2514 .mbar.commit add
command -label [mc
"Show Less Context"] \
2515 -command show_less_context \
2516 -accelerator $M1T-\
-
2518 .mbar.commit add
command -label [mc
"Show More Context"] \
2519 -command show_more_context \
2522 .mbar.commit add separator
2524 if {![is_enabled nocommitmsg
]} {
2525 .mbar.commit add
command -label [mc
"Sign Off"] \
2526 -command do_signoff \
2530 .mbar.commit add
command -label [commit_btn_caption
] \
2531 -command do_commit \
2532 -accelerator $M1T-Return
2533 lappend disable_on_lock \
2534 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2539 if {[is_enabled branch
]} {
2541 .mbar.merge add
command -label [mc
"Local Merge..."] \
2542 -command merge
::dialog \
2544 lappend disable_on_lock \
2545 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2546 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2547 -command merge
::reset_hard
2548 lappend disable_on_lock \
2549 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2554 if {[is_enabled transport
]} {
2557 .mbar.remote add
command \
2558 -label [mc
"Add..."] \
2559 -command remote_add
::dialog \
2561 .mbar.remote add
command \
2562 -label [mc
"Push..."] \
2563 -command do_push_anywhere \
2565 .mbar.remote add
command \
2566 -label [mc
"Delete Branch..."] \
2567 -command remote_branch_delete
::dialog
2571 # -- Apple Menu (Mac OS X only)
2573 .mbar add cascade
-label Apple
-menu .mbar.apple
2576 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2578 .mbar.apple add separator
2579 .mbar.apple add
command \
2580 -label [mc
"Preferences..."] \
2581 -command do_options \
2583 bind .
<$M1B-,> do_options
2587 .mbar.edit add separator
2588 .mbar.edit add
command -label [mc
"Options..."] \
2594 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2595 set tools_menubar .mbar.tools
2597 $tools_menubar add separator
2598 $tools_menubar add
command -label [mc
"Add..."] -command tools_add
::dialog
2599 $tools_menubar add
command -label [mc
"Remove..."] -command tools_remove
::dialog
2601 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
2608 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2612 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2617 set doc_path
[githtmldir
]
2618 if {$doc_path ne
{}} {
2619 set doc_path
[file join $doc_path index.html
]
2622 set doc_path
[exec cygpath
--mixed $doc_path]
2626 if {[file isfile
$doc_path]} {
2627 set doc_url
"file:$doc_path"
2629 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2632 proc start_browser
{url
} {
2633 git
"web--browse" $url
2636 .mbar.
help add
command -label [mc
"Online Documentation"] \
2637 -command [list start_browser
$doc_url]
2639 .mbar.
help add
command -label [mc
"Show SSH Key"] \
2642 unset doc_path doc_url
2644 # -- Standard bindings
2646 wm protocol . WM_DELETE_WINDOW do_quit
2647 bind all
<$M1B-Key-q> do_quit
2648 bind all
<$M1B-Key-Q> do_quit
2649 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2650 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2652 set subcommand_args
{}
2654 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2658 proc normalize_relpath
{path
} {
2660 foreach item
[file split $path] {
2661 if {$item eq
{.
}} continue
2662 if {$item eq
{..
} && [llength
$elements] > 0
2663 && [lindex
$elements end
] ne
{..
}} {
2664 set elements
[lrange
$elements 0 end-1
]
2667 lappend elements
$item
2669 return [eval file join $elements]
2672 # -- Not a normal commit type invocation? Do that instead!
2674 switch
-- $subcommand {
2677 if {$subcommand eq
"blame"} {
2678 set subcommand_args
{[--line=<num
>] rev? path
}
2680 set subcommand_args
{rev? path
}
2682 if {$argv eq
{}} usage
2688 if {$is_path ||
[file exists
$_prefix$a]} {
2689 if {$path ne
{}} usage
2690 set path
[normalize_relpath
$_prefix$a]
2692 } elseif
{$a eq
{--}} {
2694 if {$head ne
{}} usage
2699 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
2700 if {$jump_spec ne
{} ||
$head ne
{}} usage
2701 set jump_spec
[list
$lnum]
2702 } elseif
{$head eq
{}} {
2703 if {$head ne
{}} usage
2712 if {$head ne
{} && $path eq
{}} {
2713 set path
[normalize_relpath
$_prefix$head]
2720 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2722 set head [git rev-parse
--verify $head]
2728 set current_branch
$head
2731 switch
-- $subcommand {
2733 if {$jump_spec ne
{}} usage
2735 if {$path ne
{} && [file isdirectory
$path]} {
2736 set head $current_branch
2742 browser
::new
$head $path
2745 if {$head eq
{} && ![file exists
$path]} {
2746 puts stderr
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
2749 blame
::new
$head $path $jump_spec
2756 if {[llength
$argv] != 0} {
2757 puts
-nonewline stderr
"usage: $argv0"
2758 if {$subcommand ne
{gui
}
2759 && [file tail $argv0] ne
"git-$subcommand"} {
2760 puts
-nonewline stderr
" $subcommand"
2765 # fall through to setup UI for commits
2768 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2779 -text [mc
"Current Branch:"] \
2783 -textvariable current_branch \
2786 pack .branch.l1
-side left
2787 pack .branch.cb
-side left
-fill x
2788 pack .branch
-side top
-fill x
2790 # -- Main Window Layout
2792 panedwindow .vpane
-orient horizontal
2793 panedwindow .vpane.files
-orient vertical
2794 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2795 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2797 # -- Index File List
2799 frame .vpane.files.index
-height 100 -width 200
2800 label .vpane.files.index.title
-text [mc
"Staged Changes (Will Commit)"] \
2801 -background lightgreen
-foreground black
2802 text
$ui_index -background white
-foreground black \
2804 -width 20 -height 10 \
2806 -cursor $cursor_ptr \
2807 -xscrollcommand {.vpane.files.index.sx
set} \
2808 -yscrollcommand {.vpane.files.index.sy
set} \
2810 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2811 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2812 pack .vpane.files.index.title
-side top
-fill x
2813 pack .vpane.files.index.sx
-side bottom
-fill x
2814 pack .vpane.files.index.sy
-side right
-fill y
2815 pack
$ui_index -side left
-fill both
-expand 1
2817 # -- Working Directory File List
2819 frame .vpane.files.workdir
-height 100 -width 200
2820 label .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
2821 -background lightsalmon
-foreground black
2822 text
$ui_workdir -background white
-foreground black \
2824 -width 20 -height 10 \
2826 -cursor $cursor_ptr \
2827 -xscrollcommand {.vpane.files.workdir.sx
set} \
2828 -yscrollcommand {.vpane.files.workdir.sy
set} \
2830 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2831 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2832 pack .vpane.files.workdir.title
-side top
-fill x
2833 pack .vpane.files.workdir.sx
-side bottom
-fill x
2834 pack .vpane.files.workdir.sy
-side right
-fill y
2835 pack
$ui_workdir -side left
-fill both
-expand 1
2837 .vpane.files add .vpane.files.workdir
-sticky nsew
2838 .vpane.files add .vpane.files.index
-sticky nsew
2840 foreach i
[list
$ui_index $ui_workdir] {
2842 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2846 # -- Diff and Commit Area
2848 frame .vpane.lower
-height 300 -width 400
2849 frame .vpane.lower.commarea
2850 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2851 pack .vpane.lower.
diff -fill both
-expand 1
2852 pack .vpane.lower.commarea
-side bottom
-fill x
2853 .vpane add .vpane.lower
-sticky nsew
2855 # -- Commit Area Buttons
2857 frame .vpane.lower.commarea.buttons
2858 label .vpane.lower.commarea.buttons.l
-text {} \
2861 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2862 pack .vpane.lower.commarea.buttons
-side left
-fill y
2864 button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
2865 -command ui_do_rescan
2866 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2867 lappend disable_on_lock \
2868 {.vpane.lower.commarea.buttons.rescan conf
-state}
2870 button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
2872 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2873 lappend disable_on_lock \
2874 {.vpane.lower.commarea.buttons.incall conf
-state}
2876 if {![is_enabled nocommitmsg
]} {
2877 button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
2879 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2882 button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
2884 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2885 lappend disable_on_lock \
2886 {.vpane.lower.commarea.buttons.commit conf
-state}
2888 if {![is_enabled nocommit
]} {
2889 button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
2890 -command do_push_anywhere
2891 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2894 # -- Commit Message Buffer
2896 frame .vpane.lower.commarea.buffer
2897 frame .vpane.lower.commarea.buffer.header
2898 set ui_comm .vpane.lower.commarea.buffer.t
2899 set ui_coml .vpane.lower.commarea.buffer.header.l
2901 if {![is_enabled nocommit
]} {
2902 radiobutton .vpane.lower.commarea.buffer.header.new \
2903 -text [mc
"New Commit"] \
2904 -command do_select_commit_type \
2905 -variable selected_commit_type \
2907 lappend disable_on_lock \
2908 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2909 radiobutton .vpane.lower.commarea.buffer.header.amend \
2910 -text [mc
"Amend Last Commit"] \
2911 -command do_select_commit_type \
2912 -variable selected_commit_type \
2914 lappend disable_on_lock \
2915 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2921 proc trace_commit_type
{varname args
} {
2922 global ui_coml commit_type
2923 switch
-glob -- $commit_type {
2924 initial
{set txt
[mc
"Initial Commit Message:"]}
2925 amend
{set txt
[mc
"Amended Commit Message:"]}
2926 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
2927 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
2928 merge
{set txt
[mc
"Merge Commit Message:"]}
2929 * {set txt
[mc
"Commit Message:"]}
2931 $ui_coml conf
-text $txt
2933 trace add variable commit_type
write trace_commit_type
2934 pack
$ui_coml -side left
-fill x
2936 if {![is_enabled nocommit
]} {
2937 pack .vpane.lower.commarea.buffer.header.amend
-side right
2938 pack .vpane.lower.commarea.buffer.header.new
-side right
2941 text
$ui_comm -background white
-foreground black \
2945 -autoseparators true \
2947 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
2949 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2950 scrollbar .vpane.lower.commarea.buffer.sby \
2951 -command [list
$ui_comm yview
]
2952 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2953 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2954 pack
$ui_comm -side left
-fill y
2955 pack .vpane.lower.commarea.buffer
-side left
-fill y
2957 # -- Commit Message Buffer Context Menu
2959 set ctxm .vpane.lower.commarea.buffer.ctxm
2960 menu
$ctxm -tearoff 0
2963 -command {tk_textCut
$ui_comm}
2966 -command {tk_textCopy
$ui_comm}
2969 -command {tk_textPaste
$ui_comm}
2971 -label [mc Delete
] \
2972 -command {catch
{$ui_comm delete sel.first sel.last
}}
2975 -label [mc
"Select All"] \
2976 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2978 -label [mc
"Copy All"] \
2980 $ui_comm tag add sel
0.0 end
2981 tk_textCopy
$ui_comm
2982 $ui_comm tag remove sel
0.0 end
2986 -label [mc
"Sign Off"] \
2988 set ui_comm_ctxm
$ctxm
2992 proc trace_current_diff_path
{varname args
} {
2993 global current_diff_path diff_actions file_states
2994 if {$current_diff_path eq
{}} {
3000 set p
$current_diff_path
3001 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3003 set p
[escape_path
$p]
3007 .vpane.lower.
diff.header.status configure
-text $s
3008 .vpane.lower.
diff.header.
file configure
-text $f
3009 .vpane.lower.
diff.header.path configure
-text $p
3010 foreach w
$diff_actions {
3014 trace add variable current_diff_path
write trace_current_diff_path
3016 frame .vpane.lower.
diff.header
-background gold
3017 label .vpane.lower.
diff.header.status \
3020 -width $max_status_desc \
3023 label .vpane.lower.
diff.header.
file \
3028 label .vpane.lower.
diff.header.path \
3033 pack .vpane.lower.
diff.header.status
-side left
3034 pack .vpane.lower.
diff.header.
file -side left
3035 pack .vpane.lower.
diff.header.path
-fill x
3036 set ctxm .vpane.lower.
diff.header.ctxm
3037 menu
$ctxm -tearoff 0
3045 -- $current_diff_path
3047 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3048 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3052 frame .vpane.lower.
diff.body
3053 set ui_diff .vpane.lower.
diff.body.t
3054 text
$ui_diff -background white
-foreground black \
3056 -width 80 -height 15 -wrap none \
3058 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
3059 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
3061 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3062 -command [list
$ui_diff xview
]
3063 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3064 -command [list
$ui_diff yview
]
3065 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3066 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3067 pack
$ui_diff -side left
-fill both
-expand 1
3068 pack .vpane.lower.
diff.header
-side top
-fill x
3069 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3071 $ui_diff tag conf d_cr
-elide true
3072 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
3073 $ui_diff tag conf d_
+ -foreground {#00a000}
3074 $ui_diff tag conf d_-
-foreground red
3076 $ui_diff tag conf d_
++ -foreground {#00a000}
3077 $ui_diff tag conf d_--
-foreground red
3078 $ui_diff tag conf d_
+s \
3079 -foreground {#00a000} \
3080 -background {#e2effa}
3081 $ui_diff tag conf d_-s \
3083 -background {#e2effa}
3084 $ui_diff tag conf d_s
+ \
3085 -foreground {#00a000} \
3087 $ui_diff tag conf d_s- \
3091 $ui_diff tag conf d
<<<<<<< \
3092 -foreground orange \
3094 $ui_diff tag conf d
======= \
3095 -foreground orange \
3097 $ui_diff tag conf d
>>>>>>> \
3098 -foreground orange \
3101 $ui_diff tag raise sel
3103 # -- Diff Body Context Menu
3106 proc create_common_diff_popup
{ctxm
} {
3108 -label [mc
"Show Less Context"] \
3109 -command show_less_context
3110 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3112 -label [mc
"Show More Context"] \
3113 -command show_more_context
3114 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3117 -label [mc Refresh
] \
3118 -command reshow_diff
3119 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3122 -command {tk_textCopy
$ui_diff}
3123 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3125 -label [mc
"Select All"] \
3126 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3127 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3129 -label [mc
"Copy All"] \
3131 $ui_diff tag add sel
0.0 end
3132 tk_textCopy
$ui_diff
3133 $ui_diff tag remove sel
0.0 end
3135 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3138 -label [mc
"Decrease Font Size"] \
3139 -command {incr_font_size font_diff
-1}
3140 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3142 -label [mc
"Increase Font Size"] \
3143 -command {incr_font_size font_diff
1}
3144 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3148 build_encoding_menu
$emenu [list force_diff_encoding
]
3150 -label [mc
"Encoding"] \
3152 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3154 $ctxm add
command -label [mc
"Options..."] \
3158 set ctxm .vpane.lower.
diff.body.ctxm
3159 menu
$ctxm -tearoff 0
3161 -label [mc
"Apply/Reverse Hunk"] \
3162 -command {apply_hunk
$cursorX $cursorY}
3163 set ui_diff_applyhunk
[$ctxm index last
]
3164 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3166 -label [mc
"Apply/Reverse Line"] \
3167 -command {apply_line
$cursorX $cursorY; do_rescan
}
3168 set ui_diff_applyline
[$ctxm index last
]
3169 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3171 create_common_diff_popup
$ctxm
3173 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3174 menu
$ctxmmg -tearoff 0
3175 $ctxmmg add
command \
3176 -label [mc
"Run Merge Tool"] \
3177 -command {merge_resolve_tool
}
3178 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3179 $ctxmmg add separator
3180 $ctxmmg add
command \
3181 -label [mc
"Use Remote Version"] \
3182 -command {merge_resolve_one
3}
3183 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3184 $ctxmmg add
command \
3185 -label [mc
"Use Local Version"] \
3186 -command {merge_resolve_one
2}
3187 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3188 $ctxmmg add
command \
3189 -label [mc
"Revert To Base"] \
3190 -command {merge_resolve_one
1}
3191 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3192 $ctxmmg add separator
3193 create_common_diff_popup
$ctxmmg
3195 proc popup_diff_menu
{ctxm ctxmmg x y X Y
} {
3196 global current_diff_path file_states
3199 if {[info exists file_states
($current_diff_path)]} {
3200 set state
[lindex
$file_states($current_diff_path) 0]
3204 if {[string first
{U
} $state] >= 0} {
3205 tk_popup
$ctxmmg $X $Y
3207 if {$
::ui_index eq $
::current_diff_side
} {
3208 set l
[mc
"Unstage Hunk From Commit"]
3209 set t
[mc
"Unstage Line From Commit"]
3211 set l
[mc
"Stage Hunk For Commit"]
3212 set t
[mc
"Stage Line For Commit"]
3215 ||
$current_diff_path eq
{}
3219 ||
{T_
} eq
$state} {
3224 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3225 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3226 tk_popup
$ctxm $X $Y
3229 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg %x
%y
%X
%Y
]
3233 set main_status
[::status_bar
::new .status
]
3234 pack .status
-anchor w
-side bottom
-fill x
3235 $main_status show
[mc
"Initializing..."]
3240 set gm
$repo_config(gui.geometry
)
3241 wm geometry .
[lindex
$gm 0]
3242 .vpane sash place
0 \
3244 [lindex
[.vpane sash coord
0] 1]
3245 .vpane.files sash place
0 \
3246 [lindex
[.vpane.files sash coord
0] 0] \
3253 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3254 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3255 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3256 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3257 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3258 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3259 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3260 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3261 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3262 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3263 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3264 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3265 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3266 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3267 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3268 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3269 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3270 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3272 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3273 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3274 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3275 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3276 bind $ui_diff <$M1B-Key-v> {break}
3277 bind $ui_diff <$M1B-Key-V> {break}
3278 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3279 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3280 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3281 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3282 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3283 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3284 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3285 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3286 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3287 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3288 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3289 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3290 bind $ui_diff <Button-1
> {focus
%W
}
3292 if {[is_enabled branch
]} {
3293 bind .
<$M1B-Key-n> branch_create
::dialog
3294 bind .
<$M1B-Key-N> branch_create
::dialog
3295 bind .
<$M1B-Key-o> branch_checkout
::dialog
3296 bind .
<$M1B-Key-O> branch_checkout
::dialog
3297 bind .
<$M1B-Key-m> merge
::dialog
3298 bind .
<$M1B-Key-M> merge
::dialog
3300 if {[is_enabled transport
]} {
3301 bind .
<$M1B-Key-p> do_push_anywhere
3302 bind .
<$M1B-Key-P> do_push_anywhere
3305 bind .
<Key-F5
> ui_do_rescan
3306 bind .
<$M1B-Key-r> ui_do_rescan
3307 bind .
<$M1B-Key-R> ui_do_rescan
3308 bind .
<$M1B-Key-s> do_signoff
3309 bind .
<$M1B-Key-S> do_signoff
3310 bind .
<$M1B-Key-t> do_add_selection
3311 bind .
<$M1B-Key-T> do_add_selection
3312 bind .
<$M1B-Key-i> do_add_all
3313 bind .
<$M1B-Key-I> do_add_all
3314 bind .
<$M1B-Key-minus> {show_less_context
;break}
3315 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3316 bind .
<$M1B-Key-equal> {show_more_context
;break}
3317 bind .
<$M1B-Key-plus> {show_more_context
;break}
3318 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3319 bind .
<$M1B-Key-Return> do_commit
3320 foreach i
[list
$ui_index $ui_workdir] {
3321 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3322 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3323 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3327 set file_lists
($ui_index) [list
]
3328 set file_lists
($ui_workdir) [list
]
3330 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
3331 focus
-force $ui_comm
3333 # -- Warn the user about environmental problems. Cygwin's Tcl
3334 # does *not* pass its env array onto any processes it spawns.
3335 # This means that git processes get none of our environment.
3340 set msg
[mc
"Possible environment issues exist.
3342 The following environment variables are probably
3343 going to be ignored by any Git subprocess run
3347 foreach name
[array names env
] {
3348 switch
-regexp -- $name {
3349 {^GIT_INDEX_FILE$
} -
3350 {^GIT_OBJECT_DIRECTORY$
} -
3351 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3353 {^GIT_EXTERNAL_DIFF$
} -
3357 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3358 append msg
" - $name\n"
3361 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3362 append msg
" - $name\n"
3364 set suggest_user
$name
3368 if {$ignored_env > 0} {
3370 This is due to a known issue with the
3371 Tcl binary distributed by Cygwin."]
3373 if {$suggest_user ne
{}} {
3376 A good replacement for %s
3377 is placing values for the user.name and
3378 user.email settings into your personal
3384 unset ignored_env msg suggest_user name
3387 # -- Only initialize complex UI if we are going to stay running.
3389 if {[is_enabled transport
]} {
3392 set n
[.mbar.remote index end
]
3393 populate_remotes_menu
3394 set n
[expr {[.mbar.remote index end
] - $n}]
3396 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3397 .mbar.remote insert
$n separator
3402 if {[winfo exists
$ui_comm]} {
3403 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3405 # -- If both our backup and message files exist use the
3406 # newer of the two files to initialize the buffer.
3408 if {$GITGUI_BCK_exists} {
3409 set m
[gitdir GITGUI_MSG
]
3410 if {[file isfile
$m]} {
3411 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3412 catch
{file delete
[gitdir GITGUI_MSG
]}
3414 $ui_comm delete
0.0 end
3416 $ui_comm edit modified false
3417 catch
{file delete
[gitdir GITGUI_BCK
]}
3418 set GITGUI_BCK_exists
0
3424 proc backup_commit_buffer
{} {
3425 global ui_comm GITGUI_BCK_exists
3427 set m
[$ui_comm edit modified
]
3428 if {$m ||
$GITGUI_BCK_exists} {
3429 set msg
[string trim
[$ui_comm get
0.0 end
]]
3430 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3433 if {$GITGUI_BCK_exists} {
3434 catch
{file delete
[gitdir GITGUI_BCK
]}
3435 set GITGUI_BCK_exists
0
3439 set fd
[open
[gitdir GITGUI_BCK
] w
]
3440 puts
-nonewline $fd $msg
3442 set GITGUI_BCK_exists
1
3446 $ui_comm edit modified false
3449 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3452 backup_commit_buffer
3454 # -- If the user has aspell available we can drive it
3455 # in pipe mode to spellcheck the commit message.
3457 set spell_cmd
[list |
]
3458 set spell_dict
[get_config gui.spellingdictionary
]
3459 lappend spell_cmd aspell
3460 if {$spell_dict ne
{}} {
3461 lappend spell_cmd
--master=$spell_dict
3463 lappend spell_cmd
--mode=none
3464 lappend spell_cmd
--encoding=utf-8
3465 lappend spell_cmd pipe
3466 if {$spell_dict eq
{none
}
3467 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3468 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3470 set ui_comm_spell
[spellcheck
::init \
3476 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3479 lock_index begin-read
3480 if {![winfo ismapped .
]} {
3484 if {[is_enabled initialamend
]} {
3490 if {[is_enabled nocommitmsg
]} {
3491 $ui_comm configure
-state disabled
-background gray
3494 if {[is_enabled multicommit
]} {
3497 if {[is_enabled retcode
]} {
3498 bind .
<Destroy
> {+terminate_me
%W
}
3500 if {$picked && [is_config_true gui.autoexplore
]} {