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
597 ######################################################################
602 font create font_diff -family Courier -size 10
606 eval font configure font_ui [font actual [.dummy cget -font]]
610 font create font_uiitalic
611 font create font_uibold
612 font create font_diffbold
613 font create font_diffitalic
615 foreach class {Button Checkbutton Entry Label
616 Labelframe Listbox Menu Message
617 Radiobutton Spinbox Text} {
618 option add *$class.font font_ui
622 if {[is_Windows] || [is_MacOSX]} {
623 option add *Menu.tearOff 0
634 proc bind_button3 {w cmd} {
635 bind $w <Any-Button-3> $cmd
637 # Mac OS X sends Button-2 on right click through three-button mouse,
638 # or through trackpad right-clicking (two-finger touch + click).
639 bind $w <Any-Button-2> $cmd
640 bind $w <Control-Button-1> $cmd
644 proc apply_config {} {
645 global repo_config font_descs
647 foreach option $font_descs {
648 set name [lindex $option 0]
649 set font [lindex $option 1]
652 foreach {cn cv} $repo_config(gui.$name) {
653 if {$cn eq {-weight}} {
656 font configure $font $cn $cv
659 font configure $font -weight normal
662 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
664 foreach {cn cv} [font configure $font] {
665 font configure ${font}bold $cn $cv
666 font configure ${font}italic $cn $cv
668 font configure ${font}bold -weight bold
669 font configure ${font}italic -slant italic
673 set default_config(branch.autosetupmerge) true
674 set default_config(merge.tool) {}
675 set default_config(merge.keepbackup) true
676 set default_config(merge.diffstat) true
677 set default_config(merge.summary) false
678 set default_config(merge.verbosity) 2
679 set default_config(user.name) {}
680 set default_config(user.email) {}
682 set default_config(gui.encoding) [encoding system]
683 set default_config(gui.matchtrackingbranch) false
684 set default_config(gui.pruneduringfetch) false
685 set default_config(gui.trustmtime) false
686 set default_config(gui.fastcopyblame) false
687 set default_config(gui.copyblamethreshold) 40
688 set default_config(gui.blamehistoryctx) 7
689 set default_config(gui.diffcontext) 5
690 set default_config(gui.commitmsgwidth) 75
691 set default_config(gui.newbranchtemplate) {}
692 set default_config(gui.spellingdictionary) {}
693 set default_config(gui.fontui) [font configure font_ui]
694 set default_config(gui.fontdiff) [font configure font_diff]
696 {fontui font_ui {mc "Main Font
"}}
697 {fontdiff font_diff {mc "Diff
/Console Font
"}}
700 ######################################################################
704 set _git [_which git]
706 catch {wm withdraw .}
710 -title [mc "git-gui
: fatal error
"] \
711 -message [mc "Cannot
find git
in PATH.
"]
715 ######################################################################
719 if {[catch {set _git_version [git --version]} err]} {
720 catch {wm withdraw .}
724 -title [mc "git-gui
: fatal error
"] \
725 -message "Cannot determine Git version
:
729 [appname
] requires Git
1.5.0 or later.
"
732 if {![regsub {^git version } $_git_version {} _git_version]} {
733 catch {wm withdraw .}
737 -title [mc "git-gui
: fatal error
"] \
738 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
742 set _real_git_version $_git_version
743 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
744 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
745 regsub {\.rc[0-9]+$} $_git_version {} _git_version
746 regsub {\.GIT$} $_git_version {} _git_version
747 regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
749 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
750 catch {wm withdraw .}
755 -title "[appname
]: warning
" \
756 -message [mc "Git version cannot be determined.
758 %s claims it is version
'%s'.
760 %s requires
at least Git
1.5.0 or later.
762 Assume
'%s' is version
1.5.0?
763 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
764 set _git_version 1.5.0
769 unset _real_git_version
771 proc git-version {args} {
774 switch [llength $args] {
780 set op [lindex $args 0]
781 set vr [lindex $args 1]
782 set cm [package vcompare $_git_version $vr]
783 return [expr $cm $op 0]
787 set type [lindex $args 0]
788 set name [lindex $args 1]
789 set parm [lindex $args 2]
790 set body [lindex $args 3]
792 if {($type ne {proc} && $type ne {method})} {
793 error "Invalid arguments to git-version
"
795 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
796 error "Last arm of
$type $name must be default
"
799 foreach {op vr cb} [lrange $body 0 end-2] {
800 if {[git-version $op $vr]} {
801 return [uplevel [list $type $name $parm $cb]]
805 return [uplevel [list $type $name $parm [lindex $body end]]]
809 error "git-version
>= x
"
815 if {[git-version < 1.5]} {
816 catch {wm withdraw .}
820 -title [mc "git-gui
: fatal error
"] \
821 -message "[appname
] requires Git
1.5.0 or later.
823 You are using
[git-version
]:
829 ######################################################################
831 ## configure our library
833 set idx [file join $oguilib tclIndex]
834 if {[catch {set fd [open $idx r]} err]} {
835 catch {wm withdraw .}
839 -title [mc "git-gui
: fatal error
"] \
843 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
845 while {[gets $fd n] >= 0} {
846 if {$n ne {} && ![string match #* $n]} {
858 if {[lsearch -exact $loaded $p] >= 0} continue
859 source [file join $oguilib $p]
864 set auto_path [concat [list $oguilib] $auto_path]
866 unset -nocomplain idx fd
868 ######################################################################
870 ## config file parsing
872 git-version proc _parse_config {arr_name args} {
879 [list git_read config] \
881 [list --null --list]]
882 fconfigure $fd_rc -translation binary
883 set buf [read $fd_rc]
886 foreach line [split $buf "\
0"] {
887 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
888 if {[is_many_config $name]} {
889 lappend arr($name) $value
891 set arr($name) $value
900 set fd_rc [eval [list git_read config --list] $args]
901 while {[gets $fd_rc line] >= 0} {
902 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
903 if {[is_many_config $name]} {
904 lappend arr($name) $value
906 set arr($name) $value
915 proc load_config {include_global} {
916 global repo_config global_config default_config
918 if {$include_global} {
919 _parse_config global_config --global
921 _parse_config repo_config
923 foreach name [array names default_config] {
924 if {[catch {set v $global_config($name)}]} {
925 set global_config($name) $default_config($name)
927 if {[catch {set v $repo_config($name)}]} {
928 set repo_config($name) $default_config($name)
933 ######################################################################
935 ## feature option selection
937 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
942 if {$subcommand eq {gui.sh}} {
945 if {$subcommand eq {gui} && [llength $argv] > 0} {
946 set subcommand [lindex $argv 0]
947 set argv [lrange $argv 1 end]
950 enable_option multicommit
952 enable_option transport
955 switch -- $subcommand {
960 disable_option multicommit
961 disable_option branch
962 disable_option transport
965 enable_option singlecommit
966 enable_option retcode
968 disable_option multicommit
969 disable_option branch
970 disable_option transport
972 while {[llength $argv] > 0} {
973 set a [lindex $argv 0]
976 enable_option initialamend
979 enable_option nocommit
980 enable_option nocommitmsg
983 disable_option nocommitmsg
990 set argv [lrange $argv 1 end]
995 ######################################################################
1001 set _gitdir $env(GIT_DIR)
1005 set _gitdir [git rev-parse --git-dir]
1006 set _prefix [git rev-parse --show-prefix]
1010 choose_repository::pick
1013 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1014 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1016 if {![file isdirectory $_gitdir]} {
1017 catch {wm withdraw .}
1018 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1021 if {$_prefix ne {}} {
1022 regsub -all {[^/]+/} $_prefix ../ cdup
1023 if {[catch {cd $cdup} err]} {
1024 catch {wm withdraw .}
1025 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1029 } elseif {![is_enabled bare]} {
1030 if {[lindex [file split $_gitdir] end] ne {.git}} {
1031 catch {wm withdraw .}
1032 error_popup [strcat [mc "Cannot use funny .git directory
:"] "\n\n$_gitdir"]
1035 if {[catch {cd [file dirname $_gitdir]} err]} {
1036 catch {wm withdraw .}
1037 error_popup [strcat [mc "No working directory
"] " [file dirname $_gitdir]:\n\n$err"]
1041 set _reponame [file split [file normalize $_gitdir]]
1042 if {[lindex $_reponame end] eq {.git}} {
1043 set _reponame [lindex $_reponame end-1]
1045 set _reponame [lindex $_reponame end]
1048 ######################################################################
1052 set current_diff_path {}
1053 set current_diff_side {}
1054 set diff_actions [list]
1058 set MERGE_HEAD [list]
1061 set current_branch {}
1063 set current_diff_path {}
1065 set is_conflict_diff 0
1066 set selected_commit_type new
1068 set nullid "0000000000000000000000000000000000000000"
1069 set nullid2 "0000000000000000000000000000000000000001"
1071 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1073 ######################################################################
1081 set disable_on_lock [list]
1082 set index_lock_type none
1084 proc lock_index {type} {
1085 global index_lock_type disable_on_lock
1087 if {$index_lock_type eq {none}} {
1088 set index_lock_type $type
1089 foreach w $disable_on_lock {
1090 uplevel #0 $w disabled
1093 } elseif {$index_lock_type eq "begin-
$type"} {
1094 set index_lock_type $type
1100 proc unlock_index {} {
1101 global index_lock_type disable_on_lock
1103 set index_lock_type none
1104 foreach w $disable_on_lock {
1105 uplevel #0 $w normal
1109 ######################################################################
1113 proc repository_state {ctvar hdvar mhvar} {
1114 global current_branch
1115 upvar $ctvar ct $hdvar hd $mhvar mh
1120 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1126 set merge_head [gitdir MERGE_HEAD]
1127 if {[file exists $merge_head]} {
1129 set fd_mh [open $merge_head r]
1130 while {[gets $fd_mh line] >= 0} {
1141 global PARENT empty_tree
1143 set p [lindex $PARENT 0]
1147 if {$empty_tree eq {}} {
1148 set empty_tree [git mktree << {}]
1153 proc force_amend {} {
1154 global selected_commit_type
1155 global HEAD PARENT MERGE_HEAD commit_type
1157 repository_state newType newHEAD newMERGE_HEAD
1160 set MERGE_HEAD $newMERGE_HEAD
1161 set commit_type $newType
1163 set selected_commit_type amend
1164 do_select_commit_type
1167 proc rescan {after {honor_trustmtime 1}} {
1168 global HEAD PARENT MERGE_HEAD commit_type
1169 global ui_index ui_workdir ui_comm
1170 global rescan_active file_states
1173 if {$rescan_active > 0 || ![lock_index read]} return
1175 repository_state newType newHEAD newMERGE_HEAD
1176 if {[string match amend* $commit_type]
1177 && $newType eq {normal}
1178 && $newHEAD eq $HEAD} {
1182 set MERGE_HEAD $newMERGE_HEAD
1183 set commit_type $newType
1186 array unset file_states
1188 if {!$::GITGUI_BCK_exists &&
1189 (![$ui_comm edit modified]
1190 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1191 if {[string match amend* $commit_type]} {
1192 } elseif {[load_message GITGUI_MSG]} {
1193 } elseif {[run_prepare_commit_msg_hook]} {
1194 } elseif {[load_message MERGE_MSG]} {
1195 } elseif {[load_message SQUASH_MSG]} {
1198 $ui_comm edit modified false
1201 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1202 rescan_stage2 {} $after
1205 ui_status [mc "Refreshing
file status...
"]
1206 set fd_rf [git_read update-index \
1212 fconfigure $fd_rf -blocking 0 -translation binary
1213 fileevent $fd_rf readable \
1214 [list rescan_stage2 $fd_rf $after]
1219 set is_git_info_exclude {}
1220 proc have_info_exclude {} {
1221 global is_git_info_exclude
1223 if {$is_git_info_exclude eq {}} {
1224 if {[catch {exec test -f [gitdir info exclude]}]} {
1225 set is_git_info_exclude 0
1227 set is_git_info_exclude 1
1230 return $is_git_info_exclude
1233 proc have_info_exclude {} {
1234 return [file readable [gitdir info exclude]]
1238 proc rescan_stage2 {fd after} {
1239 global rescan_active buf_rdi buf_rdf buf_rlo
1243 if {![eof $fd]} return
1247 set ls_others [list --exclude-per-directory=.gitignore]
1248 if {[have_info_exclude]} {
1249 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1251 set user_exclude [get_config core.excludesfile]
1252 if {$user_exclude ne {} && [file readable $user_exclude]} {
1253 lappend ls_others "--exclude-from=$user_exclude"
1261 ui_status [mc "Scanning
for modified files ...
"]
1262 set fd_di [git_read diff-index --cached -z [PARENT]]
1263 set fd_df [git_read diff-files -z]
1264 set fd_lo [eval git_read ls-files --others -z $ls_others]
1266 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1267 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1268 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1269 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1270 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1271 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1274 proc load_message {file} {
1277 set f [gitdir $file]
1278 if {[file isfile $f]} {
1279 if {[catch {set fd [open $f r]}]} {
1282 fconfigure $fd -eofchar {}
1283 set content [string trim [read $fd]]
1285 regsub -all -line {[ \r\t]+$} $content {} content
1286 $ui_comm delete 0.0 end
1287 $ui_comm insert end $content
1293 proc run_prepare_commit_msg_hook {} {
1296 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1297 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1298 # empty file but existant file.
1300 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1302 if {[file isfile [gitdir MERGE_MSG]]} {
1303 set pcm_source "merge
"
1304 set fd_mm [open [gitdir MERGE_MSG] r]
1305 puts -nonewline $fd_pcm [read $fd_mm]
1307 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1308 set pcm_source "squash
"
1309 set fd_sm [open [gitdir SQUASH_MSG] r]
1310 puts -nonewline $fd_pcm [read $fd_sm]
1318 set fd_ph [githook_read prepare-commit-msg \
1319 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1321 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1325 ui_status [mc "Calling prepare-commit-msg hook...
"]
1328 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1329 fileevent $fd_ph readable \
1330 [list prepare_commit_msg_hook_wait $fd_ph]
1335 proc prepare_commit_msg_hook_wait {fd_ph} {
1338 append pch_error [read $fd_ph]
1339 fconfigure $fd_ph -blocking 1
1341 if {[catch {close $fd_ph}]} {
1342 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1343 hook_failed_popup prepare-commit-msg $pch_error
1344 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1347 load_message PREPARE_COMMIT_MSG
1350 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1353 fconfigure $fd_ph -blocking 0
1354 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1357 proc read_diff_index {fd after} {
1360 append buf_rdi [read $fd]
1362 set n [string length $buf_rdi]
1364 set z1 [string first "\
0" $buf_rdi $c]
1365 if {$z1 == -1} break
1367 set z2 [string first "\
0" $buf_rdi $z1]
1368 if {$z2 == -1} break
1371 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1372 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1374 [encoding convertfrom $p] \
1376 [list [lindex $i 0] [lindex $i 2]] \
1382 set buf_rdi [string range $buf_rdi $c end]
1387 rescan_done $fd buf_rdi $after
1390 proc read_diff_files {fd after} {
1393 append buf_rdf [read $fd]
1395 set n [string length $buf_rdf]
1397 set z1 [string first "\
0" $buf_rdf $c]
1398 if {$z1 == -1} break
1400 set z2 [string first "\
0" $buf_rdf $z1]
1401 if {$z2 == -1} break
1404 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1405 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1407 [encoding convertfrom $p] \
1410 [list [lindex $i 0] [lindex $i 2]]
1415 set buf_rdf [string range $buf_rdf $c end]
1420 rescan_done $fd buf_rdf $after
1423 proc read_ls_others {fd after} {
1426 append buf_rlo [read $fd]
1427 set pck [split $buf_rlo "\
0"]
1428 set buf_rlo [lindex $pck end]
1429 foreach p [lrange $pck 0 end-1] {
1430 set p [encoding convertfrom $p]
1431 if {[string index $p end] eq {/}} {
1432 set p [string range $p 0 end-1]
1436 rescan_done $fd buf_rlo $after
1439 proc rescan_done {fd buf after} {
1440 global rescan_active current_diff_path
1441 global file_states repo_config
1444 if {![eof $fd]} return
1447 if {[incr rescan_active -1] > 0} return
1452 if {$current_diff_path ne {}} reshow_diff
1453 if {$current_diff_path eq {}} select_first_diff
1458 proc prune_selection {} {
1459 global file_states selected_paths
1461 foreach path [array names selected_paths] {
1462 if {[catch {set still_here $file_states($path)}]} {
1463 unset selected_paths($path)
1468 ######################################################################
1472 proc mapicon {w state path} {
1475 if {[catch {set r $all_icons($state$w)}]} {
1476 puts "error
: no icon
for $w state
={$state} $path"
1482 proc mapdesc {state path} {
1485 if {[catch {set r $all_descs($state)}]} {
1486 puts "error
: no desc
for state
={$state} $path"
1492 proc ui_status {msg} {
1494 if {[info exists main_status]} {
1495 $main_status show $msg
1499 proc ui_ready {{test {}}} {
1501 if {[info exists main_status]} {
1502 $main_status show [mc "Ready.
"] $test
1506 proc escape_path {path} {
1507 regsub -all {\\} $path "\\\\" path
1508 regsub -all "\n" $path "\\n
" path
1512 proc short_path {path} {
1513 return [escape_path [lindex [file split $path] end]]
1517 set null_sha1 [string repeat 0 40]
1519 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1520 global file_states next_icon_id null_sha1
1522 set s0 [string index $new_state 0]
1523 set s1 [string index $new_state 1]
1525 if {[catch {set info $file_states($path)}]} {
1527 set icon n[incr next_icon_id]
1529 set state [lindex $info 0]
1530 set icon [lindex $info 1]
1531 if {$head_info eq {}} {set head_info [lindex $info 2]}
1532 if {$index_info eq {}} {set index_info [lindex $info 3]}
1535 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1536 elseif {$s0 eq {_}} {set s0 _}
1538 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1539 elseif {$s1 eq {_}} {set s1 _}
1541 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1542 set head_info [list 0 $null_sha1]
1543 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1544 && $head_info eq {}} {
1545 set head_info $index_info
1548 set file_states($path) [list $s0$s1 $icon \
1549 $head_info $index_info \
1554 proc display_file_helper {w path icon_name old_m new_m} {
1557 if {$new_m eq {_}} {
1558 set lno [lsearch -sorted -exact $file_lists($w) $path]
1560 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1562 $w conf -state normal
1563 $w delete $lno.0 [expr {$lno + 1}].0
1564 $w conf -state disabled
1566 } elseif {$old_m eq {_} && $new_m ne {_}} {
1567 lappend file_lists($w) $path
1568 set file_lists($w) [lsort -unique $file_lists($w)]
1569 set lno [lsearch -sorted -exact $file_lists($w) $path]
1571 $w conf -state normal
1572 $w image create $lno.0 \
1573 -align center -padx 5 -pady 1 \
1575 -image [mapicon $w $new_m $path]
1576 $w insert $lno.1 "[escape_path
$path]\n"
1577 $w conf -state disabled
1578 } elseif {$old_m ne $new_m} {
1579 $w conf -state normal
1580 $w image conf $icon_name -image [mapicon $w $new_m $path]
1581 $w conf -state disabled
1585 proc display_file {path state} {
1586 global file_states selected_paths
1587 global ui_index ui_workdir
1589 set old_m [merge_state $path $state]
1590 set s $file_states($path)
1591 set new_m [lindex $s 0]
1592 set icon_name [lindex $s 1]
1594 set o [string index $old_m 0]
1595 set n [string index $new_m 0]
1602 display_file_helper $ui_index $path $icon_name $o $n
1604 if {[string index $old_m 0] eq {U}} {
1607 set o [string index $old_m 1]
1609 if {[string index $new_m 0] eq {U}} {
1612 set n [string index $new_m 1]
1614 display_file_helper $ui_workdir $path $icon_name $o $n
1616 if {$new_m eq {__}} {
1617 unset file_states($path)
1618 catch {unset selected_paths($path)}
1622 proc display_all_files_helper {w path icon_name m} {
1625 lappend file_lists($w) $path
1626 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1627 $w image create end \
1628 -align center -padx 5 -pady 1 \
1630 -image [mapicon $w $m $path]
1631 $w insert end "[escape_path
$path]\n"
1634 proc display_all_files {} {
1635 global ui_index ui_workdir
1636 global file_states file_lists
1639 $ui_index conf -state normal
1640 $ui_workdir conf -state normal
1642 $ui_index delete 0.0 end
1643 $ui_workdir delete 0.0 end
1646 set file_lists($ui_index) [list]
1647 set file_lists($ui_workdir) [list]
1649 foreach path [lsort [array names file_states]] {
1650 set s $file_states($path)
1652 set icon_name [lindex $s 1]
1654 set s [string index $m 0]
1655 if {$s ne {U} && $s ne {_}} {
1656 display_all_files_helper $ui_index $path \
1660 if {[string index $m 0] eq {U}} {
1663 set s [string index $m 1]
1666 display_all_files_helper $ui_workdir $path \
1671 $ui_index conf -state disabled
1672 $ui_workdir conf -state disabled
1675 ######################################################################
1680 #define mask_width 14
1681 #define mask_height 15
1682 static unsigned char mask_bits[] = {
1683 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1684 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1685 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1688 image create bitmap file_plain -background white -foreground black -data {
1689 #define plain_width 14
1690 #define plain_height 15
1691 static unsigned char plain_bits[] = {
1692 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1693 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1694 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1695 } -maskdata $filemask
1697 image create bitmap file_mod -background white -foreground blue -data {
1698 #define mod_width 14
1699 #define mod_height 15
1700 static unsigned char mod_bits[] = {
1701 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1702 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1703 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1704 } -maskdata $filemask
1706 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1707 #define file_fulltick_width 14
1708 #define file_fulltick_height 15
1709 static unsigned char file_fulltick_bits
[] = {
1710 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1711 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1712 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1713 } -maskdata $filemask
1715 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1716 #define parttick_width 14
1717 #define parttick_height 15
1718 static unsigned char parttick_bits
[] = {
1719 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1720 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1721 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1722 } -maskdata $filemask
1724 image create bitmap file_question
-background white
-foreground black
-data {
1725 #define file_question_width 14
1726 #define file_question_height 15
1727 static unsigned char file_question_bits
[] = {
1728 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1729 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1730 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1731 } -maskdata $filemask
1733 image create bitmap file_removed
-background white
-foreground red
-data {
1734 #define file_removed_width 14
1735 #define file_removed_height 15
1736 static unsigned char file_removed_bits
[] = {
1737 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1738 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1739 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1740 } -maskdata $filemask
1742 image create bitmap file_merge
-background white
-foreground blue
-data {
1743 #define file_merge_width 14
1744 #define file_merge_height 15
1745 static unsigned char file_merge_bits
[] = {
1746 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1747 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1748 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1749 } -maskdata $filemask
1751 image create bitmap file_statechange
-background white
-foreground green
-data {
1752 #define file_merge_width 14
1753 #define file_merge_height 15
1754 static unsigned char file_statechange_bits
[] = {
1755 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1756 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1757 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1758 } -maskdata $filemask
1760 set ui_index .vpane.files.index.list
1761 set ui_workdir .vpane.files.workdir.list
1763 set all_icons
(_
$ui_index) file_plain
1764 set all_icons
(A
$ui_index) file_fulltick
1765 set all_icons
(M
$ui_index) file_fulltick
1766 set all_icons
(D
$ui_index) file_removed
1767 set all_icons
(U
$ui_index) file_merge
1768 set all_icons
(T
$ui_index) file_statechange
1770 set all_icons
(_
$ui_workdir) file_plain
1771 set all_icons
(M
$ui_workdir) file_mod
1772 set all_icons
(D
$ui_workdir) file_question
1773 set all_icons
(U
$ui_workdir) file_merge
1774 set all_icons
(O
$ui_workdir) file_plain
1775 set all_icons
(T
$ui_workdir) file_statechange
1777 set max_status_desc
0
1779 {__
{mc
"Unmodified"}}
1781 {_M
{mc
"Modified, not staged"}}
1782 {M_
{mc
"Staged for commit"}}
1783 {MM
{mc
"Portions staged for commit"}}
1784 {MD
{mc
"Staged for commit, missing"}}
1786 {_T
{mc
"File type changed, not staged"}}
1787 {T_
{mc
"File type changed, staged"}}
1789 {_O
{mc
"Untracked, not staged"}}
1790 {A_
{mc
"Staged for commit"}}
1791 {AM
{mc
"Portions staged for commit"}}
1792 {AD
{mc
"Staged for commit, missing"}}
1795 {D_
{mc
"Staged for removal"}}
1796 {DO
{mc
"Staged for removal, still present"}}
1798 {_U
{mc
"Requires merge resolution"}}
1799 {U_
{mc
"Requires merge resolution"}}
1800 {UU
{mc
"Requires merge resolution"}}
1801 {UM
{mc
"Requires merge resolution"}}
1802 {UD
{mc
"Requires merge resolution"}}
1803 {UT
{mc
"Requires merge resolution"}}
1805 set text
[eval [lindex
$i 1]]
1806 if {$max_status_desc < [string length
$text]} {
1807 set max_status_desc
[string length
$text]
1809 set all_descs
([lindex
$i 0]) $text
1813 ######################################################################
1817 proc scrollbar2many
{list mode args
} {
1818 foreach w
$list {eval $w $mode $args}
1821 proc many2scrollbar
{list mode sb top bottom
} {
1822 $sb set $top $bottom
1823 foreach w
$list {$w $mode moveto
$top}
1826 proc incr_font_size
{font
{amt
1}} {
1827 set sz
[font configure
$font -size]
1829 font configure
$font -size $sz
1830 font configure
${font}bold
-size $sz
1831 font configure
${font}italic
-size $sz
1834 ######################################################################
1838 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1840 proc do_gitk
{revs
} {
1841 # -- Always start gitk through whatever we were loaded with. This
1842 # lets us bypass using shell process on Windows systems.
1844 set exe
[_which gitk
-script]
1845 set cmd
[list
[info nameofexecutable
] $exe]
1847 error_popup
[mc
"Couldn't find gitk in PATH"]
1851 if {[info exists env
(GIT_DIR
)]} {
1852 set old_GIT_DIR
$env(GIT_DIR
)
1858 cd [file dirname [gitdir
]]
1859 set env
(GIT_DIR
) [file tail [gitdir
]]
1861 eval exec $cmd $revs &
1863 if {$old_GIT_DIR eq
{}} {
1866 set env
(GIT_DIR
) $old_GIT_DIR
1870 ui_status $
::starting_gitk_msg
1872 ui_ready
$starting_gitk_msg
1877 proc do_explore
{} {
1879 if {[is_Cygwin
] ||
[is_Windows
]} {
1880 set explorer
"explorer.exe"
1881 } elseif
{[is_MacOSX
]} {
1884 # freedesktop.org-conforming system is our best shot
1885 set explorer
"xdg-open"
1887 eval exec $explorer [file dirname [gitdir
]] &
1893 proc terminate_me
{win
} {
1895 if {$win ne
{.
}} return
1899 proc do_quit
{{rc
{1}}} {
1900 global ui_comm is_quitting repo_config commit_type
1901 global GITGUI_BCK_exists GITGUI_BCK_i
1902 global ui_comm_spell
1905 if {$is_quitting} return
1908 if {[winfo exists
$ui_comm]} {
1909 # -- Stash our current commit buffer.
1911 set save
[gitdir GITGUI_MSG
]
1912 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1913 file rename
-force [gitdir GITGUI_BCK
] $save
1914 set GITGUI_BCK_exists
0
1916 set msg
[string trim
[$ui_comm get
0.0 end
]]
1917 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1918 if {(![string match amend
* $commit_type]
1919 ||
[$ui_comm edit modified
])
1922 set fd
[open
$save w
]
1923 puts
-nonewline $fd $msg
1927 catch
{file delete
$save}
1931 # -- Cancel our spellchecker if its running.
1933 if {[info exists ui_comm_spell
]} {
1937 # -- Remove our editor backup, its not needed.
1939 after cancel
$GITGUI_BCK_i
1940 if {$GITGUI_BCK_exists} {
1941 catch
{file delete
[gitdir GITGUI_BCK
]}
1944 # -- Stash our current window geometry into this repository.
1946 set cfg_geometry
[list
]
1947 lappend cfg_geometry
[wm geometry .
]
1948 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
1949 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
1950 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1953 if {$cfg_geometry ne
$rc_geometry} {
1954 catch
{git config gui.geometry
$cfg_geometry}
1966 proc ui_do_rescan
{} {
1967 rescan
{force_first_diff
; ui_ready
}
1975 global next_diff_p next_diff_w next_diff_i
1976 show_diff
$next_diff_p $next_diff_w {}
1979 proc find_anchor_pos
{lst name
} {
1980 set lid
[lsearch
-sorted -exact $lst $name]
1984 foreach lname
$lst {
1985 if {$lname >= $name} break
1993 proc find_file_from
{flist idx delta path mmask
} {
1996 set len
[llength
$flist]
1997 while {$idx >= 0 && $idx < $len} {
1998 set name
[lindex
$flist $idx]
2000 if {$name ne
$path && [info exists file_states
($name)]} {
2001 set state
[lindex
$file_states($name) 0]
2003 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2014 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2015 global next_diff_p next_diff_w next_diff_i
2016 global file_lists ui_index ui_workdir
2018 set flist
$file_lists($w)
2020 set lno
[find_anchor_pos
$flist $path]
2025 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2026 if {$w eq
$ui_index} {
2029 set mmask
"$mmask\$"
2033 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2036 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2041 set next_diff_p
[lindex
$flist $idx]
2042 set next_diff_i
[expr {$idx+1}]
2049 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2050 global current_diff_path
2052 if {$path ne
$current_diff_path} {
2054 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2057 return {reshow_diff
;}
2061 proc select_first_diff
{} {
2064 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2065 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2070 proc force_first_diff
{} {
2071 global current_diff_path
2073 if {[info exists file_states
($current_diff_path)]} {
2074 set state
[lindex
$file_states($current_diff_path) 0]
2076 if {[string index
$state 1] ne
{O
}} return
2082 proc toggle_or_diff
{w x y
} {
2083 global file_states file_lists current_diff_path ui_index ui_workdir
2084 global last_clicked selected_paths
2086 set pos
[split [$w index @
$x,$y] .
]
2087 set lno
[lindex
$pos 0]
2088 set col [lindex
$pos 1]
2089 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2095 set last_clicked
[list
$w $lno]
2096 array
unset selected_paths
2097 $ui_index tag remove in_sel
0.0 end
2098 $ui_workdir tag remove in_sel
0.0 end
2100 # Determine the state of the file
2101 if {[info exists file_states
($path)]} {
2102 set state
[lindex
$file_states($path) 0]
2107 # Restage the file, or simply show the diff
2108 if {$col == 0 && $y > 1} {
2109 # Conflicts need special handling
2110 if {[string first
{U
} $state] >= 0} {
2111 # $w must always be $ui_workdir, but...
2112 if {$w ne
$ui_workdir} { set lno
{} }
2113 merge_stage_workdir
$path $lno
2117 if {[string index
$state 1] eq
{O
}} {
2123 set after
[next_diff_after_action
$w $path $lno $mmask]
2125 if {$w eq
$ui_index} {
2127 "Unstaging [short_path $path] from commit" \
2129 [concat
$after [list ui_ready
]]
2130 } elseif
{$w eq
$ui_workdir} {
2132 "Adding [short_path $path]" \
2134 [concat
$after [list ui_ready
]]
2137 show_diff
$path $w $lno
2141 proc add_one_to_selection
{w x y
} {
2142 global file_lists last_clicked selected_paths
2144 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2145 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2151 if {$last_clicked ne
{}
2152 && [lindex
$last_clicked 0] ne
$w} {
2153 array
unset selected_paths
2154 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2157 set last_clicked
[list
$w $lno]
2158 if {[catch
{set in_sel
$selected_paths($path)}]} {
2162 unset selected_paths
($path)
2163 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2165 set selected_paths
($path) 1
2166 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2170 proc add_range_to_selection
{w x y
} {
2171 global file_lists last_clicked selected_paths
2173 if {[lindex
$last_clicked 0] ne
$w} {
2174 toggle_or_diff
$w $x $y
2178 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2179 set lc
[lindex
$last_clicked 1]
2188 foreach path
[lrange
$file_lists($w) \
2189 [expr {$begin - 1}] \
2190 [expr {$end - 1}]] {
2191 set selected_paths
($path) 1
2193 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2196 proc show_more_context
{} {
2198 if {$repo_config(gui.diffcontext
) < 99} {
2199 incr repo_config
(gui.diffcontext
)
2204 proc show_less_context
{} {
2206 if {$repo_config(gui.diffcontext
) > 1} {
2207 incr repo_config
(gui.diffcontext
) -1
2212 ######################################################################
2222 menu .mbar
-tearoff 0
2223 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2224 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2225 if {[is_enabled branch
]} {
2226 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2228 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2229 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2231 if {[is_enabled transport
]} {
2232 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2233 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2235 . configure
-menu .mbar
2237 # -- Repository Menu
2239 menu .mbar.repository
2241 .mbar.repository add
command \
2242 -label [mc
"Explore Working Copy"] \
2243 -command {do_explore
}
2244 .mbar.repository add separator
2246 .mbar.repository add
command \
2247 -label [mc
"Browse Current Branch's Files"] \
2248 -command {browser
::new
$current_branch}
2249 set ui_browse_current
[.mbar.repository index last
]
2250 .mbar.repository add
command \
2251 -label [mc
"Browse Branch Files..."] \
2252 -command browser_open
::dialog
2253 .mbar.repository add separator
2255 .mbar.repository add
command \
2256 -label [mc
"Visualize Current Branch's History"] \
2257 -command {do_gitk
$current_branch}
2258 set ui_visualize_current
[.mbar.repository index last
]
2259 .mbar.repository add
command \
2260 -label [mc
"Visualize All Branch History"] \
2261 -command {do_gitk
--all}
2262 .mbar.repository add separator
2264 proc current_branch_write
{args
} {
2265 global current_branch
2266 .mbar.repository entryconf $
::ui_browse_current \
2267 -label [mc
"Browse %s's Files" $current_branch]
2268 .mbar.repository entryconf $
::ui_visualize_current \
2269 -label [mc
"Visualize %s's History" $current_branch]
2271 trace add variable current_branch
write current_branch_write
2273 if {[is_enabled multicommit
]} {
2274 .mbar.repository add
command -label [mc
"Database Statistics"] \
2277 .mbar.repository add
command -label [mc
"Compress Database"] \
2280 .mbar.repository add
command -label [mc
"Verify Database"] \
2281 -command do_fsck_objects
2283 .mbar.repository add separator
2286 .mbar.repository add
command \
2287 -label [mc
"Create Desktop Icon"] \
2288 -command do_cygwin_shortcut
2289 } elseif
{[is_Windows
]} {
2290 .mbar.repository add
command \
2291 -label [mc
"Create Desktop Icon"] \
2292 -command do_windows_shortcut
2293 } elseif
{[is_MacOSX
]} {
2294 .mbar.repository add
command \
2295 -label [mc
"Create Desktop Icon"] \
2296 -command do_macosx_app
2301 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2303 .mbar.repository add
command -label [mc Quit
] \
2311 .mbar.edit add
command -label [mc Undo
] \
2312 -command {catch
{[focus
] edit undo
}} \
2314 .mbar.edit add
command -label [mc Redo
] \
2315 -command {catch
{[focus
] edit redo
}} \
2317 .mbar.edit add separator
2318 .mbar.edit add
command -label [mc Cut
] \
2319 -command {catch
{tk_textCut
[focus
]}} \
2321 .mbar.edit add
command -label [mc Copy
] \
2322 -command {catch
{tk_textCopy
[focus
]}} \
2324 .mbar.edit add
command -label [mc Paste
] \
2325 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2327 .mbar.edit add
command -label [mc Delete
] \
2328 -command {catch
{[focus
] delete sel.first sel.last
}} \
2330 .mbar.edit add separator
2331 .mbar.edit add
command -label [mc
"Select All"] \
2332 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2337 if {[is_enabled branch
]} {
2340 .mbar.branch add
command -label [mc
"Create..."] \
2341 -command branch_create
::dialog \
2343 lappend disable_on_lock
[list .mbar.branch entryconf \
2344 [.mbar.branch index last
] -state]
2346 .mbar.branch add
command -label [mc
"Checkout..."] \
2347 -command branch_checkout
::dialog \
2349 lappend disable_on_lock
[list .mbar.branch entryconf \
2350 [.mbar.branch index last
] -state]
2352 .mbar.branch add
command -label [mc
"Rename..."] \
2353 -command branch_rename
::dialog
2354 lappend disable_on_lock
[list .mbar.branch entryconf \
2355 [.mbar.branch index last
] -state]
2357 .mbar.branch add
command -label [mc
"Delete..."] \
2358 -command branch_delete
::dialog
2359 lappend disable_on_lock
[list .mbar.branch entryconf \
2360 [.mbar.branch index last
] -state]
2362 .mbar.branch add
command -label [mc
"Reset..."] \
2363 -command merge
::reset_hard
2364 lappend disable_on_lock
[list .mbar.branch entryconf \
2365 [.mbar.branch index last
] -state]
2370 proc commit_btn_caption
{} {
2371 if {[is_enabled nocommit
]} {
2374 return [mc Commit@@verb
]
2378 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2381 if {![is_enabled nocommit
]} {
2382 .mbar.commit add radiobutton \
2383 -label [mc
"New Commit"] \
2384 -command do_select_commit_type \
2385 -variable selected_commit_type \
2387 lappend disable_on_lock \
2388 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2390 .mbar.commit add radiobutton \
2391 -label [mc
"Amend Last Commit"] \
2392 -command do_select_commit_type \
2393 -variable selected_commit_type \
2395 lappend disable_on_lock \
2396 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2398 .mbar.commit add separator
2401 .mbar.commit add
command -label [mc Rescan
] \
2402 -command ui_do_rescan \
2404 lappend disable_on_lock \
2405 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2407 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2408 -command do_add_selection \
2410 lappend disable_on_lock \
2411 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2413 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2414 -command do_add_all \
2416 lappend disable_on_lock \
2417 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2419 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2420 -command do_unstage_selection
2421 lappend disable_on_lock \
2422 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2424 .mbar.commit add
command -label [mc
"Revert Changes"] \
2425 -command do_revert_selection
2426 lappend disable_on_lock \
2427 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2429 .mbar.commit add separator
2431 .mbar.commit add
command -label [mc
"Show Less Context"] \
2432 -command show_less_context \
2433 -accelerator $M1T-\
-
2435 .mbar.commit add
command -label [mc
"Show More Context"] \
2436 -command show_more_context \
2439 .mbar.commit add separator
2441 if {![is_enabled nocommitmsg
]} {
2442 .mbar.commit add
command -label [mc
"Sign Off"] \
2443 -command do_signoff \
2447 .mbar.commit add
command -label [commit_btn_caption
] \
2448 -command do_commit \
2449 -accelerator $M1T-Return
2450 lappend disable_on_lock \
2451 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2456 if {[is_enabled branch
]} {
2458 .mbar.merge add
command -label [mc
"Local Merge..."] \
2459 -command merge
::dialog \
2461 lappend disable_on_lock \
2462 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2463 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2464 -command merge
::reset_hard
2465 lappend disable_on_lock \
2466 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2471 if {[is_enabled transport
]} {
2474 .mbar.remote add
command \
2475 -label [mc
"Add..."] \
2476 -command remote_add
::dialog \
2478 .mbar.remote add
command \
2479 -label [mc
"Push..."] \
2480 -command do_push_anywhere \
2482 .mbar.remote add
command \
2483 -label [mc
"Delete Branch..."] \
2484 -command remote_branch_delete
::dialog
2488 # -- Apple Menu (Mac OS X only)
2490 .mbar add cascade
-label Apple
-menu .mbar.apple
2493 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2495 .mbar.apple add separator
2496 .mbar.apple add
command \
2497 -label [mc
"Preferences..."] \
2498 -command do_options \
2500 bind .
<$M1B-,> do_options
2504 .mbar.edit add separator
2505 .mbar.edit add
command -label [mc
"Options..."] \
2511 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2515 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2520 set doc_path
[file dirname [gitexec
]]
2521 set doc_path
[file join $doc_path Documentation index.html
]
2524 set doc_path
[exec cygpath
--mixed $doc_path]
2527 if {[file isfile
$doc_path]} {
2528 set doc_url
"file:$doc_path"
2530 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2533 proc start_browser
{url
} {
2534 git
"web--browse" $url
2537 .mbar.
help add
command -label [mc
"Online Documentation"] \
2538 -command [list start_browser
$doc_url]
2539 unset doc_path doc_url
2541 # -- Standard bindings
2543 wm protocol . WM_DELETE_WINDOW do_quit
2544 bind all
<$M1B-Key-q> do_quit
2545 bind all
<$M1B-Key-Q> do_quit
2546 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2547 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2549 set subcommand_args
{}
2551 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2555 # -- Not a normal commit type invocation? Do that instead!
2557 switch
-- $subcommand {
2560 if {$subcommand eq
"blame"} {
2561 set subcommand_args
{[--line=<num
>] rev? path
}
2563 set subcommand_args
{rev? path
}
2565 if {$argv eq
{}} usage
2571 if {$is_path ||
[file exists
$_prefix$a]} {
2572 if {$path ne
{}} usage
2575 } elseif
{$a eq
{--}} {
2577 if {$head ne
{}} usage
2582 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
2583 if {$jump_spec ne
{} ||
$head ne
{}} usage
2584 set jump_spec
[list
$lnum]
2585 } elseif
{$head eq
{}} {
2586 if {$head ne
{}} usage
2595 if {$head ne
{} && $path eq
{}} {
2596 set path
$_prefix$head
2603 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2605 set head [git rev-parse
--verify $head]
2611 set current_branch
$head
2614 switch
-- $subcommand {
2616 if {$jump_spec ne
{}} usage
2618 if {$path ne
{} && [file isdirectory
$path]} {
2619 set head $current_branch
2625 browser
::new
$head $path
2628 if {$head eq
{} && ![file exists
$path]} {
2629 puts stderr
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
2632 blame
::new
$head $path $jump_spec
2639 if {[llength
$argv] != 0} {
2640 puts
-nonewline stderr
"usage: $argv0"
2641 if {$subcommand ne
{gui
}
2642 && [file tail $argv0] ne
"git-$subcommand"} {
2643 puts
-nonewline stderr
" $subcommand"
2648 # fall through to setup UI for commits
2651 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2662 -text [mc
"Current Branch:"] \
2666 -textvariable current_branch \
2669 pack .branch.l1
-side left
2670 pack .branch.cb
-side left
-fill x
2671 pack .branch
-side top
-fill x
2673 # -- Main Window Layout
2675 panedwindow .vpane
-orient horizontal
2676 panedwindow .vpane.files
-orient vertical
2677 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2678 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2680 # -- Index File List
2682 frame .vpane.files.index
-height 100 -width 200
2683 label .vpane.files.index.title
-text [mc
"Staged Changes (Will Commit)"] \
2684 -background lightgreen
-foreground black
2685 text
$ui_index -background white
-foreground black \
2687 -width 20 -height 10 \
2689 -cursor $cursor_ptr \
2690 -xscrollcommand {.vpane.files.index.sx
set} \
2691 -yscrollcommand {.vpane.files.index.sy
set} \
2693 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2694 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2695 pack .vpane.files.index.title
-side top
-fill x
2696 pack .vpane.files.index.sx
-side bottom
-fill x
2697 pack .vpane.files.index.sy
-side right
-fill y
2698 pack
$ui_index -side left
-fill both
-expand 1
2700 # -- Working Directory File List
2702 frame .vpane.files.workdir
-height 100 -width 200
2703 label .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
2704 -background lightsalmon
-foreground black
2705 text
$ui_workdir -background white
-foreground black \
2707 -width 20 -height 10 \
2709 -cursor $cursor_ptr \
2710 -xscrollcommand {.vpane.files.workdir.sx
set} \
2711 -yscrollcommand {.vpane.files.workdir.sy
set} \
2713 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2714 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2715 pack .vpane.files.workdir.title
-side top
-fill x
2716 pack .vpane.files.workdir.sx
-side bottom
-fill x
2717 pack .vpane.files.workdir.sy
-side right
-fill y
2718 pack
$ui_workdir -side left
-fill both
-expand 1
2720 .vpane.files add .vpane.files.workdir
-sticky nsew
2721 .vpane.files add .vpane.files.index
-sticky nsew
2723 foreach i
[list
$ui_index $ui_workdir] {
2725 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2729 # -- Diff and Commit Area
2731 frame .vpane.lower
-height 300 -width 400
2732 frame .vpane.lower.commarea
2733 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2734 pack .vpane.lower.
diff -fill both
-expand 1
2735 pack .vpane.lower.commarea
-side bottom
-fill x
2736 .vpane add .vpane.lower
-sticky nsew
2738 # -- Commit Area Buttons
2740 frame .vpane.lower.commarea.buttons
2741 label .vpane.lower.commarea.buttons.l
-text {} \
2744 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2745 pack .vpane.lower.commarea.buttons
-side left
-fill y
2747 button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
2748 -command ui_do_rescan
2749 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2750 lappend disable_on_lock \
2751 {.vpane.lower.commarea.buttons.rescan conf
-state}
2753 button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
2755 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2756 lappend disable_on_lock \
2757 {.vpane.lower.commarea.buttons.incall conf
-state}
2759 if {![is_enabled nocommitmsg
]} {
2760 button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
2762 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2765 button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
2767 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2768 lappend disable_on_lock \
2769 {.vpane.lower.commarea.buttons.commit conf
-state}
2771 if {![is_enabled nocommit
]} {
2772 button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
2773 -command do_push_anywhere
2774 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2777 # -- Commit Message Buffer
2779 frame .vpane.lower.commarea.buffer
2780 frame .vpane.lower.commarea.buffer.header
2781 set ui_comm .vpane.lower.commarea.buffer.t
2782 set ui_coml .vpane.lower.commarea.buffer.header.l
2784 if {![is_enabled nocommit
]} {
2785 radiobutton .vpane.lower.commarea.buffer.header.new \
2786 -text [mc
"New Commit"] \
2787 -command do_select_commit_type \
2788 -variable selected_commit_type \
2790 lappend disable_on_lock \
2791 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2792 radiobutton .vpane.lower.commarea.buffer.header.amend \
2793 -text [mc
"Amend Last Commit"] \
2794 -command do_select_commit_type \
2795 -variable selected_commit_type \
2797 lappend disable_on_lock \
2798 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2804 proc trace_commit_type
{varname args
} {
2805 global ui_coml commit_type
2806 switch
-glob -- $commit_type {
2807 initial
{set txt
[mc
"Initial Commit Message:"]}
2808 amend
{set txt
[mc
"Amended Commit Message:"]}
2809 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
2810 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
2811 merge
{set txt
[mc
"Merge Commit Message:"]}
2812 * {set txt
[mc
"Commit Message:"]}
2814 $ui_coml conf
-text $txt
2816 trace add variable commit_type
write trace_commit_type
2817 pack
$ui_coml -side left
-fill x
2819 if {![is_enabled nocommit
]} {
2820 pack .vpane.lower.commarea.buffer.header.amend
-side right
2821 pack .vpane.lower.commarea.buffer.header.new
-side right
2824 text
$ui_comm -background white
-foreground black \
2828 -autoseparators true \
2830 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
2832 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2833 scrollbar .vpane.lower.commarea.buffer.sby \
2834 -command [list
$ui_comm yview
]
2835 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2836 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2837 pack
$ui_comm -side left
-fill y
2838 pack .vpane.lower.commarea.buffer
-side left
-fill y
2840 # -- Commit Message Buffer Context Menu
2842 set ctxm .vpane.lower.commarea.buffer.ctxm
2843 menu
$ctxm -tearoff 0
2846 -command {tk_textCut
$ui_comm}
2849 -command {tk_textCopy
$ui_comm}
2852 -command {tk_textPaste
$ui_comm}
2854 -label [mc Delete
] \
2855 -command {$ui_comm delete sel.first sel.last
}
2858 -label [mc
"Select All"] \
2859 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2861 -label [mc
"Copy All"] \
2863 $ui_comm tag add sel
0.0 end
2864 tk_textCopy
$ui_comm
2865 $ui_comm tag remove sel
0.0 end
2869 -label [mc
"Sign Off"] \
2871 set ui_comm_ctxm
$ctxm
2875 proc trace_current_diff_path
{varname args
} {
2876 global current_diff_path diff_actions file_states
2877 if {$current_diff_path eq
{}} {
2883 set p
$current_diff_path
2884 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2886 set p
[escape_path
$p]
2890 .vpane.lower.
diff.header.status configure
-text $s
2891 .vpane.lower.
diff.header.
file configure
-text $f
2892 .vpane.lower.
diff.header.path configure
-text $p
2893 foreach w
$diff_actions {
2897 trace add variable current_diff_path
write trace_current_diff_path
2899 frame .vpane.lower.
diff.header
-background gold
2900 label .vpane.lower.
diff.header.status \
2903 -width $max_status_desc \
2906 label .vpane.lower.
diff.header.
file \
2911 label .vpane.lower.
diff.header.path \
2916 pack .vpane.lower.
diff.header.status
-side left
2917 pack .vpane.lower.
diff.header.
file -side left
2918 pack .vpane.lower.
diff.header.path
-fill x
2919 set ctxm .vpane.lower.
diff.header.ctxm
2920 menu
$ctxm -tearoff 0
2928 -- $current_diff_path
2930 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2931 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2935 frame .vpane.lower.
diff.body
2936 set ui_diff .vpane.lower.
diff.body.t
2937 text
$ui_diff -background white
-foreground black \
2939 -width 80 -height 15 -wrap none \
2941 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2942 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2944 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2945 -command [list
$ui_diff xview
]
2946 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2947 -command [list
$ui_diff yview
]
2948 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2949 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2950 pack
$ui_diff -side left
-fill both
-expand 1
2951 pack .vpane.lower.
diff.header
-side top
-fill x
2952 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2954 $ui_diff tag conf d_cr
-elide true
2955 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2956 $ui_diff tag conf d_
+ -foreground {#00a000}
2957 $ui_diff tag conf d_-
-foreground red
2959 $ui_diff tag conf d_
++ -foreground {#00a000}
2960 $ui_diff tag conf d_--
-foreground red
2961 $ui_diff tag conf d_
+s \
2962 -foreground {#00a000} \
2963 -background {#e2effa}
2964 $ui_diff tag conf d_-s \
2966 -background {#e2effa}
2967 $ui_diff tag conf d_s
+ \
2968 -foreground {#00a000} \
2970 $ui_diff tag conf d_s- \
2974 $ui_diff tag conf d
<<<<<<< \
2975 -foreground orange \
2977 $ui_diff tag conf d
======= \
2978 -foreground orange \
2980 $ui_diff tag conf d
>>>>>>> \
2981 -foreground orange \
2984 $ui_diff tag raise sel
2986 # -- Diff Body Context Menu
2989 proc create_common_diff_popup
{ctxm
} {
2991 -label [mc
"Show Less Context"] \
2992 -command show_less_context
2993 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2995 -label [mc
"Show More Context"] \
2996 -command show_more_context
2997 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3000 -label [mc Refresh
] \
3001 -command reshow_diff
3002 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3005 -command {tk_textCopy
$ui_diff}
3006 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3008 -label [mc
"Select All"] \
3009 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3010 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3012 -label [mc
"Copy All"] \
3014 $ui_diff tag add sel
0.0 end
3015 tk_textCopy
$ui_diff
3016 $ui_diff tag remove sel
0.0 end
3018 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3021 -label [mc
"Decrease Font Size"] \
3022 -command {incr_font_size font_diff
-1}
3023 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3025 -label [mc
"Increase Font Size"] \
3026 -command {incr_font_size font_diff
1}
3027 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3031 build_encoding_menu
$emenu [list force_diff_encoding
]
3033 -label [mc
"Encoding"] \
3035 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3037 $ctxm add
command -label [mc
"Options..."] \
3041 set ctxm .vpane.lower.
diff.body.ctxm
3042 menu
$ctxm -tearoff 0
3044 -label [mc
"Apply/Reverse Hunk"] \
3045 -command {apply_hunk
$cursorX $cursorY}
3046 set ui_diff_applyhunk
[$ctxm index last
]
3047 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3049 -label [mc
"Apply/Reverse Line"] \
3050 -command {apply_line
$cursorX $cursorY; do_rescan
}
3051 set ui_diff_applyline
[$ctxm index last
]
3052 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3054 create_common_diff_popup
$ctxm
3056 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3057 menu
$ctxmmg -tearoff 0
3058 $ctxmmg add
command \
3059 -label [mc
"Run Merge Tool"] \
3060 -command {merge_resolve_tool
}
3061 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3062 $ctxmmg add separator
3063 $ctxmmg add
command \
3064 -label [mc
"Use Remote Version"] \
3065 -command {merge_resolve_one
3}
3066 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3067 $ctxmmg add
command \
3068 -label [mc
"Use Local Version"] \
3069 -command {merge_resolve_one
2}
3070 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3071 $ctxmmg add
command \
3072 -label [mc
"Revert To Base"] \
3073 -command {merge_resolve_one
1}
3074 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3075 $ctxmmg add separator
3076 create_common_diff_popup
$ctxmmg
3078 proc popup_diff_menu
{ctxm ctxmmg x y X Y
} {
3079 global current_diff_path file_states
3082 if {[info exists file_states
($current_diff_path)]} {
3083 set state
[lindex
$file_states($current_diff_path) 0]
3087 if {[string first
{U
} $state] >= 0} {
3088 tk_popup
$ctxmmg $X $Y
3090 if {$
::ui_index eq $
::current_diff_side
} {
3091 set l
[mc
"Unstage Hunk From Commit"]
3092 set t
[mc
"Unstage Line From Commit"]
3094 set l
[mc
"Stage Hunk For Commit"]
3095 set t
[mc
"Stage Line For Commit"]
3098 ||
$current_diff_path eq
{}
3102 ||
{T_
} eq
$state} {
3107 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3108 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3109 tk_popup
$ctxm $X $Y
3112 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg %x
%y
%X
%Y
]
3116 set main_status
[::status_bar
::new .status
]
3117 pack .status
-anchor w
-side bottom
-fill x
3118 $main_status show
[mc
"Initializing..."]
3123 set gm
$repo_config(gui.geometry
)
3124 wm geometry .
[lindex
$gm 0]
3125 .vpane sash place
0 \
3127 [lindex
[.vpane sash coord
0] 1]
3128 .vpane.files sash place
0 \
3129 [lindex
[.vpane.files sash coord
0] 0] \
3136 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3137 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3138 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3139 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3140 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3141 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3142 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3143 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3144 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3145 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3146 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3147 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3148 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3149 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3150 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3151 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3152 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3153 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3155 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3156 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3157 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3158 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3159 bind $ui_diff <$M1B-Key-v> {break}
3160 bind $ui_diff <$M1B-Key-V> {break}
3161 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3162 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3163 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3164 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3165 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3166 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3167 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3168 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3169 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3170 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3171 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3172 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3173 bind $ui_diff <Button-1
> {focus
%W
}
3175 if {[is_enabled branch
]} {
3176 bind .
<$M1B-Key-n> branch_create
::dialog
3177 bind .
<$M1B-Key-N> branch_create
::dialog
3178 bind .
<$M1B-Key-o> branch_checkout
::dialog
3179 bind .
<$M1B-Key-O> branch_checkout
::dialog
3180 bind .
<$M1B-Key-m> merge
::dialog
3181 bind .
<$M1B-Key-M> merge
::dialog
3183 if {[is_enabled transport
]} {
3184 bind .
<$M1B-Key-p> do_push_anywhere
3185 bind .
<$M1B-Key-P> do_push_anywhere
3188 bind .
<Key-F5
> ui_do_rescan
3189 bind .
<$M1B-Key-r> ui_do_rescan
3190 bind .
<$M1B-Key-R> ui_do_rescan
3191 bind .
<$M1B-Key-s> do_signoff
3192 bind .
<$M1B-Key-S> do_signoff
3193 bind .
<$M1B-Key-t> do_add_selection
3194 bind .
<$M1B-Key-T> do_add_selection
3195 bind .
<$M1B-Key-i> do_add_all
3196 bind .
<$M1B-Key-I> do_add_all
3197 bind .
<$M1B-Key-minus> {show_less_context
;break}
3198 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3199 bind .
<$M1B-Key-equal> {show_more_context
;break}
3200 bind .
<$M1B-Key-plus> {show_more_context
;break}
3201 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3202 bind .
<$M1B-Key-Return> do_commit
3203 foreach i
[list
$ui_index $ui_workdir] {
3204 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3205 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3206 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3210 set file_lists
($ui_index) [list
]
3211 set file_lists
($ui_workdir) [list
]
3213 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
3214 focus
-force $ui_comm
3216 # -- Warn the user about environmental problems. Cygwin's Tcl
3217 # does *not* pass its env array onto any processes it spawns.
3218 # This means that git processes get none of our environment.
3223 set msg
[mc
"Possible environment issues exist.
3225 The following environment variables are probably
3226 going to be ignored by any Git subprocess run
3230 foreach name
[array names env
] {
3231 switch
-regexp -- $name {
3232 {^GIT_INDEX_FILE$
} -
3233 {^GIT_OBJECT_DIRECTORY$
} -
3234 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3236 {^GIT_EXTERNAL_DIFF$
} -
3240 {^GIT_CONFIG_LOCAL$
} -
3241 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3242 append msg
" - $name\n"
3245 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3246 append msg
" - $name\n"
3248 set suggest_user
$name
3252 if {$ignored_env > 0} {
3254 This is due to a known issue with the
3255 Tcl binary distributed by Cygwin."]
3257 if {$suggest_user ne
{}} {
3260 A good replacement for %s
3261 is placing values for the user.name and
3262 user.email settings into your personal
3268 unset ignored_env msg suggest_user name
3271 # -- Only initialize complex UI if we are going to stay running.
3273 if {[is_enabled transport
]} {
3276 set n
[.mbar.remote index end
]
3277 populate_remotes_menu
3278 set n
[expr {[.mbar.remote index end
] - $n}]
3280 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3281 .mbar.remote insert
$n separator
3286 if {[winfo exists
$ui_comm]} {
3287 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3289 # -- If both our backup and message files exist use the
3290 # newer of the two files to initialize the buffer.
3292 if {$GITGUI_BCK_exists} {
3293 set m
[gitdir GITGUI_MSG
]
3294 if {[file isfile
$m]} {
3295 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3296 catch
{file delete
[gitdir GITGUI_MSG
]}
3298 $ui_comm delete
0.0 end
3300 $ui_comm edit modified false
3301 catch
{file delete
[gitdir GITGUI_BCK
]}
3302 set GITGUI_BCK_exists
0
3308 proc backup_commit_buffer
{} {
3309 global ui_comm GITGUI_BCK_exists
3311 set m
[$ui_comm edit modified
]
3312 if {$m ||
$GITGUI_BCK_exists} {
3313 set msg
[string trim
[$ui_comm get
0.0 end
]]
3314 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3317 if {$GITGUI_BCK_exists} {
3318 catch
{file delete
[gitdir GITGUI_BCK
]}
3319 set GITGUI_BCK_exists
0
3323 set fd
[open
[gitdir GITGUI_BCK
] w
]
3324 puts
-nonewline $fd $msg
3326 set GITGUI_BCK_exists
1
3330 $ui_comm edit modified false
3333 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3336 backup_commit_buffer
3338 # -- If the user has aspell available we can drive it
3339 # in pipe mode to spellcheck the commit message.
3341 set spell_cmd
[list |
]
3342 set spell_dict
[get_config gui.spellingdictionary
]
3343 lappend spell_cmd aspell
3344 if {$spell_dict ne
{}} {
3345 lappend spell_cmd
--master=$spell_dict
3347 lappend spell_cmd
--mode=none
3348 lappend spell_cmd
--encoding=utf-8
3349 lappend spell_cmd pipe
3350 if {$spell_dict eq
{none
}
3351 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3352 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3354 set ui_comm_spell
[spellcheck
::init \
3360 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3363 lock_index begin-read
3364 if {![winfo ismapped .
]} {
3368 if {[is_enabled initialamend
]} {
3374 if {[is_enabled nocommitmsg
]} {
3375 $ui_comm configure
-state disabled
-background gray
3378 if {[is_enabled multicommit
]} {
3381 if {[is_enabled retcode
]} {
3382 bind .
<Destroy
> {+terminate_me
%W
}
3384 if {$picked && [is_config_true gui.autoexplore
]} {