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
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"
- }
+file."
clear_diff
display_file $path __
+ rescan {set ui_status_value {Ready.}} 0
}
proc show_diff {path w {lno {}}} {
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
if {[string match {index *} $line]
+ || [string match {mode *} $line]
+ || [string match {new file *} $line]
+ || [string match {deleted file *} $line]
|| [regexp {^\* Unmerged path } $line]} {
set tags {}
} elseif {$is_3way_diff} {
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
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 [gitdir MERGE_HEAD]}
##
## 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 [list]
- foreach b [array names tracking_branches] {
- regsub ^refs/(heads|remotes)/ $b {} b
- lappend all_trackings $b
+ 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]
}
-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 "
#
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 \
# -- 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 \
$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 \
$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} \