Merge branch 'master' into randy3k/sha

timbrel · May 5, 2017 · 3d6ec0c · 3d6ec0c
2 parents f3723ce + 2938321
commit 3d6ec0c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/common/util/debug.py b/common/util/debug.py
@@ -3,7 +3,7 @@
 import pprint as _pprint
 
 import sublime
-
+from contextlib import contextmanager
 
 _log = []
 enabled = False
@@ -21,6 +21,16 @@ def stop_logging():
     enabled = False
 
 
+@contextmanager
+def disable_logging():
+    global enabled
+    enabled = False
+    try:
+        yield
+    finally:
+        enabled = True
+
+
 def get_log():
     return json.dumps(_log, indent=2)
 

diff --git a/core/commands/status_bar.py b/core/commands/status_bar.py
@@ -3,6 +3,7 @@
 from sublime_plugin import TextCommand, EventListener
 
 from ..git_command import GitCommand
+from ...common.util import debug
 
 
 class GsStatusBarEventListener(EventListener):
@@ -57,7 +58,8 @@ def run_async(self):
             self.view.erase_status("gitsavvy-repo-status")
             return
 
-        short_status = self.get_branch_status_short()
+        with debug.disable_logging():
+            short_status = self.get_branch_status_short()
         self.view.set_status("gitsavvy-repo-status", short_status)
 
         global update_status_bar_soon