4603e57147
Similar to423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were configured. When deleting a branch, this is what was happening: 1. DeleteBranchService calls execute_hooks and execute_services 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls the same hooks/services again.5145706now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService is not called. Closes #10330
51 lines
1.4 KiB
Ruby
51 lines
1.4 KiB
Ruby
require_relative 'base_service'
|
|
|
|
class CreateBranchService < BaseService
|
|
def execute(branch_name, ref, source_project: @project)
|
|
valid_branch = Gitlab::GitRefValidator.validate(branch_name)
|
|
if valid_branch == false
|
|
return error('Branch name is invalid')
|
|
end
|
|
|
|
repository = project.repository
|
|
existing_branch = repository.find_branch(branch_name)
|
|
if existing_branch
|
|
return error('Branch already exists')
|
|
end
|
|
|
|
new_branch = nil
|
|
if source_project != @project
|
|
repository.with_tmp_ref do |tmp_ref|
|
|
repository.fetch_ref(
|
|
source_project.repository.path_to_repo,
|
|
"refs/heads/#{ref}",
|
|
tmp_ref
|
|
)
|
|
|
|
new_branch = repository.add_branch(current_user, branch_name, tmp_ref)
|
|
end
|
|
else
|
|
new_branch = repository.add_branch(current_user, branch_name, ref)
|
|
end
|
|
|
|
if new_branch
|
|
# GitPushService handles execution of services and hooks for branch pushes
|
|
success(new_branch)
|
|
else
|
|
error('Invalid reference name')
|
|
end
|
|
rescue GitHooksService::PreReceiveError
|
|
error('Branch creation was rejected by Git hook')
|
|
end
|
|
|
|
def success(branch)
|
|
out = super()
|
|
out[:branch] = branch
|
|
out
|
|
end
|
|
|
|
def build_push_data(project, user, branch)
|
|
Gitlab::PushDataBuilder.
|
|
build(project, user, Gitlab::Git::BLANK_SHA, branch.target, "#{Gitlab::Git::BRANCH_REF_PREFIX}#{branch.name}", [])
|
|
end
|
|
end
|