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
}
}
-proc update_status {} {
- global HEAD commit_type
+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
if {$status_active || ![lock_index read]} return
- repository_state HEAD commit_type
+ repository_state new_HEAD new_type
+ if {$commit_type == {amend}
+ && $new_type == {normal}
+ && $new_HEAD == $HEAD} {
+ } else {
+ set HEAD $new_HEAD
+ set PARENT $new_HEAD
+ set commit_type $new_type
+ }
+
array unset file_states
foreach w [list $ui_index $ui_other] {
$w conf -state normal
}
if {![$ui_comm edit modified]
- || [string trim [$ui_comm get 0.0 end]] == {}} {
+ || [string trim [$ui_comm get 0.0 end]] == {}} {
if {[load_message GITGUI_MSG]} {
} elseif {[load_message MERGE_MSG]} {
} elseif {[load_message SQUASH_MSG]} {
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]
+ fileevent $fd_rf readable [list read_refresh $fd_rf $final]
}
-proc read_refresh {fd} {
- global gitdir HEAD commit_type
+proc read_refresh {fd final} {
+ global gitdir PARENT commit_type
global ui_index ui_other ui_status_value ui_comm
global status_active file_states
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]
display_file $p [string index $m end]_
}
}
- status_eof $fd 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]
display_file $p _[string index $m end]
}
}
- 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} {
+proc status_eof {fd buf final} {
global status_active $buf
- global ui_fname_value ui_status_value
+ global ui_fname_value ui_status_value file_states
if {[eof $fd]} {
set $buf {}
close $fd
if {[incr status_active -1] == 0} {
unlock_index
- set ui_status_value {Ready.}
- if {$ui_fname_value != {}} {
+
+ set ui_status_value $final
+ if {$ui_fname_value != {} && [array names file_states \
+ -exact $ui_fname_value] != {}} {
show_diff $ui_fname_value
+ } else {
+ clear_diff
}
}
}
}
proc show_diff {path} {
- global file_states HEAD diff_3way diff_active
+ global file_states PARENT diff_3way diff_active
global ui_diff ui_fname_value ui_fstatus_value ui_status_value
if {$diff_active || ![lock_index read]} return
set ui_fstatus_value [mapdesc $m $path]
set ui_status_value "Loading diff of $path..."
- set cmd [list | git diff-index -p $HEAD -- $path]
+ set cmd [list | git diff-index -p $PARENT -- $path]
switch $m {
AM {
}
MM {
- set cmd [list | git diff-index -p -c $HEAD $path]
+ set cmd [list | git diff-index -p -c $PARENT $path]
}
_O {
if {[catch {
$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
}
}
##
## commit
+proc load_last_commit {} {
+ global HEAD PARENT commit_type ui_comm
+
+ if {$commit_type == {amend}} return
+ if {$commit_type != {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$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
+ 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 commit_active ui_status_value
# -- Our in memory state should match the repository.
#
repository_state curHEAD cur_type
- if {$commit_type != $cur_type || $HEAD != $curHEAD} {
+ if {$commit_type == {amend}
+ && $cur_type == {normal}
+ && $curHEAD == $HEAD} {
+ } elseif {$commit_type != $cur_type || $HEAD != $curHEAD} {
error_popup {Last scanned state does not match repository state.
Its highly likely that another Git program modified the
# -- 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]} {
+ if {$tcl_platform(platform) == {windows} && [file isfile $pchook]} {
set pchook [list sh -c \
"if test -x \"$pchook\"; then exec \"$pchook\"; fi"]
} elseif {[file executable $pchook]} {
set ui_status_value {Committing changes...}
set fd_wt [open "| git write-tree" r]
- fileevent $fd_wt readable \
- [list commit_stage2 $fd_wt $curHEAD $msg]
+ fileevent $fd_wt readable [list commit_stage2 $fd_wt $curHEAD $msg]
}
proc commit_stage2 {fd_wt curHEAD msg} {
- global single_commit gitdir HEAD commit_type
- global commit_active ui_status_value comm_ui
+ global single_commit gitdir PARENT commit_type
+ global commit_active ui_status_value ui_comm
gets $fd_wt tree_id
close $fd_wt
# -- Create the commit.
#
set cmd [list git commit-tree $tree_id]
- if {$commit_type != {initial}} {
- lappend cmd -p $HEAD
+ if {$PARENT != {}} {
+ lappend cmd -p $PARENT
}
if {$commit_type == {merge}} {
if {[catch {
set fd_mh [open [file join $gitdir MERGE_HEAD] r]
- while {[gets $fd_mh merge_head] > 0} {
- lappend -p $merge_head
+ while {[gets $fd_mh merge_head] >= 0} {
+ lappend cmd -p $merge_head
}
close $fd_mh
} err]} {
return
}
}
- if {$commit_type == {initial}} {
+ if {$PARENT == {}} {
# git commit-tree writes to stderr during initial commit.
lappend cmd 2>/dev/null
}
} else {
append reflogm {: } $msg
}
- set cmd [list git update-ref \
- -m $reflogm \
- HEAD $cmt_id $curHEAD]
+ set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
if {[catch {eval exec $cmd} err]} {
error_popup "update-ref failed:\n$err"
set commit_active 0
catch {exec git rerere}
}
- $comm_ui delete 0.0 end
- $comm_ui edit modified false
+ $ui_comm delete 0.0 end
+ $ui_comm edit modified false
if {$single_commit} do_quit
+ set commit_type {}
set commit_active 0
- set ui_status_value "Changes committed as $cmt_id."
+ set HEAD $cmt_id
+ set PARENT $cmt_id
unlock_index
- update_status
+ update_status "Changes committed as $cmt_id."
+}
+
+######################################################################
+##
+## 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 -v
+ lappend cmd $remote
+ console_exec $w $cmd
+}
+
+proc push_to {remote} {
+ set w [new_console "push $remote" \
+ "Pushing changes to $remote"]
+ set cmd [list git push]
+ lappend -v
+ lappend cmd $remote
+ console_exec $w $cmd
}
######################################################################
}
proc toggle_mode {path} {
- global file_states
+ global file_states ui_fname_value
set s $file_states($path)
set m [lindex $s 0]
_O {set new A*}
_M -
MM {set new M*}
+ AD -
_D {set new D*}
default {return}
}
with_update_index {update_index $path}
display_file $path $new
+ if {$ui_fname_value == $path} {
+ show_diff $path
+ }
+}
+
+######################################################################
+##
+## config (fetch push pull)
+
+proc load_all_remotes {} {
+ global gitdir all_remotes
+
+ 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 -directory $rm_dir * *]]
+ }
+
+ set fd_rc [open "| git repo-config --list" r]
+ while {[gets $fd_rc line] >= 0} {
+ if {[regexp ^remote\.(.*)\.url= $line line name]} {
+ lappend all_remotes $name
+ }
+ }
+ close $fd_rc
+
+ set all_remotes [lsort -unique $all_remotes]
+}
+
+proc populate_remote_menu {m pfx op} {
+ global gitdir all_remotes mainfont
+
+ foreach remote $all_remotes {
+ $m add command -label "$pfx $remote..." \
+ -command [list $op $remote] \
+ -font $mainfont
+ }
}
######################################################################
{_O o plain "Untracked"}
{A_ o fulltick "Added"}
{AM o parttick "Partially added"}
+ {AD o question "Added (but now gone)"}
{_D i question "Missing"}
{D_ i removed "Removed"}
}
proc show_msg {w top msg} {
- global gitdir appname
+ global gitdir appname mainfont
message $w.m -text $msg -justify left -aspect 400
pack $w.m -side top -fill x -padx 5 -pady 10
button $w.ok -text OK \
-width 15 \
+ -font $mainfont \
-command "destroy $top"
pack $w.ok -side bottom
bind $top <Visibility> "grab $top; focus $top"
button $w.ok -text OK \
-width 15 \
+ -font $mainfont \
-command "destroy $w"
pack $w.ok -side bottom
tkwait window $w
}
+set next_console_id 0
+
+proc new_console {short_title long_title} {
+ global next_console_id gitdir appname mainfont difffont
+
+ set w .console[incr next_console_id]
+ toplevel $w
+ frame $w.m
+ label $w.m.l1 -text "$long_title:" \
+ -anchor w \
+ -justify left \
+ -font [concat $mainfont bold]
+ text $w.m.t \
+ -background white -borderwidth 1 \
+ -relief sunken \
+ -width 80 -height 10 \
+ -font $difffont \
+ -state disabled \
+ -yscrollcommand [list $w.m.sby set]
+ scrollbar $w.m.sby -command [list $w.m.t yview]
+ pack $w.m.l1 -side top -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
+
+ button $w.ok -text {OK} \
+ -width 15 \
+ -font $mainfont \
+ -state disabled \
+ -command "destroy $w"
+ pack $w.ok -side bottom
+
+ bind $w <Visibility> "focus $w"
+ bind $w <Destroy> break
+ wm title $w "$appname ([file dirname [file normalize [file dirname $gitdir]]]): $short_title"
+ return $w
+}
+
+proc console_exec {w cmd} {
+ 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) == {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 auto
+ fileevent $fd_f readable [list console_read $w $fd_f]
+}
+
+proc console_read {w fd} {
+ $w.m.t conf -state normal
+ while {[gets $fd line] >= 0} {
+ $w.m.t insert end $line
+ $w.m.t insert end "\n"
+ }
+ $w.m.t conf -state disabled
+ $w.m.t see end
+
+ if {[eof $fd]} {
+ close $fd
+ $w.ok conf -state normal
+ }
+}
+
######################################################################
##
## 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 {
+ after 10000 {
if {$ui_status_value == $starting_gitk_msg} {
set ui_status_value {Ready.}
}
}
- if {$tcl_platform(platform) == "windows"} {
+ if {$tcl_platform(platform) == {windows}} {
exec sh -c gitk &
} else {
exec gitk &
}
}
+proc do_amend_last {} {
+ load_last_commit
+}
+
proc do_commit {} {
commit_tree
}
.mbar add cascade -label Commit -menu .mbar.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
-font $mainfont
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
+.mbar.commit add command -label {Amend Last Commit} \
+ -command do_amend_last \
+ -font $mainfont
+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 \
# -- Pull Menu
menu .mbar.pull
+# -- Push Menu
+menu .mbar.push
+
# -- Main Window Layout
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
$ui_diff tag conf bold -font [concat $difffont bold]
# -- Commit Area
-frame .vpane.commarea -height 150
+frame .vpane.commarea -height 170
.vpane add .vpane.commarea -stick nsew
# -- Commit Area Buttons
pack .vpane.commarea.buttons.rescan -side top -fill x
lappend disable_on_lock {.vpane.commarea.buttons.rescan conf -state}
+button .vpane.commarea.buttons.amend -text {Amend Last} \
+ -command do_amend_last \
+ -font $mainfont
+pack .vpane.commarea.buttons.amend -side top -fill x
+lappend disable_on_lock {.vpane.commarea.buttons.amend conf -state}
+
button .vpane.commarea.buttons.ciall -text {Check-in All} \
-command do_checkin_all \
-font $mainfont
# -- Commit Message Buffer
frame .vpane.commarea.buffer
set ui_comm .vpane.commarea.buffer.t
-label .vpane.commarea.buffer.l -text {Commit Message:} \
+set ui_coml .vpane.commarea.buffer.l
+label $ui_coml -text {Commit Message:} \
-anchor w \
-justify left \
-font $mainfont
+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 \
-relief sunken \
-width 75 -height 10 -wrap none \
-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 $ui_coml -side top -fill x
pack .vpane.commarea.buffer.sby -side right -fill y
pack $ui_comm -side left -fill y
pack .vpane.commarea.buffer -side left -fill y
##
## main
+set appname [lindex [file split $argv0] end]
+set gitdir {}
+
+if {[catch {set cdup [exec git rev-parse --show-cdup]} err]} {
+ show_msg {} . "Cannot find the git directory: $err"
+ exit 1
+}
+if {$cdup != ""} {
+ cd $cdup
+}
+unset cdup
+
if {[catch {set gitdir [exec git rev-parse --git-dir]} err]} {
show_msg {} . "Cannot find the git directory: $err"
exit 1
}
-set appname [lindex [file split $argv0] end]
if {$appname == {git-citool}} {
set single_commit 1
}
wm title . "$appname ([file normalize [file dirname $gitdir]])"
focus -force $ui_comm
+load_all_remotes
+populate_remote_menu .mbar.fetch From fetch_from
+populate_remote_menu .mbar.push To push_to
update_status