Local branches go through Gitaly
Closes https://gitlab.com/gitlab-org/gitaly/issues/217
This commit is contained in:
parent
3ed4a1b3aa
commit
15f0cef1d0
1 changed files with 2 additions and 20 deletions
|
@ -190,12 +190,8 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
def local_branches(sort_by: nil)
|
def local_branches(sort_by: nil)
|
||||||
gitaly_migrate(:local_branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
|
wrapped_gitaly_errors do
|
||||||
if is_enabled
|
|
||||||
gitaly_ref_client.local_branches(sort_by: sort_by)
|
gitaly_ref_client.local_branches(sort_by: sort_by)
|
||||||
else
|
|
||||||
branches_filter(filter: :local, sort_by: sort_by)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1682,20 +1678,6 @@ module Gitlab
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
# Gitaly note: JV: Trying to get rid of the 'filter' option so we can implement this with 'git'.
|
|
||||||
def branches_filter(filter: nil, sort_by: nil)
|
|
||||||
branches = rugged.branches.each(filter).map do |rugged_ref|
|
|
||||||
begin
|
|
||||||
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
|
|
||||||
# Omit invalid branch
|
|
||||||
end
|
|
||||||
end.compact
|
|
||||||
|
|
||||||
sort_branches(branches, sort_by)
|
|
||||||
end
|
|
||||||
|
|
||||||
def git_merged_branch_names(branch_names, root_sha)
|
def git_merged_branch_names(branch_names, root_sha)
|
||||||
git_arguments =
|
git_arguments =
|
||||||
%W[branch --merged #{root_sha}
|
%W[branch --merged #{root_sha}
|
||||||
|
|
Loading…
Reference in a new issue