##
## task management
-set status_active 0
+set rescan_active 0
set diff_active 0
+set last_clicked {}
set disable_on_lock [list]
set index_lock_type none
}
}
-proc update_status {{final Ready.}} {
+proc rescan {after} {
global HEAD PARENT commit_type
global ui_index ui_other ui_status_value ui_comm
- global status_active file_states
+ global rescan_active file_states
global repo_config
- if {$status_active || ![lock_index read]} return
+ if {$rescan_active > 0 || ![lock_index read]} return
repository_state new_HEAD new_type
if {$commit_type eq {amend}
}
if {$repo_config(gui.trustmtime) eq {true}} {
- update_status_stage2 {} $final
+ rescan_stage2 {} $after
} else {
- set status_active 1
+ set rescan_active 1
set ui_status_value {Refreshing file status...}
set cmd [list git update-index]
lappend cmd -q
set fd_rf [open "| $cmd" r]
fconfigure $fd_rf -blocking 0 -translation binary
fileevent $fd_rf readable \
- [list update_status_stage2 $fd_rf $final]
+ [list rescan_stage2 $fd_rf $after]
}
}
-proc update_status_stage2 {fd final} {
+proc rescan_stage2 {fd after} {
global gitdir PARENT commit_type
global ui_index ui_other ui_status_value ui_comm
- global status_active
+ global rescan_active
global buf_rdi buf_rdf buf_rlo
if {$fd ne {}} {
set buf_rdf {}
set buf_rlo {}
- set status_active 3
+ set rescan_active 3
set ui_status_value {Scanning for modified files ...}
set fd_di [open "| git diff-index --cached -z $PARENT" r]
set fd_df [open "| git diff-files -z" 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 $final]
- fileevent $fd_df readable [list read_diff_files $fd_df $final]
- fileevent $fd_lo readable [list read_ls_others $fd_lo $final]
+ 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]
}
proc load_message {file} {
return 0
}
-proc read_diff_index {fd final} {
+proc read_diff_index {fd after} {
global buf_rdi
append buf_rdi [read $fd]
incr z2 -1
display_file \
[string range $buf_rdi $z1 $z2] \
- [string index $buf_rdi [expr $z1 - 2]]_
+ [string index $buf_rdi [expr {$z1 - 2}]]_
incr c
}
if {$c < $n} {
set buf_rdi {}
}
- status_eof $fd buf_rdi $final
+ rescan_done $fd buf_rdi $after
}
-proc read_diff_files {fd final} {
+proc read_diff_files {fd after} {
global buf_rdf
append buf_rdf [read $fd]
incr z2 -1
display_file \
[string range $buf_rdf $z1 $z2] \
- _[string index $buf_rdf [expr $z1 - 2]]
+ _[string index $buf_rdf [expr {$z1 - 2}]]
incr c
}
if {$c < $n} {
set buf_rdf {}
}
- status_eof $fd buf_rdf $final
+ rescan_done $fd buf_rdf $after
}
-proc read_ls_others {fd final} {
+proc read_ls_others {fd after} {
global buf_rlo
append buf_rlo [read $fd]
foreach p [lrange $pck 0 end-1] {
display_file $p _O
}
- status_eof $fd buf_rlo $final
+ rescan_done $fd buf_rlo $after
}
-proc status_eof {fd buf final} {
- global status_active ui_status_value
+proc rescan_done {fd buf after} {
+ global rescan_active
+ global file_states repo_config
upvar $buf to_clear
- if {[eof $fd]} {
- set to_clear {}
- close $fd
+ if {![eof $fd]} return
+ set to_clear {}
+ close $fd
+ if {[incr rescan_active -1] > 0} return
- if {[incr status_active -1] == 0} {
- display_all_files
- unlock_index
- reshow_diff
- set ui_status_value $final
+ prune_selection
+ unlock_index
+ display_all_files
+
+ if {$repo_config(gui.partialinclude) ne {true}} {
+ set pathList [list]
+ foreach path [array names file_states] {
+ switch -- [lindex $file_states($path) 0] {
+ AM -
+ MM {lappend pathList $path}
+ }
+ }
+ if {$pathList ne {}} {
+ update_index \
+ "Updating included files" \
+ $pathList \
+ [concat {reshow_diff;} $after]
+ return
+ }
+ }
+
+ reshow_diff
+ uplevel #0 $after
+}
+
+proc prune_selection {} {
+ global file_states selected_paths
+
+ foreach path [array names selected_paths] {
+ if {[catch {set still_here $file_states($path)}]} {
+ unset selected_paths($path)
}
}
}
[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.
+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.
+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"
[lreplace $file_lists($old_w) $lno $lno]
incr lno
$old_w conf -state normal
- $old_w delete $lno.0 [expr $lno + 1].0
+ $old_w delete $lno.0 [expr {$lno + 1}].0
$old_w conf -state disabled
}
}
}
}
if {$w ne {} && $lno >= 1} {
- $w tag add in_diff $lno.0 [expr $lno + 1].0
+ $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 [escape_path $path]
+ set ui_fname_value $path
set ui_fstatus_value [mapdesc $m $path]
set ui_status_value "Loading diff of [escape_path $path]..."
set commit_type amend
set HEAD {}
set PARENT {}
- update_status
+ rescan {set ui_status_value {Ready.}}
} elseif {$parent_count == 1} {
set commit_type amend
set PARENT $parent
$ui_comm insert end $msg
$ui_comm edit modified false
$ui_comm edit reset
- update_status
+ rescan {set ui_status_value {Ready.}}
} else {
error_popup {You can't amend a merge commit.}
return
}
proc commit_tree {} {
- global tcl_platform HEAD gitdir commit_type file_states
- global pch_error
- global ui_status_value ui_comm
+ global HEAD commit_type file_states ui_comm repo_config
if {![lock_index update]} return
error_popup {Last scanned state does not match repository state.
Its highly likely that another Git program modified the
-repository since our last scan. A rescan is required
+repository since the last scan. A rescan is required
before committing.
+
+A rescan will be automatically started now.
}
unlock_index
- update_status
+ rescan {set ui_status_value {Ready.}}
return
}
#
set files_ready 0
foreach path [array names file_states] {
- set s $file_states($path)
- switch -glob -- [lindex $s 0] {
+ switch -glob -- [lindex $file_states($path) 0] {
_? {continue}
A? -
D? -
return
}
- # -- Ask the pre-commit hook for the go-ahead.
+ # -- Update included files if partialincludes are off.
#
+ if {$repo_config(gui.partialinclude) ne {true}} {
+ set pathList [list]
+ foreach path [array names file_states] {
+ switch -glob -- [lindex $file_states($path) 0] {
+ A? -
+ M? {lappend pathList $path}
+ }
+ }
+ if {$pathList ne {}} {
+ unlock_index
+ update_index \
+ "Updating included files" \
+ $pathList \
+ [concat {lock_index update;} \
+ [list commit_prehook $curHEAD $msg]]
+ return
+ }
+ }
+
+ commit_prehook $curHEAD $msg
+}
+
+proc commit_prehook {curHEAD msg} {
+ global tcl_platform gitdir ui_status_value pch_error
+
+ # On Cygwin [file executable] might lie so we need to ask
+ # the shell if the hook is executable. Yes that's annoying.
+
set pchook [file join $gitdir hooks pre-commit]
- if {$tcl_platform(platform) eq {windows} && [file isfile $pchook]} {
+ if {$tcl_platform(platform) eq {windows}
+ && [file isfile $pchook]} {
set pchook [list sh -c [concat \
"if test -x \"$pchook\";" \
"then exec \"$pchook\" 2>&1;" \
} elseif {[file executable $pchook]} {
set pchook [list $pchook |& cat]
} else {
- set pchook {}
- }
- if {$pchook ne {}} {
- set ui_status_value {Calling pre-commit hook...}
- set pch_error {}
- set fd_ph [open "| $pchook" r]
- fconfigure $fd_ph -blocking 0 -translation binary
- fileevent $fd_ph readable \
- [list commit_stage1 $fd_ph $curHEAD $msg]
- } else {
- commit_stage2 $curHEAD $msg
+ commit_writetree $curHEAD $msg
+ return
}
+
+ set ui_status_value {Calling pre-commit hook...}
+ set pch_error {}
+ set fd_ph [open "| $pchook" r]
+ fconfigure $fd_ph -blocking 0 -translation binary
+ fileevent $fd_ph readable \
+ [list commit_prehook_wait $fd_ph $curHEAD $msg]
}
-proc commit_stage1 {fd_ph curHEAD msg} {
+proc commit_prehook_wait {fd_ph curHEAD msg} {
global pch_error ui_status_value
append pch_error [read $fd_ph]
hook_failed_popup pre-commit $pch_error
unlock_index
} else {
- commit_stage2 $curHEAD $msg
+ commit_writetree $curHEAD $msg
}
set pch_error {}
- } else {
- fconfigure $fd_ph -blocking 0
+ return
}
+ fconfigure $fd_ph -blocking 0
}
-proc commit_stage2 {curHEAD msg} {
+proc commit_writetree {curHEAD msg} {
global ui_status_value
- # -- Write the tree in the background.
- #
set ui_status_value {Committing changes...}
set fd_wt [open "| git write-tree" r]
- fileevent $fd_wt readable [list commit_stage3 $fd_wt $curHEAD $msg]
+ fileevent $fd_wt readable \
+ [list commit_committree $fd_wt $curHEAD $msg]
}
-proc commit_stage3 {fd_wt curHEAD msg} {
+proc commit_committree {fd_wt curHEAD msg} {
global single_commit gitdir HEAD PARENT commit_type tcl_platform
global ui_status_value ui_comm
- global file_states
+ global file_states selected_paths
gets $fd_wt tree_id
if {$tree_id eq {} || [catch {close $fd_wt} err]} {
}
set i [string first "\n" $msg]
if {$i >= 0} {
- append reflogm {: } [string range $msg 0 [expr $i - 1]]
+ append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
} else {
append reflogm {: } $msg
}
if {$m eq {__}} {
unset file_states($path)
+ catch {unset selected_paths($path)}
} else {
lset file_states($path) 0 $m
}
before a pull can be started.
}
unlock_index
- update_status
+ rescan {set ui_status_value {Ready.}}
return
}
if {$success} {
repository_state HEAD commit_type
set PARENT $HEAD
- set $ui_status_value {Ready.}
+ set $ui_status_value "Pulling $branch from $remote complete."
} else {
- update_status \
- "Conflicts detected while pulling $branch from $remote."
+ set m "Conflicts detected while pulling $branch from $remote."
+ rescan "set ui_status_value {$m}"
}
}
}
proc display_file {path state} {
- global file_states file_lists status_active
+ global file_states file_lists selected_paths rescan_active
set old_m [merge_state $path $state]
- if {$status_active} return
+ if {$rescan_active > 0} return
set s $file_states($path)
set new_m [lindex $s 0]
if {$lno >= 0} {
incr lno
$old_w conf -state normal
- $old_w delete $lno.0 [expr $lno + 1].0
+ $old_w delete $lno.0 [expr {$lno + 1}].0
$old_w conf -state disabled
}
-name [lindex $s 1] \
-image $new_icon
$new_w insert $lno.1 "[escape_path $path]\n"
+ if {[catch {set in_sel $selected_paths($path)}]} {
+ set in_sel 0
+ }
+ if {$in_sel} {
+ $new_w tag add in_sel $lno.0 [expr {$lno + 1}].0
+ }
$new_w conf -state disabled
} elseif {$new_icon ne [mapicon $old_m $path]} {
$new_w conf -state normal
}
proc display_all_files {} {
- global ui_index ui_other file_states file_lists
+ global ui_index ui_other
+ global file_states file_lists
+ global last_clicked selected_paths
$ui_index conf -state normal
$ui_other conf -state normal
$ui_index delete 0.0 end
$ui_other delete 0.0 end
+ set last_clicked {}
set file_lists($ui_index) [list]
set file_lists($ui_other) [list]
set m [lindex $s 0]
set w [mapcol $m $path]
lappend file_lists($w) $path
+ set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
$w image create end \
-align center -padx 5 -pady 1 \
-name [lindex $s 1] \
-image [mapicon $m $path]
$w insert end "[escape_path $path]\n"
+ if {[catch {set in_sel $selected_paths($path)}]} {
+ set in_sel 0
+ }
+ if {$in_sel} {
+ $w tag add in_sel $lno.0 [expr {$lno + 1}].0
+ }
}
$ui_index conf -state disabled
$ui_other conf -state disabled
}
-proc update_index {pathList} {
+proc update_index {msg pathList after} {
global update_index_cp update_index_rsd ui_status_value
if {![lock_index update]} return
set update_index_cp 0
set update_index_rsd 0
+ set pathList [lsort $pathList]
set totalCnt [llength $pathList]
set batch [expr {int($totalCnt * .01) + 1}]
if {$batch > 25} {set batch 25}
- set ui_status_value "Including files ... 0/$totalCnt 0%"
set ui_status_value [format \
- "Including files ... %i/%i files (%.2f%%)" \
+ "$msg... %i/%i files (%.2f%%)" \
$update_index_cp \
$totalCnt \
0.0]
set fd [open "| git update-index --add --remove -z --stdin" w]
- fconfigure $fd -blocking 0 -translation binary
+ fconfigure $fd \
+ -blocking 0 \
+ -buffering full \
+ -buffersize 512 \
+ -translation binary
fileevent $fd writable [list \
write_update_index \
$fd \
$pathList \
$totalCnt \
$batch \
+ $msg \
+ $after \
]
}
-proc write_update_index {fd pathList totalCnt batch} {
+proc write_update_index {fd pathList totalCnt batch msg after} {
global update_index_cp update_index_rsd ui_status_value
global file_states ui_fname_value
if {$update_index_cp >= $totalCnt} {
close $fd
unlock_index
- if {$update_index_rsd} {
- reshow_diff
- } else {
- set ui_status_value {Ready.}
- }
+ if {$update_index_rsd} reshow_diff
+ uplevel #0 $after
return
}
set path [lindex $pathList $update_index_cp]
incr update_index_cp
- switch -- [lindex $file_states($path) 0] {
- AM -
- _O {set new A*}
- _M -
- MM {set new M*}
+ switch -glob -- [lindex $file_states($path) 0] {
AD -
+ MD -
_D {set new D*}
- default {continue}
+
+ _M -
+ MM -
+ M_ {set new M*}
+
+ _O -
+ AM -
+ A_ {set new A*}
+
+ ?? {continue}
}
puts -nonewline $fd $path
}
set ui_status_value [format \
- "Including files ... %i/%i files (%.2f%%)" \
+ "$msg... %i/%i files (%.2f%%)" \
$update_index_cp \
$totalCnt \
[expr {100.0 * $update_index_cp / $totalCnt}]]
foreach i {
{__ i plain "Unmodified"}
{_M i mod "Modified"}
- {M_ i fulltick "Checked in"}
+ {M_ i fulltick "Included in commit"}
{MM i parttick "Partially included"}
{_O o plain "Untracked"}
- {A_ o fulltick "Added"}
+ {A_ o fulltick "Added by commit"}
{AM o parttick "Partially added"}
{AD o question "Added (but now gone)"}
{_D i question "Missing"}
- {D_ i removed "Removed"}
- {DD i removed "Removed"}
+ {D_ i removed "Removed by commit"}
+ {DD i removed "Removed by commit"}
{DO i removed "Removed (still exists)"}
{UM i merge "Merge conflicts"}
-width 15 \
-font font_ui \
-command "destroy $w"
- pack $w.ok -side bottom
+ pack $w.ok -side bottom -anchor e -pady 10 -padx 10
bind $w <Visibility> "grab $w; focus $w"
bind $w <Key-Return> "destroy $w"
-font font_diff \
-state disabled \
-yscrollcommand [list $w.m.sby set]
- label $w.m.s -anchor w \
+ label $w.m.s -text {Working... please wait...} \
+ -anchor w \
-justify left \
-font font_uibold
scrollbar $w.m.sby -command [list $w.m.t yview]
$w.m.t tag remove sel 0.0 end
"
- button $w.ok -text {Running...} \
- -width 15 \
+ button $w.ok -text {Close} \
-font font_ui \
-state disabled \
-command "destroy $w"
- pack $w.ok -side bottom
+ pack $w.ok -side bottom -anchor e -pady 10 -padx 10
bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
while {$c < $n} {
set cr [string first "\r" $buf $c]
set lf [string first "\n" $buf $c]
- if {$cr < 0} {set cr [expr $n + 1]}
- if {$lf < 0} {set lf [expr $n + 1]}
+ if {$cr < 0} {set cr [expr {$n + 1}]}
+ if {$lf < 0} {set lf [expr {$n + 1}]}
if {$lf < $cr} {
$w.m.t insert end [string range $buf $c $lf]
if {[catch {close $fd}]} {
if {![winfo exists $w]} {console_init $w}
$w.m.s conf -background red -text {Error: Command Failed}
- $w.ok conf -text Close
$w.ok conf -state normal
set ok 0
} elseif {[winfo exists $w]} {
$w.m.s conf -background green -text {Success}
- $w.ok conf -text Close
$w.ok conf -state normal
set ok 1
}
}
proc do_rescan {} {
- update_status
+ rescan {set ui_status_value {Ready.}}
}
proc do_include_all {} {
if {$pathList eq {}} {
unlock_index
} else {
- update_index $pathList
+ update_index \
+ "Including all modified files" \
+ $pathList \
+ {set ui_status_value {Ready to commit.}}
}
}
pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
foreach option {
+ {b partialinclude {Allow Partially Included Files}}
{b pullsummary {Show Pull Summary}}
{b trustmtime {Trust File Modification Timestamps}}
{i diffcontext {Number of Diff Context Lines}}
destroy $w
}
-# shift == 1: left click
-# 3: right click
-proc click {w x y shift wx wy} {
- global ui_index ui_other file_lists
+proc toggle_or_diff {w x y} {
+ global file_lists ui_index ui_other
+ global last_clicked selected_paths
set pos [split [$w index @$x,$y] .]
set lno [lindex $pos 0]
set col [lindex $pos 1]
- set path [lindex $file_lists($w) [expr $lno - 1]]
- if {$path eq {}} return
+ set path [lindex $file_lists($w) [expr {$lno - 1}]]
+ if {$path eq {}} {
+ set last_clicked {}
+ return
+ }
+
+ set last_clicked [list $w $lno]
+ array unset selected_paths
+ $ui_index tag remove in_sel 0.0 end
+ $ui_other tag remove in_sel 0.0 end
- if {$col > 0 && $shift == 1} {
+ if {$col == 0} {
+ update_index \
+ "Including [short_path $path]" \
+ [list $path] \
+ {set ui_status_value {Ready.}}
+ } else {
show_diff $path $w $lno
}
}
-proc unclick {w x y} {
+proc add_one_to_selection {w x y} {
global file_lists
+ global last_clicked selected_paths
set pos [split [$w index @$x,$y] .]
set lno [lindex $pos 0]
set col [lindex $pos 1]
- set path [lindex $file_lists($w) [expr $lno - 1]]
- if {$path eq {}} return
+ set path [lindex $file_lists($w) [expr {$lno - 1}]]
+ if {$path eq {}} {
+ set last_clicked {}
+ return
+ }
- if {$col == 0} {
- update_index [list $path]
+ set last_clicked [list $w $lno]
+ if {[catch {set in_sel $selected_paths($path)}]} {
+ set in_sel 0
+ }
+ if {$in_sel} {
+ unset selected_paths($path)
+ $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
+ } else {
+ set selected_paths($path) 1
+ $w tag add in_sel $lno.0 [expr {$lno + 1}].0
}
}
+proc add_range_to_selection {w x y} {
+ global file_lists
+ global last_clicked selected_paths
+
+ if {[lindex $last_clicked 0] ne $w} {
+ toggle_or_diff $w $x $y
+ return
+ }
+
+ set pos [split [$w index @$x,$y] .]
+ set lno [lindex $pos 0]
+ set lc [lindex $last_clicked 1]
+ if {$lc < $lno} {
+ set begin $lc
+ set end $lno
+ } else {
+ set begin $lno
+ set end $lc
+ }
+
+ foreach path [lrange $file_lists($w) \
+ [expr {$begin - 1}] \
+ [expr {$end - 1}]] {
+ set selected_paths($path) 1
+ }
+ $w tag add in_sel $begin.0 [expr {$end + 1}].0
+}
+
######################################################################
##
## config defaults
set default_config(gui.trustmtime) false
set default_config(gui.pullsummary) true
+set default_config(gui.partialinclude) false
set default_config(gui.diffcontext) 5
set default_config(gui.fontui) [font configure font_ui]
set default_config(gui.fontdiff) [font configure font_diff]
pack $ui_other -side left -fill both -expand 1
.vpane.files add .vpane.files.other -sticky nsew
-$ui_index tag conf in_diff -font font_uibold
-$ui_other tag conf in_diff -font font_uibold
+foreach i [list $ui_index $ui_other] {
+ $i tag conf in_diff -font font_uibold
+ $i tag conf in_sel \
+ -background [$i cget -foreground] \
+ -foreground [$i cget -background]
+}
+unset i
# -- Diff and Commit Area
frame .vpane.lower -height 300 -width 400
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 font_ui
-label .vpane.lower.diff.header.l2 -textvariable ui_fname_value \
+label .vpane.lower.diff.header.l4 \
+ -textvariable ui_fstatus_value \
-background orange \
+ -width $max_status_desc \
-anchor w \
-justify left \
-font font_ui
-label .vpane.lower.diff.header.l3 -text {Status:} \
+label .vpane.lower.diff.header.l1 -text {File:} \
-background orange \
-font font_ui
-label .vpane.lower.diff.header.l4 -textvariable ui_fstatus_value \
+set ui_fname .vpane.lower.diff.header.l2
+label $ui_fname \
+ -textvariable ui_fname_value \
-background orange \
- -width $max_status_desc \
-anchor w \
-justify left \
-font font_ui
+menu $ui_fname.ctxm -tearoff 0
+$ui_fname.ctxm add command -label "Copy" \
+ -font font_ui \
+ -command {
+ clipboard clear
+ clipboard append \
+ -format STRING \
+ -type STRING \
+ -- $ui_fname_value
+ }
+bind_button3 $ui_fname "tk_popup $ui_fname.ctxm %X %Y"
+pack .vpane.lower.diff.header.l4 -side left
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
-pack .vpane.lower.diff.header.l3 -side right
+pack $ui_fname -fill x
# -- Diff Body
frame .vpane.lower.diff.body
bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
foreach i [list $ui_index $ui_other] {
- bind $i <Button-1> {click %W %x %y 1 %X %Y; break}
- bind $i <ButtonRelease-1> {unclick %W %x %y; break}
- bind_button3 $i {click %W %x %y 3 %X %Y; break}
+ bind $i <Button-1> "toggle_or_diff $i %x %y; break"
+ bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
+ bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
}
unset i
populate_remote_menu .mbar.push To push_to
populate_pull_menu .mbar.pull
}
-after 1 update_status
+after 1 do_rescan