## status
proc repository_state {ctvar hdvar mhvar} {
- global gitdir
+ global gitdir current_branch
upvar $ctvar ct $hdvar hd $mhvar mh
set mh [list]
+ if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
+ set current_branch {}
+ } else {
+ regsub ^refs/((heads|tags|remotes)/)? \
+ $current_branch \
+ {} \
+ current_branch
+ }
+
if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
set hd {}
set ct initial
set pathList [list]
foreach path [array names file_states] {
switch -- [lindex $file_states($path) 0] {
- AM -
- MM {lappend pathList $path}
+ A? -
+ M? {lappend pathList $path}
}
}
if {$pathList ne {}} {
AM -
AD -
MM -
+ MD -
DM {
set file_states($path) [list \
_[string index $m 1] \
#
repository_state curType curHEAD curMERGE_HEAD
if {$commit_type ne $curType || $HEAD ne $curHEAD} {
- error_popup {Last scanned state does not match repository state.
+ 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 pull operation can be started.
-Its highly likely that another Git program modified the
-repository since our last scan. A rescan is required
-before a pull can be started.
+The rescan will be automatically started now.
}
unlock_index
rescan {set ui_status_value {Ready.}}
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.
+You should not perform a pull with unmodified
+files in your working directory as Git will be
+unable to recover from an incorrect merge.
-Commit or throw away all changes before starting a pull operation.
+You should commit or revert all changes before
+starting a pull operation.
}
unlock_index
return
set old_w [mapcol $old_m $path]
set new_icon [mapicon $new_m $path]
+ if {$new_m eq {__}} {
+ 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
+ }
+ unset file_states($path)
+ catch {unset selected_paths($path)}
+ return
+ }
+
if {$new_w ne $old_w} {
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
switch -glob -- [lindex $file_states($path) 0] {
AD -
MD -
+ UD -
_D {set new DD}
_M -
MM -
+ UM -
+ U_ -
M_ {set new M_}
_O -
[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 \
+ -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
+
+ 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] {
+ AM -
+ AD {set new A_}
+ MM -
+ MD {set new M_}
+ _M -
+ _D {set new __}
+ ?? {continue}
+ }
+
+ puts -nonewline $fd $path
+ puts -nonewline $fd "\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}]]
+}
+
+######################################################################
+##
+## branch management
+
+proc load_all_heads {} {
+ global all_heads tracking_branches
+
+ set all_heads [list]
+ set cmd [list git for-each-ref]
+ lappend cmd --format=%(refname)
+ lappend cmd refs/heads
+ set fd [open "| $cmd" r]
+ while {[gets $fd line] > 0} {
+ if {![catch {set info $tracking_branches($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 {m} {
+ global all_heads disable_on_lock
+
+ $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 do_create_branch {} {
+ error "NOT IMPLEMENTED"
+}
+
+proc do_delete_branch {} {
+ error "NOT IMPLEMENTED"
+}
+
+proc switch_branch {b} {
+ global HEAD commit_type file_states current_branch
+ global selected_commit_type ui_comm
+
+ if {![lock_index switch]} return
+
+ # -- Backup the selected branch (repository_state resets it)
+ #
+ set new_branch $current_branch
+
+ # -- 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
+ }
+
+ # -- Toss the message buffer if we are in amend mode.
+ #
+ if {[string match amend* $curType]} {
+ $ui_comm delete 0.0 end
+ $ui_comm edit reset
+ $ui_comm edit modified false
+ }
+
+ set selected_commit_type new
+ set current_branch $new_branch
+
+ unlock_index
+ error "NOT FINISHED"
+}
+
######################################################################
##
## remote management
proc load_all_remotes {} {
- global gitdir all_remotes repo_config
+ global gitdir repo_config
+ global all_remotes tracking_branches
set all_remotes [list]
+ array unset tracking_branches
+
set rm_dir [file join $gitdir remotes]
if {[file isdirectory $rm_dir]} {
- set all_remotes [concat $all_remotes [glob \
+ set all_remotes [glob \
-types f \
-tails \
-nocomplain \
- -directory $rm_dir *]]
+ -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]} {
- lappend all_remotes $name
+ 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]
}
}
{_M i mod "Modified"}
{M_ i fulltick "Included in commit"}
{MM i parttick "Partially included"}
+ {MD i question "Included (but gone)"}
{_O o plain "Untracked"}
{A_ o fulltick "Added by commit"}
{AM o parttick "Partially added"}
- {AD o question "Added (but now gone)"}
+ {AD o question "Added (but gone)"}
{_D i question "Missing"}
{DD i removed "Removed by commit"}
set starting_gitk_msg {Please wait... Starting gitk...}
-proc do_gitk {} {
+proc do_gitk {revs} {
global ui_status_value starting_gitk_msg
- set ui_status_value $starting_gitk_msg
- after 10000 {
- if {$ui_status_value eq $starting_gitk_msg} {
- set ui_status_value {Ready.}
- }
+ set cmd gitk
+ if {$revs ne {}} {
+ append cmd { }
+ append cmd $revs
}
-
if {[is_Windows]} {
- exec sh -c gitk &
+ set cmd "sh -c \"exec $cmd\""
+ }
+ append cmd { &}
+
+ if {[catch {eval exec $cmd} err]} {
+ error_popup "Failed to start gitk:\n\n$err"
} else {
- exec gitk &
+ set ui_status_value $starting_gitk_msg
+ after 10000 {
+ if {$ui_status_value eq $starting_gitk_msg} {
+ set ui_status_value {Ready.}
+ }
+ }
}
}
AM -
AD -
MM -
+ MD -
U? -
_M -
_D -
AM -
AD -
MM -
+ MD -
_M -
_D {lappend paths $path}
}
$paths
}
+proc revert_helper {txt paths} {
+ global gitdir appname
+ global file_states current_diff
+
+ if {![lock_index begin-update]} return
+
+ set pathList [list]
+ set after {}
+ foreach path $paths {
+ switch -glob -- [lindex $file_states($path) 0] {
+ AM -
+ AD -
+ MM -
+ MD -
+ _M -
+ _D {
+ lappend pathList $path
+ if {$path eq $current_diff} {
+ 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 reponame [lindex [file split \
+ [file normalize [file dirname $gitdir]]] \
+ end]
+
+ set reply [tk_dialog \
+ .confirm_revert \
+ "$appname ($reponame)" \
+ "Revert unincluded changes in $s?
+
+Any unincluded 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 selected_paths
+
+ if {[array size selected_paths] > 0} {
+ revert_helper \
+ {Reverting selected files} \
+ [array names selected_paths]
+ } elseif {$current_diff ne {}} {
+ revert_helper \
+ "Reverting [short_path $current_diff]" \
+ [list $current_diff]
+ }
+}
+
proc do_signoff {} {
global ui_comm
menu .mbar -tearoff 0
.mbar add cascade -label Repository -menu .mbar.repository
.mbar add cascade -label Edit -menu .mbar.edit
+if {!$single_commit} {
+ .mbar add cascade -label Branch -menu .mbar.branch
+}
.mbar add cascade -label Commit -menu .mbar.commit
if {!$single_commit} {
.mbar add cascade -label Fetch -menu .mbar.fetch
# -- Repository Menu
#
menu .mbar.repository
-.mbar.repository add command -label Visualize \
- -command do_gitk \
+.mbar.repository add command \
+ -label {Visualize Current Branch} \
+ -command {do_gitk {}} \
-font font_ui
-if {!$single_commit} {
- .mbar.repository add separator
+if {![is_MacOSX]} {
+ .mbar.repository add command \
+ -label {Visualize All Branches} \
+ -command {do_gitk {--all}} \
+ -font font_ui
+}
+.mbar.repository add separator
+if {!$single_commit} {
.mbar.repository add command -label {Repack Database} \
-command do_repack \
-font font_ui
-font font_ui
}
}
+
.mbar.repository add command -label Quit \
-command do_quit \
-accelerator $M1T-Q \
-accelerator $M1T-A \
-font font_ui
+# -- Branch Menu
+#
+if {!$single_commit} {
+ menu .mbar.branch
+
+ .mbar.branch add command -label {Create...} \
+ -command do_create_branch \
+ -font font_ui
+ 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
+ lappend disable_on_lock [list .mbar.branch entryconf \
+ [.mbar.branch index last] -state]
+}
+
# -- Commit Menu
#
menu .mbar.commit
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Remove From Commit} \
- -command do_remove_selection \
+.mbar.commit add command -label {Add To Commit} \
+ -command do_include_selection \
-font font_ui
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Include In Commit} \
- -command do_include_selection \
+.mbar.commit add command -label {Add All To Commit} \
+ -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 {Include All In Commit} \
- -command do_include_all \
- -accelerator $M1T-I \
+.mbar.commit add command -label {Remove From Commit} \
+ -command do_remove_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 \
-font font_ui
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
}
+# -- Branch Control
+#
+frame .branch \
+ -borderwidth 1 \
+ -relief sunken
+label .branch.l1 \
+ -text {Current Branch:} \
+ -anchor w \
+ -justify left \
+ -font font_ui
+label .branch.cb \
+ -textvariable current_branch \
+ -anchor w \
+ -justify left \
+ -font font_ui
+pack .branch.l1 -side left
+pack .branch.cb -side left -fill x
+pack .branch -side top -fill x
+
# -- Main Window Layout
#
panedwindow .vpane -orient vertical
lappend disable_on_lock \
{.vpane.lower.commarea.buttons.rescan conf -state}
-button .vpane.lower.commarea.buttons.incall -text {Include All} \
+button .vpane.lower.commarea.buttons.incall -text {Add All} \
-command do_include_all \
-font font_ui
pack .vpane.lower.commarea.buttons.incall -side top -fill x
set MERGE_HEAD [list]
set commit_type {}
set empty_tree {}
+set current_branch {}
set current_diff {}
set selected_commit_type new
wm title . "$appname ([file normalize [file dirname $gitdir]])"
focus -force $ui_comm
-# -- Warn the user about environmental problems.
-# Cygwin's Tcl does *not* pass its env array
-# onto any processes it spawns. This means
-# that the git processes get none of our
-# environment. That may not work...
+# -- Warn the user about environmental problems. Cygwin's Tcl
+# does *not* pass its env array onto any processes it spawns.
+# This means that git processes get none of our environment.
#
if {[is_Windows]} {
set ignored_env 0
unset ignored_env msg suggest_user name
}
+# -- Only initialize complex UI if we are going to stay running.
+#
if {!$single_commit} {
load_all_remotes
+ load_all_heads
+
+ populate_branch_menu .mbar.branch
populate_fetch_menu .mbar.fetch
populate_pull_menu .mbar.pull
populate_push_menu .mbar.push
}
+
lock_index begin-read
after 1 do_rescan