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
}
129 set _trace
[lsearch
-exact $argv --trace]
131 set argv
[lreplace
$argv $_trace $_trace]
147 return [eval [list
file join $_gitdir] $args]
150 proc gitexec
{args
} {
152 if {$_gitexec eq
{}} {
153 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
154 error
"Git not installed?\n\n$err"
157 set _gitexec
[exec cygpath \
162 set _gitexec
[file normalize
$_gitexec]
168 return [eval [list
file join $_gitexec] $args]
176 if {[tk windowingsystem
] eq
{aqua
}} {
183 if {$
::tcl_platform
(platform
) eq
{windows
}} {
191 if {$_iscygwin eq
{}} {
192 if {$
::tcl_platform
(platform
) eq
{windows
}} {
193 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
205 proc is_enabled
{option
} {
206 global enabled_options
207 if {[catch
{set on
$enabled_options($option)}]} {return 0}
211 proc enable_option
{option
} {
212 global enabled_options
213 set enabled_options
($option) 1
216 proc disable_option
{option
} {
217 global enabled_options
218 set enabled_options
($option) 0
221 ######################################################################
225 proc is_many_config
{name
} {
226 switch
-glob -- $name {
236 proc is_config_true
{name
} {
238 if {[catch
{set v
$repo_config($name)}]} {
240 } elseif
{$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes}} {
247 proc get_config
{name
} {
249 if {[catch
{set v
$repo_config($name)}]} {
256 ######################################################################
260 proc _trace_exec
{cmd
} {
261 if {!$
::_trace
} return
267 if {[regexp
{[ \t\r\n'"$?*]} $v]} {
275 proc _git_cmd {name} {
278 if {[catch {set v $_git_cmd_path($name)}]} {
282 --exec-path { return [list $::_git $name] }
285 set p [gitexec git-$name$::_search_exe]
286 if {[file exists $p]} {
288 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
289 # Try to determine what sort of magic will make
290 # git-$name go and do its thing, because native
291 # Tcl on Windows doesn't know it.
293 set p
[gitexec git-
$name]
298 switch
-glob -- [lindex
$s 0] {
300 #!*perl { set i perl }
301 #!*python { set i python }
302 default
{ error
"git-$name is not supported: $s" }
306 if {![info exists interp
]} {
307 set interp
[_which
$i]
310 error
"git-$name requires $i (not in PATH)"
312 set v
[concat
[list
$interp] [lrange
$s 1 end
] [list
$p]]
314 # Assume it is builtin to git somehow and we
315 # aren't actually able to see a file for it.
317 set v
[list $
::_git
$name]
319 set _git_cmd_path
($name) $v
324 proc _which
{what args
} {
325 global env _search_exe _search_path
327 if {$_search_path eq
{}} {
328 if {[is_Cygwin
] && [regexp
{^
(/|\.
:)} $env(PATH
)]} {
329 set _search_path
[split [exec cygpath \
335 } elseif
{[is_Windows
]} {
336 set gitguidir
[file dirname [info
script]]
337 regsub
-all ";" $gitguidir "\\;" gitguidir
338 set env
(PATH
) "$gitguidir;$env(PATH)"
339 set _search_path
[split $env(PATH
) {;}]
342 set _search_path
[split $env(PATH
) :]
347 if {[is_Windows
] && [lsearch
-exact $args -script] >= 0} {
350 set suffix
$_search_exe
353 foreach p
$_search_path {
354 set p
[file join $p $what$suffix]
355 if {[file exists
$p]} {
356 return [file normalize
$p]
362 proc _lappend_nice
{cmd_var
} {
366 if {![info exists _nice
]} {
367 set _nice
[_which nice
]
378 switch
-- [lindex
$args 0] {
389 set args
[lrange
$args 1 end
]
392 set cmdp
[_git_cmd
[lindex
$args 0]]
393 set args
[lrange
$args 1 end
]
395 _trace_exec
[concat
$opt $cmdp $args]
396 set result
[eval exec $opt $cmdp $args]
398 puts stderr
"< $result"
403 proc _open_stdout_stderr
{cmd
} {
406 set fd
[open
[concat
[list |
] $cmd] r
]
408 if { [lindex
$cmd end
] eq
{2>@
1}
409 && $err eq
{can not
find channel named
"1"}
411 # Older versions of Tcl 8.4 don't have this 2>@1 IO
412 # redirect operator. Fallback to |& cat for those.
413 # The command was not actually started, so its safe
414 # to try to start it a second time.
416 set fd
[open
[concat \
418 [lrange
$cmd 0 end-1
] \
425 fconfigure
$fd -eofchar {}
429 proc git_read
{args
} {
433 switch
-- [lindex
$args 0] {
448 set args
[lrange
$args 1 end
]
451 set cmdp
[_git_cmd
[lindex
$args 0]]
452 set args
[lrange
$args 1 end
]
454 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
457 proc git_write
{args
} {
461 switch
-- [lindex
$args 0] {
472 set args
[lrange
$args 1 end
]
475 set cmdp
[_git_cmd
[lindex
$args 0]]
476 set args
[lrange
$args 1 end
]
478 _trace_exec
[concat
$opt $cmdp $args]
479 return [open
[concat
[list |
] $opt $cmdp $args] w
]
482 proc githook_read
{hook_name args
} {
483 set pchook
[gitdir hooks
$hook_name]
486 # On Windows [file executable] might lie so we need to ask
487 # the shell if the hook is executable. Yes that's annoying.
491 if {![info exists interp
]} {
492 set interp
[_which sh
]
495 error
"hook execution requires sh (not in PATH)"
498 set scr
{if test -x "$1";then exec "$@";fi}
499 set sh_c
[list
$interp -c $scr $interp $pchook]
500 return [_open_stdout_stderr
[concat
$sh_c $args]]
503 if {[file executable
$pchook]} {
504 return [_open_stdout_stderr
[concat
[list
$pchook] $args]]
510 proc kill_file_process
{fd
} {
511 set process
[pid
$fd]
515 # Use a Cygwin-specific flag to allow killing
516 # native Windows processes
517 exec kill -f $process
524 proc gitattr
{path attr default
} {
525 if {[catch
{set r
[git check-attr
$attr -- $path]}]} {
528 set r
[join [lrange
[split $r :] 2 end
] :]
531 if {$r eq
{unspecified
}} {
538 regsub
-all ' $value "'\\''" value
542 proc load_current_branch {} {
543 global current_branch is_detached
545 set fd [open [gitdir HEAD] r]
546 if {[gets $fd ref] < 1} {
551 set pfx {ref: refs/heads/}
552 set len [string length $pfx]
553 if {[string equal -length $len $pfx $ref]} {
554 # We're on a branch. It might not exist. But
555 # HEAD looks good enough to be a branch.
557 set current_branch [string range $ref $len end]
560 # Assume this is a detached head.
562 set current_branch HEAD
567 auto_load tk_optionMenu
568 rename tk_optionMenu real__tkOptionMenu
569 proc tk_optionMenu {w varName args} {
570 set m [eval real__tkOptionMenu $w $varName $args]
571 $m configure -font font_ui
572 $w configure -font font_ui
576 proc rmsel_tag {text} {
578 -background [$text cget -background] \
579 -foreground [$text cget -foreground] \
581 $text tag conf in_sel -background lightgray
582 bind $text <Motion> break
587 bind . <Visibility> {
588 bind . <Visibility> {}
593 wm iconbitmap . -default $oguilib/git-gui.ico
596 ######################################################################
601 font create font_diff -family Courier -size 10
605 eval font configure font_ui [font actual [.dummy cget -font]]
609 font create font_uiitalic
610 font create font_uibold
611 font create font_diffbold
612 font create font_diffitalic
614 foreach class {Button Checkbutton Entry Label
615 Labelframe Listbox Menu Message
616 Radiobutton Spinbox Text} {
617 option add *$class.font font_ui
621 if {[is_Windows] || [is_MacOSX]} {
622 option add *Menu.tearOff 0
633 proc bind_button3 {w cmd} {
634 bind $w <Any-Button-3> $cmd
636 # Mac OS X sends Button-2 on right click through three-button mouse,
637 # or through trackpad right-clicking (two-finger touch + click).
638 bind $w <Any-Button-2> $cmd
639 bind $w <Control-Button-1> $cmd
643 proc apply_config {} {
644 global repo_config font_descs
646 foreach option $font_descs {
647 set name [lindex $option 0]
648 set font [lindex $option 1]
651 foreach {cn cv} $repo_config(gui.$name) {
652 if {$cn eq {-weight}} {
655 font configure $font $cn $cv
658 font configure $font -weight normal
661 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
663 foreach {cn cv} [font configure $font] {
664 font configure ${font}bold $cn $cv
665 font configure ${font}italic $cn $cv
667 font configure ${font}bold -weight bold
668 font configure ${font}italic -slant italic
672 set default_config(branch.autosetupmerge) true
673 set default_config(merge.tool) {}
674 set default_config(merge.keepbackup) true
675 set default_config(merge.diffstat) true
676 set default_config(merge.summary) false
677 set default_config(merge.verbosity) 2
678 set default_config(user.name) {}
679 set default_config(user.email) {}
681 set default_config(gui.encoding) [encoding system]
682 set default_config(gui.matchtrackingbranch) false
683 set default_config(gui.pruneduringfetch) false
684 set default_config(gui.trustmtime) false
685 set default_config(gui.fastcopyblame) false
686 set default_config(gui.copyblamethreshold) 40
687 set default_config(gui.blamehistoryctx) 7
688 set default_config(gui.diffcontext) 5
689 set default_config(gui.commitmsgwidth) 75
690 set default_config(gui.newbranchtemplate) {}
691 set default_config(gui.spellingdictionary) {}
692 set default_config(gui.fontui) [font configure font_ui]
693 set default_config(gui.fontdiff) [font configure font_diff]
695 {fontui font_ui {mc "Main Font
"}}
696 {fontdiff font_diff {mc "Diff
/Console Font
"}}
699 ######################################################################
703 set _git [_which git]
705 catch {wm withdraw .}
709 -title [mc "git-gui
: fatal error
"] \
710 -message [mc "Cannot
find git
in PATH.
"]
714 ######################################################################
718 if {[catch {set _git_version [git --version]} err]} {
719 catch {wm withdraw .}
723 -title [mc "git-gui
: fatal error
"] \
724 -message "Cannot determine Git version
:
728 [appname
] requires Git
1.5.0 or later.
"
731 if {![regsub {^git version } $_git_version {} _git_version]} {
732 catch {wm withdraw .}
736 -title [mc "git-gui
: fatal error
"] \
737 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
741 set _real_git_version $_git_version
742 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
743 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
744 regsub {\.rc[0-9]+$} $_git_version {} _git_version
745 regsub {\.GIT$} $_git_version {} _git_version
746 regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
748 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
749 catch {wm withdraw .}
754 -title "[appname
]: warning
" \
755 -message [mc "Git version cannot be determined.
757 %s claims it is version
'%s'.
759 %s requires
at least Git
1.5.0 or later.
761 Assume
'%s' is version
1.5.0?
762 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
763 set _git_version 1.5.0
768 unset _real_git_version
770 proc git-version {args} {
773 switch [llength $args] {
779 set op [lindex $args 0]
780 set vr [lindex $args 1]
781 set cm [package vcompare $_git_version $vr]
782 return [expr $cm $op 0]
786 set type [lindex $args 0]
787 set name [lindex $args 1]
788 set parm [lindex $args 2]
789 set body [lindex $args 3]
791 if {($type ne {proc} && $type ne {method})} {
792 error "Invalid arguments to git-version
"
794 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
795 error "Last arm of
$type $name must be default
"
798 foreach {op vr cb} [lrange $body 0 end-2] {
799 if {[git-version $op $vr]} {
800 return [uplevel [list $type $name $parm $cb]]
804 return [uplevel [list $type $name $parm [lindex $body end]]]
808 error "git-version
>= x
"
814 if {[git-version < 1.5]} {
815 catch {wm withdraw .}
819 -title [mc "git-gui
: fatal error
"] \
820 -message "[appname
] requires Git
1.5.0 or later.
822 You are using
[git-version
]:
828 ######################################################################
830 ## configure our library
832 set idx [file join $oguilib tclIndex]
833 if {[catch {set fd [open $idx r]} err]} {
834 catch {wm withdraw .}
838 -title [mc "git-gui
: fatal error
"] \
842 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
844 while {[gets $fd n] >= 0} {
845 if {$n ne {} && ![string match #* $n]} {
857 if {[lsearch -exact $loaded $p] >= 0} continue
858 source [file join $oguilib $p]
863 set auto_path [concat [list $oguilib] $auto_path]
865 unset -nocomplain idx fd
867 ######################################################################
869 ## config file parsing
871 git-version proc _parse_config {arr_name args} {
878 [list git_read config] \
880 [list --null --list]]
881 fconfigure $fd_rc -translation binary
882 set buf [read $fd_rc]
885 foreach line [split $buf "\
0"] {
886 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
887 if {[is_many_config $name]} {
888 lappend arr($name) $value
890 set arr($name) $value
899 set fd_rc [eval [list git_read config --list] $args]
900 while {[gets $fd_rc line] >= 0} {
901 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
902 if {[is_many_config $name]} {
903 lappend arr($name) $value
905 set arr($name) $value
914 proc load_config {include_global} {
915 global repo_config global_config default_config
917 if {$include_global} {
918 _parse_config global_config --global
920 _parse_config repo_config
922 foreach name [array names default_config] {
923 if {[catch {set v $global_config($name)}]} {
924 set global_config($name) $default_config($name)
926 if {[catch {set v $repo_config($name)}]} {
927 set repo_config($name) $default_config($name)
932 ######################################################################
934 ## feature option selection
936 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
941 if {$subcommand eq {gui.sh}} {
944 if {$subcommand eq {gui} && [llength $argv] > 0} {
945 set subcommand [lindex $argv 0]
946 set argv [lrange $argv 1 end]
949 enable_option multicommit
951 enable_option transport
954 switch -- $subcommand {
959 disable_option multicommit
960 disable_option branch
961 disable_option transport
964 enable_option singlecommit
965 enable_option retcode
967 disable_option multicommit
968 disable_option branch
969 disable_option transport
971 while {[llength $argv] > 0} {
972 set a [lindex $argv 0]
975 enable_option initialamend
978 enable_option nocommit
979 enable_option nocommitmsg
982 disable_option nocommitmsg
989 set argv [lrange $argv 1 end]
994 ######################################################################
999 set _gitdir $env(GIT_DIR)
1003 set _gitdir [git rev-parse --git-dir]
1004 set _prefix [git rev-parse --show-prefix]
1008 choose_repository::pick
1010 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1011 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1013 if {![file isdirectory $_gitdir]} {
1014 catch {wm withdraw .}
1015 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1018 if {$_prefix ne {}} {
1019 regsub -all {[^/]+/} $_prefix ../ cdup
1020 if {[catch {cd $cdup} err]} {
1021 catch {wm withdraw .}
1022 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1026 } elseif {![is_enabled bare]} {
1027 if {[lindex [file split $_gitdir] end] ne {.git}} {
1028 catch {wm withdraw .}
1029 error_popup [strcat [mc "Cannot use funny .git directory
:"] "\n\n$_gitdir"]
1032 if {[catch {cd [file dirname $_gitdir]} err]} {
1033 catch {wm withdraw .}
1034 error_popup [strcat [mc "No working directory
"] " [file dirname $_gitdir]:\n\n$err"]
1038 set _reponame [file split [file normalize $_gitdir]]
1039 if {[lindex $_reponame end] eq {.git}} {
1040 set _reponame [lindex $_reponame end-1]
1042 set _reponame [lindex $_reponame end]
1045 ######################################################################
1049 set current_diff_path {}
1050 set current_diff_side {}
1051 set diff_actions [list]
1055 set MERGE_HEAD [list]
1058 set current_branch {}
1060 set current_diff_path {}
1062 set is_conflict_diff 0
1063 set selected_commit_type new
1065 set nullid "0000000000000000000000000000000000000000"
1066 set nullid2 "0000000000000000000000000000000000000001"
1068 ######################################################################
1076 set disable_on_lock [list]
1077 set index_lock_type none
1079 proc lock_index {type} {
1080 global index_lock_type disable_on_lock
1082 if {$index_lock_type eq {none}} {
1083 set index_lock_type $type
1084 foreach w $disable_on_lock {
1085 uplevel #0 $w disabled
1088 } elseif {$index_lock_type eq "begin-
$type"} {
1089 set index_lock_type $type
1095 proc unlock_index {} {
1096 global index_lock_type disable_on_lock
1098 set index_lock_type none
1099 foreach w $disable_on_lock {
1100 uplevel #0 $w normal
1104 ######################################################################
1108 proc repository_state {ctvar hdvar mhvar} {
1109 global current_branch
1110 upvar $ctvar ct $hdvar hd $mhvar mh
1115 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1121 set merge_head [gitdir MERGE_HEAD]
1122 if {[file exists $merge_head]} {
1124 set fd_mh [open $merge_head r]
1125 while {[gets $fd_mh line] >= 0} {
1136 global PARENT empty_tree
1138 set p [lindex $PARENT 0]
1142 if {$empty_tree eq {}} {
1143 set empty_tree [git mktree << {}]
1148 proc force_amend {} {
1149 global selected_commit_type
1150 global HEAD PARENT MERGE_HEAD commit_type
1152 repository_state newType newHEAD newMERGE_HEAD
1155 set MERGE_HEAD $newMERGE_HEAD
1156 set commit_type $newType
1158 set selected_commit_type amend
1159 do_select_commit_type
1162 proc rescan {after {honor_trustmtime 1}} {
1163 global HEAD PARENT MERGE_HEAD commit_type
1164 global ui_index ui_workdir ui_comm
1165 global rescan_active file_states
1168 if {$rescan_active > 0 || ![lock_index read]} return
1170 repository_state newType newHEAD newMERGE_HEAD
1171 if {[string match amend* $commit_type]
1172 && $newType eq {normal}
1173 && $newHEAD eq $HEAD} {
1177 set MERGE_HEAD $newMERGE_HEAD
1178 set commit_type $newType
1181 array unset file_states
1183 if {!$::GITGUI_BCK_exists &&
1184 (![$ui_comm edit modified]
1185 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1186 if {[string match amend* $commit_type]} {
1187 } elseif {[load_message GITGUI_MSG]} {
1188 } elseif {[run_prepare_commit_msg_hook]} {
1189 } elseif {[load_message MERGE_MSG]} {
1190 } elseif {[load_message SQUASH_MSG]} {
1193 $ui_comm edit modified false
1196 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1197 rescan_stage2 {} $after
1200 ui_status [mc "Refreshing
file status...
"]
1201 set fd_rf [git_read update-index \
1207 fconfigure $fd_rf -blocking 0 -translation binary
1208 fileevent $fd_rf readable \
1209 [list rescan_stage2 $fd_rf $after]
1214 set is_git_info_exclude {}
1215 proc have_info_exclude {} {
1216 global is_git_info_exclude
1218 if {$is_git_info_exclude eq {}} {
1219 if {[catch {exec test -f [gitdir info exclude]}]} {
1220 set is_git_info_exclude 0
1222 set is_git_info_exclude 1
1225 return $is_git_info_exclude
1228 proc have_info_exclude {} {
1229 return [file readable [gitdir info exclude]]
1233 proc rescan_stage2 {fd after} {
1234 global rescan_active buf_rdi buf_rdf buf_rlo
1238 if {![eof $fd]} return
1242 set ls_others [list --exclude-per-directory=.gitignore]
1243 if {[have_info_exclude]} {
1244 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1246 set user_exclude [get_config core.excludesfile]
1247 if {$user_exclude ne {} && [file readable $user_exclude]} {
1248 lappend ls_others "--exclude-from=$user_exclude"
1256 ui_status [mc "Scanning
for modified files ...
"]
1257 set fd_di [git_read diff-index --cached -z [PARENT]]
1258 set fd_df [git_read diff-files -z]
1259 set fd_lo [eval git_read ls-files --others -z $ls_others]
1261 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1262 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1263 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1264 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1265 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1266 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1269 proc load_message {file} {
1272 set f [gitdir $file]
1273 if {[file isfile $f]} {
1274 if {[catch {set fd [open $f r]}]} {
1277 fconfigure $fd -eofchar {}
1278 set content [string trim [read $fd]]
1280 regsub -all -line {[ \r\t]+$} $content {} content
1281 $ui_comm delete 0.0 end
1282 $ui_comm insert end $content
1288 proc run_prepare_commit_msg_hook {} {
1291 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1292 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1293 # empty file but existant file.
1295 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1297 if {[file isfile [gitdir MERGE_MSG]]} {
1298 set pcm_source "merge
"
1299 set fd_mm [open [gitdir MERGE_MSG] r]
1300 puts -nonewline $fd_pcm [read $fd_mm]
1302 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1303 set pcm_source "squash
"
1304 set fd_sm [open [gitdir SQUASH_MSG] r]
1305 puts -nonewline $fd_pcm [read $fd_sm]
1313 set fd_ph [githook_read prepare-commit-msg \
1314 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1316 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1320 ui_status [mc "Calling prepare-commit-msg hook...
"]
1323 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1324 fileevent $fd_ph readable \
1325 [list prepare_commit_msg_hook_wait $fd_ph]
1330 proc prepare_commit_msg_hook_wait {fd_ph} {
1333 append pch_error [read $fd_ph]
1334 fconfigure $fd_ph -blocking 1
1336 if {[catch {close $fd_ph}]} {
1337 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1338 hook_failed_popup prepare-commit-msg $pch_error
1339 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1342 load_message PREPARE_COMMIT_MSG
1345 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1348 fconfigure $fd_ph -blocking 0
1349 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1352 proc read_diff_index {fd after} {
1355 append buf_rdi [read $fd]
1357 set n [string length $buf_rdi]
1359 set z1 [string first "\
0" $buf_rdi $c]
1360 if {$z1 == -1} break
1362 set z2 [string first "\
0" $buf_rdi $z1]
1363 if {$z2 == -1} break
1366 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1367 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1369 [encoding convertfrom $p] \
1371 [list [lindex $i 0] [lindex $i 2]] \
1377 set buf_rdi [string range $buf_rdi $c end]
1382 rescan_done $fd buf_rdi $after
1385 proc read_diff_files {fd after} {
1388 append buf_rdf [read $fd]
1390 set n [string length $buf_rdf]
1392 set z1 [string first "\
0" $buf_rdf $c]
1393 if {$z1 == -1} break
1395 set z2 [string first "\
0" $buf_rdf $z1]
1396 if {$z2 == -1} break
1399 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1400 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1402 [encoding convertfrom $p] \
1405 [list [lindex $i 0] [lindex $i 2]]
1410 set buf_rdf [string range $buf_rdf $c end]
1415 rescan_done $fd buf_rdf $after
1418 proc read_ls_others {fd after} {
1421 append buf_rlo [read $fd]
1422 set pck [split $buf_rlo "\
0"]
1423 set buf_rlo [lindex $pck end]
1424 foreach p [lrange $pck 0 end-1] {
1425 set p [encoding convertfrom $p]
1426 if {[string index $p end] eq {/}} {
1427 set p [string range $p 0 end-1]
1431 rescan_done $fd buf_rlo $after
1434 proc rescan_done {fd buf after} {
1435 global rescan_active current_diff_path
1436 global file_states repo_config
1439 if {![eof $fd]} return
1442 if {[incr rescan_active -1] > 0} return
1447 if {$current_diff_path ne {}} reshow_diff
1448 if {$current_diff_path eq {}} select_first_diff
1453 proc prune_selection {} {
1454 global file_states selected_paths
1456 foreach path [array names selected_paths] {
1457 if {[catch {set still_here $file_states($path)}]} {
1458 unset selected_paths($path)
1463 ######################################################################
1467 proc mapicon {w state path} {
1470 if {[catch {set r $all_icons($state$w)}]} {
1471 puts "error
: no icon
for $w state
={$state} $path"
1477 proc mapdesc {state path} {
1480 if {[catch {set r $all_descs($state)}]} {
1481 puts "error
: no desc
for state
={$state} $path"
1487 proc ui_status {msg} {
1489 if {[info exists main_status]} {
1490 $main_status show $msg
1494 proc ui_ready {{test {}}} {
1496 if {[info exists main_status]} {
1497 $main_status show [mc "Ready.
"] $test
1501 proc escape_path {path} {
1502 regsub -all {\\} $path "\\\\" path
1503 regsub -all "\n" $path "\\n
" path
1507 proc short_path {path} {
1508 return [escape_path [lindex [file split $path] end]]
1512 set null_sha1 [string repeat 0 40]
1514 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1515 global file_states next_icon_id null_sha1
1517 set s0 [string index $new_state 0]
1518 set s1 [string index $new_state 1]
1520 if {[catch {set info $file_states($path)}]} {
1522 set icon n[incr next_icon_id]
1524 set state [lindex $info 0]
1525 set icon [lindex $info 1]
1526 if {$head_info eq {}} {set head_info [lindex $info 2]}
1527 if {$index_info eq {}} {set index_info [lindex $info 3]}
1530 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1531 elseif {$s0 eq {_}} {set s0 _}
1533 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1534 elseif {$s1 eq {_}} {set s1 _}
1536 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1537 set head_info [list 0 $null_sha1]
1538 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1539 && $head_info eq {}} {
1540 set head_info $index_info
1543 set file_states($path) [list $s0$s1 $icon \
1544 $head_info $index_info \
1549 proc display_file_helper {w path icon_name old_m new_m} {
1552 if {$new_m eq {_}} {
1553 set lno [lsearch -sorted -exact $file_lists($w) $path]
1555 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1557 $w conf -state normal
1558 $w delete $lno.0 [expr {$lno + 1}].0
1559 $w conf -state disabled
1561 } elseif {$old_m eq {_} && $new_m ne {_}} {
1562 lappend file_lists($w) $path
1563 set file_lists($w) [lsort -unique $file_lists($w)]
1564 set lno [lsearch -sorted -exact $file_lists($w) $path]
1566 $w conf -state normal
1567 $w image create $lno.0 \
1568 -align center -padx 5 -pady 1 \
1570 -image [mapicon $w $new_m $path]
1571 $w insert $lno.1 "[escape_path
$path]\n"
1572 $w conf -state disabled
1573 } elseif {$old_m ne $new_m} {
1574 $w conf -state normal
1575 $w image conf $icon_name -image [mapicon $w $new_m $path]
1576 $w conf -state disabled
1580 proc display_file {path state} {
1581 global file_states selected_paths
1582 global ui_index ui_workdir
1584 set old_m [merge_state $path $state]
1585 set s $file_states($path)
1586 set new_m [lindex $s 0]
1587 set icon_name [lindex $s 1]
1589 set o [string index $old_m 0]
1590 set n [string index $new_m 0]
1597 display_file_helper $ui_index $path $icon_name $o $n
1599 if {[string index $old_m 0] eq {U}} {
1602 set o [string index $old_m 1]
1604 if {[string index $new_m 0] eq {U}} {
1607 set n [string index $new_m 1]
1609 display_file_helper $ui_workdir $path $icon_name $o $n
1611 if {$new_m eq {__}} {
1612 unset file_states($path)
1613 catch {unset selected_paths($path)}
1617 proc display_all_files_helper {w path icon_name m} {
1620 lappend file_lists($w) $path
1621 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1622 $w image create end \
1623 -align center -padx 5 -pady 1 \
1625 -image [mapicon $w $m $path]
1626 $w insert end "[escape_path
$path]\n"
1629 proc display_all_files {} {
1630 global ui_index ui_workdir
1631 global file_states file_lists
1634 $ui_index conf -state normal
1635 $ui_workdir conf -state normal
1637 $ui_index delete 0.0 end
1638 $ui_workdir delete 0.0 end
1641 set file_lists($ui_index) [list]
1642 set file_lists($ui_workdir) [list]
1644 foreach path [lsort [array names file_states]] {
1645 set s $file_states($path)
1647 set icon_name [lindex $s 1]
1649 set s [string index $m 0]
1650 if {$s ne {U} && $s ne {_}} {
1651 display_all_files_helper $ui_index $path \
1655 if {[string index $m 0] eq {U}} {
1658 set s [string index $m 1]
1661 display_all_files_helper $ui_workdir $path \
1666 $ui_index conf -state disabled
1667 $ui_workdir conf -state disabled
1670 ######################################################################
1675 #define mask_width 14
1676 #define mask_height 15
1677 static unsigned char mask_bits[] = {
1678 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1679 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1680 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1683 image create bitmap file_plain -background white -foreground black -data {
1684 #define plain_width 14
1685 #define plain_height 15
1686 static unsigned char plain_bits[] = {
1687 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1688 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1689 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1690 } -maskdata $filemask
1692 image create bitmap file_mod -background white -foreground blue -data {
1693 #define mod_width 14
1694 #define mod_height 15
1695 static unsigned char mod_bits[] = {
1696 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1697 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1698 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1699 } -maskdata $filemask
1701 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1702 #define file_fulltick_width 14
1703 #define file_fulltick_height 15
1704 static unsigned char file_fulltick_bits
[] = {
1705 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1706 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1707 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1708 } -maskdata $filemask
1710 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1711 #define parttick_width 14
1712 #define parttick_height 15
1713 static unsigned char parttick_bits
[] = {
1714 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1715 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1716 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1717 } -maskdata $filemask
1719 image create bitmap file_question
-background white
-foreground black
-data {
1720 #define file_question_width 14
1721 #define file_question_height 15
1722 static unsigned char file_question_bits
[] = {
1723 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1724 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1725 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1726 } -maskdata $filemask
1728 image create bitmap file_removed
-background white
-foreground red
-data {
1729 #define file_removed_width 14
1730 #define file_removed_height 15
1731 static unsigned char file_removed_bits
[] = {
1732 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1733 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1734 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1735 } -maskdata $filemask
1737 image create bitmap file_merge
-background white
-foreground blue
-data {
1738 #define file_merge_width 14
1739 #define file_merge_height 15
1740 static unsigned char file_merge_bits
[] = {
1741 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1742 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1743 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1744 } -maskdata $filemask
1746 image create bitmap file_statechange
-background white
-foreground green
-data {
1747 #define file_merge_width 14
1748 #define file_merge_height 15
1749 static unsigned char file_statechange_bits
[] = {
1750 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1751 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1752 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1753 } -maskdata $filemask
1755 set ui_index .vpane.files.index.list
1756 set ui_workdir .vpane.files.workdir.list
1758 set all_icons
(_
$ui_index) file_plain
1759 set all_icons
(A
$ui_index) file_fulltick
1760 set all_icons
(M
$ui_index) file_fulltick
1761 set all_icons
(D
$ui_index) file_removed
1762 set all_icons
(U
$ui_index) file_merge
1763 set all_icons
(T
$ui_index) file_statechange
1765 set all_icons
(_
$ui_workdir) file_plain
1766 set all_icons
(M
$ui_workdir) file_mod
1767 set all_icons
(D
$ui_workdir) file_question
1768 set all_icons
(U
$ui_workdir) file_merge
1769 set all_icons
(O
$ui_workdir) file_plain
1770 set all_icons
(T
$ui_workdir) file_statechange
1772 set max_status_desc
0
1774 {__
{mc
"Unmodified"}}
1776 {_M
{mc
"Modified, not staged"}}
1777 {M_
{mc
"Staged for commit"}}
1778 {MM
{mc
"Portions staged for commit"}}
1779 {MD
{mc
"Staged for commit, missing"}}
1781 {_T
{mc
"File type changed, not staged"}}
1782 {T_
{mc
"File type changed, staged"}}
1784 {_O
{mc
"Untracked, not staged"}}
1785 {A_
{mc
"Staged for commit"}}
1786 {AM
{mc
"Portions staged for commit"}}
1787 {AD
{mc
"Staged for commit, missing"}}
1790 {D_
{mc
"Staged for removal"}}
1791 {DO
{mc
"Staged for removal, still present"}}
1793 {_U
{mc
"Requires merge resolution"}}
1794 {U_
{mc
"Requires merge resolution"}}
1795 {UU
{mc
"Requires merge resolution"}}
1796 {UM
{mc
"Requires merge resolution"}}
1797 {UD
{mc
"Requires merge resolution"}}
1798 {UT
{mc
"Requires merge resolution"}}
1800 set text
[eval [lindex
$i 1]]
1801 if {$max_status_desc < [string length
$text]} {
1802 set max_status_desc
[string length
$text]
1804 set all_descs
([lindex
$i 0]) $text
1808 ######################################################################
1812 proc scrollbar2many
{list mode args
} {
1813 foreach w
$list {eval $w $mode $args}
1816 proc many2scrollbar
{list mode sb top bottom
} {
1817 $sb set $top $bottom
1818 foreach w
$list {$w $mode moveto
$top}
1821 proc incr_font_size
{font
{amt
1}} {
1822 set sz
[font configure
$font -size]
1824 font configure
$font -size $sz
1825 font configure
${font}bold
-size $sz
1826 font configure
${font}italic
-size $sz
1829 ######################################################################
1833 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1835 proc do_gitk
{revs
} {
1836 # -- Always start gitk through whatever we were loaded with. This
1837 # lets us bypass using shell process on Windows systems.
1839 set exe
[_which gitk
-script]
1840 set cmd
[list
[info nameofexecutable
] $exe]
1842 error_popup
[mc
"Couldn't find gitk in PATH"]
1846 if {[info exists env
(GIT_DIR
)]} {
1847 set old_GIT_DIR
$env(GIT_DIR
)
1853 cd [file dirname [gitdir
]]
1854 set env
(GIT_DIR
) [file tail [gitdir
]]
1856 eval exec $cmd $revs &
1858 if {$old_GIT_DIR eq
{}} {
1861 set env
(GIT_DIR
) $old_GIT_DIR
1865 ui_status $
::starting_gitk_msg
1867 ui_ready
$starting_gitk_msg
1875 proc terminate_me
{win
} {
1877 if {$win ne
{.
}} return
1881 proc do_quit
{{rc
{1}}} {
1882 global ui_comm is_quitting repo_config commit_type
1883 global GITGUI_BCK_exists GITGUI_BCK_i
1884 global ui_comm_spell
1887 if {$is_quitting} return
1890 if {[winfo exists
$ui_comm]} {
1891 # -- Stash our current commit buffer.
1893 set save
[gitdir GITGUI_MSG
]
1894 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1895 file rename
-force [gitdir GITGUI_BCK
] $save
1896 set GITGUI_BCK_exists
0
1898 set msg
[string trim
[$ui_comm get
0.0 end
]]
1899 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1900 if {(![string match amend
* $commit_type]
1901 ||
[$ui_comm edit modified
])
1904 set fd
[open
$save w
]
1905 puts
-nonewline $fd $msg
1909 catch
{file delete
$save}
1913 # -- Cancel our spellchecker if its running.
1915 if {[info exists ui_comm_spell
]} {
1919 # -- Remove our editor backup, its not needed.
1921 after cancel
$GITGUI_BCK_i
1922 if {$GITGUI_BCK_exists} {
1923 catch
{file delete
[gitdir GITGUI_BCK
]}
1926 # -- Stash our current window geometry into this repository.
1928 set cfg_geometry
[list
]
1929 lappend cfg_geometry
[wm geometry .
]
1930 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
1931 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
1932 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1935 if {$cfg_geometry ne
$rc_geometry} {
1936 catch
{git config gui.geometry
$cfg_geometry}
1948 proc ui_do_rescan
{} {
1949 rescan
{force_first_diff
; ui_ready
}
1957 global next_diff_p next_diff_w next_diff_i
1958 show_diff
$next_diff_p $next_diff_w {}
1961 proc find_anchor_pos
{lst name
} {
1962 set lid
[lsearch
-sorted -exact $lst $name]
1966 foreach lname
$lst {
1967 if {$lname >= $name} break
1975 proc find_file_from
{flist idx delta path mmask
} {
1978 set len
[llength
$flist]
1979 while {$idx >= 0 && $idx < $len} {
1980 set name
[lindex
$flist $idx]
1982 if {$name ne
$path && [info exists file_states
($name)]} {
1983 set state
[lindex
$file_states($name) 0]
1985 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
1996 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
1997 global next_diff_p next_diff_w next_diff_i
1998 global file_lists ui_index ui_workdir
2000 set flist
$file_lists($w)
2002 set lno
[find_anchor_pos
$flist $path]
2007 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2008 if {$w eq
$ui_index} {
2011 set mmask
"$mmask\$"
2015 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2018 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2023 set next_diff_p
[lindex
$flist $idx]
2024 set next_diff_i
[expr {$idx+1}]
2031 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2032 global current_diff_path
2034 if {$path ne
$current_diff_path} {
2036 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2039 return {reshow_diff
;}
2043 proc select_first_diff
{} {
2046 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2047 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2052 proc force_first_diff
{} {
2053 global current_diff_path
2055 if {[info exists file_states
($current_diff_path)]} {
2056 set state
[lindex
$file_states($current_diff_path) 0]
2058 if {[string index
$state 1] ne
{O
}} return
2064 proc toggle_or_diff
{w x y
} {
2065 global file_states file_lists current_diff_path ui_index ui_workdir
2066 global last_clicked selected_paths
2068 set pos
[split [$w index @
$x,$y] .
]
2069 set lno
[lindex
$pos 0]
2070 set col [lindex
$pos 1]
2071 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2077 set last_clicked
[list
$w $lno]
2078 array
unset selected_paths
2079 $ui_index tag remove in_sel
0.0 end
2080 $ui_workdir tag remove in_sel
0.0 end
2082 # Determine the state of the file
2083 if {[info exists file_states
($path)]} {
2084 set state
[lindex
$file_states($path) 0]
2089 # Restage the file, or simply show the diff
2090 if {$col == 0 && $y > 1} {
2091 # Conflicts need special handling
2092 if {[string first
{U
} $state] >= 0} {
2093 # $w must always be $ui_workdir, but...
2094 if {$w ne
$ui_workdir} { set lno
{} }
2095 merge_stage_workdir
$path $lno
2099 if {[string index
$state 1] eq
{O
}} {
2105 set after
[next_diff_after_action
$w $path $lno $mmask]
2107 if {$w eq
$ui_index} {
2109 "Unstaging [short_path $path] from commit" \
2111 [concat
$after [list ui_ready
]]
2112 } elseif
{$w eq
$ui_workdir} {
2114 "Adding [short_path $path]" \
2116 [concat
$after [list ui_ready
]]
2119 show_diff
$path $w $lno
2123 proc add_one_to_selection
{w x y
} {
2124 global file_lists last_clicked selected_paths
2126 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2127 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2133 if {$last_clicked ne
{}
2134 && [lindex
$last_clicked 0] ne
$w} {
2135 array
unset selected_paths
2136 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2139 set last_clicked
[list
$w $lno]
2140 if {[catch
{set in_sel
$selected_paths($path)}]} {
2144 unset selected_paths
($path)
2145 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2147 set selected_paths
($path) 1
2148 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2152 proc add_range_to_selection
{w x y
} {
2153 global file_lists last_clicked selected_paths
2155 if {[lindex
$last_clicked 0] ne
$w} {
2156 toggle_or_diff
$w $x $y
2160 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2161 set lc
[lindex
$last_clicked 1]
2170 foreach path
[lrange
$file_lists($w) \
2171 [expr {$begin - 1}] \
2172 [expr {$end - 1}]] {
2173 set selected_paths
($path) 1
2175 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2178 proc show_more_context
{} {
2180 if {$repo_config(gui.diffcontext
) < 99} {
2181 incr repo_config
(gui.diffcontext
)
2186 proc show_less_context
{} {
2188 if {$repo_config(gui.diffcontext
) > 1} {
2189 incr repo_config
(gui.diffcontext
) -1
2194 ######################################################################
2204 menu .mbar
-tearoff 0
2205 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2206 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2207 if {[is_enabled branch
]} {
2208 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2210 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2211 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2213 if {[is_enabled transport
]} {
2214 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2215 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2217 . configure
-menu .mbar
2219 # -- Repository Menu
2221 menu .mbar.repository
2223 .mbar.repository add
command \
2224 -label [mc
"Browse Current Branch's Files"] \
2225 -command {browser
::new
$current_branch}
2226 set ui_browse_current
[.mbar.repository index last
]
2227 .mbar.repository add
command \
2228 -label [mc
"Browse Branch Files..."] \
2229 -command browser_open
::dialog
2230 .mbar.repository add separator
2232 .mbar.repository add
command \
2233 -label [mc
"Visualize Current Branch's History"] \
2234 -command {do_gitk
$current_branch}
2235 set ui_visualize_current
[.mbar.repository index last
]
2236 .mbar.repository add
command \
2237 -label [mc
"Visualize All Branch History"] \
2238 -command {do_gitk
--all}
2239 .mbar.repository add separator
2241 proc current_branch_write
{args
} {
2242 global current_branch
2243 .mbar.repository entryconf $
::ui_browse_current \
2244 -label [mc
"Browse %s's Files" $current_branch]
2245 .mbar.repository entryconf $
::ui_visualize_current \
2246 -label [mc
"Visualize %s's History" $current_branch]
2248 trace add variable current_branch
write current_branch_write
2250 if {[is_enabled multicommit
]} {
2251 .mbar.repository add
command -label [mc
"Database Statistics"] \
2254 .mbar.repository add
command -label [mc
"Compress Database"] \
2257 .mbar.repository add
command -label [mc
"Verify Database"] \
2258 -command do_fsck_objects
2260 .mbar.repository add separator
2263 .mbar.repository add
command \
2264 -label [mc
"Create Desktop Icon"] \
2265 -command do_cygwin_shortcut
2266 } elseif
{[is_Windows
]} {
2267 .mbar.repository add
command \
2268 -label [mc
"Create Desktop Icon"] \
2269 -command do_windows_shortcut
2270 } elseif
{[is_MacOSX
]} {
2271 .mbar.repository add
command \
2272 -label [mc
"Create Desktop Icon"] \
2273 -command do_macosx_app
2278 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2280 .mbar.repository add
command -label [mc Quit
] \
2288 .mbar.edit add
command -label [mc Undo
] \
2289 -command {catch
{[focus
] edit undo
}} \
2291 .mbar.edit add
command -label [mc Redo
] \
2292 -command {catch
{[focus
] edit redo
}} \
2294 .mbar.edit add separator
2295 .mbar.edit add
command -label [mc Cut
] \
2296 -command {catch
{tk_textCut
[focus
]}} \
2298 .mbar.edit add
command -label [mc Copy
] \
2299 -command {catch
{tk_textCopy
[focus
]}} \
2301 .mbar.edit add
command -label [mc Paste
] \
2302 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2304 .mbar.edit add
command -label [mc Delete
] \
2305 -command {catch
{[focus
] delete sel.first sel.last
}} \
2307 .mbar.edit add separator
2308 .mbar.edit add
command -label [mc
"Select All"] \
2309 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2314 if {[is_enabled branch
]} {
2317 .mbar.branch add
command -label [mc
"Create..."] \
2318 -command branch_create
::dialog \
2320 lappend disable_on_lock
[list .mbar.branch entryconf \
2321 [.mbar.branch index last
] -state]
2323 .mbar.branch add
command -label [mc
"Checkout..."] \
2324 -command branch_checkout
::dialog \
2326 lappend disable_on_lock
[list .mbar.branch entryconf \
2327 [.mbar.branch index last
] -state]
2329 .mbar.branch add
command -label [mc
"Rename..."] \
2330 -command branch_rename
::dialog
2331 lappend disable_on_lock
[list .mbar.branch entryconf \
2332 [.mbar.branch index last
] -state]
2334 .mbar.branch add
command -label [mc
"Delete..."] \
2335 -command branch_delete
::dialog
2336 lappend disable_on_lock
[list .mbar.branch entryconf \
2337 [.mbar.branch index last
] -state]
2339 .mbar.branch add
command -label [mc
"Reset..."] \
2340 -command merge
::reset_hard
2341 lappend disable_on_lock
[list .mbar.branch entryconf \
2342 [.mbar.branch index last
] -state]
2347 proc commit_btn_caption
{} {
2348 if {[is_enabled nocommit
]} {
2351 return [mc Commit@@verb
]
2355 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2358 if {![is_enabled nocommit
]} {
2359 .mbar.commit add radiobutton \
2360 -label [mc
"New Commit"] \
2361 -command do_select_commit_type \
2362 -variable selected_commit_type \
2364 lappend disable_on_lock \
2365 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2367 .mbar.commit add radiobutton \
2368 -label [mc
"Amend Last Commit"] \
2369 -command do_select_commit_type \
2370 -variable selected_commit_type \
2372 lappend disable_on_lock \
2373 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2375 .mbar.commit add separator
2378 .mbar.commit add
command -label [mc Rescan
] \
2379 -command ui_do_rescan \
2381 lappend disable_on_lock \
2382 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2384 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2385 -command do_add_selection \
2387 lappend disable_on_lock \
2388 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2390 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2391 -command do_add_all \
2393 lappend disable_on_lock \
2394 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2396 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2397 -command do_unstage_selection
2398 lappend disable_on_lock \
2399 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2401 .mbar.commit add
command -label [mc
"Revert Changes"] \
2402 -command do_revert_selection
2403 lappend disable_on_lock \
2404 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2406 .mbar.commit add separator
2408 .mbar.commit add
command -label [mc
"Show Less Context"] \
2409 -command show_less_context \
2410 -accelerator $M1T-\
-
2412 .mbar.commit add
command -label [mc
"Show More Context"] \
2413 -command show_more_context \
2416 .mbar.commit add separator
2418 if {![is_enabled nocommitmsg
]} {
2419 .mbar.commit add
command -label [mc
"Sign Off"] \
2420 -command do_signoff \
2424 .mbar.commit add
command -label [commit_btn_caption
] \
2425 -command do_commit \
2426 -accelerator $M1T-Return
2427 lappend disable_on_lock \
2428 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2433 if {[is_enabled branch
]} {
2435 .mbar.merge add
command -label [mc
"Local Merge..."] \
2436 -command merge
::dialog \
2438 lappend disable_on_lock \
2439 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2440 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2441 -command merge
::reset_hard
2442 lappend disable_on_lock \
2443 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2448 if {[is_enabled transport
]} {
2451 .mbar.remote add
command \
2452 -label [mc
"Add..."] \
2453 -command remote_add
::dialog \
2455 .mbar.remote add
command \
2456 -label [mc
"Push..."] \
2457 -command do_push_anywhere \
2459 .mbar.remote add
command \
2460 -label [mc
"Delete Branch..."] \
2461 -command remote_branch_delete
::dialog
2465 # -- Apple Menu (Mac OS X only)
2467 .mbar add cascade
-label Apple
-menu .mbar.apple
2470 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2472 .mbar.apple add separator
2473 .mbar.apple add
command \
2474 -label [mc
"Preferences..."] \
2475 -command do_options \
2477 bind .
<$M1B-,> do_options
2481 .mbar.edit add separator
2482 .mbar.edit add
command -label [mc
"Options..."] \
2488 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2492 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2497 set doc_path
[file dirname [gitexec
]]
2498 set doc_path
[file join $doc_path Documentation index.html
]
2501 set doc_path
[exec cygpath
--mixed $doc_path]
2504 if {[file isfile
$doc_path]} {
2505 set doc_url
"file:$doc_path"
2507 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2510 proc start_browser
{url
} {
2511 git
"web--browse" $url
2514 .mbar.
help add
command -label [mc
"Online Documentation"] \
2515 -command [list start_browser
$doc_url]
2516 unset doc_path doc_url
2518 # -- Standard bindings
2520 wm protocol . WM_DELETE_WINDOW do_quit
2521 bind all
<$M1B-Key-q> do_quit
2522 bind all
<$M1B-Key-Q> do_quit
2523 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2524 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2526 set subcommand_args
{}
2528 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2532 # -- Not a normal commit type invocation? Do that instead!
2534 switch
-- $subcommand {
2537 if {$subcommand eq
"blame"} {
2538 set subcommand_args
{[--line=<num
>] rev? path
}
2540 set subcommand_args
{rev? path
}
2542 if {$argv eq
{}} usage
2548 if {$is_path ||
[file exists
$_prefix$a]} {
2549 if {$path ne
{}} usage
2552 } elseif
{$a eq
{--}} {
2554 if {$head ne
{}} usage
2559 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
2560 if {$jump_spec ne
{} ||
$head ne
{}} usage
2561 set jump_spec
[list
$lnum]
2562 } elseif
{$head eq
{}} {
2563 if {$head ne
{}} usage
2572 if {$head ne
{} && $path eq
{}} {
2573 set path
$_prefix$head
2580 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2582 set head [git rev-parse
--verify $head]
2588 set current_branch
$head
2591 switch
-- $subcommand {
2593 if {$jump_spec ne
{}} usage
2595 if {$path ne
{} && [file isdirectory
$path]} {
2596 set head $current_branch
2602 browser
::new
$head $path
2605 if {$head eq
{} && ![file exists
$path]} {
2606 puts stderr
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
2609 blame
::new
$head $path $jump_spec
2616 if {[llength
$argv] != 0} {
2617 puts
-nonewline stderr
"usage: $argv0"
2618 if {$subcommand ne
{gui
}
2619 && [file tail $argv0] ne
"git-$subcommand"} {
2620 puts
-nonewline stderr
" $subcommand"
2625 # fall through to setup UI for commits
2628 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2639 -text [mc
"Current Branch:"] \
2643 -textvariable current_branch \
2646 pack .branch.l1
-side left
2647 pack .branch.cb
-side left
-fill x
2648 pack .branch
-side top
-fill x
2650 # -- Main Window Layout
2652 panedwindow .vpane
-orient horizontal
2653 panedwindow .vpane.files
-orient vertical
2654 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2655 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2657 # -- Index File List
2659 frame .vpane.files.index
-height 100 -width 200
2660 label .vpane.files.index.title
-text [mc
"Staged Changes (Will Commit)"] \
2661 -background lightgreen
-foreground black
2662 text
$ui_index -background white
-foreground black \
2664 -width 20 -height 10 \
2666 -cursor $cursor_ptr \
2667 -xscrollcommand {.vpane.files.index.sx
set} \
2668 -yscrollcommand {.vpane.files.index.sy
set} \
2670 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2671 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2672 pack .vpane.files.index.title
-side top
-fill x
2673 pack .vpane.files.index.sx
-side bottom
-fill x
2674 pack .vpane.files.index.sy
-side right
-fill y
2675 pack
$ui_index -side left
-fill both
-expand 1
2677 # -- Working Directory File List
2679 frame .vpane.files.workdir
-height 100 -width 200
2680 label .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
2681 -background lightsalmon
-foreground black
2682 text
$ui_workdir -background white
-foreground black \
2684 -width 20 -height 10 \
2686 -cursor $cursor_ptr \
2687 -xscrollcommand {.vpane.files.workdir.sx
set} \
2688 -yscrollcommand {.vpane.files.workdir.sy
set} \
2690 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2691 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2692 pack .vpane.files.workdir.title
-side top
-fill x
2693 pack .vpane.files.workdir.sx
-side bottom
-fill x
2694 pack .vpane.files.workdir.sy
-side right
-fill y
2695 pack
$ui_workdir -side left
-fill both
-expand 1
2697 .vpane.files add .vpane.files.workdir
-sticky nsew
2698 .vpane.files add .vpane.files.index
-sticky nsew
2700 foreach i
[list
$ui_index $ui_workdir] {
2702 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2706 # -- Diff and Commit Area
2708 frame .vpane.lower
-height 300 -width 400
2709 frame .vpane.lower.commarea
2710 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2711 pack .vpane.lower.
diff -fill both
-expand 1
2712 pack .vpane.lower.commarea
-side bottom
-fill x
2713 .vpane add .vpane.lower
-sticky nsew
2715 # -- Commit Area Buttons
2717 frame .vpane.lower.commarea.buttons
2718 label .vpane.lower.commarea.buttons.l
-text {} \
2721 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2722 pack .vpane.lower.commarea.buttons
-side left
-fill y
2724 button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
2725 -command ui_do_rescan
2726 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2727 lappend disable_on_lock \
2728 {.vpane.lower.commarea.buttons.rescan conf
-state}
2730 button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
2732 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2733 lappend disable_on_lock \
2734 {.vpane.lower.commarea.buttons.incall conf
-state}
2736 if {![is_enabled nocommitmsg
]} {
2737 button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
2739 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2742 button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
2744 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2745 lappend disable_on_lock \
2746 {.vpane.lower.commarea.buttons.commit conf
-state}
2748 if {![is_enabled nocommit
]} {
2749 button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
2750 -command do_push_anywhere
2751 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2754 # -- Commit Message Buffer
2756 frame .vpane.lower.commarea.buffer
2757 frame .vpane.lower.commarea.buffer.header
2758 set ui_comm .vpane.lower.commarea.buffer.t
2759 set ui_coml .vpane.lower.commarea.buffer.header.l
2761 if {![is_enabled nocommit
]} {
2762 radiobutton .vpane.lower.commarea.buffer.header.new \
2763 -text [mc
"New Commit"] \
2764 -command do_select_commit_type \
2765 -variable selected_commit_type \
2767 lappend disable_on_lock \
2768 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2769 radiobutton .vpane.lower.commarea.buffer.header.amend \
2770 -text [mc
"Amend Last Commit"] \
2771 -command do_select_commit_type \
2772 -variable selected_commit_type \
2774 lappend disable_on_lock \
2775 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2781 proc trace_commit_type
{varname args
} {
2782 global ui_coml commit_type
2783 switch
-glob -- $commit_type {
2784 initial
{set txt
[mc
"Initial Commit Message:"]}
2785 amend
{set txt
[mc
"Amended Commit Message:"]}
2786 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
2787 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
2788 merge
{set txt
[mc
"Merge Commit Message:"]}
2789 * {set txt
[mc
"Commit Message:"]}
2791 $ui_coml conf
-text $txt
2793 trace add variable commit_type
write trace_commit_type
2794 pack
$ui_coml -side left
-fill x
2796 if {![is_enabled nocommit
]} {
2797 pack .vpane.lower.commarea.buffer.header.amend
-side right
2798 pack .vpane.lower.commarea.buffer.header.new
-side right
2801 text
$ui_comm -background white
-foreground black \
2805 -autoseparators true \
2807 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
2809 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2810 scrollbar .vpane.lower.commarea.buffer.sby \
2811 -command [list
$ui_comm yview
]
2812 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2813 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2814 pack
$ui_comm -side left
-fill y
2815 pack .vpane.lower.commarea.buffer
-side left
-fill y
2817 # -- Commit Message Buffer Context Menu
2819 set ctxm .vpane.lower.commarea.buffer.ctxm
2820 menu
$ctxm -tearoff 0
2823 -command {tk_textCut
$ui_comm}
2826 -command {tk_textCopy
$ui_comm}
2829 -command {tk_textPaste
$ui_comm}
2831 -label [mc Delete
] \
2832 -command {$ui_comm delete sel.first sel.last
}
2835 -label [mc
"Select All"] \
2836 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2838 -label [mc
"Copy All"] \
2840 $ui_comm tag add sel
0.0 end
2841 tk_textCopy
$ui_comm
2842 $ui_comm tag remove sel
0.0 end
2846 -label [mc
"Sign Off"] \
2848 set ui_comm_ctxm
$ctxm
2852 proc trace_current_diff_path
{varname args
} {
2853 global current_diff_path diff_actions file_states
2854 if {$current_diff_path eq
{}} {
2860 set p
$current_diff_path
2861 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2863 set p
[escape_path
$p]
2867 .vpane.lower.
diff.header.status configure
-text $s
2868 .vpane.lower.
diff.header.
file configure
-text $f
2869 .vpane.lower.
diff.header.path configure
-text $p
2870 foreach w
$diff_actions {
2874 trace add variable current_diff_path
write trace_current_diff_path
2876 frame .vpane.lower.
diff.header
-background gold
2877 label .vpane.lower.
diff.header.status \
2880 -width $max_status_desc \
2883 label .vpane.lower.
diff.header.
file \
2888 label .vpane.lower.
diff.header.path \
2893 pack .vpane.lower.
diff.header.status
-side left
2894 pack .vpane.lower.
diff.header.
file -side left
2895 pack .vpane.lower.
diff.header.path
-fill x
2896 set ctxm .vpane.lower.
diff.header.ctxm
2897 menu
$ctxm -tearoff 0
2905 -- $current_diff_path
2907 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2908 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2912 frame .vpane.lower.
diff.body
2913 set ui_diff .vpane.lower.
diff.body.t
2914 text
$ui_diff -background white
-foreground black \
2916 -width 80 -height 15 -wrap none \
2918 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2919 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2921 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2922 -command [list
$ui_diff xview
]
2923 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2924 -command [list
$ui_diff yview
]
2925 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2926 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2927 pack
$ui_diff -side left
-fill both
-expand 1
2928 pack .vpane.lower.
diff.header
-side top
-fill x
2929 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2931 $ui_diff tag conf d_cr
-elide true
2932 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2933 $ui_diff tag conf d_
+ -foreground {#00a000}
2934 $ui_diff tag conf d_-
-foreground red
2936 $ui_diff tag conf d_
++ -foreground {#00a000}
2937 $ui_diff tag conf d_--
-foreground red
2938 $ui_diff tag conf d_
+s \
2939 -foreground {#00a000} \
2940 -background {#e2effa}
2941 $ui_diff tag conf d_-s \
2943 -background {#e2effa}
2944 $ui_diff tag conf d_s
+ \
2945 -foreground {#00a000} \
2947 $ui_diff tag conf d_s- \
2951 $ui_diff tag conf d
<<<<<<< \
2952 -foreground orange \
2954 $ui_diff tag conf d
======= \
2955 -foreground orange \
2957 $ui_diff tag conf d
>>>>>>> \
2958 -foreground orange \
2961 $ui_diff tag raise sel
2963 # -- Diff Body Context Menu
2966 proc create_common_diff_popup
{ctxm
} {
2968 -label [mc
"Show Less Context"] \
2969 -command show_less_context
2970 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2972 -label [mc
"Show More Context"] \
2973 -command show_more_context
2974 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2977 -label [mc Refresh
] \
2978 -command reshow_diff
2979 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2982 -command {tk_textCopy
$ui_diff}
2983 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2985 -label [mc
"Select All"] \
2986 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
2987 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2989 -label [mc
"Copy All"] \
2991 $ui_diff tag add sel
0.0 end
2992 tk_textCopy
$ui_diff
2993 $ui_diff tag remove sel
0.0 end
2995 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2998 -label [mc
"Decrease Font Size"] \
2999 -command {incr_font_size font_diff
-1}
3000 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3002 -label [mc
"Increase Font Size"] \
3003 -command {incr_font_size font_diff
1}
3004 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3008 build_encoding_menu
$emenu [list force_diff_encoding
]
3010 -label [mc
"Encoding"] \
3012 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3014 $ctxm add
command -label [mc
"Options..."] \
3018 set ctxm .vpane.lower.
diff.body.ctxm
3019 menu
$ctxm -tearoff 0
3021 -label [mc
"Apply/Reverse Hunk"] \
3022 -command {apply_hunk
$cursorX $cursorY}
3023 set ui_diff_applyhunk
[$ctxm index last
]
3024 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3026 -label [mc
"Apply/Reverse Line"] \
3027 -command {apply_line
$cursorX $cursorY; do_rescan
}
3028 set ui_diff_applyline
[$ctxm index last
]
3029 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3031 create_common_diff_popup
$ctxm
3033 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3034 menu
$ctxmmg -tearoff 0
3035 $ctxmmg add
command \
3036 -label [mc
"Run Merge Tool"] \
3037 -command {merge_resolve_tool
}
3038 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3039 $ctxmmg add separator
3040 $ctxmmg add
command \
3041 -label [mc
"Use Remote Version"] \
3042 -command {merge_resolve_one
3}
3043 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3044 $ctxmmg add
command \
3045 -label [mc
"Use Local Version"] \
3046 -command {merge_resolve_one
2}
3047 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3048 $ctxmmg add
command \
3049 -label [mc
"Revert To Base"] \
3050 -command {merge_resolve_one
1}
3051 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3052 $ctxmmg add separator
3053 create_common_diff_popup
$ctxmmg
3055 proc popup_diff_menu
{ctxm ctxmmg x y X Y
} {
3056 global current_diff_path file_states
3059 if {[info exists file_states
($current_diff_path)]} {
3060 set state
[lindex
$file_states($current_diff_path) 0]
3064 if {[string first
{U
} $state] >= 0} {
3065 tk_popup
$ctxmmg $X $Y
3067 if {$
::ui_index eq $
::current_diff_side
} {
3068 set l
[mc
"Unstage Hunk From Commit"]
3069 set t
[mc
"Unstage Line From Commit"]
3071 set l
[mc
"Stage Hunk For Commit"]
3072 set t
[mc
"Stage Line For Commit"]
3075 ||
$current_diff_path eq
{}
3079 ||
{T_
} eq
$state} {
3084 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3085 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3086 tk_popup
$ctxm $X $Y
3089 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg %x
%y
%X
%Y
]
3093 set main_status
[::status_bar
::new .status
]
3094 pack .status
-anchor w
-side bottom
-fill x
3095 $main_status show
[mc
"Initializing..."]
3100 set gm
$repo_config(gui.geometry
)
3101 wm geometry .
[lindex
$gm 0]
3102 .vpane sash place
0 \
3104 [lindex
[.vpane sash coord
0] 1]
3105 .vpane.files sash place
0 \
3106 [lindex
[.vpane.files sash coord
0] 0] \
3113 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3114 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3115 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3116 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3117 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3118 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3119 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3120 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3121 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3122 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3123 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3124 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3125 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3126 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3127 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3128 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3129 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3130 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3132 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3133 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3134 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3135 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3136 bind $ui_diff <$M1B-Key-v> {break}
3137 bind $ui_diff <$M1B-Key-V> {break}
3138 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3139 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3140 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3141 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3142 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3143 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3144 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3145 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3146 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3147 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3148 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3149 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3150 bind $ui_diff <Button-1
> {focus
%W
}
3152 if {[is_enabled branch
]} {
3153 bind .
<$M1B-Key-n> branch_create
::dialog
3154 bind .
<$M1B-Key-N> branch_create
::dialog
3155 bind .
<$M1B-Key-o> branch_checkout
::dialog
3156 bind .
<$M1B-Key-O> branch_checkout
::dialog
3157 bind .
<$M1B-Key-m> merge
::dialog
3158 bind .
<$M1B-Key-M> merge
::dialog
3160 if {[is_enabled transport
]} {
3161 bind .
<$M1B-Key-p> do_push_anywhere
3162 bind .
<$M1B-Key-P> do_push_anywhere
3165 bind .
<Key-F5
> ui_do_rescan
3166 bind .
<$M1B-Key-r> ui_do_rescan
3167 bind .
<$M1B-Key-R> ui_do_rescan
3168 bind .
<$M1B-Key-s> do_signoff
3169 bind .
<$M1B-Key-S> do_signoff
3170 bind .
<$M1B-Key-t> do_add_selection
3171 bind .
<$M1B-Key-T> do_add_selection
3172 bind .
<$M1B-Key-i> do_add_all
3173 bind .
<$M1B-Key-I> do_add_all
3174 bind .
<$M1B-Key-minus> {show_less_context
;break}
3175 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3176 bind .
<$M1B-Key-equal> {show_more_context
;break}
3177 bind .
<$M1B-Key-plus> {show_more_context
;break}
3178 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3179 bind .
<$M1B-Key-Return> do_commit
3180 foreach i
[list
$ui_index $ui_workdir] {
3181 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3182 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3183 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3187 set file_lists
($ui_index) [list
]
3188 set file_lists
($ui_workdir) [list
]
3190 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
3191 focus
-force $ui_comm
3193 # -- Warn the user about environmental problems. Cygwin's Tcl
3194 # does *not* pass its env array onto any processes it spawns.
3195 # This means that git processes get none of our environment.
3200 set msg
[mc
"Possible environment issues exist.
3202 The following environment variables are probably
3203 going to be ignored by any Git subprocess run
3207 foreach name
[array names env
] {
3208 switch
-regexp -- $name {
3209 {^GIT_INDEX_FILE$
} -
3210 {^GIT_OBJECT_DIRECTORY$
} -
3211 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3213 {^GIT_EXTERNAL_DIFF$
} -
3217 {^GIT_CONFIG_LOCAL$
} -
3218 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3219 append msg
" - $name\n"
3222 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3223 append msg
" - $name\n"
3225 set suggest_user
$name
3229 if {$ignored_env > 0} {
3231 This is due to a known issue with the
3232 Tcl binary distributed by Cygwin."]
3234 if {$suggest_user ne
{}} {
3237 A good replacement for %s
3238 is placing values for the user.name and
3239 user.email settings into your personal
3245 unset ignored_env msg suggest_user name
3248 # -- Only initialize complex UI if we are going to stay running.
3250 if {[is_enabled transport
]} {
3253 set n
[.mbar.remote index end
]
3254 populate_remotes_menu
3255 set n
[expr {[.mbar.remote index end
] - $n}]
3257 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3258 .mbar.remote insert
$n separator
3263 if {[winfo exists
$ui_comm]} {
3264 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3266 # -- If both our backup and message files exist use the
3267 # newer of the two files to initialize the buffer.
3269 if {$GITGUI_BCK_exists} {
3270 set m
[gitdir GITGUI_MSG
]
3271 if {[file isfile
$m]} {
3272 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3273 catch
{file delete
[gitdir GITGUI_MSG
]}
3275 $ui_comm delete
0.0 end
3277 $ui_comm edit modified false
3278 catch
{file delete
[gitdir GITGUI_BCK
]}
3279 set GITGUI_BCK_exists
0
3285 proc backup_commit_buffer
{} {
3286 global ui_comm GITGUI_BCK_exists
3288 set m
[$ui_comm edit modified
]
3289 if {$m ||
$GITGUI_BCK_exists} {
3290 set msg
[string trim
[$ui_comm get
0.0 end
]]
3291 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3294 if {$GITGUI_BCK_exists} {
3295 catch
{file delete
[gitdir GITGUI_BCK
]}
3296 set GITGUI_BCK_exists
0
3300 set fd
[open
[gitdir GITGUI_BCK
] w
]
3301 puts
-nonewline $fd $msg
3303 set GITGUI_BCK_exists
1
3307 $ui_comm edit modified false
3310 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3313 backup_commit_buffer
3315 # -- If the user has aspell available we can drive it
3316 # in pipe mode to spellcheck the commit message.
3318 set spell_cmd
[list |
]
3319 set spell_dict
[get_config gui.spellingdictionary
]
3320 lappend spell_cmd aspell
3321 if {$spell_dict ne
{}} {
3322 lappend spell_cmd
--master=$spell_dict
3324 lappend spell_cmd
--mode=none
3325 lappend spell_cmd
--encoding=utf-8
3326 lappend spell_cmd pipe
3327 if {$spell_dict eq
{none
}
3328 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3329 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3331 set ui_comm_spell
[spellcheck
::init \
3337 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3340 lock_index begin-read
3341 if {![winfo ismapped .
]} {
3345 if {[is_enabled initialamend
]} {
3351 if {[is_enabled nocommitmsg
]} {
3352 $ui_comm configure
-state disabled
-background gray
3355 if {[is_enabled multicommit
]} {
3358 if {[is_enabled retcode
]} {
3359 bind .
<Destroy
> {+terminate_me
%W
}