Merge pull request #430 from Jonnymcc/add-command-lock

Use threading lock object instead of commands_working counter

Author: kemayo

git.py

@@ -134,11 +134,10 @@ def find_git():
     return git_path
 GIT = find_git()
 
-commands_working = 0
-def are_commands_working():
-    return commands_working != 0
 
 class CommandThread(threading.Thread):
+    command_lock = threading.Lock()
+
     def __init__(self, command, on_done, working_dir="", fallback_encoding="", **kwargs):
         threading.Thread.__init__(self)
         self.command = command
@@ -156,12 +155,11 @@ def __init__(self, command, on_done, working_dir="", fallback_encoding="", **kwa
         self.kwargs = kwargs
 
     def run(self):
-        global commands_working
         # Ignore directories that no longer exist
         if not os.path.isdir(self.working_dir):
             return
 
-        commands_working = commands_working + 1
+        self.command_lock.acquire()
         output = ''
         callback = self.on_done
         try:
@@ -200,7 +198,7 @@ def run(self):
             else:
                 output = e.strerror
         finally:
-            commands_working = commands_working - 1
+            self.command_lock.release()
             main_thread(callback, output, **self.kwargs)
 
 class GitScratchOutputCommand(sublime_plugin.TextCommand):
@@ -216,23 +214,14 @@ class GitCommand(object):
     may_change_files = False
 
     def run_command(self, command, callback=None, show_status=True,
-            filter_empty_args=True, no_save=False, wait_for_lock=True, **kwargs):
+            filter_empty_args=True, no_save=False, **kwargs):
         if filter_empty_args:
             command = [arg for arg in command if arg]
         if 'working_dir' not in kwargs:
             kwargs['working_dir'] = self.get_working_dir()
         if 'fallback_encoding' not in kwargs and self.active_view() and self.active_view().settings().get('fallback_encoding'):
             kwargs['fallback_encoding'] = self.active_view().settings().get('fallback_encoding').rpartition('(')[2].rpartition(')')[0]
 
-        root = git_root(self.get_working_dir())
-        if wait_for_lock and root and os.path.exists(os.path.join(root, '.git', 'index.lock')):
-            print("waiting for index.lock", command)
-            do_when(lambda: not os.path.exists(os.path.join(root, '.git', 'index.lock')),
-                    self.run_command, command, callback=callback,
-                    show_status=show_status, filter_empty_args=filter_empty_args,
-                    no_save=no_save, wait_for_lock=wait_for_lock, **kwargs)
-            return
-
         s = sublime.load_settings("Git.sublime-settings")
         if s.get('save_first') and self.active_view() and self.active_view().is_dirty() and not no_save:
             self.active_view().run_command('save')

statusbar.py

@@ -2,7 +2,7 @@
 
 import sublime
 import sublime_plugin
-from .git import GitTextCommand, do_when, are_commands_working
+from .git import GitTextCommand
 
 
 class GitBranchStatusListener(sublime_plugin.EventListener):
@@ -21,10 +21,7 @@ def run(self, view):
         else:
             self.view.set_status("git-branch", "")
         if (s.get("statusbar_status")):
-            do_when(
-                lambda: not are_commands_working(),
-                self.run_command,
-                ['git', 'status', '--porcelain'], self.status_done, show_status=False, no_save=True)
+            self.run_command(['git', 'status', '--porcelain'], self.status_done, show_status=False, no_save=True)
         else:
             self.view.set_status("git-status", "")