# 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 load_repo_config {} {
+ global repo_config
+ global cfg_trust_mtime
+
+ 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]} {
+ lappend repo_config($name) $value
+ }
+ }
+ close $fd_rc
+ }
+
+ if {[catch {set cfg_trust_mtime \
+ [lindex $repo_config(gui.trustmtime) 0]
+ }]} {
+ set cfg_trust_mtime false
+ }
+}
+
+proc save_my_config {} {
+ global repo_config
+ global cfg_trust_mtime
+
+ if {[catch {set rc_trustMTime $repo_config(gui.trustmtime)}]} {
+ set rc_trustMTime [list false]
+ }
+ if {$cfg_trust_mtime != [lindex $rc_trustMTime 0]} {
+ exec git repo-config gui.trustMTime $cfg_trust_mtime
+ set repo_config(gui.trustmtime) [list $cfg_trust_mtime]
+ }
+
+ set cfg_geometry [wm geometry .]
+ append cfg_geometry " [lindex [.vpane sash coord 0] 1]"
+ append cfg_geometry " [lindex [.vpane.files sash coord 0] 0]"
+ if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
+ set rc_geometry [list [list]]
+ }
+ if {$cfg_geometry != [lindex $rc_geometry 0]} {
+ exec git repo-config gui.geometry $cfg_geometry
+ set repo_config(gui.geometry) [list $cfg_geometry]
+ }
+}
+
+proc error_popup {msg} {
+ global gitdir appname
+
+ set title $appname
+ if {$gitdir != {}} {
+ 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
+}
+
+######################################################################
+##
+## 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 != ""} {
+ cd $cdup
+}
+unset cdup
+
+if {$appname == {git-citool}} {
+ set single_commit 1
+}
+
+load_repo_config
+
######################################################################
##
## task management
}
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 {![$ui_comm edit modified]
|| [string trim [$ui_comm get 0.0 end]] == {}} {
} elseif {[load_message SQUASH_MSG]} {
}
$ui_comm edit modified false
+ $ui_comm edit reset
}
if {$cfg_trust_mtime == {true}} {
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 update_status_stage2 $fd_rf $final]
+ fileevent $fd_rf readable \
+ [list update_status_stage2 $fd_rf $final]
}
}
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
if {$fd != {}} {
}
proc status_eof {fd buf final} {
- global status_active $buf
- global ui_fname_value ui_status_value file_states
+ 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} {
- unlock_index
-
display_all_files
+ unlock_index
+ reshow_diff
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
- }
}
}
}
## 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 PARENT diff_3way diff_active
+proc reshow_diff {} {
+ global ui_fname_value ui_status_value file_states
+
+ if {$ui_fname_value == {}
+ || [catch {set s $file_states($ui_fname_value)}]} {
+ clear_diff
+ } else {
+ show_diff $ui_fname_value
+ }
+}
+
+proc show_diff {path {w {}} {lno {}}} {
+ global file_states file_lists
+ global PARENT diff_3way diff_active
global ui_diff ui_fname_value ui_fstatus_value ui_status_value
if {$diff_active || ![lock_index read]} return
clear_diff
+ if {$w == {} || $lno == {}} {
+ foreach w [array names file_lists] {
+ set lno [lsearch -sorted $file_lists($w) $path]
+ if {$lno >= 0} {
+ incr lno
+ break
+ }
+ }
+ }
+ if {$w != {} && $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_fname_value [escape_path $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 $PARENT -- $path]
switch $m {
- AM {
- }
MM {
set cmd [list | git diff-index -p -c $PARENT $path]
}
} 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
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
}
set msg [string trim [read $fd]]
close $fd
} err]} {
- error_popup "Error loading commit data for amend:\n$err"
+ error_popup "Error loading commit data for amend:\n\n$err"
return
}
$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.}
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* {
+ _? {continue}
+ A? -
+ D? -
+ M? {set files_ready 1; break}
+ U? {
error_popup "Unmerged files cannot be committed.
-File $path has merge conflicts.
+File [escape_path $path] has merge conflicts.
You must resolve them and include the file before committing.
"
unlock_index
default {
error_popup "Unknown file state [lindex $s 0] detected.
-File $path cannot be committed by this program.
+File [escape_path $path] cannot be committed by this program.
"
}
}
}
proc commit_stage2 {fd_wt curHEAD msg} {
- global single_commit gitdir PARENT commit_type
+ global single_commit gitdir HEAD PARENT commit_type
global commit_active ui_status_value ui_comm
+ global file_states
gets $fd_wt tree_id
- close $fd_wt
-
- if {$tree_id == {}} {
- error_popup "write-tree failed"
+ if {$tree_id == {} || [catch {close $fd_wt} err]} {
+ error_popup "write-tree failed:\n\n$err"
set commit_active 0
set ui_status_value {Commit failed.}
unlock_index
}
close $fd_mh
} err]} {
- error_popup "Loading MERGE_HEADs failed:\n$err"
+ error_popup "Loading MERGE_HEAD failed:\n\n$err"
set commit_active 0
set ui_status_value {Commit failed.}
unlock_index
}
lappend cmd << $msg
if {[catch {set cmt_id [eval exec $cmd]} err]} {
- error_popup "commit-tree failed:\n$err"
+ error_popup "commit-tree failed:\n\n$err"
set commit_active 0
set ui_status_value {Commit failed.}
unlock_index
}
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"
+ error_popup "update-ref failed:\n\n$err"
set commit_active 0
set ui_status_value {Commit failed.}
unlock_index
$ui_comm delete 0.0 end
$ui_comm edit modified false
+ $ui_comm edit reset
if {$single_commit} do_quit
- set commit_type {}
+ # -- Update status without invoking any git commands.
+ #
set commit_active 0
+ 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 == {__}} {
+ unset file_states($path)
+ } else {
+ lset file_states($path) 0 $m
+ }
+ }
+
+ display_all_files
unlock_index
- update_status "Changes committed as [string range $cmt_id 0 7]."
+ reshow_diff
+ set ui_status_value \
+ "Changes committed as [string range $cmt_id 0 7]."
}
######################################################################
set PARENT $HEAD
set $ui_status_value {Ready.}
} else {
- update_status "Conflicts detected while pulling $branch from $remote."
+ update_status \
+ "Conflicts detected while pulling $branch from $remote."
}
}
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
- }
- }
- return -[expr $lo + 1]
+proc escape_path {path} {
+ regsub -all "\n" $path "\\n" path
+ return $path
}
set next_icon_id 0
}
proc display_file {path state} {
- global ui_index ui_other file_states status_active
+ global ui_index ui_other
+ global file_states file_lists status_active
set old_m [merge_state $path $state]
if {$status_active} return
set new_icon [mapicon $new_m $path]
if {$new_w != $old_w} {
- set lno [bsearch $old_w $path]
+ set lno [lsearch -sorted $file_lists($old_w) $path]
if {$lno >= 0} {
incr lno
$old_w conf -state normal
$old_w conf -state disabled
}
- set lno [expr abs([bsearch $new_w $path] + 1) + 1]
+ 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 "$path\n"
+ $new_w insert $lno.1 "[escape_path $path]\n"
$new_w conf -state disabled
} elseif {$new_icon != [mapicon $old_m $path]} {
$new_w conf -state normal
}
proc display_all_files {} {
- global ui_index ui_other file_states
+ global ui_index ui_other file_states file_lists
$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 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 "$path\n"
+ $w insert end "[escape_path $path]\n"
}
$ui_index conf -state disabled
######################################################################
##
-## config (fetch push pull)
-
-proc load_repo_config {} {
- global repo_config
- global cfg_trust_mtime
-
- 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]} {
- lappend repo_config($name) $value
- }
- }
- close $fd_rc
- }
-
- if {[catch {set cfg_trust_mtime $repo_config(gui.trustmtime)}]} {
- set cfg_trust_mtime false
- }
-}
-
-proc save_my_config {} {
- global repo_config
- global cfg_trust_mtime
-
- if {[catch {set rc_trustMTime $repo_config(gui.trustmtime)}]} {
- set rc_trustMTime false
- }
- if {$cfg_trust_mtime != $rc_trustMTime} {
- exec git repo-config gui.trustMTime $cfg_trust_mtime
- }
-}
+## remote management
proc load_all_remotes {} {
global gitdir all_remotes repo_config
}
proc populate_remote_menu {m pfx op} {
- global all_remotes mainfont
+ global all_remotes font_ui
foreach remote $all_remotes {
$m add command -label "$pfx $remote..." \
-command [list $op $remote] \
- -font $mainfont
+ -font $font_ui
}
}
proc populate_pull_menu {m} {
- global gitdir repo_config all_remotes mainfont disable_on_lock
+ global gitdir repo_config all_remotes font_ui disable_on_lock
foreach remote $all_remotes {
set rb {}
$m add command \
-label "Branch $rb_short from $remote..." \
-command [list pull_remote $remote $rb] \
- -font $mainfont
+ -font $font_ui
lappend disable_on_lock \
[list $m entryconf [$m index last] -state]
}
##
## util
-proc error_popup {msg} {
- set w .error
- toplevel $w
- wm transient $w .
- show_msg $w $w $msg
-}
-
-proc show_msg {w top msg} {
- 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"
- bind $top <Key-Return> "destroy $top"
- wm title $w "$appname ([lindex [file split \
- [file normalize [file dirname $gitdir]]] \
- end]): error"
- tkwait window $top
-}
-
proc hook_failed_popup {hook msg} {
- global gitdir mainfont difffont appname
+ global gitdir font_ui font_diff appname
set w .hookfail
toplevel $w
label $w.m.l1 -text "$hook hook failed:" \
-anchor w \
-justify left \
- -font [concat $mainfont bold]
+ -font [concat $font_ui bold]
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 [concat $font_ui bold]
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 $mainfont \
+ -font $font_ui \
-command "destroy $w"
pack $w.ok -side bottom
proc console_init {w} {
global console_cr console_data
- global gitdir appname mainfont difffont
+ global gitdir appname font_ui font_diff M1B
set console_cr($w) 1.0
toplevel $w
label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
-anchor w \
-justify left \
- -font [concat $mainfont bold]
+ -font [concat $font_ui bold]
text $w.m.t \
-background white -borderwidth 1 \
-relief sunken \
-width 80 -height 10 \
- -font $difffont \
+ -font $font_diff \
-state disabled \
-yscrollcommand [list $w.m.sby set]
label $w.m.s -anchor w \
-justify left \
- -font [concat $mainfont bold]
+ -font [concat $font_ui bold]
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.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 {Running...} \
-width 15 \
- -font $mainfont \
+ -font $font_ui \
-state disabled \
-command "destroy $w"
pack $w.ok -side bottom
+ bind $w.m.t <Any-Button-3> "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]]] \
console_exec $w $cmd
}
+set quitting 0
+
proc do_quit {} {
- global gitdir ui_comm
+ global gitdir ui_comm quitting
+
+ if {$quitting} return
+ set quitting 1
set save [file join $gitdir GITGUI_MSG]
set msg [string trim [$ui_comm get 0.0 end]]
if {$GIT_COMMITTER_IDENT == {}} {
if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
- error_popup "Unable to obtain your identity:\n$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$me"
+ error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
return
}
}
- set str "Signed-off-by: $GIT_COMMITTER_IDENT"
- if {[$ui_comm get {end -1c linestart} {end -1c}] != $str} {
- $ui_comm insert end "\n"
- $ui_comm insert end $str
+ set sob "Signed-off-by: $GIT_COMMITTER_IDENT"
+ set last [$ui_comm get {end -1c linestart} {end -1c}]
+ if {$last != $sob} {
+ $ui_comm edit separator
+ if {$last != {}
+ && ![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
}
}
# 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]
+ set path [lindex $file_lists($w) [expr $lno - 1]]
if {$path == {}} 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]
+ set path [lindex $file_lists($w) [expr $lno - 1]]
if {$path == {}} return
if {$col == 0} {
##
## ui init
-set mainfont {Helvetica 10}
-set difffont {Courier 10}
-set maincursor [. cget -cursor]
+set font_ui {Helvetica 10}
+set font_diff {Courier 10}
+set cursor_ptr left_ptr
switch -glob -- "$tcl_platform(platform),$tcl_platform(os)" {
windows,* {set M1B Control; set M1T Ctrl}
unix,Darwin {set M1B M1; set M1T Cmd}
-default {set M1B M1; set M1T M1}
+* {set M1B M1; set M1T M1}
}
# -- 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
menu .mbar.project
.mbar.project add command -label Visualize \
-command do_gitk \
- -font $mainfont
+ -font $font_ui
.mbar.project add command -label {Repack Database} \
-command do_repack \
- -font $mainfont
+ -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
# -- 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 {Amend Last Commit} \
-command do_amend_last \
- -font $mainfont
+ -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-U \
- -font $mainfont
+ -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]
# -- Options Menu
menu .mbar.options
-.mbar.options add checkbutton -label {Trust File Modification Timestamps} \
+.mbar.options add checkbutton \
+ -label {Trust File Modification Timestamps} \
+ -font $font_ui \
-offvalue false \
-onvalue true \
-variable cfg_trust_mtime
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
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]
+$ui_index tag conf in_diff -font [concat $font_ui bold]
+$ui_other tag conf in_diff -font [concat $font_ui bold]
# -- Diff and Commit Area
frame .vpane.lower -height 400 -width 400
label .vpane.lower.commarea.buttons.l -text {} \
-anchor w \
-justify left \
- -font $mainfont
+ -font $font_ui
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
-command do_rescan \
- -font $mainfont
+ -font $font_ui
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
-lappend disable_on_lock {.vpane.lower.commarea.buttons.rescan conf -state}
+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 $mainfont
+ -font $font_ui
pack .vpane.lower.commarea.buttons.amend -side top -fill x
-lappend disable_on_lock {.vpane.lower.commarea.buttons.amend conf -state}
+lappend disable_on_lock \
+ {.vpane.lower.commarea.buttons.amend conf -state}
button .vpane.lower.commarea.buttons.incall -text {Include All} \
-command do_include_all \
- -font $mainfont
+ -font $font_ui
pack .vpane.lower.commarea.buttons.incall -side top -fill x
-lappend disable_on_lock {.vpane.lower.commarea.buttons.incall conf -state}
+lappend disable_on_lock \
+ {.vpane.lower.commarea.buttons.incall conf -state}
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
-command do_signoff \
- -font $mainfont
+ -font $font_ui
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
button .vpane.lower.commarea.buttons.commit -text {Commit} \
-command do_commit \
- -font $mainfont
+ -font $font_ui
pack .vpane.lower.commarea.buttons.commit -side top -fill x
-lappend disable_on_lock {.vpane.lower.commarea.buttons.commit conf -state}
+lappend disable_on_lock \
+ {.vpane.lower.commarea.buttons.commit conf -state}
# -- Commit Message Buffer
frame .vpane.lower.commarea.buffer
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:}} \
* {$ui_coml conf -text {Commit Message:}}
}}
text $ui_comm -background white -borderwidth 1 \
+ -undo true \
+ -maxundo 20 \
+ -autoseparators true \
-relief sunken \
-width 75 -height 9 -wrap none \
- -font $difffont \
- -yscrollcommand {.vpane.lower.commarea.buffer.sby set} \
- -cursor $maincursor
-scrollbar .vpane.lower.commarea.buffer.sby -command [list $ui_comm yview]
+ -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.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 $ui_comm <Any-Button-3> "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.l1 -text {File:} \
-background orange \
- -font $mainfont
+ -font $font_ui
label .vpane.lower.diff.header.l2 -textvariable ui_fname_value \
-background orange \
-anchor w \
-justify left \
- -font $mainfont
+ -font $font_ui
label .vpane.lower.diff.header.l3 -text {Status:} \
-background orange \
- -font $mainfont
+ -font $font_ui
label .vpane.lower.diff.header.l4 -textvariable ui_fstatus_value \
-background orange \
-width $max_status_desc \
-anchor w \
-justify left \
- -font $mainfont
+ -font $font_ui
pack .vpane.lower.diff.header.l1 -side left
pack .vpane.lower.diff.header.l2 -side left -fill x
pack .vpane.lower.diff.header.l4 -side right
set ui_diff .vpane.lower.diff.body.t
text $ui_diff -background white -borderwidth 0 \
-width 80 -height 15 -wrap none \
- -font $difffont \
+ -font $font_diff \
-xscrollcommand {.vpane.lower.diff.body.sbx set} \
-yscrollcommand {.vpane.lower.diff.body.sby set} \
- -cursor $maincursor \
-state disabled
scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
-command [list $ui_diff xview]
$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 da -font [concat $font_diff 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_diff tag conf bold -font [concat $font_diff bold]
+
+# -- 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
+ "
+bind $ui_diff <Any-Button-3> "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 [lindex $repo_config(gui.geometry) 0]
+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 $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-u> do_include_all
-bind . <$M1B-Key-U> do_include_all
+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 $i <Button-3> {click %W %x %y 3 %X %Y; break}
bind $i <ButtonRelease-1> {unclick %W %x %y; break}
}
-unset i M1B M1T
-
-######################################################################
-##
-## 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
+unset i
-if {[catch {set gitdir [exec git rev-parse --git-dir]} err]} {
- show_msg {} . "Cannot find the git directory: $err"
- exit 1
-}
-
-if {$appname == {git-citool}} {
- set single_commit 1
-}
+set file_lists($ui_index) [list]
+set file_lists($ui_other) [list]
wm title . "$appname ([file normalize [file dirname $gitdir]])"
focus -force $ui_comm
-load_repo_config
load_all_remotes
populate_remote_menu .mbar.fetch From fetch_from
populate_remote_menu .mbar.push To push_to