Merge branch 'repo-write-ref-client-prep' into 'master'

Move Repository#write_ref to Git::Repository#write_ref

Closes gitaly#793

See merge request gitlab-org/gitlab-ce!15712

app/models/project.rb

@@ -1147,7 +1147,7 @@ class Project < ActiveRecord::Base
   def change_head(branch)
     if repository.branch_exists?(branch)
       repository.before_change_head
-      repository.write_ref('HEAD', "refs/heads/#{branch}")
+      repository.write_ref('HEAD', "refs/heads/#{branch}", force: true)
       repository.copy_gitattributes(branch)
       repository.after_change_head
       reload_default_branch

app/models/repository.rb

@@ -19,6 +19,7 @@ class Repository
   attr_accessor :full_path, :disk_path, :project, :is_wiki
 
   delegate :ref_name_for_sha, to: :raw_repository
+  delegate :write_ref, to: :raw_repository
 
   CreateTreeError = Class.new(StandardError)
 
@@ -237,11 +238,10 @@ class Repository
 
     # This will still fail if the file is corrupted (e.g. 0 bytes)
     begin
-      write_ref(keep_around_ref_name(sha), sha)
-    rescue Rugged::ReferenceError => ex
-      Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
-    rescue Rugged::OSError => ex
-      raise unless ex.message =~ /Failed to create locked file/ && ex.message =~ /File exists/
+      write_ref(keep_around_ref_name(sha), sha, force: true)
+    rescue Gitlab::Git::Repository::GitError => ex
+      # Necessary because https://gitlab.com/gitlab-org/gitlab-ce/issues/20156
+      return true if ex.message =~ /Failed to create locked file/ && ex.message =~ /File exists/
 
       Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
     end
@@ -251,10 +251,6 @@ class Repository
     ref_exists?(keep_around_ref_name(sha))
   end
 
-  def write_ref(ref_path, sha)
-    rugged.references.create(ref_path, sha, force: true)
-  end
-
   def diverging_commit_counts(branch)
     root_ref_hash = raw_repository.commit(root_ref).id
     cache.fetch(:"diverging_commit_counts_#{branch.name}") do
@@ -994,7 +990,7 @@ class Repository
   end
 
   def create_ref(ref, ref_path)
-    raw_repository.write_ref(ref_path, ref)
+    write_ref(ref_path, ref)
   end
 
   def ls_files(ref)

lib/gitlab/git/repository.rb

@@ -1073,12 +1073,17 @@ module Gitlab
         end
       end
 
-      def write_ref(ref_path, ref)
+      def write_ref(ref_path, ref, force: false)
         raise ArgumentError, "invalid ref_path #{ref_path.inspect}" if ref_path.include?(' ')
         raise ArgumentError, "invalid ref #{ref.inspect}" if ref.include?("\x00")
 
-        input = "update #{ref_path}\x00#{ref}\x00\x00"
-        run_git!(%w[update-ref --stdin -z]) { |stdin| stdin.write(input) }
+        ref = "refs/heads/#{ref}" unless ref.start_with?("refs") || ref =~ /\A[a-f0-9]+\z/i
+
+        rugged.references.create(ref_path, ref, force: force)
+      rescue Rugged::ReferenceError => ex
+        raise GitError, "could not create ref #{ref_path}: #{ex}"
+      rescue Rugged::OSError => ex
+        raise GitError, "could not create ref #{ref_path}: #{ex}"
       end
 
       def fetch_ref(source_repository, source_ref:, target_ref:)

spec/models/project_spec.rb

@@ -1863,10 +1863,11 @@ describe Project do
       project.change_head(project.default_branch)
     end
 
-    it 'creates the new reference with rugged' do
-      expect(project.repository.rugged.references).to receive(:create).with('HEAD',
+    it 'creates the new reference' do
+      expect(project.repository.raw_repository).to receive(:write_ref).with('HEAD',
                                                                             "refs/heads/#{project.default_branch}",
                                                                             force: true)
+
       project.change_head(project.default_branch)
     end
 

spec/models/repository_spec.rb

@@ -1916,6 +1916,23 @@ describe Repository do
 
       File.delete(path)
     end
+
+    it "attempting to call keep_around when exists a lock does not fail" do
+      ref = repository.send(:keep_around_ref_name, sample_commit.id)
+      path = File.join(repository.path, ref)
+      lock_path = "#{path}.lock"
+
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(lock_path, 'w') { |f| f.write('') }
+
+      begin
+        expect { repository.keep_around(sample_commit.id) }.not_to raise_error(Gitlab::Git::Repository::GitError)
+
+        expect(File.exist?(lock_path)).to be_falsey
+      ensure
+        File.delete(path)
+      end
+    end
   end
 
   describe '#update_ref' do