![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 0b941c3ffb8a320e0e8c86413d7a3463d71c51ba..ca7f8dbc414b365a70489a5323f6e9ee440eb5c5 100755 (executable)
--- a/git-gui
+++ b/git-gui
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.
+set appname [lindex [file split $argv0] end]
+set gitdir {}
+
+######################################################################
+##
+## config
+
+proc is_many_config {name} {
+ switch -glob -- $name {
+ remote.*.fetch -
+ remote.*.push
+ {return 1}
+ *
+ {return 0}
+ }
+}
+
+proc load_config {include_global} {
+ global repo_config global_config default_config
+
+ array unset global_config
+ if {$include_global} {
+ catch {
+ set fd_rc [open "| git repo-config --global --list" r]
+ while {[gets $fd_rc line] >= 0} {
+ if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
+ if {[is_many_config $name]} {
+ lappend global_config($name) $value
+ } else {
+ set global_config($name) $value
+ }
+ }
+ }
+ close $fd_rc
+ }
+ }
+
+ array unset repo_config
+ catch {
+ set fd_rc [open "| git repo-config --list" r]
+ while {[gets $fd_rc line] >= 0} {
+ if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
+ if {[is_many_config $name]} {
+ lappend repo_config($name) $value
+ } else {
+ set repo_config($name) $value
+ }
+ }
+ }
+ close $fd_rc
+ }
+
+ foreach name [array names default_config] {
+ if {[catch {set v $global_config($name)}]} {
+ set global_config($name) $default_config($name)
+ }
+ if {[catch {set v $repo_config($name)}]} {
+ set repo_config($name) $default_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
+ }
+ }
+ }
+
+ 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 error_popup {msg} {
+ global gitdir appname
+
+ set title $appname
+ if {$gitdir ne {}} {
+ append title { (}
+ append title [lindex \
+ [file split [file normalize [file dirname $gitdir]]] \
+ end]
+ append title {)}
+ }
+ tk_messageBox \
+ -parent . \
+ -icon error \
+ -type ok \
+ -title "$title: error" \
+ -message $msg
+}
+
+proc info_popup {msg} {
+ global gitdir appname
+
+ set title $appname
+ if {$gitdir ne {}} {
+ append title { (}
+ append title [lindex \
+ [file split [file normalize [file dirname $gitdir]]] \
+ end]
+ append title {)}
+ }
+ tk_messageBox \
+ -parent . \
+ -icon error \
+ -type ok \
+ -title $title \
+ -message $msg
+}
+
+######################################################################
+##
+## repository setup
+
+if { [catch {set cdup [exec git rev-parse --show-cdup]} err]
+ || [catch {set gitdir [exec git rev-parse --git-dir]} err]} {
+ catch {wm withdraw .}
+ error_popup "Cannot find the git directory:\n\n$err"
+ exit 1
+}
+if {$cdup ne ""} {
+ cd $cdup
+}
+unset cdup
+
+set single_commit 0
+if {$appname eq {git-citool}} {
+ set single_commit 1
+}
+
######################################################################
##
## task management
set status_active 0
set diff_active 0
-set checkin_active 0
-set update_index_fd {}
set disable_on_lock [list]
set index_lock_type none
+set HEAD {}
+set PARENT {}
+set commit_type {}
+
proc lock_index {type} {
global index_lock_type disable_on_lock
- if {$index_lock_type == {none}} {
+ if {$index_lock_type eq {none}} {
set index_lock_type $type
foreach w $disable_on_lock {
uplevel #0 $w disabled
}
return 1
- } elseif {$index_lock_type == {begin-update} && $type == {update}} {
+ } elseif {$index_lock_type eq {begin-update} && $type eq {update}} {
set index_lock_type $type
return 1
}
##
## status
-proc update_status {} {
- global gitdir HEAD commit_type
+proc repository_state {hdvar ctvar} {
+ global gitdir
+ upvar $hdvar hd $ctvar ct
+
+ if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
+ set ct initial
+ } elseif {[file exists [file join $gitdir MERGE_HEAD]]} {
+ set ct merge
+ } else {
+ set ct normal
+ }
+}
+
+proc update_status {{final Ready.}} {
+ global HEAD PARENT commit_type
global ui_index ui_other ui_status_value ui_comm
global status_active file_states
+ global repo_config
if {$status_active || ![lock_index read]} return
- array unset file_states
- foreach w [list $ui_index $ui_other] {
- $w conf -state normal
- $w delete 0.0 end
- $w conf -state disabled
- }
-
- if {[catch {set HEAD [exec git rev-parse --verify HEAD]}]} {
- set commit_type initial
+ repository_state new_HEAD new_type
+ if {$commit_type eq {amend}
+ && $new_type eq {normal}
+ && $new_HEAD eq $HEAD} {
} else {
- set commit_type normal
+ set HEAD $new_HEAD
+ set PARENT $new_HEAD
+ set commit_type $new_type
}
+ array unset file_states
+
if {![$ui_comm edit modified]
- || [string trim [$ui_comm get 0.0 end]] == {}} {
+ || [string trim [$ui_comm get 0.0 end]] eq {}} {
if {[load_message GITGUI_MSG]} {
} elseif {[load_message MERGE_MSG]} {
} elseif {[load_message SQUASH_MSG]} {
}
$ui_comm edit modified false
+ $ui_comm edit reset
}
- set status_active 1
- set ui_status_value {Refreshing file status...}
- set fd_rf [open "| git update-index -q --unmerged --refresh" r]
- fconfigure $fd_rf -blocking 0 -translation binary
- fileevent $fd_rf readable [list read_refresh $fd_rf]
+ if {$repo_config(gui.trustmtime) eq {true}} {
+ update_status_stage2 {} $final
+ } else {
+ set status_active 1
+ 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 update_status_stage2 $fd_rf $final]
+ }
}
-proc read_refresh {fd} {
- global gitdir HEAD commit_type
+proc update_status_stage2 {fd final} {
+ global gitdir PARENT commit_type
global ui_index ui_other ui_status_value ui_comm
- global status_active file_states
+ global status_active
+ global buf_rdi buf_rdf buf_rlo
- read $fd
- if {![eof $fd]} return
- close $fd
+ if {$fd ne {}} {
+ read $fd
+ if {![eof $fd]} return
+ close $fd
+ }
set ls_others [list | git ls-files --others -z \
--exclude-per-directory=.gitignore]
lappend ls_others "--exclude-from=$info_exclude"
}
+ set buf_rdi {}
+ set buf_rdf {}
+ set buf_rlo {}
+
set status_active 3
set ui_status_value {Scanning for modified files ...}
- set fd_di [open "| git diff-index --cached -z $HEAD" r]
+ set fd_di [open "| git diff-index --cached -z $PARENT" r]
set fd_df [open "| git diff-files -z" r]
set fd_lo [open $ls_others r]
fconfigure $fd_di -blocking 0 -translation binary
fconfigure $fd_df -blocking 0 -translation binary
fconfigure $fd_lo -blocking 0 -translation binary
- fileevent $fd_di readable [list read_diff_index $fd_di]
- fileevent $fd_df readable [list read_diff_files $fd_df]
- fileevent $fd_lo readable [list read_ls_others $fd_lo]
+ fileevent $fd_di readable [list read_diff_index $fd_di $final]
+ fileevent $fd_df readable [list read_diff_files $fd_df $final]
+ fileevent $fd_lo readable [list read_ls_others $fd_lo $final]
}
proc load_message {file} {
global gitdir ui_comm
set f [file join $gitdir $file]
- if {[file exists $f]} {
+ if {[file isfile $f]} {
if {[catch {set fd [open $f r]}]} {
return 0
}
- set content [read $fd]
+ set content [string trim [read $fd]]
close $fd
$ui_comm delete 0.0 end
$ui_comm insert end $content
return 0
}
-proc read_diff_index {fd} {
+proc read_diff_index {fd final} {
global buf_rdi
append buf_rdi [read $fd]
- set pck [split $buf_rdi "\0"]
- set buf_rdi [lindex $pck end]
- foreach {m p} [lrange $pck 0 end-1] {
- if {$m != {} && $p != {}} {
- display_file $p [string index $m end]_
- }
+ set c 0
+ set n [string length $buf_rdi]
+ while {$c < $n} {
+ set z1 [string first "\0" $buf_rdi $c]
+ if {$z1 == -1} break
+ incr z1
+ set z2 [string first "\0" $buf_rdi $z1]
+ if {$z2 == -1} break
+
+ set c $z2
+ incr z2 -1
+ display_file \
+ [string range $buf_rdi $z1 $z2] \
+ [string index $buf_rdi [expr $z1 - 2]]_
+ incr c
}
- status_eof $fd buf_rdi
+ if {$c < $n} {
+ set buf_rdi [string range $buf_rdi $c end]
+ } else {
+ set buf_rdi {}
+ }
+
+ status_eof $fd buf_rdi $final
}
-proc read_diff_files {fd} {
+proc read_diff_files {fd final} {
global buf_rdf
append buf_rdf [read $fd]
- set pck [split $buf_rdf "\0"]
- set buf_rdf [lindex $pck end]
- foreach {m p} [lrange $pck 0 end-1] {
- if {$m != {} && $p != {}} {
- display_file $p _[string index $m end]
- }
+ set c 0
+ set n [string length $buf_rdf]
+ while {$c < $n} {
+ set z1 [string first "\0" $buf_rdf $c]
+ if {$z1 == -1} break
+ incr z1
+ set z2 [string first "\0" $buf_rdf $z1]
+ if {$z2 == -1} break
+
+ set c $z2
+ incr z2 -1
+ display_file \
+ [string range $buf_rdf $z1 $z2] \
+ _[string index $buf_rdf [expr $z1 - 2]]
+ incr c
+ }
+ if {$c < $n} {
+ set buf_rdf [string range $buf_rdf $c end]
+ } else {
+ set buf_rdf {}
}
- status_eof $fd buf_rdf
+
+ status_eof $fd buf_rdf $final
}
-proc read_ls_others {fd} {
+proc read_ls_others {fd final} {
global buf_rlo
append buf_rlo [read $fd]
foreach p [lrange $pck 0 end-1] {
display_file $p _O
}
- status_eof $fd buf_rlo
+ status_eof $fd buf_rlo $final
}
-proc status_eof {fd buf} {
- global status_active $buf
- global ui_fname_value ui_status_value
+proc status_eof {fd buf final} {
+ global status_active ui_status_value
+ upvar $buf to_clear
if {[eof $fd]} {
- set $buf {}
+ set to_clear {}
close $fd
+
if {[incr status_active -1] == 0} {
+ display_all_files
unlock_index
- set ui_status_value {Ready.}
- if {$ui_fname_value != {}} {
- show_diff $ui_fname_value
- }
+ reshow_diff
+ set ui_status_value $final
}
}
}
## diff
proc clear_diff {} {
- global ui_diff ui_fname_value ui_fstatus_value
+ global ui_diff ui_fname_value ui_fstatus_value ui_index ui_other
$ui_diff conf -state normal
$ui_diff delete 0.0 end
$ui_diff conf -state disabled
+
set ui_fname_value {}
set ui_fstatus_value {}
+
+ $ui_index tag remove in_diff 0.0 end
+ $ui_other tag remove in_diff 0.0 end
}
-proc show_diff {path} {
- global file_states HEAD diff_3way diff_active
+proc reshow_diff {} {
+ global ui_fname_value ui_status_value file_states
+
+ if {$ui_fname_value eq {}
+ || [catch {set s $file_states($ui_fname_value)}]} {
+ clear_diff
+ } else {
+ show_diff $ui_fname_value
+ }
+}
+
+proc handle_empty_diff {} {
+ global ui_fname_value file_states file_lists
+
+ set path $ui_fname_value
+ set s $file_states($path)
+ if {[lindex $s 0] ne {_M}} return
+
+ info_popup "No differences detected.
+
+[short_path $path] has no changes.
+
+The modification date of this file was updated by another
+application and you currently have the Trust File Modification
+Timestamps option enabled, so Git did not automatically detect
+that there are no content differences in this file.
+
+This file will now be removed from the modified files list, to
+prevent possible confusion.
+"
+ if {[catch {exec git update-index -- $path} err]} {
+ error_popup "Failed to refresh index:\n\n$err"
+ }
+
+ clear_diff
+ set old_w [mapcol [lindex $file_states($path) 0] $path]
+ set lno [lsearch -sorted $file_lists($old_w) $path]
+ if {$lno >= 0} {
+ set file_lists($old_w) \
+ [lreplace $file_lists($old_w) $lno $lno]
+ incr lno
+ $old_w conf -state normal
+ $old_w delete $lno.0 [expr $lno + 1].0
+ $old_w conf -state disabled
+ }
+}
+
+proc show_diff {path {w {}} {lno {}}} {
+ global file_states file_lists
+ global PARENT diff_3way diff_active repo_config
global ui_diff ui_fname_value ui_fstatus_value ui_status_value
if {$diff_active || ![lock_index read]} return
clear_diff
+ if {$w eq {} || $lno == {}} {
+ foreach w [array names file_lists] {
+ set lno [lsearch -sorted $file_lists($w) $path]
+ if {$lno >= 0} {
+ incr lno
+ break
+ }
+ }
+ }
+ if {$w ne {} && $lno >= 1} {
+ $w tag add in_diff $lno.0 [expr $lno + 1].0
+ }
+
set s $file_states($path)
set m [lindex $s 0]
set diff_3way 0
set diff_active 1
set ui_fname_value $path
set ui_fstatus_value [mapdesc $m $path]
- set ui_status_value "Loading diff of $path..."
+ set ui_status_value "Loading diff of [escape_path $path]..."
- set cmd [list | git diff-index -p $HEAD -- $path]
- switch $m {
- AM {
+ set cmd [list | git diff-index]
+ lappend cmd --no-color
+ if {$repo_config(gui.diffcontext) > 0} {
+ lappend cmd "-U$repo_config(gui.diffcontext)"
}
+ lappend cmd -p
+
+ switch $m {
MM {
- set cmd [list | git diff-index -p -c $HEAD $path]
+ lappend cmd -c
}
_O {
if {[catch {
} err ]} {
set diff_active 0
unlock_index
- set ui_status_value "Unable to display $path"
- error_popup "Error loading file:\n$err"
+ set ui_status_value "Unable to display [escape_path $path]"
+ error_popup "Error loading file:\n\n$err"
return
}
$ui_diff conf -state normal
$ui_diff insert end $content
$ui_diff conf -state disabled
+ set diff_active 0
+ unlock_index
+ set ui_status_value {Ready.}
return
}
}
+ lappend cmd $PARENT
+ 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 $path"
- error_popup "Error loading diff:\n$err"
+ set ui_status_value "Unable to display [escape_path $path]"
+ error_popup "Error loading diff:\n\n$err"
return
}
proc read_diff {fd} {
global ui_diff ui_status_value diff_3way diff_active
+ global repo_config
while {[gets $fd line] >= 0} {
if {[string match {diff --git *} $line]} continue
set diff_active 0
unlock_index
set ui_status_value {Ready.}
+
+ if {$repo_config(gui.trustmtime) eq {true}
+ && [$ui_diff index end] eq {2.0}} {
+ handle_empty_diff
+ }
+ }
+}
+
+######################################################################
+##
+## commit
+
+proc load_last_commit {} {
+ global HEAD PARENT commit_type ui_comm
+
+ if {$commit_type eq {amend}} return
+ if {$commit_type ne {normal}} {
+ error_popup "Can't amend a $commit_type commit."
+ return
+ }
+
+ set msg {}
+ set parent {}
+ set parent_count 0
+ if {[catch {
+ set fd [open "| git cat-file commit $HEAD" r]
+ while {[gets $fd line] > 0} {
+ if {[string match {parent *} $line]} {
+ set parent [string range $line 7 end]
+ incr parent_count
+ }
+ }
+ set msg [string trim [read $fd]]
+ close $fd
+ } err]} {
+ error_popup "Error loading commit data for amend:\n\n$err"
+ return
+ }
+
+ if {$parent_count == 0} {
+ set commit_type amend
+ set HEAD {}
+ set PARENT {}
+ update_status
+ } elseif {$parent_count == 1} {
+ set commit_type amend
+ set PARENT $parent
+ $ui_comm delete 0.0 end
+ $ui_comm insert end $msg
+ $ui_comm edit modified false
+ $ui_comm edit reset
+ update_status
+ } else {
+ error_popup {You can't amend a merge commit.}
+ return
+ }
+}
+
+proc commit_tree {} {
+ global tcl_platform HEAD gitdir commit_type file_states
+ global pch_error
+ global ui_status_value ui_comm
+
+ if {![lock_index update]} return
+
+ # -- Our in memory state should match the repository.
+ #
+ repository_state curHEAD cur_type
+ if {$commit_type eq {amend}
+ && $cur_type eq {normal}
+ && $curHEAD eq $HEAD} {
+ } elseif {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
+ error_popup {Last scanned state does not match repository state.
+
+Its highly likely that another Git program modified the
+repository since our last scan. A rescan is required
+before committing.
+}
+ unlock_index
+ update_status
+ return
+ }
+
+ # -- At least one file should differ in the index.
+ #
+ set files_ready 0
+ foreach path [array names file_states] {
+ set s $file_states($path)
+ switch -glob -- [lindex $s 0] {
+ _? {continue}
+ A? -
+ D? -
+ M? {set files_ready 1; break}
+ U? {
+ error_popup "Unmerged files cannot be committed.
+
+File [short_path $path] has merge conflicts.
+You must resolve them and include 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} {
+ error_popup {No included files to commit.
+
+You must include 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]]
+ 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
}
+
+ # -- Ask the pre-commit hook for the go-ahead.
+ #
+ set pchook [file join $gitdir hooks pre-commit]
+ if {$tcl_platform(platform) eq {windows} && [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 {
+ set pchook {}
+ }
+ if {$pchook ne {}} {
+ 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_stage1 $fd_ph $curHEAD $msg]
+ } else {
+ commit_stage2 $curHEAD $msg
+ }
+}
+
+proc commit_stage1 {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_stage2 $curHEAD $msg
+ }
+ set pch_error {}
+ } else {
+ fconfigure $fd_ph -blocking 0
+ }
+}
+
+proc commit_stage2 {curHEAD msg} {
+ global ui_status_value
+
+ # -- Write the tree in the background.
+ #
+ set ui_status_value {Committing changes...}
+ set fd_wt [open "| git write-tree" r]
+ fileevent $fd_wt readable [list commit_stage3 $fd_wt $curHEAD $msg]
+}
+
+proc commit_stage3 {fd_wt curHEAD msg} {
+ global single_commit gitdir HEAD PARENT commit_type tcl_platform
+ global ui_status_value ui_comm
+ global file_states
+
+ 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
+ }
+
+ # -- Create the commit.
+ #
+ set cmd [list git commit-tree $tree_id]
+ if {$PARENT ne {}} {
+ lappend cmd -p $PARENT
+ }
+ if {$commit_type eq {merge}} {
+ if {[catch {
+ set fd_mh [open [file join $gitdir MERGE_HEAD] r]
+ while {[gets $fd_mh merge_head] >= 0} {
+ lappend cmd -p $merge_head
+ }
+ close $fd_mh
+ } err]} {
+ error_popup "Loading MERGE_HEAD failed:\n\n$err"
+ set ui_status_value {Commit failed.}
+ unlock_index
+ return
+ }
+ }
+ if {$PARENT eq {}} {
+ # git commit-tree writes to stderr during initial commit.
+ lappend cmd 2>/dev/null
+ }
+ lappend cmd << $msg
+ 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
+ }
+
+ # -- Cleanup after ourselves.
+ #
+ catch {file delete [file join $gitdir MERGE_HEAD]}
+ catch {file delete [file join $gitdir MERGE_MSG]}
+ catch {file delete [file join $gitdir SQUASH_MSG]}
+ catch {file delete [file join $gitdir GITGUI_MSG]}
+
+ # -- Let rerere do its thing.
+ #
+ if {[file isdirectory [file join $gitdir rr-cache]]} {
+ catch {exec git rerere}
+ }
+
+ # -- Run the post-commit hook.
+ #
+ set pchook [file join $gitdir hooks post-commit]
+ if {$tcl_platform(platform) eq {windows} && [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 modified false
+ $ui_comm edit reset
+
+ if {$single_commit} do_quit
+
+ # -- Update status without invoking any git commands.
+ #
+ set commit_type normal
+ set HEAD $cmt_id
+ set PARENT $cmt_id
+
+ foreach path [array names file_states] {
+ set s $file_states($path)
+ set m [lindex $s 0]
+ switch -glob -- $m {
+ A? -
+ M? -
+ D? {set m _[string index $m 1]}
+ }
+
+ if {$m eq {__}} {
+ unset file_states($path)
+ } else {
+ lset file_states($path) 0 $m
+ }
+ }
+
+ display_all_files
+ unlock_index
+ reshow_diff
+ set ui_status_value \
+ "Changes committed as [string range $cmt_id 0 7]."
+}
+
+######################################################################
+##
+## fetch pull 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
+}
+
+proc pull_remote {remote branch} {
+ global HEAD commit_type file_states repo_config
+
+ if {![lock_index update]} return
+
+ # -- Our in memory state should match the repository.
+ #
+ repository_state curHEAD cur_type
+ if {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
+ error_popup {Last scanned state does not match repository state.
+
+Its highly likely that another Git program modified the
+repository since our last scan. A rescan is required
+before a pull can be started.
+}
+ unlock_index
+ update_status
+ return
+ }
+
+ # -- No differences should exist before a pull.
+ #
+ if {[array size file_states] != 0} {
+ error_popup {Uncommitted but modified files are present.
+
+You should not perform a pull with unmodified files in your working
+directory as Git would be unable to recover from an incorrect merge.
+
+Commit or throw away all changes before starting a pull operation.
+}
+ unlock_index
+ return
+ }
+
+ set w [new_console "pull $remote $branch" \
+ "Pulling new changes from branch $branch in $remote"]
+ set cmd [list git pull]
+ if {$repo_config(gui.pullsummary) eq {false}} {
+ lappend cmd --no-summary
+ }
+ lappend cmd $remote
+ lappend cmd $branch
+ console_exec $w $cmd [list post_pull_remote $remote $branch]
+}
+
+proc post_pull_remote {remote branch success} {
+ global HEAD PARENT commit_type
+ global ui_status_value
+
+ unlock_index
+ if {$success} {
+ repository_state HEAD commit_type
+ set PARENT $HEAD
+ set $ui_status_value {Ready.}
+ } else {
+ update_status \
+ "Conflicts detected while pulling $branch from $remote."
+ }
+}
+
+proc push_to {remote} {
+ set w [new_console "push $remote" \
+ "Pushing changes to $remote"]
+ set cmd [list git push]
+ lappend cmd $remote
+ console_exec $w $cmd
}
######################################################################
## ui helpers
proc mapcol {state path} {
- global all_cols
+ global all_cols ui_other
if {[catch {set r $all_cols($state)}]} {
puts "error: no column for state={$state} $path"
- return o
+ return $ui_other
}
return $r
}
return $r
}
-proc bsearch {w path} {
- set hi [expr [lindex [split [$w index end] .] 0] - 2]
- if {$hi == 0} {
- return -1
- }
- set lo 0
- while {$lo < $hi} {
- set mi [expr [expr $lo + $hi] / 2]
- set ti [expr $mi + 1]
- set cmp [string compare [$w get $ti.1 $ti.end] $path]
- if {$cmp < 0} {
- set lo $ti
- } elseif {$cmp == 0} {
- return $mi
- } else {
- set hi $mi
+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
+
+proc merge_state {path new_state} {
+ global file_states next_icon_id
+
+ 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 {$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 _
+ }
+
+ set file_states($path) [list $s0$s1 $icon]
+ return $state
+}
+
+proc display_file {path state} {
+ global file_states file_lists status_active
+
+ set old_m [merge_state $path $state]
+ if {$status_active} return
+
+ set s $file_states($path)
+ set new_m [lindex $s 0]
+ set new_w [mapcol $new_m $path]
+ set old_w [mapcol $old_m $path]
+ set new_icon [mapicon $new_m $path]
+
+ if {$new_w ne $old_w} {
+ set lno [lsearch -sorted $file_lists($old_w) $path]
+ if {$lno >= 0} {
+ incr lno
+ $old_w conf -state normal
+ $old_w delete $lno.0 [expr $lno + 1].0
+ $old_w conf -state disabled
}
+
+ lappend file_lists($new_w) $path
+ set file_lists($new_w) [lsort $file_lists($new_w)]
+ set lno [lsearch -sorted $file_lists($new_w) $path]
+ incr lno
+ $new_w conf -state normal
+ $new_w image create $lno.0 \
+ -align center -padx 5 -pady 1 \
+ -name [lindex $s 1] \
+ -image $new_icon
+ $new_w insert $lno.1 "[escape_path $path]\n"
+ $new_w conf -state disabled
+ } elseif {$new_icon ne [mapicon $old_m $path]} {
+ $new_w conf -state normal
+ $new_w image conf [lindex $s 1] -image $new_icon
+ $new_w conf -state disabled
}
- return -[expr $lo + 1]
}
-proc merge_state {path state} {
- global file_states
+proc display_all_files {} {
+ global ui_index ui_other file_states file_lists
- if {[array names file_states -exact $path] == {}} {
- set o __
- set s [list $o none none]
- } else {
+ $ui_index conf -state normal
+ $ui_other conf -state normal
+
+ $ui_index delete 0.0 end
+ $ui_other delete 0.0 end
+
+ set file_lists($ui_index) [list]
+ set file_lists($ui_other) [list]
+
+ foreach path [lsort [array names file_states]] {
set s $file_states($path)
- set o [lindex $s 0]
+ set m [lindex $s 0]
+ set w [mapcol $m $path]
+ lappend file_lists($w) $path
+ $w image create end \
+ -align center -padx 5 -pady 1 \
+ -name [lindex $s 1] \
+ -image [mapicon $m $path]
+ $w insert end "[escape_path $path]\n"
+ }
+
+ $ui_index conf -state disabled
+ $ui_other conf -state disabled
+}
+
+proc update_index {pathList} {
+ global update_index_cp update_index_rsd ui_status_value
+
+ if {![lock_index update]} return
+
+ set update_index_cp 0
+ set update_index_rsd 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 "Including files ... 0/$totalCnt 0%"
+ set ui_status_value [format \
+ "Including files ... %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 \
+ -translation binary
+ fileevent $fd writable [list \
+ write_update_index \
+ $fd \
+ $pathList \
+ $totalCnt \
+ $batch \
+ ]
+}
+
+proc write_update_index {fd pathList totalCnt batch} {
+ global update_index_cp update_index_rsd ui_status_value
+ global file_states ui_fname_value
+
+ if {$update_index_cp >= $totalCnt} {
+ close $fd
+ unlock_index
+ if {$update_index_rsd} {
+ reshow_diff
+ } else {
+ set ui_status_value {Ready.}
+ }
+ return
}
- set m [lindex $s 0]
- if {[string index $state 0] == "_"} {
- set state [string index $m 0][string index $state 1]
- } elseif {[string index $state 0] == "*"} {
- set state _[string index $state 1]
- }
+ 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 -- [lindex $file_states($path) 0] {
+ AM -
+ _O {set new A*}
+ _M -
+ MM {set new M*}
+ AD -
+ _D {set new D*}
+ default {continue}
+ }
- if {[string index $state 1] == "_"} {
- set state [string index $state 0][string index $m 1]
- } elseif {[string index $state 1] == "*"} {
- set state [string index $state 0]_
+ puts -nonewline $fd $path
+ puts -nonewline $fd "\0"
+ display_file $path $new
+ if {$ui_fname_value eq $path} {
+ set update_index_rsd 1
+ }
}
- set file_states($path) [lreplace $s 0 0 $state]
- return $o
+ set ui_status_value [format \
+ "Including files ... %i/%i files (%.2f%%)" \
+ $update_index_cp \
+ $totalCnt \
+ [expr {100.0 * $update_index_cp / $totalCnt}]]
}
-proc display_file {path state} {
- global ui_index ui_other file_states
-
- set old_m [merge_state $path $state]
- set s $file_states($path)
- set m [lindex $s 0]
-
- if {[mapcol $m $path] == "o"} {
- set ii 1
- set ai 2
- set iw $ui_index
- set aw $ui_other
- } else {
- set ii 2
- set ai 1
- set iw $ui_other
- set aw $ui_index
+######################################################################
+##
+## remote management
+
+proc load_all_remotes {} {
+ global gitdir all_remotes repo_config
+
+ set all_remotes [list]
+ set rm_dir [file join $gitdir remotes]
+ if {[file isdirectory $rm_dir]} {
+ set all_remotes [concat $all_remotes [glob \
+ -types f \
+ -tails \
+ -nocomplain \
+ -directory $rm_dir *]]
}
- set d [lindex $s $ii]
- if {$d != "none"} {
- set lno [bsearch $iw $path]
- if {$lno >= 0} {
- incr lno
- $iw conf -state normal
- $iw delete $lno.0 [expr $lno + 1].0
- $iw conf -state disabled
- set s [lreplace $s $ii $ii none]
+ foreach line [array names repo_config remote.*.url] {
+ if {[regexp ^remote\.(.*)\.url\$ $line line name]} {
+ lappend all_remotes $name
}
}
- set d [lindex $s $ai]
- if {$d == "none"} {
- set lno [expr abs([bsearch $aw $path] + 1) + 1]
- $aw conf -state normal
- set ico [$aw image create $lno.0 \
- -align center -padx 5 -pady 1 \
- -image [mapicon $m $path]]
- $aw insert $lno.1 "$path\n"
- $aw conf -state disabled
- set file_states($path) [lreplace $s $ai $ai [list $ico]]
- } elseif {[mapicon $m $path] != [mapicon $old_m $path]} {
- set ico [lindex $d 0]
- $aw image conf $ico -image [mapicon $m $path]
- }
-}
-
-proc with_update_index {body} {
- global update_index_fd
-
- if {$update_index_fd == {}} {
- if {![lock_index update]} return
- set update_index_fd [open \
- "| git update-index --add --remove -z --stdin" \
- w]
- fconfigure $update_index_fd -translation binary
- uplevel 1 $body
- close $update_index_fd
- set update_index_fd {}
- unlock_index
- } else {
- uplevel 1 $body
- }
+ set all_remotes [lsort -unique $all_remotes]
}
-proc update_index {path} {
- global update_index_fd
+proc populate_remote_menu {m pfx op} {
+ global all_remotes
- if {$update_index_fd == {}} {
- error {not in with_update_index}
- } else {
- puts -nonewline $update_index_fd "$path\0"
+ foreach remote $all_remotes {
+ $m add command -label "$pfx $remote..." \
+ -command [list $op $remote] \
+ -font font_ui
}
}
-proc toggle_mode {path} {
- global file_states
+proc populate_pull_menu {m} {
+ global gitdir repo_config all_remotes disable_on_lock
- set s $file_states($path)
- set m [lindex $s 0]
+ foreach remote $all_remotes {
+ set rb {}
+ if {[array get repo_config remote.$remote.url] ne {}} {
+ if {[array get repo_config remote.$remote.fetch] ne {}} {
+ regexp {^([^:]+):} \
+ [lindex $repo_config(remote.$remote.fetch) 0] \
+ line rb
+ }
+ } else {
+ catch {
+ set fd [open [file join $gitdir remotes $remote] r]
+ while {[gets $fd line] >= 0} {
+ if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
+ break
+ }
+ }
+ close $fd
+ }
+ }
- switch -- $m {
- AM -
- _O {set new A*}
- _M -
- MM {set new M*}
- _D {set new D*}
- default {return}
+ set rb_short $rb
+ regsub ^refs/heads/ $rb {} rb_short
+ if {$rb_short ne {}} {
+ $m add command \
+ -label "Branch $rb_short from $remote..." \
+ -command [list pull_remote $remote $rb] \
+ -font font_ui
+ lappend disable_on_lock \
+ [list $m entryconf [$m index last] -state]
+ }
}
-
- with_update_index {update_index $path}
- display_file $path $new
}
######################################################################
0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask
+set ui_index .vpane.files.index.list
+set ui_other .vpane.files.other.list
set max_status_desc 0
foreach i {
{__ i plain "Unmodified"}
{_M i mod "Modified"}
- {M_ i fulltick "Checked in"}
- {MM i parttick "Partially checked in"}
+ {M_ i fulltick "Included in commit"}
+ {MM i parttick "Partially included"}
{_O o plain "Untracked"}
- {A_ o fulltick "Added"}
+ {A_ o fulltick "Added by commit"}
{AM o parttick "Partially added"}
+ {AD o question "Added (but now gone)"}
{_D i question "Missing"}
- {D_ i removed "Removed"}
- {DD i removed "Removed"}
+ {D_ i removed "Removed by commit"}
+ {DD i removed "Removed by commit"}
{DO i removed "Removed (still exists)"}
{UM i merge "Merge conflicts"}
if {$max_status_desc < [string length [lindex $i 3]]} {
set max_status_desc [string length [lindex $i 3]]
}
- set all_cols([lindex $i 0]) [lindex $i 1]
+ if {[lindex $i 1] eq {i}} {
+ set all_cols([lindex $i 0]) $ui_index
+ } else {
+ set all_cols([lindex $i 0]) $ui_other
+ }
set all_icons([lindex $i 0]) file_[lindex $i 2]
set all_descs([lindex $i 0]) [lindex $i 3]
}
##
## util
-proc error_popup {msg} {
- set w .error
- toplevel $w
- wm transient $w .
- show_msg $w $w $msg
+proc is_MacOSX {} {
+ global tcl_platform tk_library
+ if {$tcl_platform(platform) eq {unix}
+ && $tcl_platform(os) eq {Darwin}
+ && [string match /Library/Frameworks/* $tk_library]} {
+ return 1
+ }
+ return 0
}
-proc show_msg {w top msg} {
- global gitdir
+proc bind_button3 {w cmd} {
+ bind $w <Any-Button-3> $cmd
+ if {[is_MacOSX]} {
+ bind $w <Control-Button-1> $cmd
+ }
+}
- message $w.m -text $msg -justify left -aspect 400
- pack $w.m -side top -fill x -padx 20 -pady 20
- button $w.ok -text OK -command "destroy $top"
- pack $w.ok -side bottom
- bind $top <Visibility> "grab $top; focus $top"
- bind $top <Key-Return> "destroy $top"
- wm title $top "error: git-ui ([file normalize [file dirname $gitdir]])"
- tkwait window $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} {
- global gitdir mainfont difffont
+ global gitdir appname
set w .hookfail
toplevel $w
- wm transient $w .
frame $w.m
label $w.m.l1 -text "$hook hook failed:" \
-anchor w \
-justify left \
- -font [concat $mainfont bold]
+ -font font_uibold
text $w.m.t \
-background white -borderwidth 1 \
-relief sunken \
-width 80 -height 10 \
- -font $difffont \
+ -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 [concat $mainfont bold]
+ -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
button $w.ok -text OK \
-width 15 \
+ -font font_ui \
-command "destroy $w"
- pack $w.ok -side bottom
+ 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 "error: git-ui ([file normalize [file dirname $gitdir]])"
+ wm title $w "$appname ([lindex [file split \
+ [file normalize [file dirname $gitdir]]] \
+ end]): 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
+ global gitdir appname 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 "$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 ([lindex [file split \
+ [file normalize [file dirname $gitdir]]] \
+ end]): [lindex $console_data($w) 0]"
+ return $w
+}
+
+proc console_exec {w cmd {after {}}} {
+ global tcl_platform
+
+ # -- Windows tosses the enviroment when we exec our child.
+ # But most users need that so we have to relogin. :-(
+ #
+ if {$tcl_platform(platform) eq {windows}} {
+ 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 console_data
+
+ 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}]} {
+ if {![winfo exists $w]} {console_init $w}
+ $w.m.s conf -background red -text {Error: Command Failed}
+ $w.ok conf -state normal
+ set ok 0
+ } elseif {[winfo exists $w]} {
+ $w.m.s conf -background green -text {Success}
+ $w.ok conf -state normal
+ set ok 1
+ }
+ array unset console_cr $w
+ array unset console_data $w
+ if {$after ne {}} {
+ uplevel #0 $after $ok
+ }
+ return
+ }
+ fconfigure $fd -blocking 0
+}
+
######################################################################
##
## ui commands
set starting_gitk_msg {Please wait... Starting gitk...}
+
proc do_gitk {} {
global tcl_platform ui_status_value starting_gitk_msg
set ui_status_value $starting_gitk_msg
- after 5000 {
- if {$ui_status_value == $starting_gitk_msg} {
+ after 10000 {
+ if {$ui_status_value eq $starting_gitk_msg} {
set ui_status_value {Ready.}
}
}
- if {$tcl_platform(platform) == "windows"} {
+ if {$tcl_platform(platform) eq {windows}} {
exec sh -c gitk &
} else {
exec gitk &
}
}
+proc do_repack {} {
+ set w [new_console "repack" "Repacking the object database"]
+ set cmd [list git repack]
+ lappend cmd -a
+ lappend cmd -d
+ console_exec $w $cmd
+}
+
+set is_quitting 0
+
proc do_quit {} {
- global gitdir ui_comm
+ global gitdir ui_comm is_quitting repo_config
+
+ if {$is_quitting} return
+ set is_quitting 1
+ # -- Stash our current commit buffer.
+ #
set save [file join $gitdir GITGUI_MSG]
- if {[$ui_comm edit modified]
- && [string trim [$ui_comm get 0.0 end]] != {}} {
+ set msg [string trim [$ui_comm get 0.0 end]]
+ if {[$ui_comm edit modified] && $msg ne {}} {
catch {
set fd [open $save w]
puts $fd [string trim [$ui_comm get 0.0 end]]
close $fd
}
- } elseif {[file exists $save]} {
+ } elseif {$msg eq {} && [file exists $save]} {
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 .
}
update_status
}
-proc do_checkin_all {} {
- global checkin_active ui_status_value
+proc do_include_all {} {
+ global file_states
- if {$checkin_active || ![lock_index begin-update]} return
+ if {![lock_index begin-update]} return
- set checkin_active 1
- set ui_status_value {Checking in all files...}
- after 1 {
- with_update_index {
- foreach path [array names file_states] {
- set s $file_states($path)
- set m [lindex $s 0]
- switch -- $m {
- AM -
- MM -
- _M -
- _D {toggle_mode $path}
- }
- }
+ set pathList [list]
+ foreach path [array names file_states] {
+ set s $file_states($path)
+ set m [lindex $s 0]
+ switch -- $m {
+ AM -
+ MM -
+ _M -
+ _D {lappend pathList $path}
}
- set checkin_active 0
- set ui_status_value {Ready.}
+ }
+ if {$pathList eq {}} {
+ unlock_index
+ } else {
+ update_index $pathList
}
}
+set GIT_COMMITTER_IDENT {}
+
proc do_signoff {} {
- global ui_comm
+ global ui_comm GIT_COMMITTER_IDENT
- catch {
- set me [exec git var GIT_COMMITTER_IDENT]
- if {[regexp {(.*) [0-9]+ [-+0-9]+$} $me me name]} {
- set str "Signed-off-by: $name"
- if {[$ui_comm get {end -1c linestart} {end -1c}] != $str} {
- $ui_comm insert end "\n"
- $ui_comm insert end $str
- $ui_comm see end
- }
+ 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
}
}
-}
-
-proc do_commit {} {
- global tcl_platform HEAD gitdir commit_type file_states
- global ui_comm
- # -- Our in memory state should match the repository.
- #
- if {[catch {set curHEAD [exec git rev-parse --verify HEAD]}]} {
- set cur_type initial
- } else {
- set cur_type normal
+ set sob "Signed-off-by: $GIT_COMMITTER_IDENT"
+ 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
}
- if {$commit_type != $commit_type || $HEAD != $curHEAD} {
- error_popup {Last scanned state does not match repository state.
+}
-Its highly likely that another Git program modified the
-repository since our last scan. A rescan is required
-before committing.
+proc do_amend_last {} {
+ load_last_commit
}
- update_status
- return
- }
- # -- At least one file should differ in the index.
- #
- set files_ready 0
- foreach path [array names file_states] {
- set s $file_states($path)
- switch -glob -- [lindex $s 0] {
- _* {continue}
- A* -
- D* -
- M* {set files_ready 1; break}
- U* {
- error_popup "Unmerged files cannot be committed.
+proc do_commit {} {
+ commit_tree
+}
-File $path has merge conflicts.
-You must resolve them and check the file in before committing.
-"
- return
- }
- default {
- error_popup "Unknown file state [lindex $s 0] detected.
+proc do_options {} {
+ global appname gitdir font_descs
+ global repo_config global_config
+ global repo_config_new global_config_new
-File $path cannot be committed by this program.
-"
+ 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 reponame [lindex [file split \
+ [file normalize [file dirname $gitdir]]] \
+ end]
+
+ 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
+ pack $w.buttons -side bottom -fill x -pady 10 -padx 10
+
+ labelframe $w.repo -text "$reponame Repository" \
+ -font font_ui \
+ -relief raised -borderwidth 2
+ labelframe $w.global -text {Global (All Repositories)} \
+ -font font_ui \
+ -relief raised -borderwidth 2
+ 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
+
+ foreach option {
+ {b pullsummary {Show Pull Summary}}
+ {b trustmtime {Trust File Modification Timestamps}}
+ {i diffcontext {Number of Diff Context Lines}}
+ } {
+ set type [lindex $option 0]
+ set name [lindex $option 1]
+ set text [lindex $option 2]
+ foreach f {repo global} {
+ switch $type {
+ b {
+ checkbutton $w.$f.$name -text $text \
+ -variable ${f}_config_new(gui.$name) \
+ -onvalue true \
+ -offvalue false \
+ -font font_ui
+ pack $w.$f.$name -side top -anchor w
+ }
+ i {
+ frame $w.$f.$name
+ label $w.$f.$name.l -text "$text:" -font font_ui
+ pack $w.$f.$name.l -side left -anchor w -fill x
+ spinbox $w.$f.$name.v \
+ -textvariable ${f}_config_new(gui.$name) \
+ -from 1 -to 99 -increment 1 \
+ -width 3 \
+ -font font_ui
+ pack $w.$f.$name.v -side right -anchor e
+ pack $w.$f.$name -side top -anchor w -fill x
+ }
+ }
}
}
- if {!$files_ready} {
- error_popup {No checked-in files to commit.
-You must check-in at least 1 file before you can commit.
-}
- return
+ 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
+ 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
}
- # -- A message is required.
- #
- set msg [string trim [$ui_comm get 1.0 end]]
- if {$msg == {}} {
- error_popup {Please supply a commit message.
+ bind $w <Visibility> "grab $w; focus $w"
+ bind $w <Key-Escape> "destroy $w"
+ wm title $w "$appname ($reponame): Options"
+ tkwait window $w
+}
-A good commit message has the following format:
+proc do_restore_defaults {} {
+ global font_descs default_config repo_config
+ global repo_config_new global_config_new
-- First line: Describe in one sentance what you did.
-- Second line: Blank
-- Remaining lines: Describe why this change is good.
-}
- return
+ foreach name [array names default_config] {
+ set repo_config_new($name) $default_config($name)
+ set global_config_new($name) $default_config($name)
}
- # -- Ask the pre-commit hook for the go-ahead.
- #
- set pchook [file join $gitdir hooks pre-commit]
- if {$tcl_platform(platform) == {windows} && [file exists $pchook]} {
- set pchook [list sh -c \
- "if test -x \"$pchook\"; then exec \"$pchook\"; fi"]
- } elseif {[file executable $pchook]} {
- set pchook [list $pchook]
- } else {
- set pchook {}
+ foreach option $font_descs {
+ set name [lindex $option 0]
+ set repo_config(gui.$name) $default_config(gui.$name)
}
- if {$pchook != {} && [catch {eval exec $pchook} err]} {
- hook_failed_popup pre-commit $err
- return
+ 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]
}
}
+proc do_save_config {w} {
+ if {[catch {save_config} err]} {
+ error_popup "Failed to completely save options:\n\n$err"
+ }
+ reshow_diff
+ destroy $w
+}
+
# shift == 1: left click
# 3: right click
proc click {w x y shift wx wy} {
- global ui_index ui_other
+ global ui_index ui_other file_lists
set pos [split [$w index @$x,$y] .]
set lno [lindex $pos 0]
set col [lindex $pos 1]
- set path [$w get $lno.1 $lno.end]
- if {$path == {}} return
+ set path [lindex $file_lists($w) [expr $lno - 1]]
+ if {$path eq {}} return
if {$col > 0 && $shift == 1} {
- $ui_index tag remove in_diff 0.0 end
- $ui_other tag remove in_diff 0.0 end
- $w tag add in_diff $lno.0 [expr $lno + 1].0
- show_diff $path
+ show_diff $path $w $lno
}
}
proc unclick {w x y} {
+ global file_lists
+
set pos [split [$w index @$x,$y] .]
set lno [lindex $pos 0]
set col [lindex $pos 1]
- set path [$w get $lno.1 $lno.end]
- if {$path == {}} return
+ set path [lindex $file_lists($w) [expr $lno - 1]]
+ if {$path eq {}} return
if {$col == 0} {
- toggle_mode $path
+ update_index [list $path]
}
}
######################################################################
##
-## ui init
+## config defaults
+
+set cursor_ptr arrow
+font create font_diff -family Courier -size 10
+font create font_ui
+catch {
+ label .dummy
+ eval font configure font_ui [font actual [.dummy cget -font]]
+ destroy .dummy
+}
+
+font create font_uibold
+font create font_diffbold
+
+set M1B M1
+set M1T M1
+if {$tcl_platform(platform) eq {windows}} {
+ set M1B Control
+ set M1T Ctrl
+} elseif {[is_MacOSX]} {
+ set M1B M1
+ set M1T Cmd
+}
-set mainfont {Helvetica 10}
-set difffont {Courier 10}
-set maincursor [. cget -cursor]
+proc apply_config {} {
+ global repo_config font_descs
-switch -- $tcl_platform(platform) {
-windows {set M1B Control; set M1T Ctrl}
-default {set M1B M1; set M1T M1}
+ foreach option $font_descs {
+ set name [lindex $option 0]
+ set font [lindex $option 1]
+ if {[catch {
+ foreach {cn cv} $repo_config(gui.$name) {
+ font configure $font $cn $cv
+ }
+ } err]} {
+ error_popup "Invalid font specified in gui.$name:\n\n$err"
+ }
+ foreach {cn cv} [font configure $font] {
+ font configure ${font}bold $cn $cv
+ }
+ font configure ${font}bold -weight bold
+ }
+}
+
+set default_config(gui.trustmtime) false
+set default_config(gui.pullsummary) true
+set default_config(gui.diffcontext) 5
+set default_config(gui.fontui) [font configure font_ui]
+set default_config(gui.fontdiff) [font configure font_diff]
+set font_descs {
+ {fontui font_ui {Main Font}}
+ {fontdiff font_diff {Diff/Console Font}}
}
+load_config 0
+apply_config
+
+######################################################################
+##
+## ui construction
# -- Menu Bar
menu .mbar -tearoff 0
.mbar add cascade -label Project -menu .mbar.project
+.mbar add cascade -label Edit -menu .mbar.edit
.mbar add cascade -label Commit -menu .mbar.commit
-.mbar add cascade -label Fetch -menu .mbar.fetch
-.mbar add cascade -label Pull -menu .mbar.pull
+if {!$single_commit} {
+ .mbar add cascade -label Fetch -menu .mbar.fetch
+ .mbar add cascade -label Pull -menu .mbar.pull
+ .mbar add cascade -label Push -menu .mbar.push
+}
. configure -menu .mbar
# -- Project Menu
menu .mbar.project
.mbar.project add command -label Visualize \
-command do_gitk \
- -font $mainfont
+ -font font_ui
+if {!$single_commit} {
+ .mbar.project add command -label {Repack Database} \
+ -command do_repack \
+ -font font_ui
+}
.mbar.project add command -label Quit \
-command do_quit \
-accelerator $M1T-Q \
- -font $mainfont
+ -font font_ui
+
+# -- Edit Menu
+#
+menu .mbar.edit
+.mbar.edit add command -label Undo \
+ -command {catch {[focus] edit undo}} \
+ -accelerator $M1T-Z \
+ -font font_ui
+.mbar.edit add command -label Redo \
+ -command {catch {[focus] edit redo}} \
+ -accelerator $M1T-Y \
+ -font font_ui
+.mbar.edit add separator
+.mbar.edit add command -label Cut \
+ -command {catch {tk_textCut [focus]}} \
+ -accelerator $M1T-X \
+ -font font_ui
+.mbar.edit add command -label Copy \
+ -command {catch {tk_textCopy [focus]}} \
+ -accelerator $M1T-C \
+ -font font_ui
+.mbar.edit add command -label Paste \
+ -command {catch {tk_textPaste [focus]; [focus] see insert}} \
+ -accelerator $M1T-V \
+ -font font_ui
+.mbar.edit add command -label Delete \
+ -command {catch {[focus] delete sel.first sel.last}} \
+ -accelerator Del \
+ -font font_ui
+.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
+.mbar.edit add separator
+.mbar.edit add command -label {Options...} \
+ -command do_options \
+ -font font_ui
# -- Commit Menu
menu .mbar.commit
.mbar.commit add command -label Rescan \
-command do_rescan \
-accelerator F5 \
- -font $mainfont
+ -font font_ui
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Check-in All Files} \
- -command do_checkin_all \
- -accelerator $M1T-U \
- -font $mainfont
+.mbar.commit add command -label {Amend Last Commit} \
+ -command do_amend_last \
+ -font font_ui
+lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+.mbar.commit add command -label {Include All Files} \
+ -command do_include_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 {Sign Off} \
-command do_signoff \
-accelerator $M1T-S \
- -font $mainfont
+ -font font_ui
.mbar.commit add command -label Commit \
-command do_commit \
-accelerator $M1T-Return \
- -font $mainfont
+ -font font_ui
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
-# -- Fetch Menu
-menu .mbar.fetch
+if {!$single_commit} {
+ # -- Fetch Menu
+ menu .mbar.fetch
-# -- Pull Menu
-menu .mbar.pull
+ # -- Pull Menu
+ menu .mbar.pull
+
+ # -- Push Menu
+ menu .mbar.push
+}
# -- Main Window Layout
panedwindow .vpane -orient vertical
pack .vpane -anchor n -side top -fill both -expand 1
# -- Index File List
-set ui_index .vpane.files.index.list
frame .vpane.files.index -height 100 -width 400
label .vpane.files.index.title -text {Modified Files} \
-background green \
- -font $mainfont
+ -font font_ui
text $ui_index -background white -borderwidth 0 \
-width 40 -height 10 \
- -font $mainfont \
+ -font font_ui \
+ -cursor $cursor_ptr \
-yscrollcommand {.vpane.files.index.sb set} \
- -cursor $maincursor \
-state disabled
scrollbar .vpane.files.index.sb -command [list $ui_index yview]
pack .vpane.files.index.title -side top -fill x
.vpane.files add .vpane.files.index -sticky nsew
# -- Other (Add) File List
-set ui_other .vpane.files.other.list
frame .vpane.files.other -height 100 -width 100
label .vpane.files.other.title -text {Untracked Files} \
-background red \
- -font $mainfont
+ -font font_ui
text $ui_other -background white -borderwidth 0 \
-width 40 -height 10 \
- -font $mainfont \
+ -font font_ui \
+ -cursor $cursor_ptr \
-yscrollcommand {.vpane.files.other.sb set} \
- -cursor $maincursor \
-state disabled
scrollbar .vpane.files.other.sb -command [list $ui_other yview]
pack .vpane.files.other.title -side top -fill x
pack $ui_other -side left -fill both -expand 1
.vpane.files add .vpane.files.other -sticky nsew
-$ui_index tag conf in_diff -font [concat $mainfont bold]
-$ui_other tag conf in_diff -font [concat $mainfont bold]
-
-# -- Diff Header
-set ui_fname_value {}
-set ui_fstatus_value {}
-frame .vpane.diff -height 200 -width 400
-frame .vpane.diff.header
-label .vpane.diff.header.l1 -text {File:} -font $mainfont
-label .vpane.diff.header.l2 -textvariable ui_fname_value \
- -anchor w \
- -justify left \
- -font $mainfont
-label .vpane.diff.header.l3 -text {Status:} -font $mainfont
-label .vpane.diff.header.l4 -textvariable ui_fstatus_value \
- -width $max_status_desc \
- -anchor w \
- -justify left \
- -font $mainfont
-pack .vpane.diff.header.l1 -side left
-pack .vpane.diff.header.l2 -side left -fill x
-pack .vpane.diff.header.l4 -side right
-pack .vpane.diff.header.l3 -side right
-
-# -- Diff Body
-frame .vpane.diff.body
-set ui_diff .vpane.diff.body.t
-text $ui_diff -background white -borderwidth 0 \
- -width 80 -height 15 -wrap none \
- -font $difffont \
- -xscrollcommand {.vpane.diff.body.sbx set} \
- -yscrollcommand {.vpane.diff.body.sby set} \
- -cursor $maincursor \
- -state disabled
-scrollbar .vpane.diff.body.sbx -orient horizontal \
- -command [list $ui_diff xview]
-scrollbar .vpane.diff.body.sby -orient vertical \
- -command [list $ui_diff yview]
-pack .vpane.diff.body.sbx -side bottom -fill x
-pack .vpane.diff.body.sby -side right -fill y
-pack $ui_diff -side left -fill both -expand 1
-pack .vpane.diff.header -side top -fill x
-pack .vpane.diff.body -side bottom -fill both -expand 1
-.vpane add .vpane.diff -stick nsew
-
-$ui_diff tag conf dm -foreground red
-$ui_diff tag conf dp -foreground blue
-$ui_diff tag conf da -font [concat $difffont bold]
-$ui_diff tag conf di -foreground "#00a000"
-$ui_diff tag conf dni -foreground "#a000a0"
-$ui_diff tag conf bold -font [concat $difffont bold]
+$ui_index tag conf in_diff -font font_uibold
+$ui_other tag conf in_diff -font font_uibold
-# -- Commit Area
-frame .vpane.commarea -height 150
-.vpane add .vpane.commarea -stick nsew
+# -- Diff and Commit Area
+frame .vpane.lower -height 300 -width 400
+frame .vpane.lower.commarea
+frame .vpane.lower.diff -relief sunken -borderwidth 1
+pack .vpane.lower.commarea -side top -fill x
+pack .vpane.lower.diff -side bottom -fill both -expand 1
+.vpane add .vpane.lower -stick nsew
# -- Commit Area Buttons
-frame .vpane.commarea.buttons
-label .vpane.commarea.buttons.l -text {} \
+frame .vpane.lower.commarea.buttons
+label .vpane.lower.commarea.buttons.l -text {} \
-anchor w \
-justify left \
- -font $mainfont
-pack .vpane.commarea.buttons.l -side top -fill x
-pack .vpane.commarea.buttons -side left -fill y
+ -font font_ui
+pack .vpane.lower.commarea.buttons.l -side top -fill x
+pack .vpane.lower.commarea.buttons -side left -fill y
-button .vpane.commarea.buttons.rescan -text {Rescan} \
+button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
-command do_rescan \
- -font $mainfont
-pack .vpane.commarea.buttons.rescan -side top -fill x
-lappend disable_on_lock {.vpane.commarea.buttons.rescan conf -state}
+ -font font_ui
+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.amend -text {Amend Last} \
+ -command do_amend_last \
+ -font font_ui
+pack .vpane.lower.commarea.buttons.amend -side top -fill x
+lappend disable_on_lock \
+ {.vpane.lower.commarea.buttons.amend conf -state}
-button .vpane.commarea.buttons.ciall -text {Check-in All} \
- -command do_checkin_all \
- -font $mainfont
-pack .vpane.commarea.buttons.ciall -side top -fill x
-lappend disable_on_lock {.vpane.commarea.buttons.ciall conf -state}
+button .vpane.lower.commarea.buttons.incall -text {Include All} \
+ -command do_include_all \
+ -font font_ui
+pack .vpane.lower.commarea.buttons.incall -side top -fill x
+lappend disable_on_lock \
+ {.vpane.lower.commarea.buttons.incall conf -state}
-button .vpane.commarea.buttons.signoff -text {Sign Off} \
+button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
-command do_signoff \
- -font $mainfont
-pack .vpane.commarea.buttons.signoff -side top -fill x
+ -font font_ui
+pack .vpane.lower.commarea.buttons.signoff -side top -fill x
-button .vpane.commarea.buttons.commit -text {Commit} \
+button .vpane.lower.commarea.buttons.commit -text {Commit} \
-command do_commit \
- -font $mainfont
-pack .vpane.commarea.buttons.commit -side top -fill x
-lappend disable_on_lock {.vpane.commarea.buttons.commit conf -state}
+ -font font_ui
+pack .vpane.lower.commarea.buttons.commit -side top -fill x
+lappend disable_on_lock \
+ {.vpane.lower.commarea.buttons.commit conf -state}
# -- Commit Message Buffer
-frame .vpane.commarea.buffer
-set ui_comm .vpane.commarea.buffer.t
-label .vpane.commarea.buffer.l -text {Commit Message:} \
+frame .vpane.lower.commarea.buffer
+set ui_comm .vpane.lower.commarea.buffer.t
+set ui_coml .vpane.lower.commarea.buffer.l
+label $ui_coml -text {Commit Message:} \
-anchor w \
-justify left \
- -font $mainfont
+ -font font_ui
+trace add variable commit_type write {uplevel #0 {
+ switch -glob $commit_type \
+ initial {$ui_coml conf -text {Initial Commit Message:}} \
+ amend {$ui_coml conf -text {Amended Commit Message:}} \
+ merge {$ui_coml conf -text {Merge Commit Message:}} \
+ * {$ui_coml conf -text {Commit Message:}}
+}}
text $ui_comm -background white -borderwidth 1 \
+ -undo true \
+ -maxundo 20 \
+ -autoseparators true \
-relief sunken \
- -width 75 -height 10 -wrap none \
- -font $difffont \
- -yscrollcommand {.vpane.commarea.buffer.sby set} \
- -cursor $maincursor
-scrollbar .vpane.commarea.buffer.sby -command [list $ui_comm yview]
-pack .vpane.commarea.buffer.l -side top -fill x
-pack .vpane.commarea.buffer.sby -side right -fill y
+ -width 75 -height 9 -wrap none \
+ -font font_diff \
+ -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
+scrollbar .vpane.lower.commarea.buffer.sby \
+ -command [list $ui_comm yview]
+pack $ui_coml -side top -fill x
+pack .vpane.lower.commarea.buffer.sby -side right -fill y
pack $ui_comm -side left -fill y
-pack .vpane.commarea.buffer -side left -fill y
+pack .vpane.lower.commarea.buffer -side left -fill y
+
+# -- Commit Message Buffer Context Menu
+#
+menu $ui_comm.ctxm -tearoff 0
+$ui_comm.ctxm add command -label "Cut" \
+ -font font_ui \
+ -command "tk_textCut $ui_comm"
+$ui_comm.ctxm add command -label "Copy" \
+ -font font_ui \
+ -command "tk_textCopy $ui_comm"
+$ui_comm.ctxm add command -label "Paste" \
+ -font font_ui \
+ -command "tk_textPaste $ui_comm"
+$ui_comm.ctxm add command -label "Delete" \
+ -font font_ui \
+ -command "$ui_comm delete sel.first sel.last"
+$ui_comm.ctxm add separator
+$ui_comm.ctxm add command -label "Select All" \
+ -font font_ui \
+ -command "$ui_comm tag add sel 0.0 end"
+$ui_comm.ctxm add command -label "Copy All" \
+ -font font_ui \
+ -command "
+ $ui_comm tag add sel 0.0 end
+ tk_textCopy $ui_comm
+ $ui_comm tag remove sel 0.0 end
+ "
+$ui_comm.ctxm add separator
+$ui_comm.ctxm add command -label "Sign Off" \
+ -font font_ui \
+ -command do_signoff
+bind_button3 $ui_comm "tk_popup $ui_comm.ctxm %X %Y"
+
+# -- Diff Header
+set ui_fname_value {}
+set ui_fstatus_value {}
+frame .vpane.lower.diff.header -background orange
+label .vpane.lower.diff.header.l4 \
+ -textvariable ui_fstatus_value \
+ -background orange \
+ -width $max_status_desc \
+ -anchor w \
+ -justify left \
+ -font font_ui
+label .vpane.lower.diff.header.l1 -text {File:} \
+ -background orange \
+ -font font_ui
+set ui_fname .vpane.lower.diff.header.l2
+label $ui_fname \
+ -textvariable ui_fname_value \
+ -background orange \
+ -anchor w \
+ -justify left \
+ -font font_ui
+menu $ui_fname.ctxm -tearoff 0
+$ui_fname.ctxm add command -label "Copy" \
+ -font font_ui \
+ -command {
+ clipboard clear
+ clipboard append \
+ -format STRING \
+ -type STRING \
+ -- $ui_fname_value
+ }
+bind_button3 $ui_fname "tk_popup $ui_fname.ctxm %X %Y"
+pack .vpane.lower.diff.header.l4 -side left
+pack .vpane.lower.diff.header.l1 -side left
+pack $ui_fname -fill x
+
+# -- Diff Body
+frame .vpane.lower.diff.body
+set ui_diff .vpane.lower.diff.body.t
+text $ui_diff -background white -borderwidth 0 \
+ -width 80 -height 15 -wrap none \
+ -font font_diff \
+ -xscrollcommand {.vpane.lower.diff.body.sbx set} \
+ -yscrollcommand {.vpane.lower.diff.body.sby set} \
+ -state disabled
+scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
+ -command [list $ui_diff xview]
+scrollbar .vpane.lower.diff.body.sby -orient vertical \
+ -command [list $ui_diff yview]
+pack .vpane.lower.diff.body.sbx -side bottom -fill x
+pack .vpane.lower.diff.body.sby -side right -fill y
+pack $ui_diff -side left -fill both -expand 1
+pack .vpane.lower.diff.header -side top -fill x
+pack .vpane.lower.diff.body -side bottom -fill both -expand 1
+
+$ui_diff tag conf dm -foreground red
+$ui_diff tag conf dp -foreground blue
+$ui_diff tag conf di -foreground {#00a000}
+$ui_diff tag conf dni -foreground {#a000a0}
+$ui_diff tag conf da -font font_diffbold
+$ui_diff tag conf bold -font font_diffbold
+
+# -- Diff Body Context Menu
+#
+menu $ui_diff.ctxm -tearoff 0
+$ui_diff.ctxm add command -label "Copy" \
+ -font font_ui \
+ -command "tk_textCopy $ui_diff"
+$ui_diff.ctxm add command -label "Select All" \
+ -font font_ui \
+ -command "$ui_diff tag add sel 0.0 end"
+$ui_diff.ctxm add command -label "Copy All" \
+ -font font_ui \
+ -command "
+ $ui_diff tag add sel 0.0 end
+ tk_textCopy $ui_diff
+ $ui_diff tag remove sel 0.0 end
+ "
+$ui_diff.ctxm add separator
+$ui_diff.ctxm add command -label "Decrease Font Size" \
+ -font font_ui \
+ -command {incr_font_size font_diff -1}
+$ui_diff.ctxm add command -label "Increase Font Size" \
+ -font font_ui \
+ -command {incr_font_size font_diff 1}
+$ui_diff.ctxm add separator
+$ui_diff.ctxm add command -label "Show Less Context" \
+ -font font_ui \
+ -command {if {$ui_fname_value ne {}
+ && $repo_config(gui.diffcontext) >= 2} {
+ incr repo_config(gui.diffcontext) -1
+ reshow_diff
+ }}
+$ui_diff.ctxm add command -label "Show More Context" \
+ -font font_ui \
+ -command {if {$ui_fname_value ne {}} {
+ incr repo_config(gui.diffcontext)
+ reshow_diff
+ }}
+$ui_diff.ctxm add separator
+$ui_diff.ctxm add command -label {Options...} \
+ -font font_ui \
+ -command do_options
+bind_button3 $ui_diff "tk_popup $ui_diff.ctxm %X %Y"
# -- Status Bar
set ui_status_value {Initializing...}
-justify left \
-borderwidth 1 \
-relief sunken \
- -font $mainfont
+ -font font_ui
pack .status -anchor w -side bottom -fill x
+# -- Load geometry
+catch {
+set gm $repo_config(gui.geometry)
+wm geometry . [lindex $gm 0]
+.vpane sash place 0 \
+ [lindex [.vpane sash coord 0] 0] \
+ [lindex $gm 1]
+.vpane.files sash place 0 \
+ [lindex $gm 2] \
+ [lindex [.vpane.files sash coord 0] 1]
+unset gm
+}
+
# -- Key Bindings
-bind . <Destroy> do_quit
-bind . <Key-F5> do_rescan
-bind . <$M1B-Key-r> do_rescan
-bind . <$M1B-Key-R> do_rescan
-bind . <$M1B-Key-s> do_signoff
-bind . <$M1B-Key-S> do_signoff
-bind . <$M1B-Key-u> do_checkin_all
-bind . <$M1B-Key-U> do_checkin_all
-bind . <$M1B-Key-Return> do_commit
-bind . <$M1B-Key-q> do_quit
-bind . <$M1B-Key-Q> do_quit
+bind $ui_comm <$M1B-Key-Return> {do_commit;break}
+bind $ui_comm <$M1B-Key-i> {do_include_all;break}
+bind $ui_comm <$M1B-Key-I> {do_include_all;break}
+bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
+bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
+bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
+bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
+bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
+bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
+bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
+bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
+
+bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
+bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
+bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
+bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
+bind $ui_diff <$M1B-Key-v> {break}
+bind $ui_diff <$M1B-Key-V> {break}
+bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
+bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
+bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
+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 . <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-s> do_signoff
+bind . <$M1B-Key-S> do_signoff
+bind . <$M1B-Key-i> do_include_all
+bind . <$M1B-Key-I> do_include_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_other] {
bind $i <Button-1> {click %W %x %y 1 %X %Y; break}
- bind $i <Button-3> {click %W %x %y 3 %X %Y; break}
bind $i <ButtonRelease-1> {unclick %W %x %y; break}
+ bind_button3 $i {click %W %x %y 3 %X %Y; break}
}
-unset i M1B M1T
-
-######################################################################
-##
-## main
+unset i
-if {[catch {set gitdir [exec git rev-parse --git-dir]} err]} {
- show_msg {} . "Cannot find the git directory: $err"
- exit 1
-}
+set file_lists($ui_index) [list]
+set file_lists($ui_other) [list]
-wm title . "git-ui ([file normalize [file dirname $gitdir]])"
+wm title . "$appname ([file normalize [file dirname $gitdir]])"
focus -force $ui_comm
-update_status
+if {!$single_commit} {
+ load_all_remotes
+ populate_remote_menu .mbar.fetch From fetch_from
+ populate_remote_menu .mbar.push To push_to
+ populate_pull_menu .mbar.pull
+}
+after 1 update_status