return $empty_tree
}
-proc rescan {after} {
+proc rescan {after {honor_trustmtime 1}} {
global HEAD PARENT MERGE_HEAD commit_type
global ui_index ui_workdir ui_status_value ui_comm
global rescan_active file_states
$ui_comm edit modified false
}
- if {$repo_config(gui.trustmtime) eq {true}} {
+ if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
rescan_stage2 {} $after
} else {
set rescan_active 1
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
+ fconfigure $fd_di -blocking 0 -translation binary -encoding binary
+ fconfigure $fd_df -blocking 0 -translation binary -encoding binary
+ fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
fileevent $fd_di readable [list read_diff_index $fd_di $after]
fileevent $fd_df readable [list read_diff_files $fd_df $after]
fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
incr c
set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
+ set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
merge_state \
- [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
+ [encoding convertfrom $p] \
[lindex $i 4]? \
[list [lindex $i 0] [lindex $i 2]] \
[list]
incr c
set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
+ set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
merge_state \
- [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
+ [encoding convertfrom $p] \
?[lindex $i 4] \
[list] \
[list [lindex $i 0] [lindex $i 2]]
set pck [split $buf_rlo "\0"]
set buf_rlo [lindex $pck end]
foreach p [lrange $pck 0 end-1] {
- merge_state $p ?O
+ merge_state [encoding convertfrom $p] ?O
}
rescan_done $fd buf_rlo $after
}
## diff
proc clear_diff {} {
- global ui_diff current_diff ui_index ui_workdir
+ global ui_diff current_diff_path ui_index ui_workdir
$ui_diff conf -state normal
$ui_diff delete 0.0 end
$ui_diff conf -state disabled
- set current_diff {}
+ set current_diff_path {}
$ui_index tag remove in_diff 0.0 end
$ui_workdir tag remove in_diff 0.0 end
}
proc reshow_diff {} {
- global current_diff ui_status_value file_states
-
- if {$current_diff eq {}
- || [catch {set s $file_states($current_diff)}]} {
+ global ui_status_value file_states file_lists
+ global current_diff_path current_diff_side
+
+ set p $current_diff_path
+ if {$p eq {}
+ || $current_diff_side eq {}
+ || [catch {set s $file_states($p)}]
+ || [lsearch -sorted $file_lists($current_diff_side) $p] == -1} {
clear_diff
} else {
- show_diff $current_diff
+ show_diff $p $current_diff_side
}
}
proc handle_empty_diff {} {
- global current_diff file_states file_lists
+ global current_diff_path file_states file_lists
- set path $current_diff
+ set path $current_diff_path
set s $file_states($path)
if {[lindex $s 0] ne {_M}} return
[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"
- }
+by another application, but the content within
+the file was not changed.
+
+A rescan will be automatically started to find
+other files which may have the same state."
clear_diff
display_file $path __
+ rescan {set ui_status_value {Ready.}} 0
}
-proc show_diff {path {w {}} {lno {}}} {
+proc show_diff {path w {lno {}}} {
global file_states file_lists
global is_3way_diff diff_active repo_config
- global ui_diff current_diff ui_status_value
+ global ui_diff ui_status_value ui_index ui_workdir
+ global current_diff_path current_diff_side
if {$diff_active || ![lock_index read]} return
set m [lindex $s 0]
set is_3way_diff 0
set diff_active 1
- set current_diff $path
+ set current_diff_path $path
+ set current_diff_side $w
set ui_status_value "Loading diff of [escape_path $path]..."
- 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 {
- lappend cmd -c
- }
- _O {
+ # - Git won't give us the diff, there's nothing to compare to!
+ #
+ if {$m eq {_O}} {
+ set max_sz [expr {128 * 1024}]
if {[catch {
set fd [open $path r]
- set content [read $fd]
+ set content [read $fd $max_sz]
close $fd
+ set sz [file size $path]
} err ]} {
set diff_active 0
unlock_index
return
}
$ui_diff conf -state normal
- $ui_diff insert end $content
+ if {![catch {set type [exec file $path]}]} {
+ set n [string length $path]
+ if {[string equal -length $n $path $type]} {
+ set type [string range $type $n end]
+ regsub {^:?\s*} $type {} type
+ }
+ $ui_diff insert end "* $type\n" d_@
+ }
+ if {[string first "\0" $content] != -1} {
+ $ui_diff insert end \
+ "* Binary file (not showing content)." \
+ d_@
+ } else {
+ if {$sz > $max_sz} {
+ $ui_diff insert end \
+"* Untracked file is $sz bytes.
+* Showing only first $max_sz bytes.
+" d_@
+ }
+ $ui_diff insert end $content
+ if {$sz > $max_sz} {
+ $ui_diff insert end "
+* Untracked file clipped here by [appname].
+* To see the entire file, use an external editor.
+" d_@
+ }
+ }
$ui_diff conf -state disabled
set diff_active 0
unlock_index
set ui_status_value {Ready.}
return
}
+
+ set cmd [list | git]
+ if {$w eq $ui_index} {
+ lappend cmd diff-index
+ lappend cmd --cached
+ } elseif {$w eq $ui_workdir} {
+ if {[string index $m 0] eq {U}} {
+ lappend cmd diff
+ } else {
+ lappend cmd diff-files
+ }
}
- lappend cmd [PARENT]
+ lappend cmd -p
+ lappend cmd --no-color
+ if {$repo_config(gui.diffcontext) > 0} {
+ lappend cmd "-U$repo_config(gui.diffcontext)"
+ }
+ if {$w eq $ui_index} {
+ lappend cmd [PARENT]
+ }
lappend cmd --
lappend cmd $path
proc read_diff {fd} {
global ui_diff ui_status_value is_3way_diff diff_active
- global repo_config
$ui_diff conf -state normal
while {[gets $fd line] >= 0} {
# -- Cleanup uninteresting diff header lines.
#
if {[string match {diff --git *} $line]} continue
+ if {[string match {diff --cc *} $line]} continue
if {[string match {diff --combined *} $line]} continue
if {[string match {--- *} $line]} continue
if {[string match {+++ *} $line]} continue
#
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
- # -- Reformat a 3 way diff, 'cause its too weird.
- #
- if {$is_3way_diff} {
+ if {[string match {index *} $line]
+ || [string match {mode *} $line]
+ || [string match {new file *} $line]
+ || [string match {deleted file *} $line]
+ || [string match {Binary files * and * differ} $line]
+ || $line eq {\ No newline at end of file}
+ || [regexp {^\* Unmerged path } $line]} {
+ set tags {}
+ } elseif {$is_3way_diff} {
set op [string range $line 0 1]
switch -- $op {
+ { } {set tags {}}
{@@} {set tags d_@}
- {++} {set tags d_+ ; set op { +}}
- {--} {set tags d_- ; set op { -}}
- { +} {set tags d_++; set op {++}}
- { -} {set tags d_--; set op {--}}
- {+ } {set tags d_-+; set op {-+}}
- {- } {set tags d_+-; set op {+-}}
- default {set tags {}}
+ { +} {set tags d_s+}
+ { -} {set tags d_s-}
+ {+ } {set tags d_+s}
+ {- } {set tags d_-s}
+ {--} {set tags d_--}
+ {++} {
+ if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
+ set line [string replace $line 0 1 { }]
+ set tags d$op
+ } else {
+ set tags d_++
+ }
+ }
+ default {
+ puts "error: Unhandled 3 way diff marker: {$op}"
+ set tags {}
+ }
}
- set line [string replace $line 0 1 $op]
} else {
- switch -- [string index $line 0] {
- @ {set tags d_@}
- + {set tags d_+}
- - {set tags d_-}
- default {set tags {}}
+ set op [string index $line 0]
+ switch -- $op {
+ { } {set tags {}}
+ {@} {set tags d_@}
+ {-} {set tags d_-}
+ {+} {
+ if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
+ set line [string replace $line 0 0 { }]
+ set tags d$op
+ } else {
+ set tags d_+
+ }
+ }
+ default {
+ puts "error: Unhandled 2 way diff marker: {$op}"
+ set tags {}
+ }
}
}
$ui_diff insert end $line $tags
unlock_index
set ui_status_value {Ready.}
- if {$repo_config(gui.trustmtime) eq {true}
- && [$ui_diff index end] eq {2.0}} {
+ if {[$ui_diff index end] eq {2.0}} {
handle_empty_diff
}
}
proc load_last_commit {} {
global HEAD PARENT MERGE_HEAD commit_type ui_comm
+ global repo_config
if {[llength $PARENT] == 0} {
error_popup {There is nothing to amend.
set parents [list]
if {[catch {
set fd [open "| git cat-file commit $curHEAD" r]
+ fconfigure $fd -encoding binary -translation lf
+ if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
+ set enc utf-8
+ }
while {[gets $fd line] > 0} {
if {[string match {parent *} $line]} {
lappend parents [string range $line 7 end]
+ } elseif {[string match {encoding *} $line]} {
+ set enc [string tolower [string range $line 9 end]]
}
}
+ fconfigure $fd -encoding $enc
set msg [string trim [read $fd]]
close $fd
} err]} {
proc commit_tree {} {
global HEAD commit_type file_states ui_comm repo_config
+ global ui_status_value pch_error
if {![lock_index update]} return
if {[committer_ident] eq {}} return
_? {continue}
A? -
D? -
- M? {set files_ready 1; break}
+ M? {set files_ready 1}
U? {
error_popup "Unmerged files cannot be committed.
File [short_path $path] has merge conflicts.
-You must resolve them and include the file before committing.
+You must resolve them and add the file before committing.
"
unlock_index
return
}
}
if {!$files_ready} {
- error_popup {No included files to commit.
+ info_popup {No changes to commit.
-You must include at least 1 file before you can commit.
+You must add at least 1 file before you can commit.
}
unlock_index
return
return
}
- commit_prehook $curHEAD $msg
-}
-
-proc commit_prehook {curHEAD msg} {
- global ui_status_value pch_error
-
+ # -- Run the pre-commit hook.
+ #
set pchook [gitdir hooks pre-commit]
# On Cygwin [file executable] might lie so we need to ask
proc commit_committree {fd_wt curHEAD msg} {
global HEAD PARENT MERGE_HEAD commit_type
- global single_commit
+ global single_commit all_heads current_branch
global ui_status_value ui_comm selected_commit_type
global file_states selected_paths rescan_active
+ global repo_config
gets $fd_wt tree_id
if {$tree_id eq {} || [catch {close $fd_wt} err]} {
return
}
+ # -- Build the message.
+ #
+ set msg_p [gitdir COMMIT_EDITMSG]
+ set msg_wt [open $msg_p w]
+ if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
+ set enc utf-8
+ }
+ fconfigure $msg_wt -encoding $enc -translation binary
+ puts -nonewline $msg_wt $msg
+ close $msg_wt
+
# -- Create the commit.
#
set cmd [list git commit-tree $tree_id]
# git commit-tree writes to stderr during initial commit.
lappend cmd 2>/dev/null
}
- lappend cmd << $msg
+ lappend cmd <$msg_p
if {[catch {set cmt_id [eval exec $cmd]} err]} {
error_popup "commit-tree failed:\n\n$err"
set ui_status_value {Commit failed.}
return
}
+ # -- Make sure our current branch exists.
+ #
+ if {$commit_type eq {initial}} {
+ lappend all_heads $current_branch
+ set all_heads [lsort -unique $all_heads]
+ populate_branch_menu
+ }
+
# -- Cleanup after ourselves.
#
+ catch {file delete $msg_p}
catch {file delete [gitdir MERGE_HEAD]}
catch {file delete [gitdir MERGE_MSG]}
catch {file delete [gitdir SQUASH_MSG]}
set new_m [lindex $s 0]
set icon_name [lindex $s 1]
- display_file_helper $ui_index $path $icon_name \
- [string index $old_m 0] \
- [string index $new_m 0]
- display_file_helper $ui_workdir $path $icon_name \
- [string index $old_m 1] \
- [string index $new_m 1]
+ set o [string index $old_m 0]
+ set n [string index $new_m 0]
+ if {$o eq {U}} {
+ set o _
+ }
+ if {$n eq {U}} {
+ set n _
+ }
+ display_file_helper $ui_index $path $icon_name $o $n
+
+ if {[string index $old_m 0] eq {U}} {
+ set o U
+ } else {
+ set o [string index $old_m 1]
+ }
+ if {[string index $new_m 0] eq {U}} {
+ set n U
+ } else {
+ set n [string index $new_m 1]
+ }
+ display_file_helper $ui_workdir $path $icon_name $o $n
if {$new_m eq {__}} {
unset file_states($path)
set m [lindex $s 0]
set icon_name [lindex $s 1]
- if {[string index $m 0] ne {_}} {
+ set s [string index $m 0]
+ if {$s ne {U} && $s ne {_}} {
display_all_files_helper $ui_index $path \
- $icon_name [string index $m 0]
+ $icon_name $s
}
- if {[string index $m 1] ne {_}} {
+
+ if {[string index $m 0] eq {U}} {
+ set s U
+ } else {
+ set s [string index $m 1]
+ }
+ if {$s ne {_}} {
display_all_files_helper $ui_workdir $path \
- $icon_name [string index $m 1]
+ $icon_name $s
}
}
-blocking 0 \
-buffering full \
-buffersize 512 \
+ -encoding binary \
-translation binary
fileevent $fd writable [list \
write_update_indexinfo \
proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
global update_index_cp ui_status_value
- global file_states current_diff
+ global file_states current_diff_path
if {$update_index_cp >= $totalCnt} {
close $fd
set info [lindex $s 2]
if {$info eq {}} continue
- puts -nonewline $fd "$info\t$path\0"
+ puts -nonewline $fd "$info\t[encoding convertto $path]\0"
display_file $path $new
}
-blocking 0 \
-buffering full \
-buffersize 512 \
+ -encoding binary \
-translation binary
fileevent $fd writable [list \
write_update_index \
proc write_update_index {fd pathList totalCnt batch msg after} {
global update_index_cp ui_status_value
- global file_states current_diff
+ global file_states current_diff_path
if {$update_index_cp >= $totalCnt} {
close $fd
?D {set new D_}
_O -
AM {set new A_}
- U_ -
+ U? {
+ if {[file exists $path]} {
+ set new M_
+ } else {
+ set new D_
+ }
+ }
?M {set new M_}
?? {continue}
}
- puts -nonewline $fd "$path\0"
+ puts -nonewline $fd "[encoding convertto $path]\0"
display_file $path $new
}
-blocking 0 \
-buffering full \
-buffersize 512 \
+ -encoding binary \
-translation binary
fileevent $fd writable [list \
write_checkout_index \
proc write_checkout_index {fd pathList totalCnt batch msg after} {
global update_index_cp ui_status_value
- global file_states current_diff
+ global file_states current_diff_path
if {$update_index_cp >= $totalCnt} {
close $fd
U? {continue}
?M -
?D {
- puts -nonewline $fd "$path\0"
+ puts -nonewline $fd "[encoding convertto $path]\0"
display_file $path ?_
}
}
##
## branch management
+proc is_tracking_branch {name} {
+ global tracking_branches
+
+ if {![catch {set info $tracking_branches($name)}]} {
+ return 1
+ }
+ foreach t [array names tracking_branches] {
+ if {[string match {*/\*} $t] && [string match $t $name]} {
+ return 1
+ }
+ }
+ return 0
+}
+
proc load_all_heads {} {
- global all_heads tracking_branches
+ global all_heads
set all_heads [list]
- set cmd [list git for-each-ref]
- lappend cmd --format=%(refname)
- lappend cmd refs/heads
- set fd [open "| $cmd" r]
+ set fd [open "| git for-each-ref --format=%(refname) refs/heads" r]
while {[gets $fd line] > 0} {
- if {![catch {set info $tracking_branches($line)}]} continue
+ if {[is_tracking_branch $line]} continue
if {![regsub ^refs/heads/ $line {} name]} continue
lappend all_heads $name
}
}
}
+proc all_tracking_branches {} {
+ global tracking_branches
+
+ set all_trackings {}
+ set cmd {}
+ foreach name [array names tracking_branches] {
+ if {[regsub {/\*$} $name {} name]} {
+ lappend cmd $name
+ } else {
+ regsub ^refs/(heads|remotes)/ $name {} name
+ lappend all_trackings $name
+ }
+ }
+
+ if {$cmd ne {}} {
+ set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
+ while {[gets $fd name] > 0} {
+ regsub ^refs/(heads|remotes)/ $name {} name
+ lappend all_trackings $name
+ }
+ close $fd
+ }
+
+ return [lsort -unique $all_trackings]
+}
+
proc do_create_branch_action {w} {
- global all_heads null_sha1
+ global all_heads null_sha1 repo_config
global create_branch_checkout create_branch_revtype
global create_branch_head create_branch_trackinghead
- set newbranch [string trim [$w.name.t get 0.0 end]]
+ set newbranch [string trim [$w.desc.name_t get 0.0 end]]
+ if {$newbranch eq {}
+ || $newbranch eq $repo_config(gui.newbranchtemplate)} {
+ tk_messageBox \
+ -icon error \
+ -type ok \
+ -title [wm title $w] \
+ -parent $w \
+ -message "Please supply a branch name."
+ focus $w.desc.name_t
+ return
+ }
if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
tk_messageBox \
-icon error \
-title [wm title $w] \
-parent $w \
-message "Branch '$newbranch' already exists."
- focus $w.name.t
+ focus $w.desc.name_t
return
}
if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
-title [wm title $w] \
-parent $w \
-message "We do not like '$newbranch' as a branch name."
- focus $w.name.t
+ focus $w.desc.name_t
return
}
switch -- $create_branch_revtype {
head {set rev $create_branch_head}
tracking {set rev $create_branch_trackinghead}
- expression {set rev [string trim [$w.from.exp.t get 0.0 end]]}
+ expression {set rev [string trim [$w.from.exp_t get 0.0 end]]}
}
if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
tk_messageBox \
set all_heads [lsort $all_heads]
populate_branch_menu
destroy $w
+ if {$create_branch_checkout} {
+ switch_branch $newbranch
+ }
}
+proc radio_selector {varname value args} {
+ upvar #0 $varname var
+ set var $value
+}
+
+trace add variable create_branch_head write \
+ [list radio_selector create_branch_revtype head]
+trace add variable create_branch_trackinghead write \
+ [list radio_selector create_branch_revtype tracking]
+
+trace add variable delete_branch_head write \
+ [list radio_selector delete_branch_checktype head]
+trace add variable delete_branch_trackinghead write \
+ [list radio_selector delete_branch_checktype tracking]
+
proc do_create_branch {} {
- global all_heads current_branch tracking_branches
+ global all_heads current_branch repo_config
global create_branch_checkout create_branch_revtype
global create_branch_head create_branch_trackinghead
- set create_branch_checkout true
- set create_branch_revtype head
- set create_branch_head $current_branch
- set create_branch_trackinghead {}
-
set w .branch_editor
toplevel $w
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
pack $w.buttons.cancel -side right -padx 5
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
- labelframe $w.name \
+ labelframe $w.desc \
-text {Branch Description} \
-font font_ui
- label $w.name.l -text {Name:} -font font_ui
- text $w.name.t \
+ label $w.desc.name_l -text {Name:} -font font_ui
+ text $w.desc.name_t \
-borderwidth 1 \
-relief sunken \
-height 1 \
-width 40 \
-font font_ui
- bind $w.name.t <Shift-Key-Tab> "focus $w.postActions.checkout;break"
- bind $w.name.t <Key-Tab> "focus $w.from.exp.t;break"
- bind $w.name.t <Key-Return> "do_create_branch_action $w;break"
- bind $w.name.t <Key> {
+ $w.desc.name_t insert 0.0 $repo_config(gui.newbranchtemplate)
+ grid $w.desc.name_l $w.desc.name_t -sticky we -padx {0 5}
+ bind $w.desc.name_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
+ bind $w.desc.name_t <Key-Tab> {focus [tk_focusNext %W];break}
+ bind $w.desc.name_t <Key-Return> "do_create_branch_action $w;break"
+ bind $w.desc.name_t <Key> {
if {{%K} ne {BackSpace}
&& {%K} ne {Tab}
&& {%K} ne {Escape}
if {[string first %A {~^:?*[}] >= 0} break
}
}
- pack $w.name.l -side left -padx 5
- pack $w.name.t -side left -fill x -expand 1
- pack $w.name -anchor nw -fill x -pady 5 -padx 5
-
- set all_trackings [list]
- foreach b [array names tracking_branches] {
- regsub ^refs/(heads|remotes)/ $b {} b
- lappend all_trackings $b
- }
- set all_trackings [lsort -unique $all_trackings]
- if {$all_trackings ne {}} {
- set create_branch_trackinghead [lindex $all_trackings 0]
- }
+ grid columnconfigure $w.desc 1 -weight 1
+ pack $w.desc -anchor nw -fill x -pady 5 -padx 5
labelframe $w.from \
-text {Starting Revision} \
-font font_ui
- frame $w.from.head
- radiobutton $w.from.head.r \
+ radiobutton $w.from.head_r \
-text {Local Branch:} \
-value head \
-variable create_branch_revtype \
-font font_ui
- eval tk_optionMenu $w.from.head.m create_branch_head $all_heads
- pack $w.from.head.r -side left
- pack $w.from.head.m -side left
- frame $w.from.tracking
- radiobutton $w.from.tracking.r \
- -text {Tracking Branch:} \
- -value tracking \
- -variable create_branch_revtype \
- -font font_ui
- eval tk_optionMenu $w.from.tracking.m \
- create_branch_trackinghead \
- $all_trackings
- pack $w.from.tracking.r -side left
- pack $w.from.tracking.m -side left
- frame $w.from.exp
- radiobutton $w.from.exp.r \
+ eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
+ grid $w.from.head_r $w.from.head_m -sticky w
+ set all_trackings [all_tracking_branches]
+ if {$all_trackings ne {}} {
+ set create_branch_trackinghead [lindex $all_trackings 0]
+ radiobutton $w.from.tracking_r \
+ -text {Tracking Branch:} \
+ -value tracking \
+ -variable create_branch_revtype \
+ -font font_ui
+ eval tk_optionMenu $w.from.tracking_m \
+ create_branch_trackinghead \
+ $all_trackings
+ grid $w.from.tracking_r $w.from.tracking_m -sticky w
+ }
+ radiobutton $w.from.exp_r \
-text {Revision Expression:} \
-value expression \
-variable create_branch_revtype \
-font font_ui
- text $w.from.exp.t \
+ text $w.from.exp_t \
-borderwidth 1 \
-relief sunken \
-height 1 \
-width 50 \
-font font_ui
- bind $w.from.exp.t <Shift-Key-Tab> "focus $w.name.t;break"
- bind $w.from.exp.t <Key-Tab> "focus $w.postActions.checkout;break"
- bind $w.from.exp.t <Key-Return> "do_create_branch_action $w;break"
- pack $w.from.exp.r -side left
- pack $w.from.exp.t -side left -fill x -expand 1
- pack $w.from.head -padx 5 -fill x -expand 1
- pack $w.from.tracking -padx 5 -fill x -expand 1
- pack $w.from.exp -padx 5 -fill x -expand 1
+ grid $w.from.exp_r $w.from.exp_t -sticky we -padx {0 5}
+ bind $w.from.exp_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
+ bind $w.from.exp_t <Key-Tab> {focus [tk_focusNext %W];break}
+ bind $w.from.exp_t <Key-Return> "do_create_branch_action $w;break"
+ bind $w.from.exp_t <Key-space> break
+ bind $w.from.exp_t <Key> {set create_branch_revtype expression}
+ grid columnconfigure $w.from 1 -weight 1
pack $w.from -anchor nw -fill x -pady 5 -padx 5
labelframe $w.postActions \
-font font_ui
checkbutton $w.postActions.checkout \
-text {Checkout after creation} \
- -offvalue false \
- -onvalue true \
-variable create_branch_checkout \
-font font_ui
pack $w.postActions.checkout -anchor nw
pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
- bind $w <Visibility> "grab $w; focus $w.name.t"
+ set create_branch_checkout 1
+ set create_branch_head $current_branch
+ set create_branch_revtype head
+
+ bind $w <Visibility> "grab $w; focus $w.desc.name_t"
bind $w <Key-Escape> "destroy $w"
bind $w <Key-Return> "do_create_branch_action $w;break"
wm title $w "[appname] ([reponame]): Create Branch"
proc do_delete_branch_action {w} {
global all_heads
- global delete_branch_checkhead delete_branch_head
+ global delete_branch_checktype delete_branch_head delete_branch_trackinghead
- set to_delete [list]
- set msg {Are you sure you want to delete the following branches?
+ set check_rev {}
+ switch -- $delete_branch_checktype {
+ head {set check_rev $delete_branch_head}
+ tracking {set check_rev $delete_branch_trackinghead}
+ always {set check_rev {:none}}
+ }
+ if {$check_rev eq {:none}} {
+ set check_cmt {}
+ } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
+ tk_messageBox \
+ -icon error \
+ -type ok \
+ -title [wm title $w] \
+ -parent $w \
+ -message "Invalid check revision: $check_rev"
+ return
+ }
-}
+ set to_delete [list]
+ set not_merged [list]
foreach i [$w.list.l curselection] {
set b [$w.list.l get $i]
if {[catch {set o [exec git rev-parse --verify $b]}]} continue
- if {$delete_branch_checkhead} {
- if {[catch {set m [exec git merge-base $o $delete_branch_head]}]} continue
- if {$o ne $m} continue
+ if {$check_cmt ne {}} {
+ if {$b eq $check_rev} continue
+ if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
+ if {$o ne $m} {
+ lappend not_merged $b
+ continue
+ }
}
lappend to_delete [list $b $o]
- append msg " - $b\n"
}
- if {$to_delete eq {}} {
+ if {$not_merged ne {}} {
+ set msg "The following branches are not completely merged into $check_rev:
+
+ - [join $not_merged "\n - "]"
tk_messageBox \
-icon info \
-type ok \
-title [wm title $w] \
-parent $w \
- -message {No branches are able to be deleted.
-
-This is likely because you did not select any branches,
-or all selected branches are not completely merged.
-}
- return
+ -message $msg
}
- append msg {
-It can be difficult to recover deleted branches.
+ if {$to_delete eq {}} return
+ if {$delete_branch_checktype eq {always}} {
+ set msg {Recovering deleted branches is difficult.
-Delete the above branches?}
- if {[tk_messageBox \
- -icon warning \
- -type yesno \
- -title [wm title $w] \
- -parent $w \
- -message $msg] ne yes} {
- return
+Delete the selected branches?}
+ if {[tk_messageBox \
+ -icon warning \
+ -type yesno \
+ -title [wm title $w] \
+ -parent $w \
+ -message $msg] ne yes} {
+ return
+ }
}
set failed {}
proc do_delete_branch {} {
global all_heads tracking_branches current_branch
- global delete_branch_checkhead delete_branch_head
-
- set delete_branch_checkhead 1
- set delete_branch_head $current_branch
+ global delete_branch_checktype delete_branch_head delete_branch_trackinghead
set w .branch_editor
toplevel $w
pack $w.list.l -fill both -pady 5 -padx 5
pack $w.list -fill both -pady 5 -padx 5
- set all_trackings [list]
- foreach b [array names tracking_branches] {
- regsub ^refs/(heads|remotes)/ $b {} b
- lappend all_trackings $b
- }
-
labelframe $w.validate \
- -text {Only Delete If} \
+ -text {Delete Only If} \
-font font_ui
- frame $w.validate.head
- checkbutton $w.validate.head.r \
- -text {Already Merged Into:} \
- -variable delete_branch_checkhead \
+ radiobutton $w.validate.head_r \
+ -text {Merged Into Local Branch:} \
+ -value head \
+ -variable delete_branch_checktype \
+ -font font_ui
+ eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
+ grid $w.validate.head_r $w.validate.head_m -sticky w
+ set all_trackings [all_tracking_branches]
+ if {$all_trackings ne {}} {
+ set delete_branch_trackinghead [lindex $all_trackings 0]
+ radiobutton $w.validate.tracking_r \
+ -text {Merged Into Tracking Branch:} \
+ -value tracking \
+ -variable delete_branch_checktype \
+ -font font_ui
+ eval tk_optionMenu $w.validate.tracking_m \
+ delete_branch_trackinghead \
+ $all_trackings
+ grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
+ }
+ radiobutton $w.validate.always_r \
+ -text {Always (Do not perform merge checks)} \
+ -value always \
+ -variable delete_branch_checktype \
-font font_ui
- eval tk_optionMenu $w.validate.head.m delete_branch_head \
- $all_heads \
- [lsort -unique $all_trackings]
- pack $w.validate.head.r -side left
- pack $w.validate.head.m -side left
- pack $w.validate.head -padx 5 -fill x -expand 1
+ grid $w.validate.always_r -columnspan 2 -sticky w
+ grid columnconfigure $w.validate 1 -weight 1
pack $w.validate -anchor nw -fill x -pady 5 -padx 5
+ set delete_branch_head $current_branch
+ set delete_branch_checktype head
+
bind $w <Visibility> "grab $w; focus $w"
bind $w <Key-Escape> "destroy $w"
wm title $w "[appname] ([reponame]): Delete Branch"
set all_icons(_$ui_workdir) file_plain
set all_icons(M$ui_workdir) file_mod
set all_icons(D$ui_workdir) file_question
+set all_icons(U$ui_workdir) file_merge
set all_icons(O$ui_workdir) file_plain
set max_status_desc 0
{DO "Staged for removal, still present"}
{U_ "Requires merge resolution"}
+ {UU "Requires merge resolution"}
{UM "Requires merge resolution"}
{UD "Requires merge resolution"}
} {
-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"
+ -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
$w.ctxm add command -label "Copy All" \
-font font_ui \
-command "
}
}
+proc do_stats {} {
+ set fd [open "| git count-objects -v" r]
+ while {[gets $fd line] > 0} {
+ if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
+ set stats($name) $value
+ }
+ }
+ close $fd
+
+ set w .stats_view
+ toplevel $w
+ wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
+
+ label $w.header -text {Database Statistics} \
+ -font font_uibold
+ pack $w.header -side top -fill x
+
+ frame $w.buttons -border 1
+ button $w.buttons.close -text Close \
+ -font font_ui \
+ -command [list destroy $w]
+ button $w.buttons.gc -text {Compress Database} \
+ -font font_ui \
+ -command "destroy $w;do_gc"
+ pack $w.buttons.close -side right
+ pack $w.buttons.gc -side left
+ pack $w.buttons -side bottom -fill x -pady 10 -padx 10
+
+ frame $w.stat -borderwidth 1 -relief solid
+ foreach s {
+ {count {Number of loose objects}}
+ {size {Disk space used by loose objects} { KiB}}
+ {in-pack {Number of packed objects}}
+ {packs {Number of packs}}
+ {prune-packable {Packed objects waiting for pruning}}
+ {garbage {Garbage files}}
+ } {
+ set name [lindex $s 0]
+ set label [lindex $s 1]
+ if {[catch {set value $stats($name)}]} continue
+ if {[llength $s] > 2} {
+ set value "$value[lindex $s 2]"
+ }
+
+ label $w.stat.l_$name -text "$label:" -anchor w -font font_ui
+ label $w.stat.v_$name -text $value -anchor w -font font_ui
+ grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
+ }
+ pack $w.stat
+
+ bind $w <Visibility> "grab $w; focus $w"
+ bind $w <Key-Escape> [list destroy $w]
+ bind $w <Key-Return> [list destroy $w]
+ wm title $w "[appname] ([reponame]): Database Statistics"
+ tkwait window $w
+}
+
proc do_gc {} {
set w [new_console {gc} {Compressing the object database}]
console_exec $w {git gc}
}
proc unstage_helper {txt paths} {
- global file_states current_diff
+ global file_states current_diff_path
if {![lock_index begin-update]} return
M? -
D? {
lappend pathList $path
- if {$path eq $current_diff} {
+ if {$path eq $current_diff_path} {
set after {reshow_diff;}
}
}
}
proc do_unstage_selection {} {
- global current_diff selected_paths
+ global current_diff_path selected_paths
if {[array size selected_paths] > 0} {
unstage_helper \
{Unstaging selected files from commit} \
[array names selected_paths]
- } elseif {$current_diff ne {}} {
+ } elseif {$current_diff_path ne {}} {
unstage_helper \
- "Unstaging [short_path $current_diff] from commit" \
- [list $current_diff]
+ "Unstaging [short_path $current_diff_path] from commit" \
+ [list $current_diff_path]
}
}
proc add_helper {txt paths} {
- global file_states current_diff
+ global file_states current_diff_path
if {![lock_index begin-update]} return
?D -
U? {
lappend pathList $path
- if {$path eq $current_diff} {
+ if {$path eq $current_diff_path} {
set after {reshow_diff;}
}
}
}
proc do_add_selection {} {
- global current_diff selected_paths
+ global current_diff_path selected_paths
if {[array size selected_paths] > 0} {
add_helper \
{Adding selected files} \
[array names selected_paths]
- } elseif {$current_diff ne {}} {
+ } elseif {$current_diff_path ne {}} {
add_helper \
- "Adding [short_path $current_diff]" \
- [list $current_diff]
+ "Adding [short_path $current_diff_path]" \
+ [list $current_diff_path]
}
}
}
proc revert_helper {txt paths} {
- global file_states current_diff
+ global file_states current_diff_path
if {![lock_index begin-update]} return
?M -
?D {
lappend pathList $path
- if {$path eq $current_diff} {
+ if {$path eq $current_diff_path} {
set after {reshow_diff;}
}
}
}
proc do_revert_selection {} {
- global current_diff selected_paths
+ global current_diff_path selected_paths
if {[array size selected_paths] > 0} {
revert_helper \
{Reverting selected files} \
[array names selected_paths]
- } elseif {$current_diff ne {}} {
+ } elseif {$current_diff_path ne {}} {
revert_helper \
- "Reverting [short_path $current_diff]" \
- [list $current_diff]
+ "Reverting [short_path $current_diff_path]" \
+ [list $current_diff_path]
}
}
pack $w.buttons.restore -side left
button $w.buttons.save -text Save \
-font font_ui \
- -command [list do_save_config $w]
+ -command "
+ catch {eval \[bind \[focus -displayof $w\] <FocusOut>\]}
+ do_save_config $w
+ "
pack $w.buttons.save -side right
button $w.buttons.cancel -text {Cancel} \
-font font_ui \
{b pullsummary {Show Pull Summary}}
{b trustmtime {Trust File Modification Timestamps}}
{i diffcontext {Number of Diff Context Lines}}
+ {t newbranchtemplate {New Branch Name Template}}
} {
set type [lindex $option 0]
set name [lindex $option 1]
-from 1 -to 99 -increment 1 \
-width 3 \
-font font_ui
- pack $w.$f.$name.v -side right -anchor e
+ bind $w.$f.$name.v <FocusIn> {%W selection range 0 end}
+ pack $w.$f.$name.v -side right -anchor e -padx 5
+ pack $w.$f.$name -side top -anchor w -fill x
+ }
+ t {
+ frame $w.$f.$name
+ label $w.$f.$name.l -text "$text:" -font font_ui
+ text $w.$f.$name.v \
+ -borderwidth 1 \
+ -relief sunken \
+ -height 1 \
+ -width 20 \
+ -font font_ui
+ $w.$f.$name.v insert 0.0 [set ${f}_config_new(gui.$name)]
+ bind $w.$f.$name.v <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
+ bind $w.$f.$name.v <Key-Tab> {focus [tk_focusNext %W];break}
+ bind $w.$f.$name.v <Key-Return> break
+ bind $w.$f.$name.v <FocusIn> "$w.$f.$name.v tag add sel 0.0 end"
+ bind $w.$f.$name.v <FocusOut> "
+ set ${f}_config_new(gui.$name) \
+ \[string trim \[$w.$f.$name.v get 0.0 end\]\]
+ "
+ pack $w.$f.$name.l -side left -anchor w
+ pack $w.$f.$name.v -side left -anchor w \
+ -fill x -expand 1 \
+ -padx 5
pack $w.$f.$name -side top -anchor w -fill x
}
}
-from 2 -to 80 -increment 1 \
-width 3 \
-font font_ui
+ bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
pack $w.global.$name.size -side right -anchor e
pack $w.global.$name.family -side right -anchor e
pack $w.global.$name -side top -anchor w -fill x
}
proc toggle_or_diff {w x y} {
- global file_states file_lists current_diff ui_index ui_workdir
+ global file_states file_lists current_diff_path ui_index ui_workdir
global last_clicked selected_paths
set pos [split [$w index @$x,$y] .]
$ui_workdir tag remove in_sel 0.0 end
if {$col == 0} {
- if {$current_diff eq $path} {
+ if {$current_diff_path eq $path} {
set after {reshow_diff;}
} else {
set after {}
set default_config(gui.trustmtime) false
set default_config(gui.pullsummary) true
set default_config(gui.diffcontext) 5
+set default_config(gui.newbranchtemplate) {}
set default_config(gui.fontui) [font configure font_ui]
set default_config(gui.fontdiff) [font configure font_diff]
set font_descs {
.mbar.repository add separator
if {!$single_commit} {
+ .mbar.repository add command -label {Database Statistics} \
+ -command do_stats \
+ -font font_ui
+
.mbar.repository add command -label {Compress Database} \
-command do_gc \
-font font_ui
#
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
-.vpane add .vpane.files -sticky nsew -height 100 -width 400
+.vpane add .vpane.files -sticky nsew -height 100 -width 200
pack .vpane -anchor n -side top -fill both -expand 1
# -- Index File List
#
-frame .vpane.files.index -height 100 -width 400
+frame .vpane.files.index -height 100 -width 200
label .vpane.files.index.title -text {Changes To Be Committed} \
-background green \
-font font_ui
text $ui_index -background white -borderwidth 0 \
- -width 40 -height 10 \
+ -width 20 -height 10 \
+ -wrap none \
-font font_ui \
-cursor $cursor_ptr \
- -yscrollcommand {.vpane.files.index.sb set} \
+ -xscrollcommand {.vpane.files.index.sx set} \
+ -yscrollcommand {.vpane.files.index.sy set} \
-state disabled
-scrollbar .vpane.files.index.sb -command [list $ui_index yview]
+scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
+scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
pack .vpane.files.index.title -side top -fill x
-pack .vpane.files.index.sb -side right -fill y
+pack .vpane.files.index.sx -side bottom -fill x
+pack .vpane.files.index.sy -side right -fill y
pack $ui_index -side left -fill both -expand 1
.vpane.files add .vpane.files.index -sticky nsew
# -- Working Directory File List
#
-frame .vpane.files.workdir -height 100 -width 100
+frame .vpane.files.workdir -height 100 -width 200
label .vpane.files.workdir.title -text {Changed But Not Updated} \
-background red \
-font font_ui
text $ui_workdir -background white -borderwidth 0 \
- -width 40 -height 10 \
+ -width 20 -height 10 \
+ -wrap none \
-font font_ui \
-cursor $cursor_ptr \
- -yscrollcommand {.vpane.files.workdir.sb set} \
+ -xscrollcommand {.vpane.files.workdir.sx set} \
+ -yscrollcommand {.vpane.files.workdir.sy set} \
-state disabled
-scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
+scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
+scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
pack .vpane.files.workdir.title -side top -fill x
-pack .vpane.files.workdir.sb -side right -fill y
+pack .vpane.files.workdir.sx -side bottom -fill x
+pack .vpane.files.workdir.sy -side right -fill y
pack $ui_workdir -side left -fill both -expand 1
.vpane.files add .vpane.files.workdir -sticky nsew
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
+.vpane add .vpane.lower -sticky nsew
# -- Commit Area Buttons
#
$ctxm add command \
-label {Select All} \
-font font_ui \
- -command {$ui_comm tag add sel 0.0 end}
+ -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
$ctxm add command \
-label {Copy All} \
-font font_ui \
# -- Diff Header
#
-set current_diff {}
+set current_diff_path {}
set diff_actions [list]
-proc trace_current_diff {varname args} {
- global current_diff diff_actions file_states
- if {$current_diff eq {}} {
+proc trace_current_diff_path {varname args} {
+ global current_diff_path diff_actions file_states
+ if {$current_diff_path eq {}} {
set s {}
set f {}
set p {}
set o disabled
} else {
- set p $current_diff
+ set p $current_diff_path
set s [mapdesc [lindex $file_states($p) 0] $p]
set f {File:}
set p [escape_path $p]
uplevel #0 $w $o
}
}
-trace add variable current_diff write trace_current_diff
+trace add variable current_diff_path write trace_current_diff_path
frame .vpane.lower.diff.header -background orange
label .vpane.lower.diff.header.status \
clipboard append \
-format STRING \
-type STRING \
- -- $current_diff
+ -- $current_diff_path
}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
pack .vpane.lower.diff.header -side top -fill x
pack .vpane.lower.diff.body -side bottom -fill both -expand 1
-$ui_diff tag conf d_@ -font font_diffbold
-$ui_diff tag conf d_+ -foreground blue
-$ui_diff tag conf d_- -foreground red
+$ui_diff tag conf d_@ -foreground blue -font font_diffbold
+$ui_diff tag conf d_+ -foreground {#00a000}
+$ui_diff tag conf d_- -foreground red
+
$ui_diff tag conf d_++ -foreground {#00a000}
-$ui_diff tag conf d_-- -foreground {#a000a0}
-$ui_diff tag conf d_+- \
+$ui_diff tag conf d_-- -foreground red
+$ui_diff tag conf d_+s \
+ -foreground {#00a000} \
+ -background {#e2effa}
+$ui_diff tag conf d_-s \
-foreground red \
- -background {light goldenrod yellow}
-$ui_diff tag conf d_-+ \
- -foreground blue \
- -background azure2
+ -background {#e2effa}
+$ui_diff tag conf d_s+ \
+ -foreground {#00a000} \
+ -background ivory1
+$ui_diff tag conf d_s- \
+ -foreground red \
+ -background ivory1
+
+$ui_diff tag conf d<<<<<<< \
+ -foreground orange \
+ -font font_diffbold
+$ui_diff tag conf d======= \
+ -foreground orange \
+ -font font_diffbold
+$ui_diff tag conf d>>>>>>> \
+ -foreground orange \
+ -font font_diffbold
+
+$ui_diff tag raise sel
# -- Diff Body Context Menu
#
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
+$ctxm add command \
+ -label {Refresh} \
+ -font font_ui \
+ -command reshow_diff
$ctxm add command \
-label {Copy} \
-font font_ui \
$ctxm add command \
-label {Select All} \
-font font_ui \
- -command {$ui_diff tag add sel 0.0 end}
+ -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
-label {Copy All} \
set commit_type {}
set empty_tree {}
set current_branch {}
-set current_diff {}
+set current_diff_path {}
set selected_commit_type new
wm title . "[appname] ([file normalize [file dirname [gitdir]]])"