[PATCH 1/2] git-gui: Delay rescan until idle time
- From
Stefan Haller <stefan@haller-berlin.de>
- Date
- Nov 1, 2020, 17:05 UTC
- Message-ID
- <20201101170505.71246-2-stefan@haller-berlin.de>
- In-Reply-To
- <20201101170505.71246-1-stefan@haller-berlin.de>
This is to ensure that a rescan is only performed once, even if it is requested multiple times during one event. We don't need this yet, because we only ever call do_rescan once per event so far; this is going to change with the next commit, when we also call it from FocusIn.
Signed-off-by: Stefan Haller <stefan@haller-berlin.de> --- git-gui.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh index 867b8ce..8864c14 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2376,8 +2376,21 @@ proc do_quit {{rc {1}}} { destroy . } +# Not to be called directly; use schedule_rescan instead proc do_rescan {} { + global rescan_id + rescan ui_ready + unset rescan_id +} + +proc schedule_rescan {} { + global rescan_id + + if {[info exists rescan_id]} { + after cancel $rescan_id + } + set rescan_id [after idle do_rescan] } proc ui_do_rescan {} { @@ -3683,7 +3696,7 @@ set ui_diff_applyhunk [$ctxm index last] lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] $ctxm add command \ -label [mc "Apply/Reverse Line"] \ - -command {apply_or_revert_range_or_line $cursorX $cursorY 0; do_rescan} + -command {apply_or_revert_range_or_line $cursorX $cursorY 0; schedule_rescan} set ui_diff_applyline [$ctxm index last] lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state] $ctxm add separator @@ -3694,12 +3707,12 @@ set ui_diff_reverthunk [$ctxm index last] lappend diff_actions [list $ctxm entryconf $ui_diff_reverthunk -state] $ctxm add command \ -label [mc "Revert Line"] \ - -command {apply_or_revert_range_or_line $cursorX $cursorY 1; do_rescan} + -command {apply_or_revert_range_or_line $cursorX $cursorY 1; schedule_rescan} set ui_diff_revertline [$ctxm index last] lappend diff_actions [list $ctxm entryconf $ui_diff_revertline -state] $ctxm add command \ -label [mc "Undo Last Revert"] \ - -command {undo_last_revert; do_rescan} + -command {undo_last_revert; schedule_rescan} set ui_diff_undorevert [$ctxm index last] lappend diff_actions [list $ctxm entryconf $ui_diff_undorevert -state] $ctxm add separator @@ -4171,7 +4184,7 @@ after 1 { if {[is_enabled initialamend]} { force_amend } else { - do_rescan + schedule_rescan } if {[is_enabled nocommitmsg]} {
-- 2.29.2