1612 handle concurrency of rugged and cli git

git/lib/git_update.rb

@@ -1,6 +1,7 @@
 require 'json'
 require File.join(File.expand_path('../../../lib', __FILE__), 'subprocess')
 require 'ontohub_net'
+require File.join(File.expand_path('../../../lib', __FILE__), 'git_repository')
 
 class GitUpdate
 
@@ -26,6 +27,12 @@ def initialize(repo_path, key_id, refs)
   end
 
   def exec
+    Semaphore.exclusively("#{GitRepository::LOCK_NAMESPACE}:#{@repo_name}") do
+      exec_without_lock
+    end
+  end
+
+  def exec_without_lock
     # If its push over ssh
     # we need to check user persmission per branch first
     if ssh?

lib/git_repository.rb

@@ -14,6 +14,8 @@ class GitRepository
   include GitRepository::Committing
   include GitRepository::History
 
+  LOCK_NAMESPACE = 'git'.freeze
+
   attr_reader :repo
 
   delegate :path, :empty?, to: :repo

lib/git_repository/cloning.rb

@@ -100,8 +100,9 @@ def git_exec(*args)
     args.push \
       GIT_DIR: local_path.to_s,
       LANG:    'C'
-
-    Subprocess.run *args
+    Semaphore.exclusively("#{GitRepository::LOCK_NAMESPACE}:#{repo}") do
+      Subprocess.run(*args)
+    end
   end
 
   # Yields the given block and returns the head OID

lib/git_repository/committing.rb

@@ -14,8 +14,22 @@ def add_file(userinfo, tmp_path, target_path, message, &block)
       &block)
   end
 
-  # change a single file and commit the change
   def commit_file(userinfo, file_contents, target_path, message, &block)
+    Semaphore.exclusively("#{GitRepository::LOCK_NAMESPACE}:#{repo}") do
+      commit_file_without_lock(userinfo,
+                               file_contents,
+                               target_path,
+                               message,
+                               &block)
+    end
+  end
+
+  # change a single file and commit the change
+  def commit_file_without_lock(userinfo,
+                               file_contents,
+                               target_path,
+                               message,
+                               &block)
     # throw exception if path is below a file
     if points_through_file?(target_path)
       raise GitRepository::PathBelowFileException