Merge pull request #1907 from timbrel/fast-branch-deletions

common/ui.py

@@ -11,7 +11,7 @@
 from sublime_plugin import TextCommand
 
 from . import util
-from ..core.runtime import enqueue_on_worker, on_worker
+from ..core.runtime import enqueue_on_worker
 from ..core.settings import GitSavvySettings
 from ..core.utils import flash, focus_view
 from GitSavvy.core import store
@@ -591,11 +591,17 @@ class gs_interface_refresh(TextCommand):
     Re-render GitSavvy interface view.
     """
 
-    @on_worker
     def run(self, edit):
         # type: (object) -> None
         interface = ensure_interface_object(self.view)
-        interface.render()
+        if self.view.settings().get("git_savvy.update_view_in_a_blocking_manner"):
+            try:
+                interface.render()
+            finally:
+                self.view.settings().erase("git_savvy.update_view_in_a_blocking_manner")
+
+        else:
+            enqueue_on_worker(interface.render)
 
 
 class gs_interface_toggle_help(TextCommand):

core/interfaces/branch.py

@@ -135,7 +135,10 @@ def title(self):
 
     def refresh_view_state(self):
         # type: () -> None
-        enqueue_on_worker(self.get_branches)
+        if self.view.settings().get("git_savvy.update_view_in_a_blocking_manner"):
+            self.get_branches()
+        else:
+            enqueue_on_worker(self.get_branches)
         enqueue_on_worker(self.fetch_branch_description_subjects)
         enqueue_on_worker(self.get_latest_commits)
         enqueue_on_worker(self.get_remotes)
@@ -433,6 +436,7 @@ def run(self, edit, force=False):
         if self.selected_branch.is_remote:
             self.delete_remote_branch(self.selected_branch.remote, self.selected_branch.name, force)
         else:
+            self.view.settings().set("git_savvy.update_view_in_a_blocking_manner", True)
             self.window.run_command("gs_delete_branch", {"branch": self.selected_branch.name, "force": force})
 
     @util.actions.destructive(description="delete a remote branch")