kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use Gitlab::Git::Repository#gitaly_... more

Browse source
This commit is contained in:
Jacob Vosmaer 2017-04-07 11:19:20 +02:00
parent 6474c67d20
commit 20d415a676
7 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/api/internal.rb
View file

@ -142,7 +142,7 @@ module API
project = Project.find_by_full_path(relative_path.sub(/\.(git|wiki)\z/, ''))
begin
Gitlab::GitalyClient::Notifications.new(project.repository_storage, relative_path).post_receive
Gitlab::GitalyClient::Notifications.new(project.repository).post_receive
rescue GRPC::Unavailable => e
render_api_error(e, 500)
end

4
lib/gitlab/git/repository.rb
View file

@ -973,7 +973,7 @@ module Gitlab
end
def gitaly_channel
Gitlab::GitalyClient::Util.channel(@repository_storage)
Gitlab::GitalyClient.get_channel(@repository_storage)
end
private
@ -1255,7 +1255,7 @@ module Gitlab
end
def gitaly_ref_client
@gitaly_ref_client ||= Gitlab::GitalyClient::Ref.new(@repository_storage, @relative_path)
@gitaly_ref_client ||= Gitlab::GitalyClient::Ref.new(self)
end
end
end

10
lib/gitlab/gitaly_client/notifications.rb
View file

@ -3,14 +3,14 @@ module Gitlab
class Notifications
attr_accessor :stub
def initialize(repository_storage, relative_path)
@channel = Util.channel(repository_storage)
@repository = Util.repository(repository_storage, relative_path)
@stub = Gitaly::Notifications::Stub.new(nil, nil, channel_override: @channel)
# 'repository' is a Gitlab::Git::Repository
def initialize(repository)
@gitaly_repo = repository.gitaly_repository
@stub = Gitaly::Notifications::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
end
def post_receive
request = Gitaly::PostReceiveRequest.new(repository: @repository)
request = Gitaly::PostReceiveRequest.new(repository: @gitaly_repo)
@stub.post_receive(request)
end
end

14
lib/gitlab/gitaly_client/ref.rb
View file

@ -3,24 +3,24 @@ module Gitlab
class Ref
attr_accessor :stub
def initialize(repository_storage, relative_path)
@channel = Util.channel(repository_storage)
@repository = Util.repository(repository_storage, relative_path)
@stub = Gitaly::Ref::Stub.new(nil, nil, channel_override: @channel)
# 'repository' is a Gitlab::Git::Repository
def initialize(repository)
@gitaly_repo = repository.gitaly_repository
@stub = Gitaly::Ref::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
end
def default_branch_name
request = Gitaly::FindDefaultBranchNameRequest.new(repository: @repository)
request = Gitaly::FindDefaultBranchNameRequest.new(repository: @gitaly_repo)
stub.find_default_branch_name(request).name.gsub(/^refs\/heads\//, '')
end
def branch_names
request = Gitaly::FindAllBranchNamesRequest.new(repository: @repository)
request = Gitaly::FindAllBranchNamesRequest.new(repository: @gitaly_repo)
consume_refs_response(stub.find_all_branch_names(request), prefix: 'refs/heads/')
end
def tag_names
request = Gitaly::FindAllTagNamesRequest.new(repository: @repository)
request = Gitaly::FindAllTagNamesRequest.new(repository: @gitaly_repo)
consume_refs_response(stub.find_all_tag_names(request), prefix: 'refs/tags/')
end

4
lib/gitlab/gitaly_client/util.rb
View file

@ -9,10 +9,6 @@ module Gitlab
relative_path: relative_path,
)
end
def channel(repository_storage)
GitalyClient.get_channel(repository_storage)
end
end
end
end

2
spec/lib/gitlab/gitaly_client/notifications_spec.rb
View file

@ -4,7 +4,7 @@ describe Gitlab::GitalyClient::Notifications do
describe '#post_receive' do
let(:project) { create(:empty_project) }
let(:repo_path) { project.repository.path_to_repo }
subject { described_class.new(project.repository_storage, project.full_path + '.git') }
subject { described_class.new(project.repository) }
it 'sends a post_receive message' do
expect_any_instance_of(Gitaly::Notifications::Stub).

2
spec/lib/gitlab/gitaly_client/ref_spec.rb
View file

@ -3,7 +3,7 @@ require 'spec_helper'
describe Gitlab::GitalyClient::Ref do
let(:project) { create(:empty_project) }
let(:repo_path) { project.repository.path_to_repo }
let(:client) { Gitlab::GitalyClient::Ref.new(project.repository_storage, project.full_path + '.git') }
let(:client) { Gitlab::GitalyClient::Ref.new(project.repository) }
before do
allow(Gitlab.config.gitaly).to receive(:enabled).and_return(true)