Skip to content
Snippets Groups Projects

Fix gitaly ref encoding bugs

Merged Jacob Vosmaer requested to merge jacobvosmaer-gitlab/gitlab-ce:gitaly-encodings into master
1 unresolved thread
Files
2
@@ -19,13 +19,13 @@ def default_branch_name
@@ -19,13 +19,13 @@ def default_branch_name
def branch_names
def branch_names
request = Gitaly::FindAllBranchNamesRequest.new(repository: @gitaly_repo)
request = Gitaly::FindAllBranchNamesRequest.new(repository: @gitaly_repo)
response = GitalyClient.call(@storage, :ref, :find_all_branch_names, request)
response = GitalyClient.call(@storage, :ref, :find_all_branch_names, request)
response.flat_map { |message| message.names.map { |name| Gitlab::Git.branch_name(name) } }
consume_refs_response(response) { |name| Gitlab::Git.branch_name(name) }
end
end
def tag_names
def tag_names
request = Gitaly::FindAllTagNamesRequest.new(repository: @gitaly_repo)
request = Gitaly::FindAllTagNamesRequest.new(repository: @gitaly_repo)
response = GitalyClient.call(@storage, :ref, :find_all_tag_names, request)
response = GitalyClient.call(@storage, :ref, :find_all_tag_names, request)
response.flat_map { |message| message.names.map { |name| Gitlab::Git.tag_name(name) } }
consume_refs_response(response) { |name| Gitlab::Git.tag_name(name) }
end
end
def find_ref_name(commit_id, ref_prefix)
def find_ref_name(commit_id, ref_prefix)
@@ -54,6 +54,10 @@ def local_branches(sort_by: nil)
@@ -54,6 +54,10 @@ def local_branches(sort_by: nil)
private
private
 
def consume_refs_response(response)
 
response.flat_map { |message| message.names.map { |name| yield(name) } }
 
end
 
def sort_by_param(sort_by)
def sort_by_param(sort_by)
enum_value = Gitaly::FindLocalBranchesRequest::SortBy.resolve(sort_by.upcase.to_sym)
enum_value = Gitaly::FindLocalBranchesRequest::SortBy.resolve(sort_by.upcase.to_sym)
raise ArgumentError, "Invalid sort_by key `#{sort_by}`" unless enum_value
raise ArgumentError, "Invalid sort_by key `#{sort_by}`" unless enum_value
Loading