Merge branch 'gitaly-mandatory-20180712-jv' into 'master'
Make more ref RPC's mandatory Closes gitaly#526, gitaly#965, gitaly#476, and gitaly#474 See merge request gitlab-org/gitlab-ce!20592
This commit is contained in:
commit
a420751cec
4 changed files with 32 additions and 200 deletions
|
@ -174,8 +174,8 @@ class Repository
|
|||
CommitCollection.new(project, commits, ref)
|
||||
end
|
||||
|
||||
def find_branch(name, fresh_repo: true)
|
||||
raw_repository.find_branch(name, fresh_repo)
|
||||
def find_branch(name)
|
||||
raw_repository.find_branch(name)
|
||||
end
|
||||
|
||||
def find_tag(name)
|
||||
|
|
|
@ -167,24 +167,9 @@ module Gitlab
|
|||
|
||||
# Directly find a branch with a simple name (e.g. master)
|
||||
#
|
||||
# force_reload causes a new Rugged repository to be instantiated
|
||||
#
|
||||
# This is to work around a bug in libgit2 that causes in-memory refs to
|
||||
# be stale/invalid when packed-refs is changed.
|
||||
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/15392#note_14538333
|
||||
def find_branch(name, force_reload = false)
|
||||
gitaly_migrate(:find_branch) do |is_enabled|
|
||||
if is_enabled
|
||||
def find_branch(name)
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_ref_client.find_branch(name)
|
||||
else
|
||||
reload_rugged if force_reload
|
||||
|
||||
rugged_ref = rugged.branches[name]
|
||||
if rugged_ref
|
||||
target_commit = Gitlab::Git::Commit.find(self, rugged_ref.target)
|
||||
Gitlab::Git::Branch.new(self, rugged_ref.name, rugged_ref.target, target_commit)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -196,20 +181,8 @@ module Gitlab
|
|||
|
||||
# Returns the number of valid branches
|
||||
def branch_count
|
||||
gitaly_migrate(:branch_names) do |is_enabled|
|
||||
if is_enabled
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_ref_client.count_branch_names
|
||||
else
|
||||
rugged.branches.each(:local).count do |ref|
|
||||
begin
|
||||
ref.name && ref.target # ensures the branch is valid
|
||||
|
||||
true
|
||||
rescue Rugged::ReferenceError
|
||||
false
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -232,12 +205,8 @@ module Gitlab
|
|||
|
||||
# Returns the number of valid tags
|
||||
def tag_count
|
||||
gitaly_migrate(:tag_names) do |is_enabled|
|
||||
if is_enabled
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_ref_client.count_tag_names
|
||||
else
|
||||
rugged.tags.count
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -260,13 +229,8 @@ module Gitlab
|
|||
#
|
||||
# Ref names must start with `refs/`.
|
||||
def ref_exists?(ref_name)
|
||||
gitaly_migrate(:ref_exists,
|
||||
status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_ref_exists?(ref_name)
|
||||
else
|
||||
rugged_ref_exists?(ref_name)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -274,12 +238,8 @@ module Gitlab
|
|||
#
|
||||
# name - The name of the tag as a String.
|
||||
def tag_exists?(name)
|
||||
gitaly_migrate(:ref_exists_tags, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_ref_exists?("refs/tags/#{name}")
|
||||
else
|
||||
rugged_tag_exists?(name)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -287,12 +247,8 @@ module Gitlab
|
|||
#
|
||||
# name - The name of the branch as a String.
|
||||
def branch_exists?(name)
|
||||
gitaly_migrate(:ref_exists_branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_ref_exists?("refs/heads/#{name}")
|
||||
else
|
||||
rugged_branch_exists?(name)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -310,12 +266,8 @@ module Gitlab
|
|||
end
|
||||
|
||||
def delete_all_refs_except(prefixes)
|
||||
gitaly_migrate(:ref_delete_refs) do |is_enabled|
|
||||
if is_enabled
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_ref_client.delete_refs(except_with_prefixes: prefixes)
|
||||
else
|
||||
delete_refs(*all_ref_names_except(prefixes))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -714,25 +666,16 @@ module Gitlab
|
|||
|
||||
# Delete the specified branch from the repository
|
||||
def delete_branch(branch_name)
|
||||
gitaly_migrate(:delete_branch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_ref_client.delete_branch(branch_name)
|
||||
else
|
||||
rugged.branches.delete(branch_name)
|
||||
end
|
||||
end
|
||||
rescue Rugged::ReferenceError, CommandError => e
|
||||
rescue CommandError => e
|
||||
raise DeleteBranchError, e
|
||||
end
|
||||
|
||||
def delete_refs(*ref_names)
|
||||
gitaly_migrate(:delete_refs,
|
||||
status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_delete_refs(*ref_names)
|
||||
else
|
||||
git_delete_refs(*ref_names)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -742,12 +685,8 @@ module Gitlab
|
|||
# create_branch("feature")
|
||||
# create_branch("other-feature", "master")
|
||||
def create_branch(ref, start_point = "HEAD")
|
||||
gitaly_migrate(:create_branch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
||||
if is_enabled
|
||||
wrapped_gitaly_errors do
|
||||
gitaly_ref_client.create_branch(ref, start_point)
|
||||
else
|
||||
rugged_create_branch(ref, start_point)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -1175,7 +1114,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def can_be_merged?(source_sha, target_branch)
|
||||
if target_sha = find_branch(target_branch, true)&.target
|
||||
if target_sha = find_branch(target_branch)&.target
|
||||
!gitaly_conflicts_client(source_sha, target_sha).conflicts?
|
||||
else
|
||||
false
|
||||
|
@ -1546,17 +1485,6 @@ module Gitlab
|
|||
end
|
||||
end
|
||||
|
||||
# Returns true if the given ref name exists
|
||||
#
|
||||
# Ref names must start with `refs/`.
|
||||
def rugged_ref_exists?(ref_name)
|
||||
raise ArgumentError, 'invalid refname' unless ref_name.start_with?('refs/')
|
||||
|
||||
rugged.references.exist?(ref_name)
|
||||
rescue Rugged::ReferenceError
|
||||
false
|
||||
end
|
||||
|
||||
# Returns true if the given ref name exists
|
||||
#
|
||||
# Ref names must start with `refs/`.
|
||||
|
@ -1564,37 +1492,6 @@ module Gitlab
|
|||
gitaly_ref_client.ref_exists?(ref_name)
|
||||
end
|
||||
|
||||
# Returns true if the given tag exists
|
||||
#
|
||||
# name - The name of the tag as a String.
|
||||
def rugged_tag_exists?(name)
|
||||
!!rugged.tags[name]
|
||||
end
|
||||
|
||||
# Returns true if the given branch exists
|
||||
#
|
||||
# name - The name of the branch as a String.
|
||||
def rugged_branch_exists?(name)
|
||||
rugged.branches.exists?(name)
|
||||
|
||||
# If the branch name is invalid (e.g. ".foo") Rugged will raise an error.
|
||||
# Whatever code calls this method shouldn't have to deal with that so
|
||||
# instead we just return `false` (which is true since a branch doesn't
|
||||
# exist when it has an invalid name).
|
||||
rescue Rugged::ReferenceError
|
||||
false
|
||||
end
|
||||
|
||||
def rugged_create_branch(ref, start_point)
|
||||
rugged_ref = rugged.branches.create(ref, start_point)
|
||||
target_commit = Gitlab::Git::Commit.find(self, rugged_ref.target)
|
||||
Gitlab::Git::Branch.new(self, rugged_ref.name, rugged_ref.target, target_commit)
|
||||
rescue Rugged::ReferenceError => e
|
||||
raise InvalidRef.new("Branch #{ref} already exists") if e.to_s =~ %r{'refs/heads/#{ref}'}
|
||||
|
||||
raise InvalidRef.new("Invalid reference #{start_point}")
|
||||
end
|
||||
|
||||
def gitaly_copy_gitattributes(revision)
|
||||
gitaly_repository_client.apply_gitattributes(revision)
|
||||
end
|
||||
|
@ -1687,20 +1584,6 @@ module Gitlab
|
|||
remote_update(remote_name, url: url)
|
||||
end
|
||||
|
||||
def git_delete_refs(*ref_names)
|
||||
instructions = ref_names.map do |ref|
|
||||
"delete #{ref}\x00\x00"
|
||||
end
|
||||
|
||||
message, status = run_git(%w[update-ref --stdin -z]) do |stdin|
|
||||
stdin.write(instructions.join)
|
||||
end
|
||||
|
||||
unless status.zero?
|
||||
raise GitError.new("Could not delete refs #{ref_names}: #{message}")
|
||||
end
|
||||
end
|
||||
|
||||
def gitaly_delete_refs(*ref_names)
|
||||
gitaly_ref_client.delete_refs(refs: ref_names) if ref_names.any?
|
||||
end
|
||||
|
|
|
@ -1187,7 +1187,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
|
|||
end
|
||||
|
||||
describe '#find_branch' do
|
||||
shared_examples 'finding a branch' do
|
||||
it 'should return a Branch for master' do
|
||||
branch = repository.find_branch('master')
|
||||
|
||||
|
@ -1202,38 +1201,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
|
|||
end
|
||||
end
|
||||
|
||||
context 'when Gitaly find_branch feature is enabled' do
|
||||
it_behaves_like 'finding a branch'
|
||||
end
|
||||
|
||||
context 'when Gitaly find_branch feature is disabled', :skip_gitaly_mock do
|
||||
it_behaves_like 'finding a branch'
|
||||
|
||||
context 'force_reload is true' do
|
||||
it 'should reload Rugged::Repository' do
|
||||
expect(Rugged::Repository).to receive(:new).twice.and_call_original
|
||||
|
||||
repository.find_branch('master')
|
||||
branch = repository.find_branch('master', force_reload: true)
|
||||
|
||||
expect(branch).to be_a_kind_of(Gitlab::Git::Branch)
|
||||
expect(branch.name).to eq('master')
|
||||
end
|
||||
end
|
||||
|
||||
context 'force_reload is false' do
|
||||
it 'should not reload Rugged::Repository' do
|
||||
expect(Rugged::Repository).to receive(:new).once.and_call_original
|
||||
|
||||
branch = repository.find_branch('master', force_reload: false)
|
||||
|
||||
expect(branch).to be_a_kind_of(Gitlab::Git::Branch)
|
||||
expect(branch.name).to eq('master')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#ref_name_for_sha' do
|
||||
let(:ref_path) { 'refs/heads' }
|
||||
let(:sha) { repository.find_branch('master').dereferenced_target.id }
|
||||
|
|
|
@ -1022,24 +1022,6 @@ describe Repository do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#find_branch' do
|
||||
context 'fresh_repo is true' do
|
||||
it 'delegates the call to raw_repository' do
|
||||
expect(repository.raw_repository).to receive(:find_branch).with('master', true)
|
||||
|
||||
repository.find_branch('master', fresh_repo: true)
|
||||
end
|
||||
end
|
||||
|
||||
context 'fresh_repo is false' do
|
||||
it 'delegates the call to raw_repository' do
|
||||
expect(repository.raw_repository).to receive(:find_branch).with('master', false)
|
||||
|
||||
repository.find_branch('master', fresh_repo: false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#update_branch_with_hooks' do
|
||||
let(:old_rev) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' } # git rev-parse feature
|
||||
let(:new_rev) { 'a74ae73c1ccde9b974a70e82b901588071dc142a' } # commit whose parent is old_rev
|
||||
|
|
Loading…
Reference in a new issue