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
594 set ::tk::AlwaysShowSelection 1
596 # Spoof an X11 display for SSH
597 if {![info exists env(DISPLAY)]} {
598 set env(DISPLAY) :9999
602 image create photo gitlogo -width 16 -height 16
604 gitlogo put #33CC33 -to 7 0 9 2
605 gitlogo put #33CC33 -to 4 2 12 4
606 gitlogo put #33CC33 -to 7 4 9 6
607 gitlogo put #CC3333 -to 4 6 12 8
608 gitlogo put gray26 -to 4 9 6 10
609 gitlogo put gray26 -to 3 10 6 12
610 gitlogo put gray26 -to 8 9 13 11
611 gitlogo put gray26 -to 8 11 10 12
612 gitlogo put gray26 -to 11 11 13 14
613 gitlogo put gray26 -to 3 12 5 14
614 gitlogo put gray26 -to 5 13
615 gitlogo put gray26 -to 10 13
616 gitlogo put gray26 -to 4 14 12 15
617 gitlogo put gray26 -to 5 15 11 16
620 wm iconphoto . -default gitlogo
624 ######################################################################
629 font create font_diff -family Courier -size 10
633 eval font configure font_ui [font actual [.dummy cget -font]]
637 font create font_uiitalic
638 font create font_uibold
639 font create font_diffbold
640 font create font_diffitalic
642 foreach class {Button Checkbutton Entry Label
643 Labelframe Listbox Menu Message
644 Radiobutton Spinbox Text} {
645 option add *$class.font font_ui
649 if {[is_Windows] || [is_MacOSX]} {
650 option add *Menu.tearOff 0
661 proc bind_button3 {w cmd} {
662 bind $w <Any-Button-3> $cmd
664 # Mac OS X sends Button-2 on right click through three-button mouse,
665 # or through trackpad right-clicking (two-finger touch + click).
666 bind $w <Any-Button-2> $cmd
667 bind $w <Control-Button-1> $cmd
671 proc apply_config {} {
672 global repo_config font_descs
674 foreach option $font_descs {
675 set name [lindex $option 0]
676 set font [lindex $option 1]
679 foreach {cn cv} $repo_config(gui.$name) {
680 if {$cn eq {-weight}} {
683 font configure $font $cn $cv
686 font configure $font -weight normal
689 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
691 foreach {cn cv} [font configure $font] {
692 font configure ${font}bold $cn $cv
693 font configure ${font}italic $cn $cv
695 font configure ${font}bold -weight bold
696 font configure ${font}italic -slant italic
700 set default_config(branch.autosetupmerge) true
701 set default_config(merge.tool) {}
702 set default_config(merge.keepbackup) true
703 set default_config(merge.diffstat) true
704 set default_config(merge.summary) false
705 set default_config(merge.verbosity) 2
706 set default_config(user.name) {}
707 set default_config(user.email) {}
709 set default_config(gui.encoding) [encoding system]
710 set default_config(gui.matchtrackingbranch) false
711 set default_config(gui.pruneduringfetch) false
712 set default_config(gui.trustmtime) false
713 set default_config(gui.fastcopyblame) false
714 set default_config(gui.copyblamethreshold) 40
715 set default_config(gui.blamehistoryctx) 7
716 set default_config(gui.diffcontext) 5
717 set default_config(gui.commitmsgwidth) 75
718 set default_config(gui.newbranchtemplate) {}
719 set default_config(gui.spellingdictionary) {}
720 set default_config(gui.fontui) [font configure font_ui]
721 set default_config(gui.fontdiff) [font configure font_diff]
723 {fontui font_ui {mc "Main Font
"}}
724 {fontdiff font_diff {mc "Diff
/Console Font
"}}
727 ######################################################################
731 set _git [_which git]
733 catch {wm withdraw .}
737 -title [mc "git-gui
: fatal error
"] \
738 -message [mc "Cannot
find git
in PATH.
"]
742 ######################################################################
746 if {[catch {set _git_version [git --version]} err]} {
747 catch {wm withdraw .}
751 -title [mc "git-gui
: fatal error
"] \
752 -message "Cannot determine Git version
:
756 [appname
] requires Git
1.5.0 or later.
"
759 if {![regsub {^git version } $_git_version {} _git_version]} {
760 catch {wm withdraw .}
764 -title [mc "git-gui
: fatal error
"] \
765 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
769 set _real_git_version $_git_version
770 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
771 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
772 regsub {\.rc[0-9]+$} $_git_version {} _git_version
773 regsub {\.GIT$} $_git_version {} _git_version
774 regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
776 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
777 catch {wm withdraw .}
782 -title "[appname
]: warning
" \
783 -message [mc "Git version cannot be determined.
785 %s claims it is version
'%s'.
787 %s requires
at least Git
1.5.0 or later.
789 Assume
'%s' is version
1.5.0?
790 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
791 set _git_version 1.5.0
796 unset _real_git_version
798 proc git-version {args} {
801 switch [llength $args] {
807 set op [lindex $args 0]
808 set vr [lindex $args 1]
809 set cm [package vcompare $_git_version $vr]
810 return [expr $cm $op 0]
814 set type [lindex $args 0]
815 set name [lindex $args 1]
816 set parm [lindex $args 2]
817 set body [lindex $args 3]
819 if {($type ne {proc} && $type ne {method})} {
820 error "Invalid arguments to git-version
"
822 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
823 error "Last arm of
$type $name must be default
"
826 foreach {op vr cb} [lrange $body 0 end-2] {
827 if {[git-version $op $vr]} {
828 return [uplevel [list $type $name $parm $cb]]
832 return [uplevel [list $type $name $parm [lindex $body end]]]
836 error "git-version
>= x
"
842 if {[git-version < 1.5]} {
843 catch {wm withdraw .}
847 -title [mc "git-gui
: fatal error
"] \
848 -message "[appname
] requires Git
1.5.0 or later.
850 You are using
[git-version
]:
856 ######################################################################
858 ## configure our library
860 set idx [file join $oguilib tclIndex]
861 if {[catch {set fd [open $idx r]} err]} {
862 catch {wm withdraw .}
866 -title [mc "git-gui
: fatal error
"] \
870 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
872 while {[gets $fd n] >= 0} {
873 if {$n ne {} && ![string match #* $n]} {
885 if {[lsearch -exact $loaded $p] >= 0} continue
886 source [file join $oguilib $p]
891 set auto_path [concat [list $oguilib] $auto_path]
893 unset -nocomplain idx fd
895 ######################################################################
897 ## config file parsing
899 git-version proc _parse_config {arr_name args} {
906 [list git_read config] \
908 [list --null --list]]
909 fconfigure $fd_rc -translation binary
910 set buf [read $fd_rc]
913 foreach line [split $buf "\
0"] {
914 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
915 if {[is_many_config $name]} {
916 lappend arr($name) $value
918 set arr($name) $value
927 set fd_rc [eval [list git_read config --list] $args]
928 while {[gets $fd_rc line] >= 0} {
929 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
930 if {[is_many_config $name]} {
931 lappend arr($name) $value
933 set arr($name) $value
942 proc load_config {include_global} {
943 global repo_config global_config default_config
945 if {$include_global} {
946 _parse_config global_config --global
948 _parse_config repo_config
950 foreach name [array names default_config] {
951 if {[catch {set v $global_config($name)}]} {
952 set global_config($name) $default_config($name)
954 if {[catch {set v $repo_config($name)}]} {
955 set repo_config($name) $default_config($name)
960 ######################################################################
962 ## feature option selection
964 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
969 if {$subcommand eq {gui.sh}} {
972 if {$subcommand eq {gui} && [llength $argv] > 0} {
973 set subcommand [lindex $argv 0]
974 set argv [lrange $argv 1 end]
977 enable_option multicommit
979 enable_option transport
982 switch -- $subcommand {
987 disable_option multicommit
988 disable_option branch
989 disable_option transport
992 enable_option singlecommit
993 enable_option retcode
995 disable_option multicommit
996 disable_option branch
997 disable_option transport
999 while {[llength $argv] > 0} {
1000 set a [lindex $argv 0]
1003 enable_option initialamend
1006 enable_option nocommit
1007 enable_option nocommitmsg
1010 disable_option nocommitmsg
1017 set argv [lrange $argv 1 end]
1022 ######################################################################
1024 ## execution environment
1026 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1028 # Suggest our implementation of askpass, if none is set
1029 if {![info exists env(SSH_ASKPASS)]} {
1030 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1033 ######################################################################
1039 set _gitdir $env(GIT_DIR)
1043 set _gitdir [git rev-parse --git-dir]
1044 set _prefix [git rev-parse --show-prefix]
1048 choose_repository::pick
1051 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1052 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1054 if {![file isdirectory $_gitdir]} {
1055 catch {wm withdraw .}
1056 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1059 if {$_prefix ne {}} {
1060 regsub -all {[^/]+/} $_prefix ../ cdup
1061 if {[catch {cd $cdup} err]} {
1062 catch {wm withdraw .}
1063 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1067 } elseif {![is_enabled bare]} {
1068 if {[lindex [file split $_gitdir] end] ne {.git}} {
1069 catch {wm withdraw .}
1070 error_popup [strcat [mc "Cannot use funny .git directory
:"] "\n\n$_gitdir"]
1073 if {[catch {cd [file dirname $_gitdir]} err]} {
1074 catch {wm withdraw .}
1075 error_popup [strcat [mc "No working directory
"] " [file dirname $_gitdir]:\n\n$err"]
1079 set _reponame [file split [file normalize $_gitdir]]
1080 if {[lindex $_reponame end] eq {.git}} {
1081 set _reponame [lindex $_reponame end-1]
1083 set _reponame [lindex $_reponame end]
1086 ######################################################################
1090 set current_diff_path {}
1091 set current_diff_side {}
1092 set diff_actions [list]
1096 set MERGE_HEAD [list]
1099 set current_branch {}
1101 set current_diff_path {}
1103 set is_conflict_diff 0
1104 set selected_commit_type new
1106 set nullid "0000000000000000000000000000000000000000"
1107 set nullid2 "0000000000000000000000000000000000000001"
1109 ######################################################################
1117 set disable_on_lock [list]
1118 set index_lock_type none
1120 proc lock_index {type} {
1121 global index_lock_type disable_on_lock
1123 if {$index_lock_type eq {none}} {
1124 set index_lock_type $type
1125 foreach w $disable_on_lock {
1126 uplevel #0 $w disabled
1129 } elseif {$index_lock_type eq "begin-
$type"} {
1130 set index_lock_type $type
1136 proc unlock_index {} {
1137 global index_lock_type disable_on_lock
1139 set index_lock_type none
1140 foreach w $disable_on_lock {
1141 uplevel #0 $w normal
1145 ######################################################################
1149 proc repository_state {ctvar hdvar mhvar} {
1150 global current_branch
1151 upvar $ctvar ct $hdvar hd $mhvar mh
1156 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1162 set merge_head [gitdir MERGE_HEAD]
1163 if {[file exists $merge_head]} {
1165 set fd_mh [open $merge_head r]
1166 while {[gets $fd_mh line] >= 0} {
1177 global PARENT empty_tree
1179 set p [lindex $PARENT 0]
1183 if {$empty_tree eq {}} {
1184 set empty_tree [git mktree << {}]
1189 proc force_amend {} {
1190 global selected_commit_type
1191 global HEAD PARENT MERGE_HEAD commit_type
1193 repository_state newType newHEAD newMERGE_HEAD
1196 set MERGE_HEAD $newMERGE_HEAD
1197 set commit_type $newType
1199 set selected_commit_type amend
1200 do_select_commit_type
1203 proc rescan {after {honor_trustmtime 1}} {
1204 global HEAD PARENT MERGE_HEAD commit_type
1205 global ui_index ui_workdir ui_comm
1206 global rescan_active file_states
1209 if {$rescan_active > 0 || ![lock_index read]} return
1211 repository_state newType newHEAD newMERGE_HEAD
1212 if {[string match amend* $commit_type]
1213 && $newType eq {normal}
1214 && $newHEAD eq $HEAD} {
1218 set MERGE_HEAD $newMERGE_HEAD
1219 set commit_type $newType
1222 array unset file_states
1224 if {!$::GITGUI_BCK_exists &&
1225 (![$ui_comm edit modified]
1226 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1227 if {[string match amend* $commit_type]} {
1228 } elseif {[load_message GITGUI_MSG]} {
1229 } elseif {[run_prepare_commit_msg_hook]} {
1230 } elseif {[load_message MERGE_MSG]} {
1231 } elseif {[load_message SQUASH_MSG]} {
1234 $ui_comm edit modified false
1237 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1238 rescan_stage2 {} $after
1241 ui_status [mc "Refreshing
file status...
"]
1242 set fd_rf [git_read update-index \
1248 fconfigure $fd_rf -blocking 0 -translation binary
1249 fileevent $fd_rf readable \
1250 [list rescan_stage2 $fd_rf $after]
1255 set is_git_info_exclude {}
1256 proc have_info_exclude {} {
1257 global is_git_info_exclude
1259 if {$is_git_info_exclude eq {}} {
1260 if {[catch {exec test -f [gitdir info exclude]}]} {
1261 set is_git_info_exclude 0
1263 set is_git_info_exclude 1
1266 return $is_git_info_exclude
1269 proc have_info_exclude {} {
1270 return [file readable [gitdir info exclude]]
1274 proc rescan_stage2 {fd after} {
1275 global rescan_active buf_rdi buf_rdf buf_rlo
1279 if {![eof $fd]} return
1283 set ls_others [list --exclude-per-directory=.gitignore]
1284 if {[have_info_exclude]} {
1285 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1287 set user_exclude [get_config core.excludesfile]
1288 if {$user_exclude ne {} && [file readable $user_exclude]} {
1289 lappend ls_others "--exclude-from=$user_exclude"
1297 ui_status [mc "Scanning
for modified files ...
"]
1298 set fd_di [git_read diff-index --cached -z [PARENT]]
1299 set fd_df [git_read diff-files -z]
1300 set fd_lo [eval git_read ls-files --others -z $ls_others]
1302 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1303 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1304 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1305 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1306 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1307 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1310 proc load_message {file} {
1313 set f [gitdir $file]
1314 if {[file isfile $f]} {
1315 if {[catch {set fd [open $f r]}]} {
1318 fconfigure $fd -eofchar {}
1319 set content [string trim [read $fd]]
1321 regsub -all -line {[ \r\t]+$} $content {} content
1322 $ui_comm delete 0.0 end
1323 $ui_comm insert end $content
1329 proc run_prepare_commit_msg_hook {} {
1332 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1333 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1334 # empty file but existant file.
1336 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1338 if {[file isfile [gitdir MERGE_MSG]]} {
1339 set pcm_source "merge
"
1340 set fd_mm [open [gitdir MERGE_MSG] r]
1341 puts -nonewline $fd_pcm [read $fd_mm]
1343 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1344 set pcm_source "squash
"
1345 set fd_sm [open [gitdir SQUASH_MSG] r]
1346 puts -nonewline $fd_pcm [read $fd_sm]
1354 set fd_ph [githook_read prepare-commit-msg \
1355 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1357 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1361 ui_status [mc "Calling prepare-commit-msg hook...
"]
1364 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1365 fileevent $fd_ph readable \
1366 [list prepare_commit_msg_hook_wait $fd_ph]
1371 proc prepare_commit_msg_hook_wait {fd_ph} {
1374 append pch_error [read $fd_ph]
1375 fconfigure $fd_ph -blocking 1
1377 if {[catch {close $fd_ph}]} {
1378 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1379 hook_failed_popup prepare-commit-msg $pch_error
1380 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1383 load_message PREPARE_COMMIT_MSG
1386 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1389 fconfigure $fd_ph -blocking 0
1390 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1393 proc read_diff_index {fd after} {
1396 append buf_rdi [read $fd]
1398 set n [string length $buf_rdi]
1400 set z1 [string first "\
0" $buf_rdi $c]
1401 if {$z1 == -1} break
1403 set z2 [string first "\
0" $buf_rdi $z1]
1404 if {$z2 == -1} break
1407 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1408 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1410 [encoding convertfrom $p] \
1412 [list [lindex $i 0] [lindex $i 2]] \
1418 set buf_rdi [string range $buf_rdi $c end]
1423 rescan_done $fd buf_rdi $after
1426 proc read_diff_files {fd after} {
1429 append buf_rdf [read $fd]
1431 set n [string length $buf_rdf]
1433 set z1 [string first "\
0" $buf_rdf $c]
1434 if {$z1 == -1} break
1436 set z2 [string first "\
0" $buf_rdf $z1]
1437 if {$z2 == -1} break
1440 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1441 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1443 [encoding convertfrom $p] \
1446 [list [lindex $i 0] [lindex $i 2]]
1451 set buf_rdf [string range $buf_rdf $c end]
1456 rescan_done $fd buf_rdf $after
1459 proc read_ls_others {fd after} {
1462 append buf_rlo [read $fd]
1463 set pck [split $buf_rlo "\
0"]
1464 set buf_rlo [lindex $pck end]
1465 foreach p [lrange $pck 0 end-1] {
1466 set p [encoding convertfrom $p]
1467 if {[string index $p end] eq {/}} {
1468 set p [string range $p 0 end-1]
1472 rescan_done $fd buf_rlo $after
1475 proc rescan_done {fd buf after} {
1476 global rescan_active current_diff_path
1477 global file_states repo_config
1480 if {![eof $fd]} return
1483 if {[incr rescan_active -1] > 0} return
1488 if {$current_diff_path ne {}} reshow_diff
1489 if {$current_diff_path eq {}} select_first_diff
1494 proc prune_selection {} {
1495 global file_states selected_paths
1497 foreach path [array names selected_paths] {
1498 if {[catch {set still_here $file_states($path)}]} {
1499 unset selected_paths($path)
1504 ######################################################################
1508 proc mapicon {w state path} {
1511 if {[catch {set r $all_icons($state$w)}]} {
1512 puts "error
: no icon
for $w state
={$state} $path"
1518 proc mapdesc {state path} {
1521 if {[catch {set r $all_descs($state)}]} {
1522 puts "error
: no desc
for state
={$state} $path"
1528 proc ui_status {msg} {
1530 if {[info exists main_status]} {
1531 $main_status show $msg
1535 proc ui_ready {{test {}}} {
1537 if {[info exists main_status]} {
1538 $main_status show [mc "Ready.
"] $test
1542 proc escape_path {path} {
1543 regsub -all {\\} $path "\\\\" path
1544 regsub -all "\n" $path "\\n
" path
1548 proc short_path {path} {
1549 return [escape_path [lindex [file split $path] end]]
1553 set null_sha1 [string repeat 0 40]
1555 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1556 global file_states next_icon_id null_sha1
1558 set s0 [string index $new_state 0]
1559 set s1 [string index $new_state 1]
1561 if {[catch {set info $file_states($path)}]} {
1563 set icon n[incr next_icon_id]
1565 set state [lindex $info 0]
1566 set icon [lindex $info 1]
1567 if {$head_info eq {}} {set head_info [lindex $info 2]}
1568 if {$index_info eq {}} {set index_info [lindex $info 3]}
1571 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1572 elseif {$s0 eq {_}} {set s0 _}
1574 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1575 elseif {$s1 eq {_}} {set s1 _}
1577 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1578 set head_info [list 0 $null_sha1]
1579 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1580 && $head_info eq {}} {
1581 set head_info $index_info
1584 set file_states($path) [list $s0$s1 $icon \
1585 $head_info $index_info \
1590 proc display_file_helper {w path icon_name old_m new_m} {
1593 if {$new_m eq {_}} {
1594 set lno [lsearch -sorted -exact $file_lists($w) $path]
1596 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1598 $w conf -state normal
1599 $w delete $lno.0 [expr {$lno + 1}].0
1600 $w conf -state disabled
1602 } elseif {$old_m eq {_} && $new_m ne {_}} {
1603 lappend file_lists($w) $path
1604 set file_lists($w) [lsort -unique $file_lists($w)]
1605 set lno [lsearch -sorted -exact $file_lists($w) $path]
1607 $w conf -state normal
1608 $w image create $lno.0 \
1609 -align center -padx 5 -pady 1 \
1611 -image [mapicon $w $new_m $path]
1612 $w insert $lno.1 "[escape_path
$path]\n"
1613 $w conf -state disabled
1614 } elseif {$old_m ne $new_m} {
1615 $w conf -state normal
1616 $w image conf $icon_name -image [mapicon $w $new_m $path]
1617 $w conf -state disabled
1621 proc display_file {path state} {
1622 global file_states selected_paths
1623 global ui_index ui_workdir
1625 set old_m [merge_state $path $state]
1626 set s $file_states($path)
1627 set new_m [lindex $s 0]
1628 set icon_name [lindex $s 1]
1630 set o [string index $old_m 0]
1631 set n [string index $new_m 0]
1638 display_file_helper $ui_index $path $icon_name $o $n
1640 if {[string index $old_m 0] eq {U}} {
1643 set o [string index $old_m 1]
1645 if {[string index $new_m 0] eq {U}} {
1648 set n [string index $new_m 1]
1650 display_file_helper $ui_workdir $path $icon_name $o $n
1652 if {$new_m eq {__}} {
1653 unset file_states($path)
1654 catch {unset selected_paths($path)}
1658 proc display_all_files_helper {w path icon_name m} {
1661 lappend file_lists($w) $path
1662 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1663 $w image create end \
1664 -align center -padx 5 -pady 1 \
1666 -image [mapicon $w $m $path]
1667 $w insert end "[escape_path
$path]\n"
1670 proc display_all_files {} {
1671 global ui_index ui_workdir
1672 global file_states file_lists
1675 $ui_index conf -state normal
1676 $ui_workdir conf -state normal
1678 $ui_index delete 0.0 end
1679 $ui_workdir delete 0.0 end
1682 set file_lists($ui_index) [list]
1683 set file_lists($ui_workdir) [list]
1685 foreach path [lsort [array names file_states]] {
1686 set s $file_states($path)
1688 set icon_name [lindex $s 1]
1690 set s [string index $m 0]
1691 if {$s ne {U} && $s ne {_}} {
1692 display_all_files_helper $ui_index $path \
1696 if {[string index $m 0] eq {U}} {
1699 set s [string index $m 1]
1702 display_all_files_helper $ui_workdir $path \
1707 $ui_index conf -state disabled
1708 $ui_workdir conf -state disabled
1711 ######################################################################
1716 #define mask_width 14
1717 #define mask_height 15
1718 static unsigned char mask_bits[] = {
1719 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1720 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1721 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1724 image create bitmap file_plain -background white -foreground black -data {
1725 #define plain_width 14
1726 #define plain_height 15
1727 static unsigned char plain_bits[] = {
1728 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1729 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1730 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1731 } -maskdata $filemask
1733 image create bitmap file_mod -background white -foreground blue -data {
1734 #define mod_width 14
1735 #define mod_height 15
1736 static unsigned char mod_bits[] = {
1737 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1738 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1739 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1740 } -maskdata $filemask
1742 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1743 #define file_fulltick_width 14
1744 #define file_fulltick_height 15
1745 static unsigned char file_fulltick_bits
[] = {
1746 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1747 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1748 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1749 } -maskdata $filemask
1751 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1752 #define parttick_width 14
1753 #define parttick_height 15
1754 static unsigned char parttick_bits
[] = {
1755 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1756 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1757 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1758 } -maskdata $filemask
1760 image create bitmap file_question
-background white
-foreground black
-data {
1761 #define file_question_width 14
1762 #define file_question_height 15
1763 static unsigned char file_question_bits
[] = {
1764 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1765 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1766 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1767 } -maskdata $filemask
1769 image create bitmap file_removed
-background white
-foreground red
-data {
1770 #define file_removed_width 14
1771 #define file_removed_height 15
1772 static unsigned char file_removed_bits
[] = {
1773 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1774 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1775 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1776 } -maskdata $filemask
1778 image create bitmap file_merge
-background white
-foreground blue
-data {
1779 #define file_merge_width 14
1780 #define file_merge_height 15
1781 static unsigned char file_merge_bits
[] = {
1782 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1783 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1784 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1785 } -maskdata $filemask
1787 image create bitmap file_statechange
-background white
-foreground green
-data {
1788 #define file_merge_width 14
1789 #define file_merge_height 15
1790 static unsigned char file_statechange_bits
[] = {
1791 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1792 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1793 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1794 } -maskdata $filemask
1796 set ui_index .vpane.files.index.list
1797 set ui_workdir .vpane.files.workdir.list
1799 set all_icons
(_
$ui_index) file_plain
1800 set all_icons
(A
$ui_index) file_fulltick
1801 set all_icons
(M
$ui_index) file_fulltick
1802 set all_icons
(D
$ui_index) file_removed
1803 set all_icons
(U
$ui_index) file_merge
1804 set all_icons
(T
$ui_index) file_statechange
1806 set all_icons
(_
$ui_workdir) file_plain
1807 set all_icons
(M
$ui_workdir) file_mod
1808 set all_icons
(D
$ui_workdir) file_question
1809 set all_icons
(U
$ui_workdir) file_merge
1810 set all_icons
(O
$ui_workdir) file_plain
1811 set all_icons
(T
$ui_workdir) file_statechange
1813 set max_status_desc
0
1815 {__
{mc
"Unmodified"}}
1817 {_M
{mc
"Modified, not staged"}}
1818 {M_
{mc
"Staged for commit"}}
1819 {MM
{mc
"Portions staged for commit"}}
1820 {MD
{mc
"Staged for commit, missing"}}
1822 {_T
{mc
"File type changed, not staged"}}
1823 {T_
{mc
"File type changed, staged"}}
1825 {_O
{mc
"Untracked, not staged"}}
1826 {A_
{mc
"Staged for commit"}}
1827 {AM
{mc
"Portions staged for commit"}}
1828 {AD
{mc
"Staged for commit, missing"}}
1831 {D_
{mc
"Staged for removal"}}
1832 {DO
{mc
"Staged for removal, still present"}}
1834 {_U
{mc
"Requires merge resolution"}}
1835 {U_
{mc
"Requires merge resolution"}}
1836 {UU
{mc
"Requires merge resolution"}}
1837 {UM
{mc
"Requires merge resolution"}}
1838 {UD
{mc
"Requires merge resolution"}}
1839 {UT
{mc
"Requires merge resolution"}}
1841 set text
[eval [lindex
$i 1]]
1842 if {$max_status_desc < [string length
$text]} {
1843 set max_status_desc
[string length
$text]
1845 set all_descs
([lindex
$i 0]) $text
1849 ######################################################################
1853 proc scrollbar2many
{list mode args
} {
1854 foreach w
$list {eval $w $mode $args}
1857 proc many2scrollbar
{list mode sb top bottom
} {
1858 $sb set $top $bottom
1859 foreach w
$list {$w $mode moveto
$top}
1862 proc incr_font_size
{font
{amt
1}} {
1863 set sz
[font configure
$font -size]
1865 font configure
$font -size $sz
1866 font configure
${font}bold
-size $sz
1867 font configure
${font}italic
-size $sz
1870 ######################################################################
1874 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1876 proc do_gitk
{revs
} {
1877 # -- Always start gitk through whatever we were loaded with. This
1878 # lets us bypass using shell process on Windows systems.
1880 set exe
[_which gitk
-script]
1881 set cmd
[list
[info nameofexecutable
] $exe]
1883 error_popup
[mc
"Couldn't find gitk in PATH"]
1887 if {[info exists env
(GIT_DIR
)]} {
1888 set old_GIT_DIR
$env(GIT_DIR
)
1894 cd [file dirname [gitdir
]]
1895 set env
(GIT_DIR
) [file tail [gitdir
]]
1897 eval exec $cmd $revs &
1899 if {$old_GIT_DIR eq
{}} {
1902 set env
(GIT_DIR
) $old_GIT_DIR
1906 ui_status $
::starting_gitk_msg
1908 ui_ready
$starting_gitk_msg
1913 proc do_explore
{} {
1915 if {[is_Cygwin
] ||
[is_Windows
]} {
1916 set explorer
"explorer.exe"
1917 } elseif
{[is_MacOSX
]} {
1920 # freedesktop.org-conforming system is our best shot
1921 set explorer
"xdg-open"
1923 eval exec $explorer [file dirname [gitdir
]] &
1929 proc terminate_me
{win
} {
1931 if {$win ne
{.
}} return
1935 proc do_quit
{{rc
{1}}} {
1936 global ui_comm is_quitting repo_config commit_type
1937 global GITGUI_BCK_exists GITGUI_BCK_i
1938 global ui_comm_spell
1941 if {$is_quitting} return
1944 if {[winfo exists
$ui_comm]} {
1945 # -- Stash our current commit buffer.
1947 set save
[gitdir GITGUI_MSG
]
1948 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1949 file rename
-force [gitdir GITGUI_BCK
] $save
1950 set GITGUI_BCK_exists
0
1952 set msg
[string trim
[$ui_comm get
0.0 end
]]
1953 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1954 if {(![string match amend
* $commit_type]
1955 ||
[$ui_comm edit modified
])
1958 set fd
[open
$save w
]
1959 puts
-nonewline $fd $msg
1963 catch
{file delete
$save}
1967 # -- Cancel our spellchecker if its running.
1969 if {[info exists ui_comm_spell
]} {
1973 # -- Remove our editor backup, its not needed.
1975 after cancel
$GITGUI_BCK_i
1976 if {$GITGUI_BCK_exists} {
1977 catch
{file delete
[gitdir GITGUI_BCK
]}
1980 # -- Stash our current window geometry into this repository.
1982 set cfg_geometry
[list
]
1983 lappend cfg_geometry
[wm geometry .
]
1984 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
1985 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
1986 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1989 if {$cfg_geometry ne
$rc_geometry} {
1990 catch
{git config gui.geometry
$cfg_geometry}
2002 proc ui_do_rescan
{} {
2003 rescan
{force_first_diff
; ui_ready
}
2011 global next_diff_p next_diff_w next_diff_i
2012 show_diff
$next_diff_p $next_diff_w {}
2015 proc find_anchor_pos
{lst name
} {
2016 set lid
[lsearch
-sorted -exact $lst $name]
2020 foreach lname
$lst {
2021 if {$lname >= $name} break
2029 proc find_file_from
{flist idx delta path mmask
} {
2032 set len
[llength
$flist]
2033 while {$idx >= 0 && $idx < $len} {
2034 set name
[lindex
$flist $idx]
2036 if {$name ne
$path && [info exists file_states
($name)]} {
2037 set state
[lindex
$file_states($name) 0]
2039 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2050 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2051 global next_diff_p next_diff_w next_diff_i
2052 global file_lists ui_index ui_workdir
2054 set flist
$file_lists($w)
2056 set lno
[find_anchor_pos
$flist $path]
2061 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2062 if {$w eq
$ui_index} {
2065 set mmask
"$mmask\$"
2069 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2072 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2077 set next_diff_p
[lindex
$flist $idx]
2078 set next_diff_i
[expr {$idx+1}]
2085 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2086 global current_diff_path
2088 if {$path ne
$current_diff_path} {
2090 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2093 return {reshow_diff
;}
2097 proc select_first_diff
{} {
2100 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2101 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2106 proc force_first_diff
{} {
2107 global current_diff_path
2109 if {[info exists file_states
($current_diff_path)]} {
2110 set state
[lindex
$file_states($current_diff_path) 0]
2112 if {[string index
$state 1] ne
{O
}} return
2118 proc toggle_or_diff
{w x y
} {
2119 global file_states file_lists current_diff_path ui_index ui_workdir
2120 global last_clicked selected_paths
2122 set pos
[split [$w index @
$x,$y] .
]
2123 set lno
[lindex
$pos 0]
2124 set col [lindex
$pos 1]
2125 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2131 set last_clicked
[list
$w $lno]
2132 array
unset selected_paths
2133 $ui_index tag remove in_sel
0.0 end
2134 $ui_workdir tag remove in_sel
0.0 end
2136 # Determine the state of the file
2137 if {[info exists file_states
($path)]} {
2138 set state
[lindex
$file_states($path) 0]
2143 # Restage the file, or simply show the diff
2144 if {$col == 0 && $y > 1} {
2145 # Conflicts need special handling
2146 if {[string first
{U
} $state] >= 0} {
2147 # $w must always be $ui_workdir, but...
2148 if {$w ne
$ui_workdir} { set lno
{} }
2149 merge_stage_workdir
$path $lno
2153 if {[string index
$state 1] eq
{O
}} {
2159 set after
[next_diff_after_action
$w $path $lno $mmask]
2161 if {$w eq
$ui_index} {
2163 "Unstaging [short_path $path] from commit" \
2165 [concat
$after [list ui_ready
]]
2166 } elseif
{$w eq
$ui_workdir} {
2168 "Adding [short_path $path]" \
2170 [concat
$after [list ui_ready
]]
2173 show_diff
$path $w $lno
2177 proc add_one_to_selection
{w x y
} {
2178 global file_lists last_clicked selected_paths
2180 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2181 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2187 if {$last_clicked ne
{}
2188 && [lindex
$last_clicked 0] ne
$w} {
2189 array
unset selected_paths
2190 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2193 set last_clicked
[list
$w $lno]
2194 if {[catch
{set in_sel
$selected_paths($path)}]} {
2198 unset selected_paths
($path)
2199 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2201 set selected_paths
($path) 1
2202 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2206 proc add_range_to_selection
{w x y
} {
2207 global file_lists last_clicked selected_paths
2209 if {[lindex
$last_clicked 0] ne
$w} {
2210 toggle_or_diff
$w $x $y
2214 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2215 set lc
[lindex
$last_clicked 1]
2224 foreach path
[lrange
$file_lists($w) \
2225 [expr {$begin - 1}] \
2226 [expr {$end - 1}]] {
2227 set selected_paths
($path) 1
2229 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2232 proc show_more_context
{} {
2234 if {$repo_config(gui.diffcontext
) < 99} {
2235 incr repo_config
(gui.diffcontext
)
2240 proc show_less_context
{} {
2242 if {$repo_config(gui.diffcontext
) > 1} {
2243 incr repo_config
(gui.diffcontext
) -1
2248 ######################################################################
2258 menu .mbar
-tearoff 0
2259 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2260 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2261 if {[is_enabled branch
]} {
2262 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2264 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2265 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2267 if {[is_enabled transport
]} {
2268 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2269 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2271 . configure
-menu .mbar
2273 # -- Repository Menu
2275 menu .mbar.repository
2277 .mbar.repository add
command \
2278 -label [mc
"Explore Working Copy"] \
2279 -command {do_explore
}
2280 .mbar.repository add separator
2282 .mbar.repository add
command \
2283 -label [mc
"Browse Current Branch's Files"] \
2284 -command {browser
::new
$current_branch}
2285 set ui_browse_current
[.mbar.repository index last
]
2286 .mbar.repository add
command \
2287 -label [mc
"Browse Branch Files..."] \
2288 -command browser_open
::dialog
2289 .mbar.repository add separator
2291 .mbar.repository add
command \
2292 -label [mc
"Visualize Current Branch's History"] \
2293 -command {do_gitk
$current_branch}
2294 set ui_visualize_current
[.mbar.repository index last
]
2295 .mbar.repository add
command \
2296 -label [mc
"Visualize All Branch History"] \
2297 -command {do_gitk
--all}
2298 .mbar.repository add separator
2300 proc current_branch_write
{args
} {
2301 global current_branch
2302 .mbar.repository entryconf $
::ui_browse_current \
2303 -label [mc
"Browse %s's Files" $current_branch]
2304 .mbar.repository entryconf $
::ui_visualize_current \
2305 -label [mc
"Visualize %s's History" $current_branch]
2307 trace add variable current_branch
write current_branch_write
2309 if {[is_enabled multicommit
]} {
2310 .mbar.repository add
command -label [mc
"Database Statistics"] \
2313 .mbar.repository add
command -label [mc
"Compress Database"] \
2316 .mbar.repository add
command -label [mc
"Verify Database"] \
2317 -command do_fsck_objects
2319 .mbar.repository add separator
2322 .mbar.repository add
command \
2323 -label [mc
"Create Desktop Icon"] \
2324 -command do_cygwin_shortcut
2325 } elseif
{[is_Windows
]} {
2326 .mbar.repository add
command \
2327 -label [mc
"Create Desktop Icon"] \
2328 -command do_windows_shortcut
2329 } elseif
{[is_MacOSX
]} {
2330 .mbar.repository add
command \
2331 -label [mc
"Create Desktop Icon"] \
2332 -command do_macosx_app
2337 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2339 .mbar.repository add
command -label [mc Quit
] \
2347 .mbar.edit add
command -label [mc Undo
] \
2348 -command {catch
{[focus
] edit undo
}} \
2350 .mbar.edit add
command -label [mc Redo
] \
2351 -command {catch
{[focus
] edit redo
}} \
2353 .mbar.edit add separator
2354 .mbar.edit add
command -label [mc Cut
] \
2355 -command {catch
{tk_textCut
[focus
]}} \
2357 .mbar.edit add
command -label [mc Copy
] \
2358 -command {catch
{tk_textCopy
[focus
]}} \
2360 .mbar.edit add
command -label [mc Paste
] \
2361 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2363 .mbar.edit add
command -label [mc Delete
] \
2364 -command {catch
{[focus
] delete sel.first sel.last
}} \
2366 .mbar.edit add separator
2367 .mbar.edit add
command -label [mc
"Select All"] \
2368 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2373 if {[is_enabled branch
]} {
2376 .mbar.branch add
command -label [mc
"Create..."] \
2377 -command branch_create
::dialog \
2379 lappend disable_on_lock
[list .mbar.branch entryconf \
2380 [.mbar.branch index last
] -state]
2382 .mbar.branch add
command -label [mc
"Checkout..."] \
2383 -command branch_checkout
::dialog \
2385 lappend disable_on_lock
[list .mbar.branch entryconf \
2386 [.mbar.branch index last
] -state]
2388 .mbar.branch add
command -label [mc
"Rename..."] \
2389 -command branch_rename
::dialog
2390 lappend disable_on_lock
[list .mbar.branch entryconf \
2391 [.mbar.branch index last
] -state]
2393 .mbar.branch add
command -label [mc
"Delete..."] \
2394 -command branch_delete
::dialog
2395 lappend disable_on_lock
[list .mbar.branch entryconf \
2396 [.mbar.branch index last
] -state]
2398 .mbar.branch add
command -label [mc
"Reset..."] \
2399 -command merge
::reset_hard
2400 lappend disable_on_lock
[list .mbar.branch entryconf \
2401 [.mbar.branch index last
] -state]
2406 proc commit_btn_caption
{} {
2407 if {[is_enabled nocommit
]} {
2410 return [mc Commit@@verb
]
2414 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2417 if {![is_enabled nocommit
]} {
2418 .mbar.commit add radiobutton \
2419 -label [mc
"New Commit"] \
2420 -command do_select_commit_type \
2421 -variable selected_commit_type \
2423 lappend disable_on_lock \
2424 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2426 .mbar.commit add radiobutton \
2427 -label [mc
"Amend Last Commit"] \
2428 -command do_select_commit_type \
2429 -variable selected_commit_type \
2431 lappend disable_on_lock \
2432 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2434 .mbar.commit add separator
2437 .mbar.commit add
command -label [mc Rescan
] \
2438 -command ui_do_rescan \
2440 lappend disable_on_lock \
2441 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2443 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2444 -command do_add_selection \
2446 lappend disable_on_lock \
2447 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2449 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2450 -command do_add_all \
2452 lappend disable_on_lock \
2453 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2455 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2456 -command do_unstage_selection
2457 lappend disable_on_lock \
2458 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2460 .mbar.commit add
command -label [mc
"Revert Changes"] \
2461 -command do_revert_selection
2462 lappend disable_on_lock \
2463 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2465 .mbar.commit add separator
2467 .mbar.commit add
command -label [mc
"Show Less Context"] \
2468 -command show_less_context \
2469 -accelerator $M1T-\
-
2471 .mbar.commit add
command -label [mc
"Show More Context"] \
2472 -command show_more_context \
2475 .mbar.commit add separator
2477 if {![is_enabled nocommitmsg
]} {
2478 .mbar.commit add
command -label [mc
"Sign Off"] \
2479 -command do_signoff \
2483 .mbar.commit add
command -label [commit_btn_caption
] \
2484 -command do_commit \
2485 -accelerator $M1T-Return
2486 lappend disable_on_lock \
2487 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2492 if {[is_enabled branch
]} {
2494 .mbar.merge add
command -label [mc
"Local Merge..."] \
2495 -command merge
::dialog \
2497 lappend disable_on_lock \
2498 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2499 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2500 -command merge
::reset_hard
2501 lappend disable_on_lock \
2502 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2507 if {[is_enabled transport
]} {
2510 .mbar.remote add
command \
2511 -label [mc
"Add..."] \
2512 -command remote_add
::dialog \
2514 .mbar.remote add
command \
2515 -label [mc
"Push..."] \
2516 -command do_push_anywhere \
2518 .mbar.remote add
command \
2519 -label [mc
"Delete Branch..."] \
2520 -command remote_branch_delete
::dialog
2524 # -- Apple Menu (Mac OS X only)
2526 .mbar add cascade
-label Apple
-menu .mbar.apple
2529 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2531 .mbar.apple add separator
2532 .mbar.apple add
command \
2533 -label [mc
"Preferences..."] \
2534 -command do_options \
2536 bind .
<$M1B-,> do_options
2540 .mbar.edit add separator
2541 .mbar.edit add
command -label [mc
"Options..."] \
2547 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2551 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2556 set doc_path
[file dirname [gitexec
]]
2557 set doc_path
[file join $doc_path Documentation index.html
]
2560 set doc_path
[exec cygpath
--mixed $doc_path]
2563 if {[file isfile
$doc_path]} {
2564 set doc_url
"file:$doc_path"
2566 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2569 proc start_browser
{url
} {
2570 git
"web--browse" $url
2573 .mbar.
help add
command -label [mc
"Online Documentation"] \
2574 -command [list start_browser
$doc_url]
2576 .mbar.
help add
command -label [mc
"Show SSH Key"] \
2579 unset doc_path doc_url
2581 # -- Standard bindings
2583 wm protocol . WM_DELETE_WINDOW do_quit
2584 bind all
<$M1B-Key-q> do_quit
2585 bind all
<$M1B-Key-Q> do_quit
2586 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2587 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2589 set subcommand_args
{}
2591 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2595 # -- Not a normal commit type invocation? Do that instead!
2597 switch
-- $subcommand {
2600 if {$subcommand eq
"blame"} {
2601 set subcommand_args
{[--line=<num
>] rev? path
}
2603 set subcommand_args
{rev? path
}
2605 if {$argv eq
{}} usage
2611 if {$is_path ||
[file exists
$_prefix$a]} {
2612 if {$path ne
{}} usage
2615 } elseif
{$a eq
{--}} {
2617 if {$head ne
{}} usage
2622 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
2623 if {$jump_spec ne
{} ||
$head ne
{}} usage
2624 set jump_spec
[list
$lnum]
2625 } elseif
{$head eq
{}} {
2626 if {$head ne
{}} usage
2635 if {$head ne
{} && $path eq
{}} {
2636 set path
$_prefix$head
2643 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2645 set head [git rev-parse
--verify $head]
2651 set current_branch
$head
2654 switch
-- $subcommand {
2656 if {$jump_spec ne
{}} usage
2658 if {$path ne
{} && [file isdirectory
$path]} {
2659 set head $current_branch
2665 browser
::new
$head $path
2668 if {$head eq
{} && ![file exists
$path]} {
2669 puts stderr
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
2672 blame
::new
$head $path $jump_spec
2679 if {[llength
$argv] != 0} {
2680 puts
-nonewline stderr
"usage: $argv0"
2681 if {$subcommand ne
{gui
}
2682 && [file tail $argv0] ne
"git-$subcommand"} {
2683 puts
-nonewline stderr
" $subcommand"
2688 # fall through to setup UI for commits
2691 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2702 -text [mc
"Current Branch:"] \
2706 -textvariable current_branch \
2709 pack .branch.l1
-side left
2710 pack .branch.cb
-side left
-fill x
2711 pack .branch
-side top
-fill x
2713 # -- Main Window Layout
2715 panedwindow .vpane
-orient horizontal
2716 panedwindow .vpane.files
-orient vertical
2717 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2718 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2720 # -- Index File List
2722 frame .vpane.files.index
-height 100 -width 200
2723 label .vpane.files.index.title
-text [mc
"Staged Changes (Will Commit)"] \
2724 -background lightgreen
-foreground black
2725 text
$ui_index -background white
-foreground black \
2727 -width 20 -height 10 \
2729 -cursor $cursor_ptr \
2730 -xscrollcommand {.vpane.files.index.sx
set} \
2731 -yscrollcommand {.vpane.files.index.sy
set} \
2733 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2734 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2735 pack .vpane.files.index.title
-side top
-fill x
2736 pack .vpane.files.index.sx
-side bottom
-fill x
2737 pack .vpane.files.index.sy
-side right
-fill y
2738 pack
$ui_index -side left
-fill both
-expand 1
2740 # -- Working Directory File List
2742 frame .vpane.files.workdir
-height 100 -width 200
2743 label .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
2744 -background lightsalmon
-foreground black
2745 text
$ui_workdir -background white
-foreground black \
2747 -width 20 -height 10 \
2749 -cursor $cursor_ptr \
2750 -xscrollcommand {.vpane.files.workdir.sx
set} \
2751 -yscrollcommand {.vpane.files.workdir.sy
set} \
2753 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2754 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2755 pack .vpane.files.workdir.title
-side top
-fill x
2756 pack .vpane.files.workdir.sx
-side bottom
-fill x
2757 pack .vpane.files.workdir.sy
-side right
-fill y
2758 pack
$ui_workdir -side left
-fill both
-expand 1
2760 .vpane.files add .vpane.files.workdir
-sticky nsew
2761 .vpane.files add .vpane.files.index
-sticky nsew
2763 foreach i
[list
$ui_index $ui_workdir] {
2765 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2769 # -- Diff and Commit Area
2771 frame .vpane.lower
-height 300 -width 400
2772 frame .vpane.lower.commarea
2773 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2774 pack .vpane.lower.
diff -fill both
-expand 1
2775 pack .vpane.lower.commarea
-side bottom
-fill x
2776 .vpane add .vpane.lower
-sticky nsew
2778 # -- Commit Area Buttons
2780 frame .vpane.lower.commarea.buttons
2781 label .vpane.lower.commarea.buttons.l
-text {} \
2784 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2785 pack .vpane.lower.commarea.buttons
-side left
-fill y
2787 button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
2788 -command ui_do_rescan
2789 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2790 lappend disable_on_lock \
2791 {.vpane.lower.commarea.buttons.rescan conf
-state}
2793 button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
2795 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2796 lappend disable_on_lock \
2797 {.vpane.lower.commarea.buttons.incall conf
-state}
2799 if {![is_enabled nocommitmsg
]} {
2800 button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
2802 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2805 button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
2807 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2808 lappend disable_on_lock \
2809 {.vpane.lower.commarea.buttons.commit conf
-state}
2811 if {![is_enabled nocommit
]} {
2812 button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
2813 -command do_push_anywhere
2814 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2817 # -- Commit Message Buffer
2819 frame .vpane.lower.commarea.buffer
2820 frame .vpane.lower.commarea.buffer.header
2821 set ui_comm .vpane.lower.commarea.buffer.t
2822 set ui_coml .vpane.lower.commarea.buffer.header.l
2824 if {![is_enabled nocommit
]} {
2825 radiobutton .vpane.lower.commarea.buffer.header.new \
2826 -text [mc
"New Commit"] \
2827 -command do_select_commit_type \
2828 -variable selected_commit_type \
2830 lappend disable_on_lock \
2831 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2832 radiobutton .vpane.lower.commarea.buffer.header.amend \
2833 -text [mc
"Amend Last Commit"] \
2834 -command do_select_commit_type \
2835 -variable selected_commit_type \
2837 lappend disable_on_lock \
2838 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2844 proc trace_commit_type
{varname args
} {
2845 global ui_coml commit_type
2846 switch
-glob -- $commit_type {
2847 initial
{set txt
[mc
"Initial Commit Message:"]}
2848 amend
{set txt
[mc
"Amended Commit Message:"]}
2849 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
2850 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
2851 merge
{set txt
[mc
"Merge Commit Message:"]}
2852 * {set txt
[mc
"Commit Message:"]}
2854 $ui_coml conf
-text $txt
2856 trace add variable commit_type
write trace_commit_type
2857 pack
$ui_coml -side left
-fill x
2859 if {![is_enabled nocommit
]} {
2860 pack .vpane.lower.commarea.buffer.header.amend
-side right
2861 pack .vpane.lower.commarea.buffer.header.new
-side right
2864 text
$ui_comm -background white
-foreground black \
2868 -autoseparators true \
2870 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
2872 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2873 scrollbar .vpane.lower.commarea.buffer.sby \
2874 -command [list
$ui_comm yview
]
2875 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2876 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2877 pack
$ui_comm -side left
-fill y
2878 pack .vpane.lower.commarea.buffer
-side left
-fill y
2880 # -- Commit Message Buffer Context Menu
2882 set ctxm .vpane.lower.commarea.buffer.ctxm
2883 menu
$ctxm -tearoff 0
2886 -command {tk_textCut
$ui_comm}
2889 -command {tk_textCopy
$ui_comm}
2892 -command {tk_textPaste
$ui_comm}
2894 -label [mc Delete
] \
2895 -command {$ui_comm delete sel.first sel.last
}
2898 -label [mc
"Select All"] \
2899 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2901 -label [mc
"Copy All"] \
2903 $ui_comm tag add sel
0.0 end
2904 tk_textCopy
$ui_comm
2905 $ui_comm tag remove sel
0.0 end
2909 -label [mc
"Sign Off"] \
2911 set ui_comm_ctxm
$ctxm
2915 proc trace_current_diff_path
{varname args
} {
2916 global current_diff_path diff_actions file_states
2917 if {$current_diff_path eq
{}} {
2923 set p
$current_diff_path
2924 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2926 set p
[escape_path
$p]
2930 .vpane.lower.
diff.header.status configure
-text $s
2931 .vpane.lower.
diff.header.
file configure
-text $f
2932 .vpane.lower.
diff.header.path configure
-text $p
2933 foreach w
$diff_actions {
2937 trace add variable current_diff_path
write trace_current_diff_path
2939 frame .vpane.lower.
diff.header
-background gold
2940 label .vpane.lower.
diff.header.status \
2943 -width $max_status_desc \
2946 label .vpane.lower.
diff.header.
file \
2951 label .vpane.lower.
diff.header.path \
2956 pack .vpane.lower.
diff.header.status
-side left
2957 pack .vpane.lower.
diff.header.
file -side left
2958 pack .vpane.lower.
diff.header.path
-fill x
2959 set ctxm .vpane.lower.
diff.header.ctxm
2960 menu
$ctxm -tearoff 0
2968 -- $current_diff_path
2970 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2971 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2975 frame .vpane.lower.
diff.body
2976 set ui_diff .vpane.lower.
diff.body.t
2977 text
$ui_diff -background white
-foreground black \
2979 -width 80 -height 15 -wrap none \
2981 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2982 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2984 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2985 -command [list
$ui_diff xview
]
2986 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2987 -command [list
$ui_diff yview
]
2988 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2989 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2990 pack
$ui_diff -side left
-fill both
-expand 1
2991 pack .vpane.lower.
diff.header
-side top
-fill x
2992 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2994 $ui_diff tag conf d_cr
-elide true
2995 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2996 $ui_diff tag conf d_
+ -foreground {#00a000}
2997 $ui_diff tag conf d_-
-foreground red
2999 $ui_diff tag conf d_
++ -foreground {#00a000}
3000 $ui_diff tag conf d_--
-foreground red
3001 $ui_diff tag conf d_
+s \
3002 -foreground {#00a000} \
3003 -background {#e2effa}
3004 $ui_diff tag conf d_-s \
3006 -background {#e2effa}
3007 $ui_diff tag conf d_s
+ \
3008 -foreground {#00a000} \
3010 $ui_diff tag conf d_s- \
3014 $ui_diff tag conf d
<<<<<<< \
3015 -foreground orange \
3017 $ui_diff tag conf d
======= \
3018 -foreground orange \
3020 $ui_diff tag conf d
>>>>>>> \
3021 -foreground orange \
3024 $ui_diff tag raise sel
3026 # -- Diff Body Context Menu
3029 proc create_common_diff_popup
{ctxm
} {
3031 -label [mc
"Show Less Context"] \
3032 -command show_less_context
3033 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3035 -label [mc
"Show More Context"] \
3036 -command show_more_context
3037 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3040 -label [mc Refresh
] \
3041 -command reshow_diff
3042 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3045 -command {tk_textCopy
$ui_diff}
3046 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3048 -label [mc
"Select All"] \
3049 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3050 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3052 -label [mc
"Copy All"] \
3054 $ui_diff tag add sel
0.0 end
3055 tk_textCopy
$ui_diff
3056 $ui_diff tag remove sel
0.0 end
3058 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3061 -label [mc
"Decrease Font Size"] \
3062 -command {incr_font_size font_diff
-1}
3063 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3065 -label [mc
"Increase Font Size"] \
3066 -command {incr_font_size font_diff
1}
3067 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3071 build_encoding_menu
$emenu [list force_diff_encoding
]
3073 -label [mc
"Encoding"] \
3075 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3077 $ctxm add
command -label [mc
"Options..."] \
3081 set ctxm .vpane.lower.
diff.body.ctxm
3082 menu
$ctxm -tearoff 0
3084 -label [mc
"Apply/Reverse Hunk"] \
3085 -command {apply_hunk
$cursorX $cursorY}
3086 set ui_diff_applyhunk
[$ctxm index last
]
3087 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3089 -label [mc
"Apply/Reverse Line"] \
3090 -command {apply_line
$cursorX $cursorY; do_rescan
}
3091 set ui_diff_applyline
[$ctxm index last
]
3092 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3094 create_common_diff_popup
$ctxm
3096 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3097 menu
$ctxmmg -tearoff 0
3098 $ctxmmg add
command \
3099 -label [mc
"Run Merge Tool"] \
3100 -command {merge_resolve_tool
}
3101 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3102 $ctxmmg add separator
3103 $ctxmmg add
command \
3104 -label [mc
"Use Remote Version"] \
3105 -command {merge_resolve_one
3}
3106 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3107 $ctxmmg add
command \
3108 -label [mc
"Use Local Version"] \
3109 -command {merge_resolve_one
2}
3110 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3111 $ctxmmg add
command \
3112 -label [mc
"Revert To Base"] \
3113 -command {merge_resolve_one
1}
3114 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3115 $ctxmmg add separator
3116 create_common_diff_popup
$ctxmmg
3118 proc popup_diff_menu
{ctxm ctxmmg x y X Y
} {
3119 global current_diff_path file_states
3122 if {[info exists file_states
($current_diff_path)]} {
3123 set state
[lindex
$file_states($current_diff_path) 0]
3127 if {[string first
{U
} $state] >= 0} {
3128 tk_popup
$ctxmmg $X $Y
3130 if {$
::ui_index eq $
::current_diff_side
} {
3131 set l
[mc
"Unstage Hunk From Commit"]
3132 set t
[mc
"Unstage Line From Commit"]
3134 set l
[mc
"Stage Hunk For Commit"]
3135 set t
[mc
"Stage Line For Commit"]
3138 ||
$current_diff_path eq
{}
3142 ||
{T_
} eq
$state} {
3147 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3148 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3149 tk_popup
$ctxm $X $Y
3152 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg %x
%y
%X
%Y
]
3156 set main_status
[::status_bar
::new .status
]
3157 pack .status
-anchor w
-side bottom
-fill x
3158 $main_status show
[mc
"Initializing..."]
3163 set gm
$repo_config(gui.geometry
)
3164 wm geometry .
[lindex
$gm 0]
3165 .vpane sash place
0 \
3167 [lindex
[.vpane sash coord
0] 1]
3168 .vpane.files sash place
0 \
3169 [lindex
[.vpane.files sash coord
0] 0] \
3176 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3177 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3178 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3179 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3180 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3181 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3182 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3183 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3184 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3185 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3186 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3187 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3188 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3189 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3190 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3191 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3192 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3193 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3195 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3196 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3197 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3198 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3199 bind $ui_diff <$M1B-Key-v> {break}
3200 bind $ui_diff <$M1B-Key-V> {break}
3201 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3202 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3203 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3204 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3205 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3206 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3207 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3208 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3209 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3210 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3211 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3212 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3213 bind $ui_diff <Button-1
> {focus
%W
}
3215 if {[is_enabled branch
]} {
3216 bind .
<$M1B-Key-n> branch_create
::dialog
3217 bind .
<$M1B-Key-N> branch_create
::dialog
3218 bind .
<$M1B-Key-o> branch_checkout
::dialog
3219 bind .
<$M1B-Key-O> branch_checkout
::dialog
3220 bind .
<$M1B-Key-m> merge
::dialog
3221 bind .
<$M1B-Key-M> merge
::dialog
3223 if {[is_enabled transport
]} {
3224 bind .
<$M1B-Key-p> do_push_anywhere
3225 bind .
<$M1B-Key-P> do_push_anywhere
3228 bind .
<Key-F5
> ui_do_rescan
3229 bind .
<$M1B-Key-r> ui_do_rescan
3230 bind .
<$M1B-Key-R> ui_do_rescan
3231 bind .
<$M1B-Key-s> do_signoff
3232 bind .
<$M1B-Key-S> do_signoff
3233 bind .
<$M1B-Key-t> do_add_selection
3234 bind .
<$M1B-Key-T> do_add_selection
3235 bind .
<$M1B-Key-i> do_add_all
3236 bind .
<$M1B-Key-I> do_add_all
3237 bind .
<$M1B-Key-minus> {show_less_context
;break}
3238 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3239 bind .
<$M1B-Key-equal> {show_more_context
;break}
3240 bind .
<$M1B-Key-plus> {show_more_context
;break}
3241 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3242 bind .
<$M1B-Key-Return> do_commit
3243 foreach i
[list
$ui_index $ui_workdir] {
3244 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3245 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3246 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3250 set file_lists
($ui_index) [list
]
3251 set file_lists
($ui_workdir) [list
]
3253 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
3254 focus
-force $ui_comm
3256 # -- Warn the user about environmental problems. Cygwin's Tcl
3257 # does *not* pass its env array onto any processes it spawns.
3258 # This means that git processes get none of our environment.
3263 set msg
[mc
"Possible environment issues exist.
3265 The following environment variables are probably
3266 going to be ignored by any Git subprocess run
3270 foreach name
[array names env
] {
3271 switch
-regexp -- $name {
3272 {^GIT_INDEX_FILE$
} -
3273 {^GIT_OBJECT_DIRECTORY$
} -
3274 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3276 {^GIT_EXTERNAL_DIFF$
} -
3280 {^GIT_CONFIG_LOCAL$
} -
3281 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3282 append msg
" - $name\n"
3285 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3286 append msg
" - $name\n"
3288 set suggest_user
$name
3292 if {$ignored_env > 0} {
3294 This is due to a known issue with the
3295 Tcl binary distributed by Cygwin."]
3297 if {$suggest_user ne
{}} {
3300 A good replacement for %s
3301 is placing values for the user.name and
3302 user.email settings into your personal
3308 unset ignored_env msg suggest_user name
3311 # -- Only initialize complex UI if we are going to stay running.
3313 if {[is_enabled transport
]} {
3316 set n
[.mbar.remote index end
]
3317 populate_remotes_menu
3318 set n
[expr {[.mbar.remote index end
] - $n}]
3320 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3321 .mbar.remote insert
$n separator
3326 if {[winfo exists
$ui_comm]} {
3327 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3329 # -- If both our backup and message files exist use the
3330 # newer of the two files to initialize the buffer.
3332 if {$GITGUI_BCK_exists} {
3333 set m
[gitdir GITGUI_MSG
]
3334 if {[file isfile
$m]} {
3335 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3336 catch
{file delete
[gitdir GITGUI_MSG
]}
3338 $ui_comm delete
0.0 end
3340 $ui_comm edit modified false
3341 catch
{file delete
[gitdir GITGUI_BCK
]}
3342 set GITGUI_BCK_exists
0
3348 proc backup_commit_buffer
{} {
3349 global ui_comm GITGUI_BCK_exists
3351 set m
[$ui_comm edit modified
]
3352 if {$m ||
$GITGUI_BCK_exists} {
3353 set msg
[string trim
[$ui_comm get
0.0 end
]]
3354 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3357 if {$GITGUI_BCK_exists} {
3358 catch
{file delete
[gitdir GITGUI_BCK
]}
3359 set GITGUI_BCK_exists
0
3363 set fd
[open
[gitdir GITGUI_BCK
] w
]
3364 puts
-nonewline $fd $msg
3366 set GITGUI_BCK_exists
1
3370 $ui_comm edit modified false
3373 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3376 backup_commit_buffer
3378 # -- If the user has aspell available we can drive it
3379 # in pipe mode to spellcheck the commit message.
3381 set spell_cmd
[list |
]
3382 set spell_dict
[get_config gui.spellingdictionary
]
3383 lappend spell_cmd aspell
3384 if {$spell_dict ne
{}} {
3385 lappend spell_cmd
--master=$spell_dict
3387 lappend spell_cmd
--mode=none
3388 lappend spell_cmd
--encoding=utf-8
3389 lappend spell_cmd pipe
3390 if {$spell_dict eq
{none
}
3391 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3392 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3394 set ui_comm_spell
[spellcheck
::init \
3400 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3403 lock_index begin-read
3404 if {![winfo ismapped .
]} {
3408 if {[is_enabled initialamend
]} {
3414 if {[is_enabled nocommitmsg
]} {
3415 $ui_comm configure
-state disabled
-background gray
3418 if {[is_enabled multicommit
]} {
3421 if {[is_enabled retcode
]} {
3422 bind .
<Destroy
> {+terminate_me
%W
}
3424 if {$picked && [is_config_true gui.autoexplore
]} {