Commit 2c528aad authored by Douwe Maan's avatar Douwe Maan

Merge branch 'grpc-1.4.5' into 'master'

Use grpc 1.4.5

Closes gitaly#468

See merge request !13597
parents 05fe4545 40752ce7
...@@ -356,7 +356,7 @@ GEM ...@@ -356,7 +356,7 @@ GEM
activesupport activesupport
grape (>= 0.16.0) grape (>= 0.16.0)
rake rake
grpc (1.4.0) grpc (1.4.5)
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
googleauth (~> 0.5.1) googleauth (~> 0.5.1)
haml (4.0.7) haml (4.0.7)
......
...@@ -13,10 +13,17 @@ module Gitlab ...@@ -13,10 +13,17 @@ module Gitlab
) )
response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_blob, request) response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_blob, request)
blob = response.first data = ''
return unless blob.oid.present? blob = nil
response.each do |msg|
if blob.nil?
blob = msg
end
data << msg.data
end
data = response.reduce(blob.data.dup) { |memo, msg| memo << msg.data.dup } return nil if blob.oid.blank?
Gitlab::Git::Blob.new( Gitlab::Git::Blob.new(
id: blob.oid, id: blob.oid,
......
...@@ -60,15 +60,21 @@ module Gitlab ...@@ -60,15 +60,21 @@ module Gitlab
) )
response = GitalyClient.call(@repository.storage, :commit_service, :tree_entry, request) response = GitalyClient.call(@repository.storage, :commit_service, :tree_entry, request)
entry = response.first
return unless entry.oid.present?
if entry.type == :BLOB entry = nil
rest_of_data = response.reduce("") { |memo, msg| memo << msg.data } data = ''
entry.data += rest_of_data response.each do |msg|
if entry.nil?
entry = msg
break unless entry.type == :BLOB
end
data << msg.data
end end
entry.data = data
entry entry unless entry.oid.blank?
end end
def tree_entries(repository, revision, path) def tree_entries(repository, revision, path)
......
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