![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/git-gui.sh b/git-gui.sh
index d5490cdde0af69102e8f5a4f0038f60528968ff9..4fbc408c4d0a1f950c7d32768ed55cbd91005023 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
#!/bin/sh
# Tcl ignores the next line -*- tcl -*- \
-exec wish "$0" -- "$@"
-
-set appvers {@@GIT_VERSION@@}
+ if test "z$*" = zversion \
+ || test "z$*" = z--version; \
+ then \
+ echo 'git-gui version @@GITGUI_VERSION@@'; \
+ exit; \
+ fi; \
+ exec wish "$0" -- "$@"
+
+set appvers {@@GITGUI_VERSION@@}
set copyright {
-Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.
+Copyright © 2006, 2007 Shawn Pearce, et. al.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
+######################################################################
+##
+## Tcl/Tk sanity check
+
+if {[catch {package require Tcl 8.4} err]
+ || [catch {package require Tk 8.4} err]
+} {
+ catch {wm withdraw .}
+ tk_messageBox \
+ -icon error \
+ -type ok \
+ -title "git-gui: fatal error" \
+ -message $err
+ exit 1
+}
+
+######################################################################
+##
+## configure our library
+
+set oguilib {@@GITGUI_LIBDIR@@}
+set oguirel {@@GITGUI_RELATIVE@@}
+if {$oguirel eq {1}} {
+ set oguilib [file dirname [file dirname [file normalize $argv0]]]
+ set oguilib [file join $oguilib share git-gui lib]
+} elseif {[string match @@* $oguirel]} {
+ set oguilib [file join [file dirname [file normalize $argv0]] lib]
+}
+set idx [file join $oguilib tclIndex]
+catch {
+ set fd [open $idx r]
+ if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
+ set idx [list]
+ while {[gets $fd n] >= 0} {
+ if {$n ne {} && ![string match #* $n]} {
+ lappend idx $n
+ }
+ }
+ } else {
+ set idx {}
+ }
+ close $fd
+}
+if {$idx ne {}} {
+ set loaded [list]
+ foreach p $idx {
+ if {[lsearch -exact $loaded $p] >= 0} continue
+ puts $p
+ source [file join $oguilib $p]
+ lappend loaded $p
+ }
+ unset loaded p
+} else {
+ set auto_path [concat [list $oguilib] $auto_path]
+}
+unset -nocomplain oguilib oguirel idx fd
+
+if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
+ unset _verbose
+ rename auto_load real__auto_load
+ proc auto_load {name args} {
+ puts stderr "auto_load $name"
+ return [uplevel 1 real__auto_load $name $args]
+ }
+ rename source real__source
+ proc source {name} {
+ puts stderr "source $name"
+ uplevel 1 real__source $name
+ }
+}
+
######################################################################
##
## read only globals
proc gitexec {args} {
global _gitexec
if {$_gitexec eq {}} {
- if {[catch {set _gitexec [exec git --exec-path]} err]} {
+ if {[catch {set _gitexec [git --exec-path]} err]} {
error "Git not installed?\n\n$err"
}
}
return $_iscygwin
}
+proc is_enabled {option} {
+ global enabled_options
+ if {[catch {set on $enabled_options($option)}]} {return 0}
+ return $on
+}
+
+proc enable_option {option} {
+ global enabled_options
+ set enabled_options($option) 1
+}
+
+proc disable_option {option} {
+ global enabled_options
+ set enabled_options($option) 0
+}
+
######################################################################
##
## config
array unset global_config
if {$include_global} {
catch {
- set fd_rc [open "| git repo-config --global --list" r]
+ set fd_rc [open "| git config --global --list" r]
while {[gets $fd_rc line] >= 0} {
if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
if {[is_many_config $name]} {
array unset repo_config
catch {
- set fd_rc [open "| git repo-config --list" r]
+ set fd_rc [open "| git config --list" r]
while {[gets $fd_rc line] >= 0} {
if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
if {[is_many_config $name]} {
}
}
-proc save_config {} {
- global default_config font_descs
- global repo_config global_config
- global repo_config_new global_config_new
-
- foreach option $font_descs {
- set name [lindex $option 0]
- set font [lindex $option 1]
- font configure $font \
- -family $global_config_new(gui.$font^^family) \
- -size $global_config_new(gui.$font^^size)
- font configure ${font}bold \
- -family $global_config_new(gui.$font^^family) \
- -size $global_config_new(gui.$font^^size)
- set global_config_new(gui.$name) [font configure $font]
- unset global_config_new(gui.$font^^family)
- unset global_config_new(gui.$font^^size)
- }
-
- foreach name [array names default_config] {
- set value $global_config_new($name)
- if {$value ne $global_config($name)} {
- if {$value eq $default_config($name)} {
- catch {exec git repo-config --global --unset $name}
- } else {
- regsub -all "\[{}\]" $value {"} value
- exec git repo-config --global $name $value
- }
- set global_config($name) $value
- if {$value eq $repo_config($name)} {
- catch {exec git repo-config --unset $name}
- set repo_config($name) $value
- }
- }
- }
+######################################################################
+##
+## handy utils
- foreach name [array names default_config] {
- set value $repo_config_new($name)
- if {$value ne $repo_config($name)} {
- if {$value eq $global_config($name)} {
- catch {exec git repo-config --unset $name}
- } else {
- regsub -all "\[{}\]" $value {"} value
- exec git repo-config $name $value
- }
- set repo_config($name) $value
- }
- }
+proc git {args} {
+ return [eval exec git $args]
}
-proc error_popup {msg} {
- set title [appname]
- if {[reponame] ne {}} {
- append title " ([reponame])"
- }
- set cmd [list tk_messageBox \
- -icon error \
- -type ok \
- -title "$title: error" \
- -message $msg]
- if {[winfo ismapped .]} {
- lappend cmd -parent .
- }
- eval $cmd
+auto_load tk_optionMenu
+rename tk_optionMenu real__tkOptionMenu
+proc tk_optionMenu {w varName args} {
+ set m [eval real__tkOptionMenu $w $varName $args]
+ $m configure -font font_ui
+ $w configure -font font_ui
+ return $m
}
-proc warn_popup {msg} {
- set title [appname]
- if {[reponame] ne {}} {
- append title " ([reponame])"
- }
- set cmd [list tk_messageBox \
- -icon warning \
- -type ok \
- -title "$title: warning" \
- -message $msg]
- if {[winfo ismapped .]} {
- lappend cmd -parent .
- }
- eval $cmd
-}
+######################################################################
+##
+## version check
-proc info_popup {msg {parent .}} {
- set title [appname]
- if {[reponame] ne {}} {
- append title " ([reponame])"
- }
- tk_messageBox \
- -parent $parent \
- -icon info \
- -type ok \
- -title $title \
- -message $msg
+set req_maj 1
+set req_min 5
+
+if {[catch {set v [git --version]} err]} {
+ catch {wm withdraw .}
+ error_popup "Cannot determine Git version:
+
+$err
+
+[appname] requires Git $req_maj.$req_min or later."
+ exit 1
}
+if {[regexp {^git version (\d+)\.(\d+)} $v _junk act_maj act_min]} {
+ if {$act_maj < $req_maj
+ || ($act_maj == $req_maj && $act_min < $req_min)} {
+ catch {wm withdraw .}
+ error_popup "[appname] requires Git $req_maj.$req_min or later.
-proc ask_popup {msg} {
- set title [appname]
- if {[reponame] ne {}} {
- append title " ([reponame])"
+You are using $v."
+ exit 1
}
- return [tk_messageBox \
- -parent . \
- -icon question \
- -type yesno \
- -title $title \
- -message $msg]
+} else {
+ catch {wm withdraw .}
+ error_popup "Cannot parse Git version string:\n\n$v"
+ exit 1
}
+unset -nocomplain v _junk act_maj act_min req_maj req_min
######################################################################
##
## repository setup
-if { [catch {set _gitdir $env(GIT_DIR)}]
- && [catch {set _gitdir [exec git rev-parse --git-dir]} err]} {
+if {[catch {
+ set _gitdir $env(GIT_DIR)
+ set _prefix {}
+ }]
+ && [catch {
+ set _gitdir [git rev-parse --git-dir]
+ set _prefix [git rev-parse --show-prefix]
+ } err]} {
catch {wm withdraw .}
error_popup "Cannot find the git directory:\n\n$err"
exit 1
[file normalize [file dirname $_gitdir]]] \
end]
-set single_commit 0
-if {[appname] eq {git-citool}} {
- set single_commit 1
-}
+######################################################################
+##
+## global init
+
+set current_diff_path {}
+set current_diff_side {}
+set diff_actions [list]
+set ui_status_value {Initializing...}
+
+set HEAD {}
+set PARENT {}
+set MERGE_HEAD [list]
+set commit_type {}
+set empty_tree {}
+set current_branch {}
+set current_diff_path {}
+set selected_commit_type new
######################################################################
##
set mh [list]
- if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
+ if {[catch {set current_branch [git symbolic-ref HEAD]}]} {
set current_branch {}
} else {
regsub ^refs/((heads|tags|remotes)/)? \
current_branch
}
- if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
+ if {[catch {set hd [git rev-parse --verify HEAD]}]} {
set hd {}
set ct initial
return
return $p
}
if {$empty_tree eq {}} {
- set empty_tree [exec git mktree << {}]
+ set empty_tree [git mktree << {}]
}
return $empty_tree
}
if {![$ui_comm edit modified]
|| [string trim [$ui_comm get 0.0 end]] eq {}} {
- if {[load_message GITGUI_MSG]} {
+ if {[string match amend* $commit_type]} {
+ } elseif {[load_message GITGUI_MSG]} {
} elseif {[load_message MERGE_MSG]} {
} elseif {[load_message SQUASH_MSG]} {
}
$ui_comm edit modified false
}
+ if {[is_enabled branch]} {
+ load_all_heads
+ populate_branch_menu
+ }
+
if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
rescan_stage2 {} $after
} else {
}
proc rescan_done {fd buf after} {
- global rescan_active
+ global rescan_active current_diff_path
global file_states repo_config
upvar $buf to_clear
prune_selection
unlock_index
display_all_files
- reshow_diff
+ if {$current_diff_path ne {}} reshow_diff
uplevel #0 $after
}
######################################################################
##
-## diff
+## ui helpers
-proc clear_diff {} {
- global ui_diff current_diff_path current_diff_header
- global ui_index ui_workdir
+proc mapicon {w state path} {
+ global all_icons
- $ui_diff conf -state normal
- $ui_diff delete 0.0 end
- $ui_diff conf -state disabled
+ if {[catch {set r $all_icons($state$w)}]} {
+ puts "error: no icon for $w state={$state} $path"
+ return file_plain
+ }
+ return $r
+}
- set current_diff_path {}
- set current_diff_header {}
+proc mapdesc {state path} {
+ global all_descs
- $ui_index tag remove in_diff 0.0 end
- $ui_workdir tag remove in_diff 0.0 end
+ if {[catch {set r $all_descs($state)}]} {
+ puts "error: no desc for state={$state} $path"
+ return $state
+ }
+ return $r
}
-proc reshow_diff {} {
- global ui_status_value file_states file_lists
- global current_diff_path current_diff_side
+proc escape_path {path} {
+ regsub -all {\\} $path "\\\\" path
+ regsub -all "\n" $path "\\n" path
+ return $path
+}
- set p $current_diff_path
- if {$p eq {}
- || $current_diff_side eq {}
- || [catch {set s $file_states($p)}]
- || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
- clear_diff
- } else {
- show_diff $p $current_diff_side
- }
+proc short_path {path} {
+ return [escape_path [lindex [file split $path] end]]
}
-proc handle_empty_diff {} {
- global current_diff_path file_states file_lists
+set next_icon_id 0
+set null_sha1 [string repeat 0 40]
+
+proc merge_state {path new_state {head_info {}} {index_info {}}} {
+ global file_states next_icon_id null_sha1
- set path $current_diff_path
- set s $file_states($path)
- if {[lindex $s 0] ne {_M}} return
+ set s0 [string index $new_state 0]
+ set s1 [string index $new_state 1]
- info_popup "No differences detected.
+ if {[catch {set info $file_states($path)}]} {
+ set state __
+ set icon n[incr next_icon_id]
+ } else {
+ set state [lindex $info 0]
+ set icon [lindex $info 1]
+ if {$head_info eq {}} {set head_info [lindex $info 2]}
+ if {$index_info eq {}} {set index_info [lindex $info 3]}
+ }
-[short_path $path] has no changes.
+ if {$s0 eq {?}} {set s0 [string index $state 0]} \
+ elseif {$s0 eq {_}} {set s0 _}
-The modification date of this file was updated
-by another application, but the content within
-the file was not changed.
+ if {$s1 eq {?}} {set s1 [string index $state 1]} \
+ elseif {$s1 eq {_}} {set s1 _}
-A rescan will be automatically started to find
-other files which may have the same state."
+ if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
+ set head_info [list 0 $null_sha1]
+ } elseif {$s0 ne {_} && [string index $state 0] eq {_}
+ && $head_info eq {}} {
+ set head_info $index_info
+ }
- clear_diff
- display_file $path __
- rescan {set ui_status_value {Ready.}} 0
+ set file_states($path) [list $s0$s1 $icon \
+ $head_info $index_info \
+ ]
+ return $state
}
-proc show_diff {path w {lno {}}} {
- global file_states file_lists
- global is_3way_diff diff_active repo_config
- global ui_diff ui_status_value ui_index ui_workdir
- global current_diff_path current_diff_side current_diff_header
-
- if {$diff_active || ![lock_index read]} return
+proc display_file_helper {w path icon_name old_m new_m} {
+ global file_lists
- clear_diff
- if {$lno == {}} {
+ if {$new_m eq {_}} {
set lno [lsearch -sorted -exact $file_lists($w) $path]
if {$lno >= 0} {
+ set file_lists($w) [lreplace $file_lists($w) $lno $lno]
incr lno
+ $w conf -state normal
+ $w delete $lno.0 [expr {$lno + 1}].0
+ $w conf -state disabled
}
+ } elseif {$old_m eq {_} && $new_m ne {_}} {
+ lappend file_lists($w) $path
+ set file_lists($w) [lsort -unique $file_lists($w)]
+ set lno [lsearch -sorted -exact $file_lists($w) $path]
+ incr lno
+ $w conf -state normal
+ $w image create $lno.0 \
+ -align center -padx 5 -pady 1 \
+ -name $icon_name \
+ -image [mapicon $w $new_m $path]
+ $w insert $lno.1 "[escape_path $path]\n"
+ $w conf -state disabled
+ } elseif {$old_m ne $new_m} {
+ $w conf -state normal
+ $w image conf $icon_name -image [mapicon $w $new_m $path]
+ $w conf -state disabled
}
- if {$lno >= 1} {
- $w tag add in_diff $lno.0 [expr {$lno + 1}].0
- }
+}
+
+proc display_file {path state} {
+ global file_states selected_paths
+ global ui_index ui_workdir
+ set old_m [merge_state $path $state]
set s $file_states($path)
- set m [lindex $s 0]
- set is_3way_diff 0
- set diff_active 1
- set current_diff_path $path
- set current_diff_side $w
- set current_diff_header {}
- set ui_status_value "Loading diff of [escape_path $path]..."
-
- # - Git won't give us the diff, there's nothing to compare to!
- #
- if {$m eq {_O}} {
- set max_sz [expr {128 * 1024}]
- if {[catch {
- set fd [open $path r]
- set content [read $fd $max_sz]
- close $fd
- set sz [file size $path]
- } err ]} {
- set diff_active 0
- unlock_index
- set ui_status_value "Unable to display [escape_path $path]"
- error_popup "Error loading file:\n\n$err"
- return
- }
- $ui_diff conf -state normal
- if {![catch {set type [exec file $path]}]} {
- set n [string length $path]
- if {[string equal -length $n $path $type]} {
- set type [string range $type $n end]
- regsub {^:?\s*} $type {} type
- }
- $ui_diff insert end "* $type\n" d_@
- }
- if {[string first "\0" $content] != -1} {
- $ui_diff insert end \
- "* Binary file (not showing content)." \
- d_@
- } else {
- if {$sz > $max_sz} {
- $ui_diff insert end \
-"* Untracked file is $sz bytes.
-* Showing only first $max_sz bytes.
-" d_@
- }
- $ui_diff insert end $content
- if {$sz > $max_sz} {
- $ui_diff insert end "
-* Untracked file clipped here by [appname].
-* To see the entire file, use an external editor.
-" d_@
- }
- }
- $ui_diff conf -state disabled
- set diff_active 0
- unlock_index
- set ui_status_value {Ready.}
- return
- }
+ set new_m [lindex $s 0]
+ set icon_name [lindex $s 1]
- set cmd [list | git]
- if {$w eq $ui_index} {
- lappend cmd diff-index
- lappend cmd --cached
- } elseif {$w eq $ui_workdir} {
- if {[string index $m 0] eq {U}} {
- lappend cmd diff
- } else {
- lappend cmd diff-files
- }
+ set o [string index $old_m 0]
+ set n [string index $new_m 0]
+ if {$o eq {U}} {
+ set o _
+ }
+ if {$n eq {U}} {
+ set n _
}
+ display_file_helper $ui_index $path $icon_name $o $n
- lappend cmd -p
- lappend cmd --no-color
- if {$repo_config(gui.diffcontext) > 0} {
- lappend cmd "-U$repo_config(gui.diffcontext)"
+ if {[string index $old_m 0] eq {U}} {
+ set o U
+ } else {
+ set o [string index $old_m 1]
}
- if {$w eq $ui_index} {
- lappend cmd [PARENT]
+ if {[string index $new_m 0] eq {U}} {
+ set n U
+ } else {
+ set n [string index $new_m 1]
}
- lappend cmd --
- lappend cmd $path
-
- if {[catch {set fd [open $cmd r]} err]} {
- set diff_active 0
- unlock_index
- set ui_status_value "Unable to display [escape_path $path]"
- error_popup "Error loading diff:\n\n$err"
- return
+ display_file_helper $ui_workdir $path $icon_name $o $n
+
+ if {$new_m eq {__}} {
+ unset file_states($path)
+ catch {unset selected_paths($path)}
}
+}
+
+proc display_all_files_helper {w path icon_name m} {
+ global file_lists
- fconfigure $fd \
- -blocking 0 \
- -encoding binary \
- -translation binary
- fileevent $fd readable [list read_diff $fd]
+ lappend file_lists($w) $path
+ set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
+ $w image create end \
+ -align center -padx 5 -pady 1 \
+ -name $icon_name \
+ -image [mapicon $w $m $path]
+ $w insert end "[escape_path $path]\n"
}
-proc read_diff {fd} {
- global ui_diff ui_status_value diff_active
- global is_3way_diff current_diff_header
+proc display_all_files {} {
+ global ui_index ui_workdir
+ global file_states file_lists
+ global last_clicked
- $ui_diff conf -state normal
- while {[gets $fd line] >= 0} {
- # -- Cleanup uninteresting diff header lines.
- #
- if { [string match {diff --git *} $line]
- || [string match {diff --cc *} $line]
- || [string match {diff --combined *} $line]
- || [string match {--- *} $line]
- || [string match {+++ *} $line]} {
- append current_diff_header $line "\n"
- continue
- }
- if {[string match {index *} $line]} continue
- if {$line eq {deleted file mode 120000}} {
- set line "deleted symlink"
- }
+ $ui_index conf -state normal
+ $ui_workdir conf -state normal
- # -- Automatically detect if this is a 3 way diff.
- #
- if {[string match {@@@ *} $line]} {set is_3way_diff 1}
-
- if {[string match {mode *} $line]
- || [string match {new file *} $line]
- || [string match {deleted file *} $line]
- || [string match {Binary files * and * differ} $line]
- || $line eq {\ No newline at end of file}
- || [regexp {^\* Unmerged path } $line]} {
- set tags {}
- } elseif {$is_3way_diff} {
- set op [string range $line 0 1]
- switch -- $op {
- { } {set tags {}}
- {@@} {set tags d_@}
- { +} {set tags d_s+}
- { -} {set tags d_s-}
- {+ } {set tags d_+s}
- {- } {set tags d_-s}
- {--} {set tags d_--}
- {++} {
- if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
- set line [string replace $line 0 1 { }]
- set tags d$op
- } else {
- set tags d_++
- }
- }
- default {
- puts "error: Unhandled 3 way diff marker: {$op}"
- set tags {}
- }
- }
- } else {
- set op [string index $line 0]
- switch -- $op {
- { } {set tags {}}
- {@} {set tags d_@}
- {-} {set tags d_-}
- {+} {
- if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
- set line [string replace $line 0 0 { }]
- set tags d$op
- } else {
- set tags d_+
- }
- }
- default {
- puts "error: Unhandled 2 way diff marker: {$op}"
- set tags {}
- }
- }
- }
- $ui_diff insert end $line $tags
- if {[string index $line end] eq "\r"} {
- $ui_diff tag add d_cr {end - 2c}
- }
- $ui_diff insert end "\n" $tags
- }
- $ui_diff conf -state disabled
-
- if {[eof $fd]} {
- close $fd
- set diff_active 0
- unlock_index
- set ui_status_value {Ready.}
-
- if {[$ui_diff index end] eq {2.0}} {
- handle_empty_diff
- }
- }
-}
-
-proc apply_hunk {x y} {
- global current_diff_path current_diff_header current_diff_side
- global ui_diff ui_index file_states
-
- if {$current_diff_path eq {} || $current_diff_header eq {}} return
- if {![lock_index apply_hunk]} return
-
- set apply_cmd {git apply --cached --whitespace=nowarn}
- set mi [lindex $file_states($current_diff_path) 0]
- if {$current_diff_side eq $ui_index} {
- set mode unstage
- lappend apply_cmd --reverse
- if {[string index $mi 0] ne {M}} {
- unlock_index
- return
- }
- } else {
- set mode stage
- if {[string index $mi 1] ne {M}} {
- unlock_index
- return
- }
- }
-
- set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
- set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
- if {$s_lno eq {}} {
- unlock_index
- return
- }
-
- set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
- if {$e_lno eq {}} {
- set e_lno end
- }
-
- if {[catch {
- set p [open "| $apply_cmd" w]
- fconfigure $p -translation binary -encoding binary
- puts -nonewline $p $current_diff_header
- puts -nonewline $p [$ui_diff get $s_lno $e_lno]
- close $p} err]} {
- error_popup "Failed to $mode selected hunk.\n\n$err"
- unlock_index
- return
- }
-
- $ui_diff conf -state normal
- $ui_diff delete $s_lno $e_lno
- $ui_diff conf -state disabled
-
- if {[$ui_diff get 1.0 end] eq "\n"} {
- set o _
- } else {
- set o ?
- }
-
- if {$current_diff_side eq $ui_index} {
- set mi ${o}M
- } elseif {[string index $mi 0] eq {_}} {
- set mi M$o
- } else {
- set mi ?$o
- }
- unlock_index
- display_file $current_diff_path $mi
- if {$o eq {_}} {
- clear_diff
- }
-}
-
-######################################################################
-##
-## commit
-
-proc load_last_commit {} {
- global HEAD PARENT MERGE_HEAD commit_type ui_comm
- global repo_config
-
- if {[llength $PARENT] == 0} {
- error_popup {There is nothing to amend.
-
-You are about to create the initial commit.
-There is no commit before this to amend.
-}
- return
- }
-
- repository_state curType curHEAD curMERGE_HEAD
- if {$curType eq {merge}} {
- error_popup {Cannot amend while merging.
-
-You are currently in the middle of a merge that
-has not been fully completed. You cannot amend
-the prior commit unless you first abort the
-current merge activity.
-}
- return
- }
-
- set msg {}
- set parents [list]
- if {[catch {
- set fd [open "| git cat-file commit $curHEAD" r]
- fconfigure $fd -encoding binary -translation lf
- if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
- set enc utf-8
- }
- while {[gets $fd line] > 0} {
- if {[string match {parent *} $line]} {
- lappend parents [string range $line 7 end]
- } elseif {[string match {encoding *} $line]} {
- set enc [string tolower [string range $line 9 end]]
- }
- }
- fconfigure $fd -encoding $enc
- set msg [string trim [read $fd]]
- close $fd
- } err]} {
- error_popup "Error loading commit data for amend:\n\n$err"
- return
- }
-
- set HEAD $curHEAD
- set PARENT $parents
- set MERGE_HEAD [list]
- switch -- [llength $parents] {
- 0 {set commit_type amend-initial}
- 1 {set commit_type amend}
- default {set commit_type amend-merge}
- }
-
- $ui_comm delete 0.0 end
- $ui_comm insert end $msg
- $ui_comm edit reset
- $ui_comm edit modified false
- rescan {set ui_status_value {Ready.}}
-}
-
-proc create_new_commit {} {
- global commit_type ui_comm
-
- set commit_type normal
- $ui_comm delete 0.0 end
- $ui_comm edit reset
- $ui_comm edit modified false
- rescan {set ui_status_value {Ready.}}
-}
-
-set GIT_COMMITTER_IDENT {}
-
-proc committer_ident {} {
- global GIT_COMMITTER_IDENT
-
- if {$GIT_COMMITTER_IDENT eq {}} {
- if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
- error_popup "Unable to obtain your identity:\n\n$err"
- return {}
- }
- if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
- $me me GIT_COMMITTER_IDENT]} {
- error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
- return {}
- }
- }
-
- return $GIT_COMMITTER_IDENT
-}
-
-proc commit_tree {} {
- global HEAD commit_type file_states ui_comm repo_config
- global ui_status_value pch_error
-
- if {[committer_ident] eq {}} return
- if {![lock_index update]} return
-
- # -- Our in memory state should match the repository.
- #
- repository_state curType curHEAD curMERGE_HEAD
- if {[string match amend* $commit_type]
- && $curType eq {normal}
- && $curHEAD eq $HEAD} {
- } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
- info_popup {Last scanned state does not match repository state.
-
-Another Git program has modified this repository
-since the last scan. A rescan must be performed
-before another commit can be created.
-
-The rescan will be automatically started now.
-}
- unlock_index
- rescan {set ui_status_value {Ready.}}
- return
- }
-
- # -- At least one file should differ in the index.
- #
- set files_ready 0
- foreach path [array names file_states] {
- switch -glob -- [lindex $file_states($path) 0] {
- _? {continue}
- A? -
- D? -
- M? {set files_ready 1}
- U? {
- error_popup "Unmerged files cannot be committed.
-
-File [short_path $path] has merge conflicts.
-You must resolve them and add the file before committing.
-"
- unlock_index
- return
- }
- default {
- error_popup "Unknown file state [lindex $s 0] detected.
-
-File [short_path $path] cannot be committed by this program.
-"
- }
- }
- }
- if {!$files_ready} {
- info_popup {No changes to commit.
-
-You must add at least 1 file before you can commit.
-}
- unlock_index
- return
- }
-
- # -- A message is required.
- #
- set msg [string trim [$ui_comm get 1.0 end]]
- regsub -all -line {[ \t\r]+$} $msg {} msg
- if {$msg eq {}} {
- error_popup {Please supply a commit message.
-
-A good commit message has the following format:
-
-- First line: Describe in one sentance what you did.
-- Second line: Blank
-- Remaining lines: Describe why this change is good.
-}
- unlock_index
- return
- }
-
- # -- Run the pre-commit hook.
- #
- set pchook [gitdir hooks pre-commit]
-
- # On Cygwin [file executable] might lie so we need to ask
- # the shell if the hook is executable. Yes that's annoying.
- #
- if {[is_Cygwin] && [file isfile $pchook]} {
- set pchook [list sh -c [concat \
- "if test -x \"$pchook\";" \
- "then exec \"$pchook\" 2>&1;" \
- "fi"]]
- } elseif {[file executable $pchook]} {
- set pchook [list $pchook |& cat]
- } else {
- commit_writetree $curHEAD $msg
- return
- }
-
- set ui_status_value {Calling pre-commit hook...}
- set pch_error {}
- set fd_ph [open "| $pchook" r]
- fconfigure $fd_ph -blocking 0 -translation binary
- fileevent $fd_ph readable \
- [list commit_prehook_wait $fd_ph $curHEAD $msg]
-}
-
-proc commit_prehook_wait {fd_ph curHEAD msg} {
- global pch_error ui_status_value
-
- append pch_error [read $fd_ph]
- fconfigure $fd_ph -blocking 1
- if {[eof $fd_ph]} {
- if {[catch {close $fd_ph}]} {
- set ui_status_value {Commit declined by pre-commit hook.}
- hook_failed_popup pre-commit $pch_error
- unlock_index
- } else {
- commit_writetree $curHEAD $msg
- }
- set pch_error {}
- return
- }
- fconfigure $fd_ph -blocking 0
-}
-
-proc commit_writetree {curHEAD msg} {
- global ui_status_value
-
- set ui_status_value {Committing changes...}
- set fd_wt [open "| git write-tree" r]
- fileevent $fd_wt readable \
- [list commit_committree $fd_wt $curHEAD $msg]
-}
-
-proc commit_committree {fd_wt curHEAD msg} {
- global HEAD PARENT MERGE_HEAD commit_type
- global single_commit all_heads current_branch
- global ui_status_value ui_comm selected_commit_type
- global file_states selected_paths rescan_active
- global repo_config
-
- gets $fd_wt tree_id
- if {$tree_id eq {} || [catch {close $fd_wt} err]} {
- error_popup "write-tree failed:\n\n$err"
- set ui_status_value {Commit failed.}
- unlock_index
- return
- }
-
- # -- Build the message.
- #
- set msg_p [gitdir COMMIT_EDITMSG]
- set msg_wt [open $msg_p w]
- if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
- set enc utf-8
- }
- fconfigure $msg_wt -encoding $enc -translation binary
- puts -nonewline $msg_wt $msg
- close $msg_wt
-
- # -- Create the commit.
- #
- set cmd [list git commit-tree $tree_id]
- set parents [concat $PARENT $MERGE_HEAD]
- if {[llength $parents] > 0} {
- foreach p $parents {
- lappend cmd -p $p
- }
- } else {
- # git commit-tree writes to stderr during initial commit.
- lappend cmd 2>/dev/null
- }
- lappend cmd <$msg_p
- if {[catch {set cmt_id [eval exec $cmd]} err]} {
- error_popup "commit-tree failed:\n\n$err"
- set ui_status_value {Commit failed.}
- unlock_index
- return
- }
-
- # -- Update the HEAD ref.
- #
- set reflogm commit
- if {$commit_type ne {normal}} {
- append reflogm " ($commit_type)"
- }
- set i [string first "\n" $msg]
- if {$i >= 0} {
- append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
- } else {
- append reflogm {: } $msg
- }
- set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
- if {[catch {eval exec $cmd} err]} {
- error_popup "update-ref failed:\n\n$err"
- set ui_status_value {Commit failed.}
- unlock_index
- return
- }
-
- # -- Make sure our current branch exists.
- #
- if {$commit_type eq {initial}} {
- lappend all_heads $current_branch
- set all_heads [lsort -unique $all_heads]
- populate_branch_menu
- }
-
- # -- Cleanup after ourselves.
- #
- catch {file delete $msg_p}
- catch {file delete [gitdir MERGE_HEAD]}
- catch {file delete [gitdir MERGE_MSG]}
- catch {file delete [gitdir SQUASH_MSG]}
- catch {file delete [gitdir GITGUI_MSG]}
-
- # -- Let rerere do its thing.
- #
- if {[file isdirectory [gitdir rr-cache]]} {
- catch {exec git rerere}
- }
-
- # -- Run the post-commit hook.
- #
- set pchook [gitdir hooks post-commit]
- if {[is_Cygwin] && [file isfile $pchook]} {
- set pchook [list sh -c [concat \
- "if test -x \"$pchook\";" \
- "then exec \"$pchook\";" \
- "fi"]]
- } elseif {![file executable $pchook]} {
- set pchook {}
- }
- if {$pchook ne {}} {
- catch {exec $pchook &}
- }
-
- $ui_comm delete 0.0 end
- $ui_comm edit reset
- $ui_comm edit modified false
-
- if {$single_commit} do_quit
-
- # -- Update in memory status
- #
- set selected_commit_type new
- set commit_type normal
- set HEAD $cmt_id
- set PARENT $cmt_id
- set MERGE_HEAD [list]
-
- foreach path [array names file_states] {
- set s $file_states($path)
- set m [lindex $s 0]
- switch -glob -- $m {
- _O -
- _M -
- _D {continue}
- __ -
- A_ -
- M_ -
- D_ {
- unset file_states($path)
- catch {unset selected_paths($path)}
- }
- DO {
- set file_states($path) [list _O [lindex $s 1] {} {}]
- }
- AM -
- AD -
- MM -
- MD {
- set file_states($path) [list \
- _[string index $m 1] \
- [lindex $s 1] \
- [lindex $s 3] \
- {}]
- }
- }
- }
-
- display_all_files
- unlock_index
- reshow_diff
- set ui_status_value \
- "Changes committed as [string range $cmt_id 0 7]."
-}
-
-######################################################################
-##
-## fetch push
-
-proc fetch_from {remote} {
- set w [new_console \
- "fetch $remote" \
- "Fetching new changes from $remote"]
- set cmd [list git fetch]
- lappend cmd $remote
- console_exec $w $cmd console_done
-}
-
-proc push_to {remote} {
- set w [new_console \
- "push $remote" \
- "Pushing changes to $remote"]
- set cmd [list git push]
- lappend cmd -v
- lappend cmd $remote
- console_exec $w $cmd console_done
-}
-
-######################################################################
-##
-## ui helpers
-
-proc mapicon {w state path} {
- global all_icons
-
- if {[catch {set r $all_icons($state$w)}]} {
- puts "error: no icon for $w state={$state} $path"
- return file_plain
- }
- return $r
-}
-
-proc mapdesc {state path} {
- global all_descs
-
- if {[catch {set r $all_descs($state)}]} {
- puts "error: no desc for state={$state} $path"
- return $state
- }
- return $r
-}
-
-proc escape_path {path} {
- regsub -all "\n" $path "\\n" path
- return $path
-}
-
-proc short_path {path} {
- return [escape_path [lindex [file split $path] end]]
-}
-
-set next_icon_id 0
-set null_sha1 [string repeat 0 40]
-
-proc merge_state {path new_state {head_info {}} {index_info {}}} {
- global file_states next_icon_id null_sha1
-
- set s0 [string index $new_state 0]
- set s1 [string index $new_state 1]
-
- if {[catch {set info $file_states($path)}]} {
- set state __
- set icon n[incr next_icon_id]
- } else {
- set state [lindex $info 0]
- set icon [lindex $info 1]
- if {$head_info eq {}} {set head_info [lindex $info 2]}
- if {$index_info eq {}} {set index_info [lindex $info 3]}
- }
-
- if {$s0 eq {?}} {set s0 [string index $state 0]} \
- elseif {$s0 eq {_}} {set s0 _}
-
- if {$s1 eq {?}} {set s1 [string index $state 1]} \
- elseif {$s1 eq {_}} {set s1 _}
-
- if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
- set head_info [list 0 $null_sha1]
- } elseif {$s0 ne {_} && [string index $state 0] eq {_}
- && $head_info eq {}} {
- set head_info $index_info
- }
-
- set file_states($path) [list $s0$s1 $icon \
- $head_info $index_info \
- ]
- return $state
-}
-
-proc display_file_helper {w path icon_name old_m new_m} {
- global file_lists
-
- if {$new_m eq {_}} {
- set lno [lsearch -sorted -exact $file_lists($w) $path]
- if {$lno >= 0} {
- set file_lists($w) [lreplace $file_lists($w) $lno $lno]
- incr lno
- $w conf -state normal
- $w delete $lno.0 [expr {$lno + 1}].0
- $w conf -state disabled
- }
- } elseif {$old_m eq {_} && $new_m ne {_}} {
- lappend file_lists($w) $path
- set file_lists($w) [lsort -unique $file_lists($w)]
- set lno [lsearch -sorted -exact $file_lists($w) $path]
- incr lno
- $w conf -state normal
- $w image create $lno.0 \
- -align center -padx 5 -pady 1 \
- -name $icon_name \
- -image [mapicon $w $new_m $path]
- $w insert $lno.1 "[escape_path $path]\n"
- $w conf -state disabled
- } elseif {$old_m ne $new_m} {
- $w conf -state normal
- $w image conf $icon_name -image [mapicon $w $new_m $path]
- $w conf -state disabled
- }
-}
-
-proc display_file {path state} {
- global file_states selected_paths
- global ui_index ui_workdir
-
- set old_m [merge_state $path $state]
- set s $file_states($path)
- set new_m [lindex $s 0]
- set icon_name [lindex $s 1]
-
- set o [string index $old_m 0]
- set n [string index $new_m 0]
- if {$o eq {U}} {
- set o _
- }
- if {$n eq {U}} {
- set n _
- }
- display_file_helper $ui_index $path $icon_name $o $n
-
- if {[string index $old_m 0] eq {U}} {
- set o U
- } else {
- set o [string index $old_m 1]
- }
- if {[string index $new_m 0] eq {U}} {
- set n U
- } else {
- set n [string index $new_m 1]
- }
- display_file_helper $ui_workdir $path $icon_name $o $n
-
- if {$new_m eq {__}} {
- unset file_states($path)
- catch {unset selected_paths($path)}
- }
-}
-
-proc display_all_files_helper {w path icon_name m} {
- global file_lists
-
- lappend file_lists($w) $path
- set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
- $w image create end \
- -align center -padx 5 -pady 1 \
- -name $icon_name \
- -image [mapicon $w $m $path]
- $w insert end "[escape_path $path]\n"
-}
-
-proc display_all_files {} {
- global ui_index ui_workdir
- global file_states file_lists
- global last_clicked
-
- $ui_index conf -state normal
- $ui_workdir conf -state normal
-
- $ui_index delete 0.0 end
- $ui_workdir delete 0.0 end
- set last_clicked {}
-
- set file_lists($ui_index) [list]
- set file_lists($ui_workdir) [list]
-
- foreach path [lsort [array names file_states]] {
- set s $file_states($path)
- set m [lindex $s 0]
- set icon_name [lindex $s 1]
-
- set s [string index $m 0]
- if {$s ne {U} && $s ne {_}} {
- display_all_files_helper $ui_index $path \
- $icon_name $s
- }
-
- if {[string index $m 0] eq {U}} {
- set s U
- } else {
- set s [string index $m 1]
- }
- if {$s ne {_}} {
- display_all_files_helper $ui_workdir $path \
- $icon_name $s
- }
- }
-
- $ui_index conf -state disabled
- $ui_workdir conf -state disabled
-}
-
-proc update_indexinfo {msg pathList after} {
- global update_index_cp ui_status_value
-
- if {![lock_index update]} return
-
- set update_index_cp 0
- set pathList [lsort $pathList]
- set totalCnt [llength $pathList]
- set batch [expr {int($totalCnt * .01) + 1}]
- if {$batch > 25} {set batch 25}
-
- set ui_status_value [format \
- "$msg... %i/%i files (%.2f%%)" \
- $update_index_cp \
- $totalCnt \
- 0.0]
- set fd [open "| git update-index -z --index-info" w]
- fconfigure $fd \
- -blocking 0 \
- -buffering full \
- -buffersize 512 \
- -encoding binary \
- -translation binary
- fileevent $fd writable [list \
- write_update_indexinfo \
- $fd \
- $pathList \
- $totalCnt \
- $batch \
- $msg \
- $after \
- ]
-}
-
-proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
- global update_index_cp ui_status_value
- global file_states current_diff_path
-
- if {$update_index_cp >= $totalCnt} {
- close $fd
- unlock_index
- uplevel #0 $after
- return
- }
-
- for {set i $batch} \
- {$update_index_cp < $totalCnt && $i > 0} \
- {incr i -1} {
- set path [lindex $pathList $update_index_cp]
- incr update_index_cp
-
- set s $file_states($path)
- switch -glob -- [lindex $s 0] {
- A? {set new _O}
- M? {set new _M}
- D_ {set new _D}
- D? {set new _?}
- ?? {continue}
- }
- set info [lindex $s 2]
- if {$info eq {}} continue
-
- puts -nonewline $fd "$info\t[encoding convertto $path]\0"
- display_file $path $new
- }
-
- set ui_status_value [format \
- "$msg... %i/%i files (%.2f%%)" \
- $update_index_cp \
- $totalCnt \
- [expr {100.0 * $update_index_cp / $totalCnt}]]
-}
-
-proc update_index {msg pathList after} {
- global update_index_cp ui_status_value
-
- if {![lock_index update]} return
-
- set update_index_cp 0
- set pathList [lsort $pathList]
- set totalCnt [llength $pathList]
- set batch [expr {int($totalCnt * .01) + 1}]
- if {$batch > 25} {set batch 25}
-
- set ui_status_value [format \
- "$msg... %i/%i files (%.2f%%)" \
- $update_index_cp \
- $totalCnt \
- 0.0]
- set fd [open "| git update-index --add --remove -z --stdin" w]
- fconfigure $fd \
- -blocking 0 \
- -buffering full \
- -buffersize 512 \
- -encoding binary \
- -translation binary
- fileevent $fd writable [list \
- write_update_index \
- $fd \
- $pathList \
- $totalCnt \
- $batch \
- $msg \
- $after \
- ]
-}
-
-proc write_update_index {fd pathList totalCnt batch msg after} {
- global update_index_cp ui_status_value
- global file_states current_diff_path
-
- if {$update_index_cp >= $totalCnt} {
- close $fd
- unlock_index
- uplevel #0 $after
- return
- }
-
- for {set i $batch} \
- {$update_index_cp < $totalCnt && $i > 0} \
- {incr i -1} {
- set path [lindex $pathList $update_index_cp]
- incr update_index_cp
-
- switch -glob -- [lindex $file_states($path) 0] {
- AD {set new __}
- ?D {set new D_}
- _O -
- AM {set new A_}
- U? {
- if {[file exists $path]} {
- set new M_
- } else {
- set new D_
- }
- }
- ?M {set new M_}
- ?? {continue}
- }
- puts -nonewline $fd "[encoding convertto $path]\0"
- display_file $path $new
- }
-
- set ui_status_value [format \
- "$msg... %i/%i files (%.2f%%)" \
- $update_index_cp \
- $totalCnt \
- [expr {100.0 * $update_index_cp / $totalCnt}]]
-}
-
-proc checkout_index {msg pathList after} {
- global update_index_cp ui_status_value
-
- if {![lock_index update]} return
-
- set update_index_cp 0
- set pathList [lsort $pathList]
- set totalCnt [llength $pathList]
- set batch [expr {int($totalCnt * .01) + 1}]
- if {$batch > 25} {set batch 25}
-
- set ui_status_value [format \
- "$msg... %i/%i files (%.2f%%)" \
- $update_index_cp \
- $totalCnt \
- 0.0]
- set cmd [list git checkout-index]
- lappend cmd --index
- lappend cmd --quiet
- lappend cmd --force
- lappend cmd -z
- lappend cmd --stdin
- set fd [open "| $cmd " w]
- fconfigure $fd \
- -blocking 0 \
- -buffering full \
- -buffersize 512 \
- -encoding binary \
- -translation binary
- fileevent $fd writable [list \
- write_checkout_index \
- $fd \
- $pathList \
- $totalCnt \
- $batch \
- $msg \
- $after \
- ]
-}
-
-proc write_checkout_index {fd pathList totalCnt batch msg after} {
- global update_index_cp ui_status_value
- global file_states current_diff_path
-
- if {$update_index_cp >= $totalCnt} {
- close $fd
- unlock_index
- uplevel #0 $after
- return
- }
-
- for {set i $batch} \
- {$update_index_cp < $totalCnt && $i > 0} \
- {incr i -1} {
- set path [lindex $pathList $update_index_cp]
- incr update_index_cp
- switch -glob -- [lindex $file_states($path) 0] {
- U? {continue}
- ?M -
- ?D {
- puts -nonewline $fd "[encoding convertto $path]\0"
- display_file $path ?_
- }
- }
- }
-
- set ui_status_value [format \
- "$msg... %i/%i files (%.2f%%)" \
- $update_index_cp \
- $totalCnt \
- [expr {100.0 * $update_index_cp / $totalCnt}]]
-}
-
-######################################################################
-##
-## branch management
-
-proc is_tracking_branch {name} {
- global tracking_branches
-
- if {![catch {set info $tracking_branches($name)}]} {
- return 1
- }
- foreach t [array names tracking_branches] {
- if {[string match {*/\*} $t] && [string match $t $name]} {
- return 1
- }
- }
- return 0
-}
-
-proc load_all_heads {} {
- global all_heads
-
- set all_heads [list]
- set fd [open "| git for-each-ref --format=%(refname) refs/heads" r]
- while {[gets $fd line] > 0} {
- if {[is_tracking_branch $line]} continue
- if {![regsub ^refs/heads/ $line {} name]} continue
- lappend all_heads $name
- }
- close $fd
-
- set all_heads [lsort $all_heads]
-}
-
-proc populate_branch_menu {} {
- global all_heads disable_on_lock
-
- set m .mbar.branch
- set last [$m index last]
- for {set i 0} {$i <= $last} {incr i} {
- if {[$m type $i] eq {separator}} {
- $m delete $i last
- set new_dol [list]
- foreach a $disable_on_lock {
- if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
- lappend new_dol $a
- }
- }
- set disable_on_lock $new_dol
- break
- }
- }
-
- if {$all_heads ne {}} {
- $m add separator
- }
- foreach b $all_heads {
- $m add radiobutton \
- -label $b \
- -command [list switch_branch $b] \
- -variable current_branch \
- -value $b \
- -font font_ui
- lappend disable_on_lock \
- [list $m entryconf [$m index last] -state]
- }
-}
-
-proc all_tracking_branches {} {
- global tracking_branches
-
- set all_trackings {}
- set cmd {}
- foreach name [array names tracking_branches] {
- if {[regsub {/\*$} $name {} name]} {
- lappend cmd $name
- } else {
- regsub ^refs/(heads|remotes)/ $name {} name
- lappend all_trackings $name
- }
- }
-
- if {$cmd ne {}} {
- set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
- while {[gets $fd name] > 0} {
- regsub ^refs/(heads|remotes)/ $name {} name
- lappend all_trackings $name
- }
- close $fd
- }
-
- return [lsort -unique $all_trackings]
-}
-
-proc do_create_branch_action {w} {
- global all_heads null_sha1 repo_config
- global create_branch_checkout create_branch_revtype
- global create_branch_head create_branch_trackinghead
- global create_branch_name create_branch_revexp
-
- set newbranch $create_branch_name
- if {$newbranch eq {}
- || $newbranch eq $repo_config(gui.newbranchtemplate)} {
- tk_messageBox \
- -icon error \
- -type ok \
- -title [wm title $w] \
- -parent $w \
- -message "Please supply a branch name."
- focus $w.desc.name_t
- return
- }
- if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
- tk_messageBox \
- -icon error \
- -type ok \
- -title [wm title $w] \
- -parent $w \
- -message "Branch '$newbranch' already exists."
- focus $w.desc.name_t
- return
- }
- if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
- tk_messageBox \
- -icon error \
- -type ok \
- -title [wm title $w] \
- -parent $w \
- -message "We do not like '$newbranch' as a branch name."
- focus $w.desc.name_t
- return
- }
-
- set rev {}
- switch -- $create_branch_revtype {
- head {set rev $create_branch_head}
- tracking {set rev $create_branch_trackinghead}
- expression {set rev $create_branch_revexp}
- }
- if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
- tk_messageBox \
- -icon error \
- -type ok \
- -title [wm title $w] \
- -parent $w \
- -message "Invalid starting revision: $rev"
- return
- }
- set cmd [list git update-ref]
- lappend cmd -m
- lappend cmd "branch: Created from $rev"
- lappend cmd "refs/heads/$newbranch"
- lappend cmd $cmt
- lappend cmd $null_sha1
- if {[catch {eval exec $cmd} err]} {
- tk_messageBox \
- -icon error \
- -type ok \
- -title [wm title $w] \
- -parent $w \
- -message "Failed to create '$newbranch'.\n\n$err"
- return
- }
-
- lappend all_heads $newbranch
- set all_heads [lsort $all_heads]
- populate_branch_menu
- destroy $w
- if {$create_branch_checkout} {
- switch_branch $newbranch
- }
-}
-
-proc radio_selector {varname value args} {
- upvar #0 $varname var
- set var $value
-}
-
-trace add variable create_branch_head write \
- [list radio_selector create_branch_revtype head]
-trace add variable create_branch_trackinghead write \
- [list radio_selector create_branch_revtype tracking]
-
-trace add variable delete_branch_head write \
- [list radio_selector delete_branch_checktype head]
-trace add variable delete_branch_trackinghead write \
- [list radio_selector delete_branch_checktype tracking]
-
-proc do_create_branch {} {
- global all_heads current_branch repo_config
- global create_branch_checkout create_branch_revtype
- global create_branch_head create_branch_trackinghead
- global create_branch_name create_branch_revexp
-
- set w .branch_editor
- toplevel $w
- wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-
- label $w.header -text {Create New Branch} \
- -font font_uibold
- pack $w.header -side top -fill x
-
- frame $w.buttons
- button $w.buttons.create -text Create \
- -font font_ui \
- -default active \
- -command [list do_create_branch_action $w]
- pack $w.buttons.create -side right
- button $w.buttons.cancel -text {Cancel} \
- -font font_ui \
- -command [list destroy $w]
- pack $w.buttons.cancel -side right -padx 5
- pack $w.buttons -side bottom -fill x -pady 10 -padx 10
-
- labelframe $w.desc \
- -text {Branch Description} \
- -font font_ui
- label $w.desc.name_l -text {Name:} -font font_ui
- entry $w.desc.name_t \
- -borderwidth 1 \
- -relief sunken \
- -width 40 \
- -textvariable create_branch_name \
- -font font_ui \
- -validate key \
- -validatecommand {
- if {%d == 1 && [regexp {[~^:?*\[\0- ]} %S]} {return 0}
- return 1
- }
- grid $w.desc.name_l $w.desc.name_t -sticky we -padx {0 5}
- grid columnconfigure $w.desc 1 -weight 1
- pack $w.desc -anchor nw -fill x -pady 5 -padx 5
-
- labelframe $w.from \
- -text {Starting Revision} \
- -font font_ui
- radiobutton $w.from.head_r \
- -text {Local Branch:} \
- -value head \
- -variable create_branch_revtype \
- -font font_ui
- eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
- grid $w.from.head_r $w.from.head_m -sticky w
- set all_trackings [all_tracking_branches]
- if {$all_trackings ne {}} {
- set create_branch_trackinghead [lindex $all_trackings 0]
- radiobutton $w.from.tracking_r \
- -text {Tracking Branch:} \
- -value tracking \
- -variable create_branch_revtype \
- -font font_ui
- eval tk_optionMenu $w.from.tracking_m \
- create_branch_trackinghead \
- $all_trackings
- grid $w.from.tracking_r $w.from.tracking_m -sticky w
- }
- radiobutton $w.from.exp_r \
- -text {Revision Expression:} \
- -value expression \
- -variable create_branch_revtype \
- -font font_ui
- entry $w.from.exp_t \
- -borderwidth 1 \
- -relief sunken \
- -width 50 \
- -textvariable create_branch_revexp \
- -font font_ui \
- -validate key \
- -validatecommand {
- if {%d == 1 && [regexp {\s} %S]} {return 0}
- if {%d == 1 && [string length %S] > 0} {
- set create_branch_revtype expression
- }
- return 1
- }
- grid $w.from.exp_r $w.from.exp_t -sticky we -padx {0 5}
- grid columnconfigure $w.from 1 -weight 1
- pack $w.from -anchor nw -fill x -pady 5 -padx 5
-
- labelframe $w.postActions \
- -text {Post Creation Actions} \
- -font font_ui
- checkbutton $w.postActions.checkout \
- -text {Checkout after creation} \
- -variable create_branch_checkout \
- -font font_ui
- pack $w.postActions.checkout -anchor nw
- pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
-
- set create_branch_checkout 1
- set create_branch_head $current_branch
- set create_branch_revtype head
- set create_branch_name $repo_config(gui.newbranchtemplate)
- set create_branch_revexp {}
-
- bind $w <Visibility> "
- grab $w
- $w.desc.name_t icursor end
- focus $w.desc.name_t
- "
- bind $w <Key-Escape> "destroy $w"
- bind $w <Key-Return> "do_create_branch_action $w;break"
- wm title $w "[appname] ([reponame]): Create Branch"
- tkwait window $w
-}
-
-proc do_delete_branch_action {w} {
- global all_heads
- global delete_branch_checktype delete_branch_head delete_branch_trackinghead
-
- set check_rev {}
- switch -- $delete_branch_checktype {
- head {set check_rev $delete_branch_head}
- tracking {set check_rev $delete_branch_trackinghead}
- always {set check_rev {:none}}
- }
- if {$check_rev eq {:none}} {
- set check_cmt {}
- } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
- tk_messageBox \
- -icon error \
- -type ok \
- -title [wm title $w] \
- -parent $w \
- -message "Invalid check revision: $check_rev"
- return
- }
-
- set to_delete [list]
- set not_merged [list]
- foreach i [$w.list.l curselection] {
- set b [$w.list.l get $i]
- if {[catch {set o [exec git rev-parse --verify $b]}]} continue
- if {$check_cmt ne {}} {
- if {$b eq $check_rev} continue
- if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
- if {$o ne $m} {
- lappend not_merged $b
- continue
- }
- }
- lappend to_delete [list $b $o]
- }
- if {$not_merged ne {}} {
- set msg "The following branches are not completely merged into $check_rev:
-
- - [join $not_merged "\n - "]"
- tk_messageBox \
- -icon info \
- -type ok \
- -title [wm title $w] \
- -parent $w \
- -message $msg
- }
- if {$to_delete eq {}} return
- if {$delete_branch_checktype eq {always}} {
- set msg {Recovering deleted branches is difficult.
-
-Delete the selected branches?}
- if {[tk_messageBox \
- -icon warning \
- -type yesno \
- -title [wm title $w] \
- -parent $w \
- -message $msg] ne yes} {
- return
- }
- }
-
- set failed {}
- foreach i $to_delete {
- set b [lindex $i 0]
- set o [lindex $i 1]
- if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
- append failed " - $b: $err\n"
- } else {
- set x [lsearch -sorted -exact $all_heads $b]
- if {$x >= 0} {
- set all_heads [lreplace $all_heads $x $x]
- }
- }
- }
-
- if {$failed ne {}} {
- tk_messageBox \
- -icon error \
- -type ok \
- -title [wm title $w] \
- -parent $w \
- -message "Failed to delete branches:\n$failed"
- }
-
- set all_heads [lsort $all_heads]
- populate_branch_menu
- destroy $w
-}
-
-proc do_delete_branch {} {
- global all_heads tracking_branches current_branch
- global delete_branch_checktype delete_branch_head delete_branch_trackinghead
-
- set w .branch_editor
- toplevel $w
- wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-
- label $w.header -text {Delete Local Branch} \
- -font font_uibold
- pack $w.header -side top -fill x
-
- frame $w.buttons
- button $w.buttons.create -text Delete \
- -font font_ui \
- -command [list do_delete_branch_action $w]
- pack $w.buttons.create -side right
- button $w.buttons.cancel -text {Cancel} \
- -font font_ui \
- -command [list destroy $w]
- pack $w.buttons.cancel -side right -padx 5
- pack $w.buttons -side bottom -fill x -pady 10 -padx 10
-
- labelframe $w.list \
- -text {Local Branches} \
- -font font_ui
- listbox $w.list.l \
- -height 10 \
- -width 70 \
- -selectmode extended \
- -yscrollcommand [list $w.list.sby set] \
- -font font_ui
- foreach h $all_heads {
- if {$h ne $current_branch} {
- $w.list.l insert end $h
- }
- }
- scrollbar $w.list.sby -command [list $w.list.l yview]
- pack $w.list.sby -side right -fill y
- pack $w.list.l -side left -fill both -expand 1
- pack $w.list -fill both -expand 1 -pady 5 -padx 5
-
- labelframe $w.validate \
- -text {Delete Only If} \
- -font font_ui
- radiobutton $w.validate.head_r \
- -text {Merged Into Local Branch:} \
- -value head \
- -variable delete_branch_checktype \
- -font font_ui
- eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
- grid $w.validate.head_r $w.validate.head_m -sticky w
- set all_trackings [all_tracking_branches]
- if {$all_trackings ne {}} {
- set delete_branch_trackinghead [lindex $all_trackings 0]
- radiobutton $w.validate.tracking_r \
- -text {Merged Into Tracking Branch:} \
- -value tracking \
- -variable delete_branch_checktype \
- -font font_ui
- eval tk_optionMenu $w.validate.tracking_m \
- delete_branch_trackinghead \
- $all_trackings
- grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
- }
- radiobutton $w.validate.always_r \
- -text {Always (Do not perform merge checks)} \
- -value always \
- -variable delete_branch_checktype \
- -font font_ui
- grid $w.validate.always_r -columnspan 2 -sticky w
- grid columnconfigure $w.validate 1 -weight 1
- pack $w.validate -anchor nw -fill x -pady 5 -padx 5
-
- set delete_branch_head $current_branch
- set delete_branch_checktype head
-
- bind $w <Visibility> "grab $w; focus $w"
- bind $w <Key-Escape> "destroy $w"
- wm title $w "[appname] ([reponame]): Delete Branch"
- tkwait window $w
-}
-
-proc switch_branch {new_branch} {
- global HEAD commit_type current_branch repo_config
-
- if {![lock_index switch]} return
-
- # -- Our in memory state should match the repository.
- #
- repository_state curType curHEAD curMERGE_HEAD
- if {[string match amend* $commit_type]
- && $curType eq {normal}
- && $curHEAD eq $HEAD} {
- } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
- info_popup {Last scanned state does not match repository state.
-
-Another Git program has modified this repository
-since the last scan. A rescan must be performed
-before the current branch can be changed.
-
-The rescan will be automatically started now.
-}
- unlock_index
- rescan {set ui_status_value {Ready.}}
- return
- }
-
- # -- Don't do a pointless switch.
- #
- if {$current_branch eq $new_branch} {
- unlock_index
- return
- }
-
- if {$repo_config(gui.trustmtime) eq {true}} {
- switch_branch_stage2 {} $new_branch
- } else {
- set ui_status_value {Refreshing file status...}
- set cmd [list git update-index]
- lappend cmd -q
- lappend cmd --unmerged
- lappend cmd --ignore-missing
- lappend cmd --refresh
- set fd_rf [open "| $cmd" r]
- fconfigure $fd_rf -blocking 0 -translation binary
- fileevent $fd_rf readable \
- [list switch_branch_stage2 $fd_rf $new_branch]
- }
-}
-
-proc switch_branch_stage2 {fd_rf new_branch} {
- global ui_status_value HEAD
-
- if {$fd_rf ne {}} {
- read $fd_rf
- if {![eof $fd_rf]} return
- close $fd_rf
- }
-
- set ui_status_value "Updating working directory to '$new_branch'..."
- set cmd [list git read-tree]
- lappend cmd -m
- lappend cmd -u
- lappend cmd --exclude-per-directory=.gitignore
- lappend cmd $HEAD
- lappend cmd $new_branch
- set fd_rt [open "| $cmd" r]
- fconfigure $fd_rt -blocking 0 -translation binary
- fileevent $fd_rt readable \
- [list switch_branch_readtree_wait $fd_rt $new_branch]
-}
-
-proc switch_branch_readtree_wait {fd_rt new_branch} {
- global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
- global current_branch
- global ui_comm ui_status_value
-
- # -- We never get interesting output on stdout; only stderr.
- #
- read $fd_rt
- fconfigure $fd_rt -blocking 1
- if {![eof $fd_rt]} {
- fconfigure $fd_rt -blocking 0
- return
- }
-
- # -- The working directory wasn't in sync with the index and
- # we'd have to overwrite something to make the switch. A
- # merge is required.
- #
- if {[catch {close $fd_rt} err]} {
- regsub {^fatal: } $err {} err
- warn_popup "File level merge required.
-
-$err
-
-Staying on branch '$current_branch'."
- set ui_status_value "Aborted checkout of '$new_branch' (file level merging is required)."
- unlock_index
- return
- }
-
- # -- Update the symbolic ref. Core git doesn't even check for failure
- # here, it Just Works(tm). If it doesn't we are in some really ugly
- # state that is difficult to recover from within git-gui.
- #
- if {[catch {exec git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
- error_popup "Failed to set current branch.
-
-This working directory is only partially switched.
-We successfully updated your files, but failed to
-update an internal Git file.
-
-This should not have occurred. [appname] will now
-close and give up.
-
-$err"
- do_quit
- return
- }
-
- # -- Update our repository state. If we were previously in amend mode
- # we need to toss the current buffer and do a full rescan to update
- # our file lists. If we weren't in amend mode our file lists are
- # accurate and we can avoid the rescan.
- #
- unlock_index
- set selected_commit_type new
- if {[string match amend* $commit_type]} {
- $ui_comm delete 0.0 end
- $ui_comm edit reset
- $ui_comm edit modified false
- rescan {set ui_status_value "Checked out branch '$current_branch'."}
- } else {
- repository_state commit_type HEAD MERGE_HEAD
- set PARENT $HEAD
- set ui_status_value "Checked out branch '$current_branch'."
- }
-}
-
-######################################################################
-##
-## remote management
-
-proc load_all_remotes {} {
- global repo_config
- global all_remotes tracking_branches
-
- set all_remotes [list]
- array unset tracking_branches
-
- set rm_dir [gitdir remotes]
- if {[file isdirectory $rm_dir]} {
- set all_remotes [glob \
- -types f \
- -tails \
- -nocomplain \
- -directory $rm_dir *]
-
- foreach name $all_remotes {
- catch {
- set fd [open [file join $rm_dir $name] r]
- while {[gets $fd line] >= 0} {
- if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
- $line line src dst]} continue
- if {![regexp ^refs/ $dst]} {
- set dst "refs/heads/$dst"
- }
- set tracking_branches($dst) [list $name $src]
- }
- close $fd
- }
- }
- }
-
- foreach line [array names repo_config remote.*.url] {
- if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
- lappend all_remotes $name
-
- if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
- set fl {}
- }
- foreach line $fl {
- if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
- if {![regexp ^refs/ $dst]} {
- set dst "refs/heads/$dst"
- }
- set tracking_branches($dst) [list $name $src]
- }
- }
-
- set all_remotes [lsort -unique $all_remotes]
-}
-
-proc populate_fetch_menu {} {
- global all_remotes repo_config
-
- set m .mbar.fetch
- foreach r $all_remotes {
- set enable 0
- if {![catch {set a $repo_config(remote.$r.url)}]} {
- if {![catch {set a $repo_config(remote.$r.fetch)}]} {
- set enable 1
- }
- } else {
- catch {
- set fd [open [gitdir remotes $r] r]
- while {[gets $fd n] >= 0} {
- if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
- set enable 1
- break
- }
- }
- close $fd
- }
- }
-
- if {$enable} {
- $m add command \
- -label "Fetch from $r..." \
- -command [list fetch_from $r] \
- -font font_ui
- }
- }
-}
-
-proc populate_push_menu {} {
- global all_remotes repo_config
-
- set m .mbar.push
- set fast_count 0
- foreach r $all_remotes {
- set enable 0
- if {![catch {set a $repo_config(remote.$r.url)}]} {
- if {![catch {set a $repo_config(remote.$r.push)}]} {
- set enable 1
- }
- } else {
- catch {
- set fd [open [gitdir remotes $r] r]
- while {[gets $fd n] >= 0} {
- if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
- set enable 1
- break
- }
- }
- close $fd
- }
- }
-
- if {$enable} {
- if {!$fast_count} {
- $m add separator
- }
- $m add command \
- -label "Push to $r..." \
- -command [list push_to $r] \
- -font font_ui
- incr fast_count
- }
- }
-}
-
-proc start_push_anywhere_action {w} {
- global push_urltype push_remote push_url push_thin push_tags
-
- set r_url {}
- switch -- $push_urltype {
- remote {set r_url $push_remote}
- url {set r_url $push_url}
- }
- if {$r_url eq {}} return
-
- set cmd [list git push]
- lappend cmd -v
- if {$push_thin} {
- lappend cmd --thin
- }
- if {$push_tags} {
- lappend cmd --tags
- }
- lappend cmd $r_url
- set cnt 0
- foreach i [$w.source.l curselection] {
- set b [$w.source.l get $i]
- lappend cmd "refs/heads/$b:refs/heads/$b"
- incr cnt
- }
- if {$cnt == 0} {
- return
- } elseif {$cnt == 1} {
- set unit branch
- } else {
- set unit branches
- }
-
- set cons [new_console "push $r_url" "Pushing $cnt $unit to $r_url"]
- console_exec $cons $cmd console_done
- destroy $w
-}
-
-trace add variable push_remote write \
- [list radio_selector push_urltype remote]
-
-proc do_push_anywhere {} {
- global all_heads all_remotes current_branch
- global push_urltype push_remote push_url push_thin push_tags
-
- set w .push_setup
- toplevel $w
- wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-
- label $w.header -text {Push Branches} -font font_uibold
- pack $w.header -side top -fill x
-
- frame $w.buttons
- button $w.buttons.create -text Push \
- -font font_ui \
- -command [list start_push_anywhere_action $w]
- pack $w.buttons.create -side right
- button $w.buttons.cancel -text {Cancel} \
- -font font_ui \
- -command [list destroy $w]
- pack $w.buttons.cancel -side right -padx 5
- pack $w.buttons -side bottom -fill x -pady 10 -padx 10
-
- labelframe $w.source \
- -text {Source Branches} \
- -font font_ui
- listbox $w.source.l \
- -height 10 \
- -width 70 \
- -selectmode extended \
- -yscrollcommand [list $w.source.sby set] \
- -font font_ui
- foreach h $all_heads {
- $w.source.l insert end $h
- if {$h eq $current_branch} {
- $w.source.l select set end
- }
- }
- scrollbar $w.source.sby -command [list $w.source.l yview]
- pack $w.source.sby -side right -fill y
- pack $w.source.l -side left -fill both -expand 1
- pack $w.source -fill both -expand 1 -pady 5 -padx 5
-
- labelframe $w.dest \
- -text {Destination Repository} \
- -font font_ui
- if {$all_remotes ne {}} {
- radiobutton $w.dest.remote_r \
- -text {Remote:} \
- -value remote \
- -variable push_urltype \
- -font font_ui
- eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes
- grid $w.dest.remote_r $w.dest.remote_m -sticky w
- if {[lsearch -sorted -exact $all_remotes origin] != -1} {
- set push_remote origin
- } else {
- set push_remote [lindex $all_remotes 0]
- }
- set push_urltype remote
- } else {
- set push_urltype url
- }
- radiobutton $w.dest.url_r \
- -text {Arbitrary URL:} \
- -value url \
- -variable push_urltype \
- -font font_ui
- entry $w.dest.url_t \
- -borderwidth 1 \
- -relief sunken \
- -width 50 \
- -textvariable push_url \
- -font font_ui \
- -validate key \
- -validatecommand {
- if {%d == 1 && [regexp {\s} %S]} {return 0}
- if {%d == 1 && [string length %S] > 0} {
- set push_urltype url
- }
- return 1
- }
- grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5}
- grid columnconfigure $w.dest 1 -weight 1
- pack $w.dest -anchor nw -fill x -pady 5 -padx 5
-
- labelframe $w.options \
- -text {Transfer Options} \
- -font font_ui
- checkbutton $w.options.thin \
- -text {Use thin pack (for slow network connections)} \
- -variable push_thin \
- -font font_ui
- grid $w.options.thin -columnspan 2 -sticky w
- checkbutton $w.options.tags \
- -text {Include tags} \
- -variable push_tags \
- -font font_ui
- grid $w.options.tags -columnspan 2 -sticky w
- grid columnconfigure $w.options 1 -weight 1
- pack $w.options -anchor nw -fill x -pady 5 -padx 5
-
- set push_url {}
- set push_thin 0
- set push_tags 0
-
- bind $w <Visibility> "grab $w"
- bind $w <Key-Escape> "destroy $w"
- wm title $w "[appname] ([reponame]): Push"
- tkwait window $w
-}
-
-######################################################################
-##
-## merge
-
-proc can_merge {} {
- global HEAD commit_type file_states
-
- if {[string match amend* $commit_type]} {
- info_popup {Cannot merge while amending.
-
-You must finish amending this commit before
-starting any type of merge.
-}
- return 0
- }
-
- if {[committer_ident] eq {}} {return 0}
- if {![lock_index merge]} {return 0}
-
- # -- Our in memory state should match the repository.
- #
- repository_state curType curHEAD curMERGE_HEAD
- if {$commit_type ne $curType || $HEAD ne $curHEAD} {
- info_popup {Last scanned state does not match repository state.
-
-Another Git program has modified this repository
-since the last scan. A rescan must be performed
-before a merge can be performed.
-
-The rescan will be automatically started now.
-}
- unlock_index
- rescan {set ui_status_value {Ready.}}
- return 0
- }
-
- foreach path [array names file_states] {
- switch -glob -- [lindex $file_states($path) 0] {
- _O {
- continue; # and pray it works!
- }
- U? {
- error_popup "You are in the middle of a conflicted merge.
-
-File [short_path $path] has merge conflicts.
-
-You must resolve them, add the file, and commit to
-complete the current merge. Only then can you
-begin another merge.
-"
- unlock_index
- return 0
- }
- ?? {
- error_popup "You are in the middle of a change.
-
-File [short_path $path] is modified.
-
-You should complete the current commit before
-starting a merge. Doing so will help you abort
-a failed merge, should the need arise.
-"
- unlock_index
- return 0
- }
- }
- }
-
- return 1
-}
-
-proc visualize_local_merge {w} {
- set revs {}
- foreach i [$w.source.l curselection] {
- lappend revs [$w.source.l get $i]
- }
- if {$revs eq {}} return
- lappend revs --not HEAD
- do_gitk $revs
-}
-
-proc start_local_merge_action {w} {
- global HEAD ui_status_value current_branch
-
- set cmd [list git merge]
- set names {}
- set revcnt 0
- foreach i [$w.source.l curselection] {
- set b [$w.source.l get $i]
- lappend cmd $b
- lappend names $b
- incr revcnt
- }
-
- if {$revcnt == 0} {
- return
- } elseif {$revcnt == 1} {
- set unit branch
- } elseif {$revcnt <= 15} {
- set unit branches
- } else {
- tk_messageBox \
- -icon error \
- -type ok \
- -title [wm title $w] \
- -parent $w \
- -message "Too many branches selected.
-
-You have requested to merge $revcnt branches
-in an octopus merge. This exceeds Git's
-internal limit of 15 branches per merge.
-
-Please select fewer branches. To merge more
-than 15 branches, merge the branches in batches.
-"
- return
- }
-
- set msg "Merging $current_branch, [join $names {, }]"
- set ui_status_value "$msg..."
- set cons [new_console "Merge" $msg]
- console_exec $cons $cmd [list finish_merge $revcnt]
- bind $w <Destroy> {}
- destroy $w
-}
-
-proc finish_merge {revcnt w ok} {
- console_done $w $ok
- if {$ok} {
- set msg {Merge completed successfully.}
- } else {
- if {$revcnt != 1} {
- info_popup "Octopus merge failed.
-
-Your merge of $revcnt branches has failed.
-
-There are file-level conflicts between the
-branches which must be resolved manually.
-
-The working directory will now be reset.
-
-You can attempt this merge again
-by merging only one branch at a time." $w
-
- set fd [open "| git read-tree --reset -u HEAD" r]
- fconfigure $fd -blocking 0 -translation binary
- fileevent $fd readable [list reset_hard_wait $fd]
- set ui_status_value {Aborting... please wait...}
- return
- }
-
- set msg {Merge failed. Conflict resolution is required.}
- }
- unlock_index
- rescan [list set ui_status_value $msg]
-}
-
-proc do_local_merge {} {
- global current_branch
-
- if {![can_merge]} return
-
- set w .merge_setup
- toplevel $w
- wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-
- label $w.header \
- -text "Merge Into $current_branch" \
- -font font_uibold
- pack $w.header -side top -fill x
-
- frame $w.buttons
- button $w.buttons.visualize -text Visualize \
- -font font_ui \
- -command [list visualize_local_merge $w]
- pack $w.buttons.visualize -side left
- button $w.buttons.create -text Merge \
- -font font_ui \
- -command [list start_local_merge_action $w]
- pack $w.buttons.create -side right
- button $w.buttons.cancel -text {Cancel} \
- -font font_ui \
- -command [list destroy $w]
- pack $w.buttons.cancel -side right -padx 5
- pack $w.buttons -side bottom -fill x -pady 10 -padx 10
-
- labelframe $w.source \
- -text {Source Branches} \
- -font font_ui
- listbox $w.source.l \
- -height 10 \
- -width 70 \
- -selectmode extended \
- -yscrollcommand [list $w.source.sby set] \
- -font font_ui
- scrollbar $w.source.sby -command [list $w.source.l yview]
- pack $w.source.sby -side right -fill y
- pack $w.source.l -side left -fill both -expand 1
- pack $w.source -fill both -expand 1 -pady 5 -padx 5
-
- set cmd [list git for-each-ref]
- lappend cmd {--format=%(objectname) %(refname)}
- lappend cmd refs/heads
- lappend cmd refs/remotes
- set fr_fd [open "| $cmd" r]
- fconfigure $fr_fd -translation binary
- while {[gets $fr_fd line] > 0} {
- set line [split $line { }]
- set sha1([lindex $line 0]) [lindex $line 1]
- }
- close $fr_fd
-
- set to_show {}
- set fr_fd [open "| git rev-list --all --not HEAD"]
- while {[gets $fr_fd line] > 0} {
- if {[catch {set ref $sha1($line)}]} continue
- regsub ^refs/(heads|remotes)/ $ref {} ref
- lappend to_show $ref
- }
- close $fr_fd
-
- foreach ref [lsort -unique $to_show] {
- $w.source.l insert end $ref
- }
-
- bind $w <Visibility> "grab $w"
- bind $w <Key-Escape> "unlock_index;destroy $w"
- bind $w <Destroy> unlock_index
- wm title $w "[appname] ([reponame]): Merge"
- tkwait window $w
-}
-
-proc do_reset_hard {} {
- global HEAD commit_type file_states
-
- if {[string match amend* $commit_type]} {
- info_popup {Cannot abort while amending.
-
-You must finish amending this commit.
-}
- return
- }
-
- if {![lock_index abort]} return
-
- if {[string match *merge* $commit_type]} {
- set op merge
- } else {
- set op commit
- }
-
- if {[ask_popup "Abort $op?
-
-Aborting the current $op will cause
-*ALL* uncommitted changes to be lost.
-
-Continue with aborting the current $op?"] eq {yes}} {
- set fd [open "| git read-tree --reset -u HEAD" r]
- fconfigure $fd -blocking 0 -translation binary
- fileevent $fd readable [list reset_hard_wait $fd]
- set ui_status_value {Aborting... please wait...}
- } else {
- unlock_index
- }
-}
-
-proc reset_hard_wait {fd} {
- global ui_comm
-
- read $fd
- if {[eof $fd]} {
- close $fd
- unlock_index
-
- $ui_comm delete 0.0 end
- $ui_comm edit modified false
-
- catch {file delete [gitdir MERGE_HEAD]}
- catch {file delete [gitdir rr-cache MERGE_RR]}
- catch {file delete [gitdir SQUASH_MSG]}
- catch {file delete [gitdir MERGE_MSG]}
- catch {file delete [gitdir GITGUI_MSG]}
-
- rescan {set ui_status_value {Abort completed. Ready.}}
- }
-}
-
-######################################################################
-##
-## browser
-
-set next_browser_id 0
-
-proc new_browser {commit} {
- global next_browser_id cursor_ptr
- global browser_commit browser_status browser_stack browser_path browser_busy
-
- set w .browser[incr next_browser_id]
- set w_list $w.list.l
- set browser_commit($w_list) $commit
- set browser_status($w_list) {Starting...}
- set browser_stack($w_list) {}
- set browser_path($w_list) $browser_commit($w_list):
- set browser_busy($w_list) 1
-
- toplevel $w
- label $w.path -textvariable browser_path($w_list) \
- -anchor w \
- -justify left \
- -borderwidth 1 \
- -relief sunken \
- -font font_uibold
- pack $w.path -anchor w -side top -fill x
-
- frame $w.list
- text $w_list -background white -borderwidth 0 \
- -cursor $cursor_ptr \
- -state disabled \
- -wrap none \
- -height 20 \
- -width 70 \
- -xscrollcommand [list $w.list.sbx set] \
- -yscrollcommand [list $w.list.sby set] \
- -font font_ui
- $w_list tag conf in_sel \
- -background [$w_list cget -foreground] \
- -foreground [$w_list cget -background]
- scrollbar $w.list.sbx -orient h -command [list $w_list xview]
- scrollbar $w.list.sby -orient v -command [list $w_list yview]
- pack $w.list.sbx -side bottom -fill x
- pack $w.list.sby -side right -fill y
- pack $w_list -side left -fill both -expand 1
- pack $w.list -side top -fill both -expand 1
-
- label $w.status -textvariable browser_status($w_list) \
- -anchor w \
- -justify left \
- -borderwidth 1 \
- -relief sunken \
- -font font_ui
- pack $w.status -anchor w -side bottom -fill x
-
- bind $w_list <Button-1> "browser_click 0 $w_list @%x,%y;break"
- bind $w_list <Double-Button-1> "browser_click 1 $w_list @%x,%y;break"
-
- bind $w <Visibility> "focus $w"
- bind $w <Destroy> "
- array unset browser_buffer $w_list
- array unset browser_files $w_list
- array unset browser_status $w_list
- array unset browser_stack $w_list
- array unset browser_path $w_list
- array unset browser_commit $w_list
- array unset browser_busy $w_list
- "
- wm title $w "[appname] ([reponame]): File Browser"
- ls_tree $w_list $browser_commit($w_list) {}
-}
-
-proc browser_click {was_double_click w pos} {
- global browser_files browser_status browser_path
- global browser_commit browser_stack browser_busy
-
- if {$browser_busy($w)} return
- set lno [lindex [split [$w index $pos] .] 0]
- set info [lindex $browser_files($w) [expr {$lno - 1}]]
-
- $w conf -state normal
- $w tag remove sel 0.0 end
- $w tag remove in_sel 0.0 end
- if {$info ne {}} {
- $w tag add in_sel $lno.0 [expr {$lno + 1}].0
- if {$was_double_click} {
- switch -- [lindex $info 0] {
- parent {
- set parent [lindex $browser_stack($w) end-1]
- set browser_stack($w) [lrange $browser_stack($w) 0 end-2]
- if {$browser_stack($w) eq {}} {
- regsub {:.*$} $browser_path($w) {:} browser_path($w)
- } else {
- regsub {/[^/]+$} $browser_path($w) {} browser_path($w)
- }
- set browser_status($w) "Loading $browser_path($w)..."
- ls_tree $w [lindex $parent 0] [lindex $parent 1]
- }
- tree {
- set name [lindex $info 2]
- set escn [escape_path $name]
- set browser_status($w) "Loading $escn..."
- append browser_path($w) $escn
- ls_tree $w [lindex $info 1] $name
- }
- blob {
- set name [lindex $info 2]
- set p {}
- foreach n $browser_stack($w) {
- append p [lindex $n 1]
- }
- append p $name
- show_blame $browser_commit($w) $p
- }
- }
- }
- }
- $w conf -state disabled
-}
-
-proc ls_tree {w tree_id name} {
- global browser_buffer browser_files browser_stack browser_busy
-
- set browser_buffer($w) {}
- set browser_files($w) {}
- set browser_busy($w) 1
-
- $w conf -state normal
- $w tag remove in_sel 0.0 end
- $w tag remove sel 0.0 end
- $w delete 0.0 end
- if {$browser_stack($w) ne {}} {
- $w image create end \
- -align center -padx 5 -pady 1 \
- -name icon0 \
- -image file_uplevel
- $w insert end {[Up To Parent]}
- lappend browser_files($w) parent
- }
- lappend browser_stack($w) [list $tree_id $name]
- $w conf -state disabled
-
- set fd [open "| git ls-tree -z $tree_id" r]
- fconfigure $fd -blocking 0 -translation binary -encoding binary
- fileevent $fd readable [list read_ls_tree $fd $w]
-}
-
-proc read_ls_tree {fd w} {
- global browser_buffer browser_files browser_status browser_busy
-
- if {![winfo exists $w]} {
- catch {close $fd}
- return
- }
-
- append browser_buffer($w) [read $fd]
- set pck [split $browser_buffer($w) "\0"]
- set browser_buffer($w) [lindex $pck end]
-
- set n [llength $browser_files($w)]
- $w conf -state normal
- foreach p [lrange $pck 0 end-1] {
- set info [split $p "\t"]
- set path [lindex $info 1]
- set info [split [lindex $info 0] { }]
- set type [lindex $info 1]
- set object [lindex $info 2]
-
- switch -- $type {
- blob {
- set image file_mod
- }
- tree {
- set image file_dir
- append path /
- }
- default {
- set image file_question
- }
- }
-
- if {$n > 0} {$w insert end "\n"}
- $w image create end \
- -align center -padx 5 -pady 1 \
- -name icon[incr n] \
- -image $image
- $w insert end [escape_path $path]
- lappend browser_files($w) [list $type $object $path]
- }
- $w conf -state disabled
-
- if {[eof $fd]} {
- close $fd
- set browser_status($w) Ready.
- set browser_busy($w) 0
- array unset browser_buffer $w
- }
-}
-
-proc show_blame {commit path} {
- global next_browser_id blame_status blame_data
-
- set w .browser[incr next_browser_id]
- set blame_status($w) {Loading current file content...}
- set texts [list]
-
- toplevel $w
- panedwindow $w.out -orient horizontal
-
- label $w.path -text "$commit:$path" \
- -anchor w \
- -justify left \
- -borderwidth 1 \
- -relief sunken \
- -font font_uibold
- pack $w.path -anchor w -side top -fill x
-
- text $w.out.commit -background white -borderwidth 0 \
- -state disabled \
- -wrap none \
- -height 40 \
- -width 8 \
- -font font_diff
- $w.out add $w.out.commit
- lappend texts $w.out.commit
-
- text $w.out.author -background white -borderwidth 0 \
- -state disabled \
- -wrap none \
- -height 40 \
- -width 20 \
- -font font_diff
- $w.out add $w.out.author
- lappend texts $w.out.author
-
- text $w.out.date -background white -borderwidth 0 \
- -state disabled \
- -wrap none \
- -height 40 \
- -width [string length "yyyy-mm-dd hh:mm:ss"] \
- -font font_diff
- $w.out add $w.out.date
- lappend texts $w.out.date
-
- text $w.out.linenumber -background white -borderwidth 0 \
- -state disabled \
- -wrap none \
- -height 40 \
- -width 5 \
- -font font_diff
- $w.out.linenumber tag conf linenumber -justify right
- $w.out add $w.out.linenumber
- lappend texts $w.out.linenumber
-
- text $w.out.file -background white -borderwidth 0 \
- -state disabled \
- -wrap none \
- -height 40 \
- -width 80 \
- -font font_diff
- $w.out add $w.out.file
- lappend texts $w.out.file
-
- label $w.status -textvariable blame_status($w) \
- -anchor w \
- -justify left \
- -borderwidth 1 \
- -relief sunken \
- -font font_ui
- pack $w.status -anchor w -side bottom -fill x
-
- scrollbar $w.sby -orient v -command [list scrollbar2many $texts yview]
- pack $w.sby -side right -fill y
- pack $w.out -side left -fill both -expand 1
-
- menu $w.ctxm -tearoff 0
- $w.ctxm add command -label "Copy Commit" \
- -font font_ui \
- -command "blame_copycommit $w \$cursorW @\$cursorX,\$cursorY"
-
- foreach i $texts {
- $i tag conf in_sel \
- -background [$i cget -foreground] \
- -foreground [$i cget -background]
- $i conf -yscrollcommand [list many2scrollbar $texts yview $w.sby]
- bind $i <Button-1> "blame_highlight $i @%x,%y $texts;break"
- bind_button3 $i "
- set cursorX %x
- set cursorY %y
- set cursorW %W
- tk_popup $w.ctxm %X %Y
- "
- }
-
- bind $w <Visibility> "focus $w"
- bind $w <Destroy> "
- array unset blame_status $w
- array unset blame_data $w,*
- "
- wm title $w "[appname] ([reponame]): File Viewer"
-
- set blame_data($w,total_lines) 0
- set fd [open "| git cat-file blob $commit:$path" r]
- fconfigure $fd -blocking 0 -translation lf -encoding binary
- fileevent $fd readable [list read_blame_catfile $fd $w $commit $path \
- $texts $w.out.linenumber $w.out.file]
-}
-
-proc read_blame_catfile {fd w commit path texts w_lno w_file} {
- global blame_status blame_data
-
- if {![winfo exists $w_file]} {
- catch {close $fd}
- return
- }
-
- set n $blame_data($w,total_lines)
- foreach i $texts {$i conf -state normal}
- while {[gets $fd line] >= 0} {
- regsub "\r\$" $line {} line
- incr n
- $w_lno insert end $n linenumber
- $w_file insert end $line
- foreach i $texts {$i insert end "\n"}
- }
- foreach i $texts {$i conf -state disabled}
- set blame_data($w,total_lines) $n
-
- if {[eof $fd]} {
- close $fd
- set blame_status($w) {Loading annotations...}
- set cmd [list git blame -M -C --incremental]
- lappend cmd $commit -- $path
- set fd [open "| $cmd" r]
- fconfigure $fd -blocking 0 -translation lf -encoding binary
- fileevent $fd readable "read_blame_incremental $fd $w $texts"
- }
-}
-
-proc read_blame_incremental {fd w w_commit w_author w_date w_lno w_file} {
- global blame_status blame_data
-
- if {![winfo exists $w_commit]} {
- catch {close $fd}
- return
- }
-
- $w_commit conf -state normal
- $w_author conf -state normal
- $w_date conf -state normal
-
- while {[gets $fd line] >= 0} {
- if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
- commit original_line final_line line_count]} {
- set blame_data($w,commit) $commit
- set blame_data($w,original_line) $original_line
- set blame_data($w,final_line) $final_line
- set blame_data($w,line_count) $line_count
- } elseif {[string match {filename *} $line]} {
- set n $blame_data($w,line_count)
- set lno $blame_data($w,final_line)
- set file [string range $line 9 end]
- set commit $blame_data($w,commit)
- set abbrev [string range $commit 0 8]
-
- if {[catch {set author $blame_data($w,$commit,author)} err]} {
- puts $err
- set author {}
- }
-
- if {[catch {set atime $blame_data($w,$commit,author-time)}]} {
- set atime {}
- } else {
- set atime [clock format $atime -format {%Y-%m-%d %T}]
- }
+ $ui_index delete 0.0 end
+ $ui_workdir delete 0.0 end
+ set last_clicked {}
- while {$n > 0} {
- $w_commit delete $lno.0 "$lno.0 lineend"
- $w_author delete $lno.0 "$lno.0 lineend"
- $w_date delete $lno.0 "$lno.0 lineend"
+ set file_lists($ui_index) [list]
+ set file_lists($ui_workdir) [list]
- $w_commit insert $lno.0 $abbrev
- $w_author insert $lno.0 $author
- $w_date insert $lno.0 $atime
- set blame_data($w,line$lno,commit) $commit
+ foreach path [lsort [array names file_states]] {
+ set s $file_states($path)
+ set m [lindex $s 0]
+ set icon_name [lindex $s 1]
- incr n -1
- incr lno
- }
- } elseif {[regexp {^([a-z-]+) (.*)$} $line line header data]} {
- set blame_data($w,$blame_data($w,commit),$header) $data
+ set s [string index $m 0]
+ if {$s ne {U} && $s ne {_}} {
+ display_all_files_helper $ui_index $path \
+ $icon_name $s
}
- }
-
- $w_commit conf -state disabled
- $w_author conf -state disabled
- $w_date conf -state disabled
-
- if {[eof $fd]} {
- close $fd
- set blame_status($w) {Annotation complete.}
- }
-}
-proc blame_highlight {w pos args} {
- set lno [lindex [split [$w index $pos] .] 0]
- foreach i $args {
- $i tag remove in_sel 0.0 end
- }
- if {$lno eq {}} return
- foreach i $args {
- $i tag add in_sel $lno.0 "$lno.0 + 1 line"
+ if {[string index $m 0] eq {U}} {
+ set s U
+ } else {
+ set s [string index $m 1]
+ }
+ if {$s ne {_}} {
+ display_all_files_helper $ui_workdir $path \
+ $icon_name $s
+ }
}
-}
-proc blame_copycommit {w i pos} {
- global blame_data
- set lno [lindex [split [$i index $pos] .] 0]
- if {![catch {set commit $blame_data($w,line$lno,commit)}]} {
- clipboard clear
- clipboard append \
- -format STRING \
- -type STRING \
- -- $commit
- }
+ $ui_index conf -state disabled
+ $ui_workdir conf -state disabled
}
######################################################################
@@ -3515,1026 +997,118 @@ foreach i {
if {$max_status_desc < [string length [lindex $i 1]]} {
set max_status_desc [string length [lindex $i 1]]
}
- set all_descs([lindex $i 0]) [lindex $i 1]
-}
-unset i
-
-######################################################################
-##
-## util
-
-proc bind_button3 {w cmd} {
- bind $w <Any-Button-3> $cmd
- if {[is_MacOSX]} {
- bind $w <Control-Button-1> $cmd
- }
-}
-
-proc scrollbar2many {list mode args} {
- foreach w $list {eval $w $mode $args}
-}
-
-proc many2scrollbar {list mode sb top bottom} {
- $sb set $top $bottom
- foreach w $list {$w $mode moveto $top}
-}
-
-proc incr_font_size {font {amt 1}} {
- set sz [font configure $font -size]
- incr sz $amt
- font configure $font -size $sz
- font configure ${font}bold -size $sz
-}
-
-proc hook_failed_popup {hook msg} {
- set w .hookfail
- toplevel $w
-
- frame $w.m
- label $w.m.l1 -text "$hook hook failed:" \
- -anchor w \
- -justify left \
- -font font_uibold
- text $w.m.t \
- -background white -borderwidth 1 \
- -relief sunken \
- -width 80 -height 10 \
- -font font_diff \
- -yscrollcommand [list $w.m.sby set]
- label $w.m.l2 \
- -text {You must correct the above errors before committing.} \
- -anchor w \
- -justify left \
- -font font_uibold
- scrollbar $w.m.sby -command [list $w.m.t yview]
- pack $w.m.l1 -side top -fill x
- pack $w.m.l2 -side bottom -fill x
- pack $w.m.sby -side right -fill y
- pack $w.m.t -side left -fill both -expand 1
- pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
-
- $w.m.t insert 1.0 $msg
- $w.m.t conf -state disabled
-
- button $w.ok -text OK \
- -width 15 \
- -font font_ui \
- -command "destroy $w"
- pack $w.ok -side bottom -anchor e -pady 10 -padx 10
-
- bind $w <Visibility> "grab $w; focus $w"
- bind $w <Key-Return> "destroy $w"
- wm title $w "[appname] ([reponame]): error"
- tkwait window $w
-}
-
-set next_console_id 0
-
-proc new_console {short_title long_title} {
- global next_console_id console_data
- set w .console[incr next_console_id]
- set console_data($w) [list $short_title $long_title]
- return [console_init $w]
-}
-
-proc console_init {w} {
- global console_cr console_data M1B
-
- set console_cr($w) 1.0
- toplevel $w
- frame $w.m
- label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
- -anchor w \
- -justify left \
- -font font_uibold
- text $w.m.t \
- -background white -borderwidth 1 \
- -relief sunken \
- -width 80 -height 10 \
- -font font_diff \
- -state disabled \
- -yscrollcommand [list $w.m.sby set]
- label $w.m.s -text {Working... please wait...} \
- -anchor w \
- -justify left \
- -font font_uibold
- scrollbar $w.m.sby -command [list $w.m.t yview]
- pack $w.m.l1 -side top -fill x
- pack $w.m.s -side bottom -fill x
- pack $w.m.sby -side right -fill y
- pack $w.m.t -side left -fill both -expand 1
- pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
-
- menu $w.ctxm -tearoff 0
- $w.ctxm add command -label "Copy" \
- -font font_ui \
- -command "tk_textCopy $w.m.t"
- $w.ctxm add command -label "Select All" \
- -font font_ui \
- -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
- $w.ctxm add command -label "Copy All" \
- -font font_ui \
- -command "
- $w.m.t tag add sel 0.0 end
- tk_textCopy $w.m.t
- $w.m.t tag remove sel 0.0 end
- "
-
- button $w.ok -text {Close} \
- -font font_ui \
- -state disabled \
- -command "destroy $w"
- pack $w.ok -side bottom -anchor e -pady 10 -padx 10
-
- bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
- bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
- bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
- bind $w <Visibility> "focus $w"
- wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
- return $w
-}
-
-proc console_exec {w cmd after} {
- # -- Cygwin's Tcl tosses the enviroment when we exec our child.
- # But most users need that so we have to relogin. :-(
- #
- if {[is_Cygwin]} {
- set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
- }
-
- # -- Tcl won't let us redirect both stdout and stderr to
- # the same pipe. So pass it through cat...
- #
- set cmd [concat | $cmd |& cat]
-
- set fd_f [open $cmd r]
- fconfigure $fd_f -blocking 0 -translation binary
- fileevent $fd_f readable [list console_read $w $fd_f $after]
-}
-
-proc console_read {w fd after} {
- global console_cr
-
- set buf [read $fd]
- if {$buf ne {}} {
- if {![winfo exists $w]} {console_init $w}
- $w.m.t conf -state normal
- set c 0
- set n [string length $buf]
- while {$c < $n} {
- set cr [string first "\r" $buf $c]
- set lf [string first "\n" $buf $c]
- if {$cr < 0} {set cr [expr {$n + 1}]}
- if {$lf < 0} {set lf [expr {$n + 1}]}
-
- if {$lf < $cr} {
- $w.m.t insert end [string range $buf $c $lf]
- set console_cr($w) [$w.m.t index {end -1c}]
- set c $lf
- incr c
- } else {
- $w.m.t delete $console_cr($w) end
- $w.m.t insert end "\n"
- $w.m.t insert end [string range $buf $c $cr]
- set c $cr
- incr c
- }
- }
- $w.m.t conf -state disabled
- $w.m.t see end
- }
-
- fconfigure $fd -blocking 1
- if {[eof $fd]} {
- if {[catch {close $fd}]} {
- set ok 0
- } else {
- set ok 1
- }
- uplevel #0 $after $w $ok
- return
- }
- fconfigure $fd -blocking 0
-}
-
-proc console_chain {cmdlist w {ok 1}} {
- if {$ok} {
- if {[llength $cmdlist] == 0} {
- console_done $w $ok
- return
- }
-
- set cmd [lindex $cmdlist 0]
- set cmdlist [lrange $cmdlist 1 end]
-
- if {[lindex $cmd 0] eq {console_exec}} {
- console_exec $w \
- [lindex $cmd 1] \
- [list console_chain $cmdlist]
- } else {
- uplevel #0 $cmd $cmdlist $w $ok
- }
- } else {
- console_done $w $ok
- }
-}
-
-proc console_done {args} {
- global console_cr console_data
-
- switch -- [llength $args] {
- 2 {
- set w [lindex $args 0]
- set ok [lindex $args 1]
- }
- 3 {
- set w [lindex $args 1]
- set ok [lindex $args 2]
- }
- default {
- error "wrong number of args: console_done ?ignored? w ok"
- }
- }
-
- if {$ok} {
- if {[winfo exists $w]} {
- $w.m.s conf -background green -text {Success}
- $w.ok conf -state normal
- }
- } else {
- if {![winfo exists $w]} {
- console_init $w
- }
- $w.m.s conf -background red -text {Error: Command Failed}
- $w.ok conf -state normal
- }
-
- array unset console_cr $w
- array unset console_data $w
-}
-
-######################################################################
-##
-## ui commands
-
-set starting_gitk_msg {Starting gitk... please wait...}
-
-proc do_gitk {revs} {
- global env ui_status_value starting_gitk_msg
-
- # -- On Windows gitk is severly broken, and right now it seems like
- # nobody cares about fixing it. The only known workaround is to
- # always delete ~/.gitk before starting the program.
- #
- if {[is_Windows]} {
- catch {file delete [file join $env(HOME) .gitk]}
- }
-
- # -- Always start gitk through whatever we were loaded with. This
- # lets us bypass using shell process on Windows systems.
- #
- set cmd [info nameofexecutable]
- lappend cmd [gitexec gitk]
- if {$revs ne {}} {
- append cmd { }
- append cmd $revs
- }
-
- if {[catch {eval exec $cmd &} err]} {
- error_popup "Failed to start gitk:\n\n$err"
- } else {
- set ui_status_value $starting_gitk_msg
- after 10000 {
- if {$ui_status_value eq $starting_gitk_msg} {
- set ui_status_value {Ready.}
- }
- }
- }
-}
-
-proc do_stats {} {
- set fd [open "| git count-objects -v" r]
- while {[gets $fd line] > 0} {
- if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
- set stats($name) $value
- }
- }
- close $fd
-
- set packed_sz 0
- foreach p [glob -directory [gitdir objects pack] \
- -type f \
- -nocomplain -- *] {
- incr packed_sz [file size $p]
- }
- if {$packed_sz > 0} {
- set stats(size-pack) [expr {$packed_sz / 1024}]
- }
-
- set w .stats_view
- toplevel $w
- wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-
- label $w.header -text {Database Statistics} \
- -font font_uibold
- pack $w.header -side top -fill x
-
- frame $w.buttons -border 1
- button $w.buttons.close -text Close \
- -font font_ui \
- -command [list destroy $w]
- button $w.buttons.gc -text {Compress Database} \
- -font font_ui \
- -command "destroy $w;do_gc"
- pack $w.buttons.close -side right
- pack $w.buttons.gc -side left
- pack $w.buttons -side bottom -fill x -pady 10 -padx 10
-
- frame $w.stat -borderwidth 1 -relief solid
- foreach s {
- {count {Number of loose objects}}
- {size {Disk space used by loose objects} { KiB}}
- {in-pack {Number of packed objects}}
- {packs {Number of packs}}
- {size-pack {Disk space used by packed objects} { KiB}}
- {prune-packable {Packed objects waiting for pruning}}
- {garbage {Garbage files}}
- } {
- set name [lindex $s 0]
- set label [lindex $s 1]
- if {[catch {set value $stats($name)}]} continue
- if {[llength $s] > 2} {
- set value "$value[lindex $s 2]"
- }
-
- label $w.stat.l_$name -text "$label:" -anchor w -font font_ui
- label $w.stat.v_$name -text $value -anchor w -font font_ui
- grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
- }
- pack $w.stat -pady 10 -padx 10
-
- bind $w <Visibility> "grab $w; focus $w"
- bind $w <Key-Escape> [list destroy $w]
- bind $w <Key-Return> [list destroy $w]
- wm title $w "[appname] ([reponame]): Database Statistics"
- tkwait window $w
-}
-
-proc do_gc {} {
- set w [new_console {gc} {Compressing the object database}]
- console_chain {
- {console_exec {git pack-refs --prune}}
- {console_exec {git reflog expire --all}}
- {console_exec {git repack -a -d -l}}
- {console_exec {git rerere gc}}
- } $w
-}
-
-proc do_fsck_objects {} {
- set w [new_console {fsck-objects} \
- {Verifying the object database with fsck-objects}]
- set cmd [list git fsck-objects]
- lappend cmd --full
- lappend cmd --cache
- lappend cmd --strict
- console_exec $w $cmd console_done
-}
-
-set is_quitting 0
-
-proc do_quit {} {
- global ui_comm is_quitting repo_config commit_type
-
- if {$is_quitting} return
- set is_quitting 1
-
- # -- Stash our current commit buffer.
- #
- set save [gitdir GITGUI_MSG]
- set msg [string trim [$ui_comm get 0.0 end]]
- regsub -all -line {[ \r\t]+$} $msg {} msg
- if {(![string match amend* $commit_type]
- || [$ui_comm edit modified])
- && $msg ne {}} {
- catch {
- set fd [open $save w]
- puts -nonewline $fd $msg
- close $fd
- }
- } else {
- catch {file delete $save}
- }
-
- # -- Stash our current window geometry into this repository.
- #
- set cfg_geometry [list]
- lappend cfg_geometry [wm geometry .]
- lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
- lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
- if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
- set rc_geometry {}
- }
- if {$cfg_geometry ne $rc_geometry} {
- catch {exec git repo-config gui.geometry $cfg_geometry}
- }
-
- destroy .
-}
-
-proc do_rescan {} {
- rescan {set ui_status_value {Ready.}}
-}
-
-proc unstage_helper {txt paths} {
- global file_states current_diff_path
-
- if {![lock_index begin-update]} return
-
- set pathList [list]
- set after {}
- foreach path $paths {
- switch -glob -- [lindex $file_states($path) 0] {
- A? -
- M? -
- D? {
- lappend pathList $path
- if {$path eq $current_diff_path} {
- set after {reshow_diff;}
- }
- }
- }
- }
- if {$pathList eq {}} {
- unlock_index
- } else {
- update_indexinfo \
- $txt \
- $pathList \
- [concat $after {set ui_status_value {Ready.}}]
- }
-}
-
-proc do_unstage_selection {} {
- global current_diff_path selected_paths
-
- if {[array size selected_paths] > 0} {
- unstage_helper \
- {Unstaging selected files from commit} \
- [array names selected_paths]
- } elseif {$current_diff_path ne {}} {
- unstage_helper \
- "Unstaging [short_path $current_diff_path] from commit" \
- [list $current_diff_path]
- }
-}
-
-proc add_helper {txt paths} {
- global file_states current_diff_path
-
- if {![lock_index begin-update]} return
-
- set pathList [list]
- set after {}
- foreach path $paths {
- switch -glob -- [lindex $file_states($path) 0] {
- _O -
- ?M -
- ?D -
- U? {
- lappend pathList $path
- if {$path eq $current_diff_path} {
- set after {reshow_diff;}
- }
- }
- }
- }
- if {$pathList eq {}} {
- unlock_index
- } else {
- update_index \
- $txt \
- $pathList \
- [concat $after {set ui_status_value {Ready to commit.}}]
- }
-}
-
-proc do_add_selection {} {
- global current_diff_path selected_paths
-
- if {[array size selected_paths] > 0} {
- add_helper \
- {Adding selected files} \
- [array names selected_paths]
- } elseif {$current_diff_path ne {}} {
- add_helper \
- "Adding [short_path $current_diff_path]" \
- [list $current_diff_path]
- }
-}
-
-proc do_add_all {} {
- global file_states
-
- set paths [list]
- foreach path [array names file_states] {
- switch -glob -- [lindex $file_states($path) 0] {
- U? {continue}
- ?M -
- ?D {lappend paths $path}
- }
- }
- add_helper {Adding all changed files} $paths
-}
-
-proc revert_helper {txt paths} {
- global file_states current_diff_path
-
- if {![lock_index begin-update]} return
-
- set pathList [list]
- set after {}
- foreach path $paths {
- switch -glob -- [lindex $file_states($path) 0] {
- U? {continue}
- ?M -
- ?D {
- lappend pathList $path
- if {$path eq $current_diff_path} {
- set after {reshow_diff;}
- }
- }
- }
- }
-
- set n [llength $pathList]
- if {$n == 0} {
- unlock_index
- return
- } elseif {$n == 1} {
- set s "[short_path [lindex $pathList]]"
- } else {
- set s "these $n files"
- }
-
- set reply [tk_dialog \
- .confirm_revert \
- "[appname] ([reponame])" \
- "Revert changes in $s?
-
-Any unadded changes will be permanently lost by the revert." \
- question \
- 1 \
- {Do Nothing} \
- {Revert Changes} \
- ]
- if {$reply == 1} {
- checkout_index \
- $txt \
- $pathList \
- [concat $after {set ui_status_value {Ready.}}]
- } else {
- unlock_index
- }
-}
-
-proc do_revert_selection {} {
- global current_diff_path selected_paths
-
- if {[array size selected_paths] > 0} {
- revert_helper \
- {Reverting selected files} \
- [array names selected_paths]
- } elseif {$current_diff_path ne {}} {
- revert_helper \
- "Reverting [short_path $current_diff_path]" \
- [list $current_diff_path]
- }
-}
-
-proc do_signoff {} {
- global ui_comm
-
- set me [committer_ident]
- if {$me eq {}} return
-
- set sob "Signed-off-by: $me"
- set last [$ui_comm get {end -1c linestart} {end -1c}]
- if {$last ne $sob} {
- $ui_comm edit separator
- if {$last ne {}
- && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
- $ui_comm insert end "\n"
- }
- $ui_comm insert end "\n$sob"
- $ui_comm edit separator
- $ui_comm see end
- }
+ set all_descs([lindex $i 0]) [lindex $i 1]
}
+unset i
-proc do_select_commit_type {} {
- global commit_type selected_commit_type
-
- if {$selected_commit_type eq {new}
- && [string match amend* $commit_type]} {
- create_new_commit
- } elseif {$selected_commit_type eq {amend}
- && ![string match amend* $commit_type]} {
- load_last_commit
+######################################################################
+##
+## util
- # The amend request was rejected...
- #
- if {![string match amend* $commit_type]} {
- set selected_commit_type new
- }
+proc bind_button3 {w cmd} {
+ bind $w <Any-Button-3> $cmd
+ if {[is_MacOSX]} {
+ bind $w <Control-Button-1> $cmd
}
}
-proc do_commit {} {
- commit_tree
+proc scrollbar2many {list mode args} {
+ foreach w $list {eval $w $mode $args}
}
-proc do_about {} {
- global appvers copyright
- global tcl_patchLevel tk_patchLevel
-
- set w .about_dialog
- toplevel $w
- wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-
- label $w.header -text "About [appname]" \
- -font font_uibold
- pack $w.header -side top -fill x
-
- frame $w.buttons
- button $w.buttons.close -text {Close} \
- -font font_ui \
- -command [list destroy $w]
- pack $w.buttons.close -side right
- pack $w.buttons -side bottom -fill x -pady 10 -padx 10
-
- label $w.desc \
- -text "[appname] - a commit creation tool for Git.
-$copyright" \
- -padx 5 -pady 5 \
- -justify left \
- -anchor w \
- -borderwidth 1 \
- -relief solid \
- -font font_ui
- pack $w.desc -side top -fill x -padx 5 -pady 5
-
- set v {}
- append v "[appname] version $appvers\n"
- append v "[exec git version]\n"
- append v "\n"
- if {$tcl_patchLevel eq $tk_patchLevel} {
- append v "Tcl/Tk version $tcl_patchLevel"
- } else {
- append v "Tcl version $tcl_patchLevel"
- append v ", Tk version $tk_patchLevel"
- }
+proc many2scrollbar {list mode sb top bottom} {
+ $sb set $top $bottom
+ foreach w $list {$w $mode moveto $top}
+}
- label $w.vers \
- -text $v \
- -padx 5 -pady 5 \
- -justify left \
- -anchor w \
- -borderwidth 1 \
- -relief solid \
- -font font_ui
- pack $w.vers -side top -fill x -padx 5 -pady 5
-
- menu $w.ctxm -tearoff 0
- $w.ctxm add command \
- -label {Copy} \
- -font font_ui \
- -command "
- clipboard clear
- clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
- "
-
- bind $w <Visibility> "grab $w; focus $w"
- bind $w <Key-Escape> "destroy $w"
- bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
- wm title $w "About [appname]"
- tkwait window $w
+proc incr_font_size {font {amt 1}} {
+ set sz [font configure $font -size]
+ incr sz $amt
+ font configure $font -size $sz
+ font configure ${font}bold -size $sz
+ font configure ${font}italic -size $sz
}
-proc do_options {} {
- global repo_config global_config font_descs
- global repo_config_new global_config_new
+######################################################################
+##
+## ui commands
- array unset repo_config_new
- array unset global_config_new
- foreach name [array names repo_config] {
- set repo_config_new($name) $repo_config($name)
- }
- load_config 1
- foreach name [array names repo_config] {
- switch -- $name {
- gui.diffcontext {continue}
- }
- set repo_config_new($name) $repo_config($name)
- }
- foreach name [array names global_config] {
- set global_config_new($name) $global_config($name)
+set starting_gitk_msg {Starting gitk... please wait...}
+
+proc do_gitk {revs} {
+ global env ui_status_value starting_gitk_msg
+
+ # -- Always start gitk through whatever we were loaded with. This
+ # lets us bypass using shell process on Windows systems.
+ #
+ set cmd [list [info nameofexecutable]]
+ lappend cmd [gitexec gitk]
+ if {$revs ne {}} {
+ append cmd { }
+ append cmd $revs
}
- set w .options_editor
- toplevel $w
- wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-
- label $w.header -text "[appname] Options" \
- -font font_uibold
- pack $w.header -side top -fill x
-
- frame $w.buttons
- button $w.buttons.restore -text {Restore Defaults} \
- -font font_ui \
- -command do_restore_defaults
- pack $w.buttons.restore -side left
- button $w.buttons.save -text Save \
- -font font_ui \
- -command [list do_save_config $w]
- pack $w.buttons.save -side right
- button $w.buttons.cancel -text {Cancel} \
- -font font_ui \
- -command [list destroy $w]
- pack $w.buttons.cancel -side right -padx 5
- pack $w.buttons -side bottom -fill x -pady 10 -padx 10
-
- labelframe $w.repo -text "[reponame] Repository" \
- -font font_ui
- labelframe $w.global -text {Global (All Repositories)} \
- -font font_ui
- pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
- pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
-
- set optid 0
- foreach option {
- {t user.name {User Name}}
- {t user.email {Email Address}}
-
- {b merge.summary {Summarize Merge Commits}}
- {i-1..5 merge.verbosity {Merge Verbosity}}
-
- {b gui.trustmtime {Trust File Modification Timestamps}}
- {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
- {t gui.newbranchtemplate {New Branch Name Template}}
- } {
- set type [lindex $option 0]
- set name [lindex $option 1]
- set text [lindex $option 2]
- incr optid
- foreach f {repo global} {
- switch -glob -- $type {
- b {
- checkbutton $w.$f.$optid -text $text \
- -variable ${f}_config_new($name) \
- -onvalue true \
- -offvalue false \
- -font font_ui
- pack $w.$f.$optid -side top -anchor w
- }
- i-* {
- regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
- frame $w.$f.$optid
- label $w.$f.$optid.l -text "$text:" -font font_ui
- pack $w.$f.$optid.l -side left -anchor w -fill x
- spinbox $w.$f.$optid.v \
- -textvariable ${f}_config_new($name) \
- -from $min \
- -to $max \
- -increment 1 \
- -width [expr {1 + [string length $max]}] \
- -font font_ui
- bind $w.$f.$optid.v <FocusIn> {%W selection range 0 end}
- pack $w.$f.$optid.v -side right -anchor e -padx 5
- pack $w.$f.$optid -side top -anchor w -fill x
- }
- t {
- frame $w.$f.$optid
- label $w.$f.$optid.l -text "$text:" -font font_ui
- entry $w.$f.$optid.v \
- -borderwidth 1 \
- -relief sunken \
- -width 20 \
- -textvariable ${f}_config_new($name) \
- -font font_ui
- pack $w.$f.$optid.l -side left -anchor w
- pack $w.$f.$optid.v -side left -anchor w \
- -fill x -expand 1 \
- -padx 5
- pack $w.$f.$optid -side top -anchor w -fill x
- }
+ if {[catch {eval exec $cmd &} err]} {
+ error_popup "Failed to start gitk:\n\n$err"
+ } else {
+ set ui_status_value $starting_gitk_msg
+ after 10000 {
+ if {$ui_status_value eq $starting_gitk_msg} {
+ set ui_status_value {Ready.}
}
}
}
-
- set all_fonts [lsort [font families]]
- foreach option $font_descs {
- set name [lindex $option 0]
- set font [lindex $option 1]
- set text [lindex $option 2]
-
- set global_config_new(gui.$font^^family) \
- [font configure $font -family]
- set global_config_new(gui.$font^^size) \
- [font configure $font -size]
-
- frame $w.global.$name
- label $w.global.$name.l -text "$text:" -font font_ui
- pack $w.global.$name.l -side left -anchor w -fill x
- eval tk_optionMenu $w.global.$name.family \
- global_config_new(gui.$font^^family) \
- $all_fonts
- spinbox $w.global.$name.size \
- -textvariable global_config_new(gui.$font^^size) \
- -from 2 -to 80 -increment 1 \
- -width 3 \
- -font font_ui
- bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
- pack $w.global.$name.size -side right -anchor e
- pack $w.global.$name.family -side right -anchor e
- pack $w.global.$name -side top -anchor w -fill x
- }
-
- bind $w <Visibility> "grab $w; focus $w"
- bind $w <Key-Escape> "destroy $w"
- wm title $w "[appname] ([reponame]): Options"
- tkwait window $w
}
-proc do_restore_defaults {} {
- global font_descs default_config repo_config
- global repo_config_new global_config_new
-
- foreach name [array names default_config] {
- set repo_config_new($name) $default_config($name)
- set global_config_new($name) $default_config($name)
- }
-
- foreach option $font_descs {
- set name [lindex $option 0]
- set repo_config(gui.$name) $default_config(gui.$name)
- }
- apply_config
-
- foreach option $font_descs {
- set name [lindex $option 0]
- set font [lindex $option 1]
- set global_config_new(gui.$font^^family) \
- [font configure $font -family]
- set global_config_new(gui.$font^^size) \
- [font configure $font -size]
- }
-}
+set is_quitting 0
-proc do_save_config {w} {
- if {[catch {save_config} err]} {
- error_popup "Failed to completely save options:\n\n$err"
- }
- reshow_diff
- destroy $w
-}
+proc do_quit {} {
+ global ui_comm is_quitting repo_config commit_type
-proc do_windows_shortcut {} {
- global argv0
+ if {$is_quitting} return
+ set is_quitting 1
- set fn [tk_getSaveFile \
- -parent . \
- -title "[appname] ([reponame]): Create Desktop Icon" \
- -initialfile "Git [reponame].bat"]
- if {$fn != {}} {
- if {[catch {
- set fd [open $fn w]
- puts $fd "@ECHO Entering [reponame]"
- puts $fd "@ECHO Starting git-gui... please wait..."
- puts $fd "@SET PATH=[file normalize [gitexec]];%PATH%"
- puts $fd "@SET GIT_DIR=[file normalize [gitdir]]"
- puts -nonewline $fd "@\"[info nameofexecutable]\""
- puts $fd " \"[file normalize $argv0]\""
+ if {[winfo exists $ui_comm]} {
+ # -- Stash our current commit buffer.
+ #
+ set save [gitdir GITGUI_MSG]
+ set msg [string trim [$ui_comm get 0.0 end]]
+ regsub -all -line {[ \r\t]+$} $msg {} msg
+ if {(![string match amend* $commit_type]
+ || [$ui_comm edit modified])
+ && $msg ne {}} {
+ catch {
+ set fd [open $save w]
+ puts -nonewline $fd $msg
close $fd
- } err]} {
- error_popup "Cannot write script:\n\n$err"
+ }
+ } else {
+ catch {file delete $save}
}
- }
-}
-proc do_cygwin_shortcut {} {
- global argv0
-
- if {[catch {
- set desktop [exec cygpath \
- --windows \
- --absolute \
- --long-name \
- --desktop]
- }]} {
- set desktop .
- }
- set fn [tk_getSaveFile \
- -parent . \
- -title "[appname] ([reponame]): Create Desktop Icon" \
- -initialdir $desktop \
- -initialfile "Git [reponame].bat"]
- if {$fn != {}} {
- if {[catch {
- set fd [open $fn w]
- set sh [exec cygpath \
- --windows \
- --absolute \
- /bin/sh]
- set me [exec cygpath \
- --unix \
- --absolute \
- $argv0]
- set gd [exec cygpath \
- --unix \
- --absolute \
- [gitdir]]
- set gw [exec cygpath \
- --windows \
- --absolute \
- [file dirname [gitdir]]]
- regsub -all ' $me "'\\''" me
- regsub -all ' $gd "'\\''" gd
- puts $fd "@ECHO Entering $gw"
- puts $fd "@ECHO Starting git-gui... please wait..."
- puts -nonewline $fd "@\"$sh\" --login -c \""
- puts -nonewline $fd "GIT_DIR='$gd'"
- puts -nonewline $fd " '$me'"
- puts $fd "&\""
- close $fd
- } err]} {
- error_popup "Cannot write script:\n\n$err"
+ # -- Stash our current window geometry into this repository.
+ #
+ set cfg_geometry [list]
+ lappend cfg_geometry [wm geometry .]
+ lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
+ lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
+ if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
+ set rc_geometry {}
+ }
+ if {$cfg_geometry ne $rc_geometry} {
+ catch {git config gui.geometry $cfg_geometry}
}
}
-}
-
-proc do_macosx_app {} {
- global argv0 env
- set fn [tk_getSaveFile \
- -parent . \
- -title "[appname] ([reponame]): Create Desktop Icon" \
- -initialdir [file join $env(HOME) Desktop] \
- -initialfile "Git [reponame].app"]
- if {$fn != {}} {
- if {[catch {
- set Contents [file join $fn Contents]
- set MacOS [file join $Contents MacOS]
- set exe [file join $MacOS git-gui]
-
- file mkdir $MacOS
-
- set fd [open [file join $Contents Info.plist] w]
- puts $fd {<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>git-gui</string>
- <key>CFBundleIdentifier</key>
- <string>org.spearce.git-gui</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.0</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
-</dict>
-</plist>}
- close $fd
+ destroy .
+}
- set fd [open $exe w]
- set gd [file normalize [gitdir]]
- set ep [file normalize [gitexec]]
- regsub -all ' $gd "'\\''" gd
- regsub -all ' $ep "'\\''" ep
- puts $fd "#!/bin/sh"
- foreach name [array names env] {
- if {[string match GIT_* $name]} {
- regsub -all ' $env($name) "'\\''" v
- puts $fd "export $name='$v'"
- }
- }
- puts $fd "export PATH='$ep':\$PATH"
- puts $fd "export GIT_DIR='$gd'"
- puts $fd "exec [file normalize $argv0]"
- close $fd
+proc do_rescan {} {
+ rescan {set ui_status_value {Ready.}}
+}
- file attributes $exe -permissions u+x,g+x,o+x
- } err]} {
- error_popup "Cannot write icon:\n\n$err"
- }
- }
+proc do_commit {} {
+ commit_tree
}
proc toggle_or_diff {w x y} {
destroy .dummy
}
+font create font_uiitalic
font create font_uibold
font create font_diffbold
+font create font_diffitalic
-if {[is_Windows]} {
- set M1B Control
- set M1T Ctrl
-} elseif {[is_MacOSX]} {
+foreach class {Button Checkbutton Entry Label
+ Labelframe Listbox Menu Message
+ Radiobutton Spinbox Text} {
+ option add *$class.font font_ui
+}
+unset class
+
+if {[is_MacOSX]} {
set M1B M1
set M1T Cmd
} else {
- set M1B M1
- set M1T M1
+ set M1B Control
+ set M1T Ctrl
}
proc apply_config {} {
}
foreach {cn cv} [font configure $font] {
font configure ${font}bold $cn $cv
+ font configure ${font}italic $cn $cv
}
font configure ${font}bold -weight bold
+ font configure ${font}italic -slant italic
}
}
load_config 0
apply_config
+######################################################################
+##
+## feature option selection
+
+if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
+ unset _junk
+} else {
+ set subcommand gui
+}
+if {$subcommand eq {gui.sh}} {
+ set subcommand gui
+}
+if {$subcommand eq {gui} && [llength $argv] > 0} {
+ set subcommand [lindex $argv 0]
+ set argv [lrange $argv 1 end]
+}
+
+enable_option multicommit
+enable_option branch
+enable_option transport
+
+switch -- $subcommand {
+browser -
+blame {
+ disable_option multicommit
+ disable_option branch
+ disable_option transport
+}
+citool {
+ enable_option singlecommit
+
+ disable_option multicommit
+ disable_option branch
+ disable_option transport
+}
+}
+
######################################################################
##
## ui construction
+set ui_comm {}
+
# -- Menu Bar
#
menu .mbar -tearoff 0
.mbar add cascade -label Repository -menu .mbar.repository
.mbar add cascade -label Edit -menu .mbar.edit
-if {!$single_commit} {
+if {[is_enabled branch]} {
.mbar add cascade -label Branch -menu .mbar.branch
}
-.mbar add cascade -label Commit -menu .mbar.commit
-if {!$single_commit} {
+if {[is_enabled multicommit] || [is_enabled singlecommit]} {
+ .mbar add cascade -label Commit -menu .mbar.commit
+}
+if {[is_enabled transport]} {
.mbar add cascade -label Merge -menu .mbar.merge
.mbar add cascade -label Fetch -menu .mbar.fetch
.mbar add cascade -label Push -menu .mbar.push
.mbar.repository add command \
-label {Browse Current Branch} \
- -command {new_browser $current_branch} \
- -font font_ui
+ -command {browser::new $current_branch}
+trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
.mbar.repository add separator
.mbar.repository add command \
-label {Visualize Current Branch} \
- -command {do_gitk {}} \
- -font font_ui
+ -command {do_gitk $current_branch}
+trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
.mbar.repository add command \
-label {Visualize All Branches} \
- -command {do_gitk {--all}} \
- -font font_ui
+ -command {do_gitk --all}
.mbar.repository add separator
-if {!$single_commit} {
+if {[is_enabled multicommit]} {
.mbar.repository add command -label {Database Statistics} \
- -command do_stats \
- -font font_ui
+ -command do_stats
.mbar.repository add command -label {Compress Database} \
- -command do_gc \
- -font font_ui
+ -command do_gc
.mbar.repository add command -label {Verify Database} \
- -command do_fsck_objects \
- -font font_ui
+ -command do_fsck_objects
.mbar.repository add separator
if {[is_Cygwin]} {
.mbar.repository add command \
-label {Create Desktop Icon} \
- -command do_cygwin_shortcut \
- -font font_ui
+ -command do_cygwin_shortcut
} elseif {[is_Windows]} {
.mbar.repository add command \
-label {Create Desktop Icon} \
- -command do_windows_shortcut \
- -font font_ui
+ -command do_windows_shortcut
} elseif {[is_MacOSX]} {
.mbar.repository add command \
-label {Create Desktop Icon} \
- -command do_macosx_app \
- -font font_ui
+ -command do_macosx_app
}
}
.mbar.repository add command -label Quit \
-command do_quit \
- -accelerator $M1T-Q \
- -font font_ui
+ -accelerator $M1T-Q
# -- Edit Menu
#
menu .mbar.edit
.mbar.edit add command -label Undo \
-command {catch {[focus] edit undo}} \
- -accelerator $M1T-Z \
- -font font_ui
+ -accelerator $M1T-Z
.mbar.edit add command -label Redo \
-command {catch {[focus] edit redo}} \
- -accelerator $M1T-Y \
- -font font_ui
+ -accelerator $M1T-Y
.mbar.edit add separator
.mbar.edit add command -label Cut \
-command {catch {tk_textCut [focus]}} \
- -accelerator $M1T-X \
- -font font_ui
+ -accelerator $M1T-X
.mbar.edit add command -label Copy \
-command {catch {tk_textCopy [focus]}} \
- -accelerator $M1T-C \
- -font font_ui
+ -accelerator $M1T-C
.mbar.edit add command -label Paste \
-command {catch {tk_textPaste [focus]; [focus] see insert}} \
- -accelerator $M1T-V \
- -font font_ui
+ -accelerator $M1T-V
.mbar.edit add command -label Delete \
-command {catch {[focus] delete sel.first sel.last}} \
- -accelerator Del \
- -font font_ui
+ -accelerator Del
.mbar.edit add separator
.mbar.edit add command -label {Select All} \
-command {catch {[focus] tag add sel 0.0 end}} \
- -accelerator $M1T-A \
- -font font_ui
+ -accelerator $M1T-A
# -- Branch Menu
#
-if {!$single_commit} {
+if {[is_enabled branch]} {
menu .mbar.branch
.mbar.branch add command -label {Create...} \
-command do_create_branch \
- -accelerator $M1T-N \
- -font font_ui
+ -accelerator $M1T-N
lappend disable_on_lock [list .mbar.branch entryconf \
[.mbar.branch index last] -state]
.mbar.branch add command -label {Delete...} \
- -command do_delete_branch \
- -font font_ui
+ -command do_delete_branch
+ lappend disable_on_lock [list .mbar.branch entryconf \
+ [.mbar.branch index last] -state]
+
+ .mbar.branch add command -label {Reset...} \
+ -command merge::reset_hard
lappend disable_on_lock [list .mbar.branch entryconf \
[.mbar.branch index last] -state]
}
# -- Commit Menu
#
-menu .mbar.commit
+if {[is_enabled multicommit] || [is_enabled singlecommit]} {
+ menu .mbar.commit
+
+ .mbar.commit add radiobutton \
+ -label {New Commit} \
+ -command do_select_commit_type \
+ -variable selected_commit_type \
+ -value new
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add radiobutton \
- -label {New Commit} \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value new \
- -font font_ui
-lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
+ .mbar.commit add radiobutton \
+ -label {Amend Last Commit} \
+ -command do_select_commit_type \
+ -variable selected_commit_type \
+ -value amend
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add radiobutton \
- -label {Amend Last Commit} \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value amend \
- -font font_ui
-lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
+ .mbar.commit add separator
-.mbar.commit add separator
+ .mbar.commit add command -label Rescan \
+ -command do_rescan \
+ -accelerator F5
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label Rescan \
- -command do_rescan \
- -accelerator F5 \
- -font font_ui
-lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
+ .mbar.commit add command -label {Add To Commit} \
+ -command do_add_selection
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Add To Commit} \
- -command do_add_selection \
- -font font_ui
-lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
+ .mbar.commit add command -label {Add Existing To Commit} \
+ -command do_add_all \
+ -accelerator $M1T-I
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Add All To Commit} \
- -command do_add_all \
- -accelerator $M1T-I \
- -font font_ui
-lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
+ .mbar.commit add command -label {Unstage From Commit} \
+ -command do_unstage_selection
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Unstage From Commit} \
- -command do_unstage_selection \
- -font font_ui
-lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
+ .mbar.commit add command -label {Revert Changes} \
+ -command do_revert_selection
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Revert Changes} \
- -command do_revert_selection \
- -font font_ui
-lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
+ .mbar.commit add separator
+
+ .mbar.commit add command -label {Sign Off} \
+ -command do_signoff \
+ -accelerator $M1T-S
+
+ .mbar.commit add command -label Commit \
+ -command do_commit \
+ -accelerator $M1T-Return
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+}
+
+# -- Merge Menu
+#
+if {[is_enabled branch]} {
+ menu .mbar.merge
+ .mbar.merge add command -label {Local Merge...} \
+ -command merge::dialog
+ lappend disable_on_lock \
+ [list .mbar.merge entryconf [.mbar.merge index last] -state]
+ .mbar.merge add command -label {Abort Merge...} \
+ -command merge::reset_hard
+ lappend disable_on_lock \
+ [list .mbar.merge entryconf [.mbar.merge index last] -state]
-.mbar.commit add separator
+}
-.mbar.commit add command -label {Sign Off} \
- -command do_signoff \
- -accelerator $M1T-S \
- -font font_ui
+# -- Transport Menu
+#
+if {[is_enabled transport]} {
+ menu .mbar.fetch
-.mbar.commit add command -label Commit \
- -command do_commit \
- -accelerator $M1T-Return \
- -font font_ui
-lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
+ menu .mbar.push
+ .mbar.push add command -label {Push...} \
+ -command do_push_anywhere
+}
if {[is_MacOSX]} {
# -- Apple Menu (Mac OS X only)
menu .mbar.apple
.mbar.apple add command -label "About [appname]" \
- -command do_about \
- -font font_ui
- .mbar.apple add command -label "[appname] Options..." \
- -command do_options \
- -font font_ui
+ -command do_about
+ .mbar.apple add command -label "Options..." \
+ -command do_options
} else {
# -- Edit Menu
#
.mbar.edit add separator
.mbar.edit add command -label {Options...} \
- -command do_options \
- -font font_ui
+ -command do_options
# -- Tools Menu
#
- if {[file exists /usr/local/miga/lib/gui-miga]
- && [file exists .pvcsrc]} {
+ if {[is_Cygwin] && [file exists /usr/local/miga/lib/gui-miga]} {
proc do_miga {} {
global ui_status_value
if {![lock_index update]} return
.mbar add cascade -label Tools -menu .mbar.tools
menu .mbar.tools
.mbar.tools add command -label "Migrate" \
- -command do_miga \
- -font font_ui
+ -command do_miga
lappend disable_on_lock \
[list .mbar.tools entryconf [.mbar.tools index last] -state]
}
if {![is_MacOSX]} {
.mbar.help add command -label "About [appname]" \
- -command do_about \
- -font font_ui
+ -command do_about
}
set browser {}
set doc_path [file join $doc_path Documentation index.html]
if {[is_Cygwin]} {
- set doc_path [exec cygpath --windows $doc_path]
+ set doc_path [exec cygpath --mixed $doc_path]
}
if {$browser eq {}} {
if {$browser ne {}} {
.mbar.help add command -label {Online Documentation} \
- -command [list exec $browser $doc_url &] \
- -font font_ui
+ -command [list exec $browser $doc_url &]
}
unset browser doc_path doc_url
+# -- Standard bindings
+#
+wm protocol . WM_DELETE_WINDOW do_quit
+bind all <$M1B-Key-q> do_quit
+bind all <$M1B-Key-Q> do_quit
+bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
+bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
+
+set subcommand_args {}
+proc usage {} {
+ puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
+ exit 1
+}
+
+# -- Not a normal commit type invocation? Do that instead!
+#
+switch -- $subcommand {
+browser {
+ set subcommand_args {rev?}
+ switch [llength $argv] {
+ 0 {
+ set current_branch [git symbolic-ref HEAD]
+ regsub ^refs/((heads|tags|remotes)/)? \
+ $current_branch {} current_branch
+ }
+ 1 {
+ set current_branch [lindex $argv 0]
+ }
+ default usage
+ }
+ browser::new $current_branch
+ return
+}
+blame {
+ set subcommand_args {rev? path?}
+ set head {}
+ set path {}
+ set is_path 0
+ foreach a $argv {
+ if {$is_path || [file exists $_prefix$a]} {
+ if {$path ne {}} usage
+ set path $_prefix$a
+ break
+ } elseif {$a eq {--}} {
+ if {$path ne {}} {
+ if {$head ne {}} usage
+ set head $path
+ set path {}
+ }
+ set is_path 1
+ } elseif {$head eq {}} {
+ if {$head ne {}} usage
+ set head $a
+ } else {
+ usage
+ }
+ }
+ unset is_path
+
+ if {$head eq {}} {
+ set current_branch [git symbolic-ref HEAD]
+ regsub ^refs/((heads|tags|remotes)/)? \
+ $current_branch {} current_branch
+ } else {
+ set current_branch $head
+ }
+
+ if {$path eq {}} usage
+ blame::new $head $path
+ return
+}
+citool -
+gui {
+ if {[llength $argv] != 0} {
+ puts -nonewline stderr "usage: $argv0"
+ if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
+ puts -nonewline stderr " $subcommand"
+ }
+ puts stderr {}
+ exit 1
+ }
+ # fall through to setup UI for commits
+}
+default {
+ puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
+ exit 1
+}
+}
+
# -- Branch Control
#
frame .branch \
label .branch.l1 \
-text {Current Branch:} \
-anchor w \
- -justify left \
- -font font_ui
+ -justify left
label .branch.cb \
-textvariable current_branch \
-anchor w \
- -justify left \
- -font font_ui
+ -justify left
pack .branch.l1 -side left
pack .branch.cb -side left -fill x
pack .branch -side top -fill x
-if {!$single_commit} {
- menu .mbar.merge
- .mbar.merge add command -label {Local Merge...} \
- -command do_local_merge \
- -font font_ui
- lappend disable_on_lock \
- [list .mbar.merge entryconf [.mbar.merge index last] -state]
- .mbar.merge add command -label {Abort Merge...} \
- -command do_reset_hard \
- -font font_ui
- lappend disable_on_lock \
- [list .mbar.merge entryconf [.mbar.merge index last] -state]
-
-
- menu .mbar.fetch
-
- menu .mbar.push
- .mbar.push add command -label {Push...} \
- -command do_push_anywhere \
- -font font_ui
-}
-
# -- Main Window Layout
#
panedwindow .vpane -orient vertical
# -- Index File List
#
frame .vpane.files.index -height 100 -width 200
-label .vpane.files.index.title -text {Changes To Be Committed} \
- -background green \
- -font font_ui
+label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
+ -background lightgreen
text $ui_index -background white -borderwidth 0 \
-width 20 -height 10 \
-wrap none \
- -font font_ui \
-cursor $cursor_ptr \
-xscrollcommand {.vpane.files.index.sx set} \
-yscrollcommand {.vpane.files.index.sy set} \
# -- Working Directory File List
#
frame .vpane.files.workdir -height 100 -width 200
-label .vpane.files.workdir.title -text {Changed But Not Updated} \
- -background red \
- -font font_ui
+label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
+ -background lightsalmon
text $ui_workdir -background white -borderwidth 0 \
-width 20 -height 10 \
-wrap none \
- -font font_ui \
-cursor $cursor_ptr \
-xscrollcommand {.vpane.files.workdir.sx set} \
-yscrollcommand {.vpane.files.workdir.sy set} \
.vpane.files add .vpane.files.workdir -sticky nsew
foreach i [list $ui_index $ui_workdir] {
- $i tag conf in_diff -font font_uibold
- $i tag conf in_sel \
- -background [$i cget -foreground] \
- -foreground [$i cget -background]
+ $i tag conf in_diff -background lightgray
+ $i tag conf in_sel -background lightgray
}
unset i
frame .vpane.lower.commarea.buttons
label .vpane.lower.commarea.buttons.l -text {} \
-anchor w \
- -justify left \
- -font font_ui
+ -justify left
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
- -command do_rescan \
- -font font_ui
+ -command do_rescan
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
lappend disable_on_lock \
{.vpane.lower.commarea.buttons.rescan conf -state}
-button .vpane.lower.commarea.buttons.incall -text {Add All} \
- -command do_add_all \
- -font font_ui
+button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
+ -command do_add_all
pack .vpane.lower.commarea.buttons.incall -side top -fill x
lappend disable_on_lock \
{.vpane.lower.commarea.buttons.incall conf -state}
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
- -command do_signoff \
- -font font_ui
+ -command do_signoff
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
button .vpane.lower.commarea.buttons.commit -text {Commit} \
- -command do_commit \
- -font font_ui
+ -command do_commit
pack .vpane.lower.commarea.buttons.commit -side top -fill x
lappend disable_on_lock \
{.vpane.lower.commarea.buttons.commit conf -state}
-text {New Commit} \
-command do_select_commit_type \
-variable selected_commit_type \
- -value new \
- -font font_ui
+ -value new
lappend disable_on_lock \
[list .vpane.lower.commarea.buffer.header.new conf -state]
radiobutton .vpane.lower.commarea.buffer.header.amend \
-text {Amend Last Commit} \
-command do_select_commit_type \
-variable selected_commit_type \
- -value amend \
- -font font_ui
+ -value amend
lappend disable_on_lock \
[list .vpane.lower.commarea.buffer.header.amend conf -state]
label $ui_coml \
-anchor w \
- -justify left \
- -font font_ui
+ -justify left
proc trace_commit_type {varname args} {
global ui_coml commit_type
switch -glob -- $commit_type {
menu $ctxm -tearoff 0
$ctxm add command \
-label {Cut} \
- -font font_ui \
-command {tk_textCut $ui_comm}
$ctxm add command \
-label {Copy} \
- -font font_ui \
-command {tk_textCopy $ui_comm}
$ctxm add command \
-label {Paste} \
- -font font_ui \
-command {tk_textPaste $ui_comm}
$ctxm add command \
-label {Delete} \
- -font font_ui \
-command {$ui_comm delete sel.first sel.last}
$ctxm add separator
$ctxm add command \
-label {Select All} \
- -font font_ui \
-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
$ctxm add command \
-label {Copy All} \
- -font font_ui \
-command {
$ui_comm tag add sel 0.0 end
tk_textCopy $ui_comm
$ctxm add separator
$ctxm add command \
-label {Sign Off} \
- -font font_ui \
-command do_signoff
bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
# -- Diff Header
#
-set current_diff_path {}
-set current_diff_side {}
-set diff_actions [list]
proc trace_current_diff_path {varname args} {
global current_diff_path diff_actions file_states
if {$current_diff_path eq {}} {
}
trace add variable current_diff_path write trace_current_diff_path
-frame .vpane.lower.diff.header -background orange
+frame .vpane.lower.diff.header -background gold
label .vpane.lower.diff.header.status \
- -background orange \
+ -background gold \
-width $max_status_desc \
-anchor w \
- -justify left \
- -font font_ui
+ -justify left
label .vpane.lower.diff.header.file \
- -background orange \
+ -background gold \
-anchor w \
- -justify left \
- -font font_ui
+ -justify left
label .vpane.lower.diff.header.path \
- -background orange \
+ -background gold \
-anchor w \
- -justify left \
- -font font_ui
+ -justify left
pack .vpane.lower.diff.header.status -side left
pack .vpane.lower.diff.header.file -side left
pack .vpane.lower.diff.header.path -fill x
menu $ctxm -tearoff 0
$ctxm add command \
-label {Copy} \
- -font font_ui \
-command {
clipboard clear
clipboard append \
menu $ctxm -tearoff 0
$ctxm add command \
-label {Refresh} \
- -font font_ui \
-command reshow_diff
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
-label {Copy} \
- -font font_ui \
-command {tk_textCopy $ui_diff}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
-label {Select All} \
- -font font_ui \
-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
-label {Copy All} \
- -font font_ui \
-command {
$ui_diff tag add sel 0.0 end
tk_textCopy $ui_diff
$ctxm add separator
$ctxm add command \
-label {Apply/Reverse Hunk} \
- -font font_ui \
-command {apply_hunk $cursorX $cursorY}
set ui_diff_applyhunk [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
$ctxm add separator
$ctxm add command \
-label {Decrease Font Size} \
- -font font_ui \
-command {incr_font_size font_diff -1}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
-label {Increase Font Size} \
- -font font_ui \
-command {incr_font_size font_diff 1}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
-label {Show Less Context} \
- -font font_ui \
- -command {if {$repo_config(gui.diffcontext) >= 2} {
+ -command {if {$repo_config(gui.diffcontext) >= 1} {
incr repo_config(gui.diffcontext) -1
reshow_diff
}}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
-label {Show More Context} \
- -font font_ui \
- -command {
+ -command {if {$repo_config(gui.diffcontext) < 99} {
incr repo_config(gui.diffcontext)
reshow_diff
- }
+ }}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command -label {Options...} \
- -font font_ui \
-command do_options
bind_button3 $ui_diff "
set cursorX %x
# -- Status Bar
#
-set ui_status_value {Initializing...}
label .status -textvariable ui_status_value \
-anchor w \
-justify left \
-borderwidth 1 \
- -relief sunken \
- -font font_ui
+ -relief sunken
pack .status -anchor w -side bottom -fill x
# -- Load geometry
bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
+bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
+bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
+bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
+bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
+bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
+bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
bind $ui_diff <Button-1> {focus %W}
-if {!$single_commit} {
+if {[is_enabled branch]} {
bind . <$M1B-Key-n> do_create_branch
bind . <$M1B-Key-N> do_create_branch
}
-bind . <Destroy> do_quit
bind all <Key-F5> do_rescan
bind all <$M1B-Key-r> do_rescan
bind all <$M1B-Key-R> do_rescan
bind . <$M1B-Key-i> do_add_all
bind . <$M1B-Key-I> do_add_all
bind . <$M1B-Key-Return> do_commit
-bind all <$M1B-Key-q> do_quit
-bind all <$M1B-Key-Q> do_quit
-bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
-bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
foreach i [list $ui_index $ui_workdir] {
bind $i <Button-1> "toggle_or_diff $i %x %y; break"
bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
set file_lists($ui_index) [list]
set file_lists($ui_workdir) [list]
-set HEAD {}
-set PARENT {}
-set MERGE_HEAD [list]
-set commit_type {}
-set empty_tree {}
-set current_branch {}
-set current_diff_path {}
-set selected_commit_type new
-
-wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
+wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
focus -force $ui_comm
# -- Warn the user about environmental problems. Cygwin's Tcl
# -- Only initialize complex UI if we are going to stay running.
#
-if {!$single_commit} {
+if {[is_enabled transport]} {
load_all_remotes
load_all_heads
# -- Only suggest a gc run if we are going to stay running.
#
-if {!$single_commit} {
+if {[is_enabled multicommit]} {
set object_limit 2000
if {[is_Windows]} {set object_limit 200}
- regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
+ regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
if {$objects_current >= $object_limit} {
if {[ask_popup \
"This repository currently has $objects_current loose objects.
-To maintain optimal performance it is strongly
-recommended that you compress the database
-when more than $object_limit loose objects exist.
+To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
Compress the database now?"] eq yes} {
do_gc