Adding mutex to command to prevent multiple parallel executions to modify each others env variables.

Roberto Decurnex · robertodecurnex · commit d72c4aba6785 · 2014-12-29T15:54:30.000-03:00
Adding --git-dir and --work-tree options to the git commands to prevent parallel executions to move the current working directory in the middle of each others process related to #181
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -6,7 +6,9 @@ class GitExecuteError < StandardError
   end
   
   class Lib
-      
+     
+    @@semaphore = Mutex.new
+
     def initialize(base = nil, logger = nil)
       @git_dir = nil
       @git_index_file = nil
@@ -777,34 +779,47 @@ def with_custom_env_variables(&block)
     ensure
       restore_git_system_env_variables()
     end
-
+    
     def command(cmd, opts = [], chdir = true, redirect = '', &block)
-      with_custom_env_variables do
-        path = @git_work_dir || @git_dir || @path
-          
-        opts = [opts].flatten.map {|s| escape(s) }.join(' ')
-
-        git_cmd = "git #{cmd} #{opts} #{redirect} 2>&1"
-
-        output = nil
-
-        if chdir && (Dir.getwd != path)
-          Dir.chdir(path) { output = run_command(git_cmd, &block) } 
-        else
-          output = run_command(git_cmd, &block)
-        end
-        
-        if @logger
-          @logger.info(git_cmd)
-          @logger.debug(output)
-        end
-                
-        if $?.exitstatus > 1 || ($?.exitstatus == 1 && output != '')
-          raise Git::GitExecuteError.new(git_cmd + ':' + output.to_s) 
+      global_opts = []
+      global_opts << "--git-dir=#{@git_dir}" if !@git_dir.nil?
+      global_opts << "--work-tree=#{@git_work_dir}" if !@git_work_dir.nil?
+      
+      opts = [opts].flatten.map {|s| escape(s) }.join(' ')
+      
+      global_opts = global_opts.flatten.map {|s| escape(s) }.join(' ')
+      
+      git_cmd = "git #{global_opts} #{cmd} #{opts} #{redirect} 2>&1"
+      
+      output = nil
+      
+      path = @git_work_dir || @git_dir || @path
+      
+      command_thread = nil; 
+      
+      exitstatus = nil
+
+      @@semaphore.synchronize do
+        with_custom_env_variables do
+          command_thread = Thread.new do 
+            output = run_command(git_cmd, &block)
+            exitstatus = $?.exitstatus
+          end
         end
+      end
 
-        return output
+      command_thread.join
+      
+      if @logger
+        @logger.info(git_cmd)
+        @logger.debug(output)
+      end
+            
+      if exitstatus > 1 || (exitstatus == 1 && output != '')
+        raise Git::GitExecuteError.new(git_cmd + ':' + output.to_s) 
       end
+
+      return output
     end
 
     # Takes the diff command line output (as Array) and parse it into a Hash
@@ -857,7 +872,6 @@ def log_path_options(opts)
      
       arr_opts << opts[:object] if opts[:object].is_a? String
       arr_opts << '--' << opts[:path_limiter] if opts[:path_limiter]
-
       arr_opts
     end
     
diff --git a/tests/units/test_log.rb b/tests/units/test_log.rb
@@ -57,7 +57,7 @@ def test_get_log_author
   end
   
   def test_get_log_since_file    
-    l = @git.log.object('example.txt')
+    l = @git.log.path('example.txt')
     assert_equal(30, l.size)
   
     l = @git.log.between('v2.5', 'test').path('example.txt')
diff --git a/tests/units/test_logger.rb b/tests/units/test_logger.rb
@@ -19,8 +19,10 @@ def test_logger
     @git.branches.size
     
     logc = File.read(log.path)
-    assert(/INFO -- : git branch '-a'/.match(logc))
-    assert(/DEBUG -- :   diff_over_patches/.match(logc))
+#    assert(/INFO -- : git branch '-a'/.match(logc))
+#    assert(/DEBUG -- :   diff_over_patches/.match(logc))
+    assert(/INFO -- : git '--git-dir=[^']+' '--work-tree=[^']+' branch '-a'/.match(logc))
+    assert(/DEBUG -- : \* git_grep/.match(logc))
 
     log = Tempfile.new('logfile')
     log.close
@@ -31,8 +33,10 @@ def test_logger
     @git.branches.size
     
     logc = File.read(log.path)
-    assert(/INFO -- : git branch '-a'/.match(logc))
-    assert(!/DEBUG -- :   diff_over_patches/.match(logc))
+#    assert(/INFO -- : git branch '-a'/.match(logc))
+#    assert(!/DEBUG -- :   diff_over_patches/.match(logc))
+    assert(/INFO -- : git '--git-dir=[^']+' '--work-tree=[^']+' branch '-a'/.match(logc))
+    assert(!/DEBUG -- : \* git_grep/.match(logc))
   end
   
 end
