Commit 95c5d0d9 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'revert-b655a4a7' into 'master'

Revert "Move Repository#write_ref to Git::Repository#write_ref"

Closes #41143

[ci skip]

See merge request gitlab-org/gitlab-ce!16055
parents e0a27ee4 28fba5ed
...@@ -1148,7 +1148,7 @@ class Project < ActiveRecord::Base ...@@ -1148,7 +1148,7 @@ class Project < ActiveRecord::Base
def change_head(branch) def change_head(branch)
if repository.branch_exists?(branch) if repository.branch_exists?(branch)
repository.before_change_head repository.before_change_head
repository.write_ref('HEAD', "refs/heads/#{branch}", force: true) repository.write_ref('HEAD', "refs/heads/#{branch}")
repository.copy_gitattributes(branch) repository.copy_gitattributes(branch)
repository.after_change_head repository.after_change_head
reload_default_branch reload_default_branch
......
...@@ -19,7 +19,6 @@ class Repository ...@@ -19,7 +19,6 @@ class Repository
attr_accessor :full_path, :disk_path, :project, :is_wiki attr_accessor :full_path, :disk_path, :project, :is_wiki
delegate :ref_name_for_sha, to: :raw_repository delegate :ref_name_for_sha, to: :raw_repository
delegate :write_ref, to: :raw_repository
CreateTreeError = Class.new(StandardError) CreateTreeError = Class.new(StandardError)
...@@ -256,10 +255,11 @@ class Repository ...@@ -256,10 +255,11 @@ class Repository
# This will still fail if the file is corrupted (e.g. 0 bytes) # This will still fail if the file is corrupted (e.g. 0 bytes)
begin begin
write_ref(keep_around_ref_name(sha), sha, force: true) write_ref(keep_around_ref_name(sha), sha)
rescue Gitlab::Git::Repository::GitError => ex rescue Rugged::ReferenceError => ex
# Necessary because https://gitlab.com/gitlab-org/gitlab-ce/issues/20156 Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
return true if ex.message =~ /Failed to create locked file/ && ex.message =~ /File exists/ rescue Rugged::OSError => ex
raise unless 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}" Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
end end
...@@ -269,6 +269,10 @@ class Repository ...@@ -269,6 +269,10 @@ class Repository
ref_exists?(keep_around_ref_name(sha)) ref_exists?(keep_around_ref_name(sha))
end end
def write_ref(ref_path, sha)
rugged.references.create(ref_path, sha, force: true)
end
def diverging_commit_counts(branch) def diverging_commit_counts(branch)
root_ref_hash = raw_repository.commit(root_ref).id root_ref_hash = raw_repository.commit(root_ref).id
cache.fetch(:"diverging_commit_counts_#{branch.name}") do cache.fetch(:"diverging_commit_counts_#{branch.name}") do
...@@ -1015,7 +1019,7 @@ class Repository ...@@ -1015,7 +1019,7 @@ class Repository
end end
def create_ref(ref, ref_path) def create_ref(ref, ref_path)
write_ref(ref_path, ref) raw_repository.write_ref(ref_path, ref)
end end
def ls_files(ref) def ls_files(ref)
......
...@@ -1101,17 +1101,12 @@ module Gitlab ...@@ -1101,17 +1101,12 @@ module Gitlab
end end
end end
def write_ref(ref_path, ref, force: false) def write_ref(ref_path, ref)
raise ArgumentError, "invalid ref_path #{ref_path.inspect}" if ref_path.include?(' ') raise ArgumentError, "invalid ref_path #{ref_path.inspect}" if ref_path.include?(' ')
raise ArgumentError, "invalid ref #{ref.inspect}" if ref.include?("\x00") raise ArgumentError, "invalid ref #{ref.inspect}" if ref.include?("\x00")
ref = "refs/heads/#{ref}" unless ref.start_with?("refs") || ref =~ /\A[a-f0-9]+\z/i input = "update #{ref_path}\x00#{ref}\x00\x00"
run_git!(%w[update-ref --stdin -z]) { |stdin| stdin.write(input) }
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 end
def fetch_ref(source_repository, source_ref:, target_ref:) def fetch_ref(source_repository, source_ref:, target_ref:)
......
...@@ -1863,11 +1863,10 @@ describe Project do ...@@ -1863,11 +1863,10 @@ describe Project do
project.change_head(project.default_branch) project.change_head(project.default_branch)
end end
it 'creates the new reference' do it 'creates the new reference with rugged' do
expect(project.repository.raw_repository).to receive(:write_ref).with('HEAD', expect(project.repository.rugged.references).to receive(:create).with('HEAD',
"refs/heads/#{project.default_branch}", "refs/heads/#{project.default_branch}",
force: true) force: true)
project.change_head(project.default_branch) project.change_head(project.default_branch)
end end
......
...@@ -1979,23 +1979,6 @@ describe Repository do ...@@ -1979,23 +1979,6 @@ describe Repository do
File.delete(path) File.delete(path)
end 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 end
describe '#update_ref' do describe '#update_ref' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment