2013-11-05 10:06:52 +00:00
|
|
|
module Files
|
2014-01-16 17:03:42 +00:00
|
|
|
class BaseService < ::BaseService
|
2015-06-05 13:01:38 +00:00
|
|
|
class ValidationError < StandardError; end
|
2013-11-05 10:06:52 +00:00
|
|
|
|
2015-06-05 13:01:38 +00:00
|
|
|
def execute
|
|
|
|
@current_branch = params[:current_branch]
|
|
|
|
@target_branch = params[:target_branch]
|
|
|
|
@commit_message = params[:commit_message]
|
|
|
|
@file_path = params[:file_path]
|
|
|
|
@file_content = if params[:file_content_encoding] == 'base64'
|
|
|
|
Base64.decode64(params[:file_content])
|
|
|
|
else
|
|
|
|
params[:file_content]
|
|
|
|
end
|
|
|
|
|
|
|
|
# Validate parameters
|
|
|
|
validate
|
|
|
|
|
|
|
|
# Create new branch if it different from current_branch
|
|
|
|
if @target_branch != @current_branch
|
|
|
|
create_target_branch
|
|
|
|
end
|
|
|
|
|
|
|
|
if sha = commit
|
|
|
|
after_commit(sha, @target_branch)
|
|
|
|
success
|
|
|
|
else
|
|
|
|
error("Something went wrong. Your changes were not committed")
|
|
|
|
end
|
|
|
|
rescue ValidationError => ex
|
|
|
|
error(ex.message)
|
2013-11-05 10:06:52 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def repository
|
|
|
|
project.repository
|
|
|
|
end
|
2015-06-02 08:45:13 +00:00
|
|
|
|
2015-06-05 13:01:38 +00:00
|
|
|
def after_commit(sha, branch)
|
2015-06-02 08:45:13 +00:00
|
|
|
commit = repository.commit(sha)
|
2015-07-22 12:07:41 +00:00
|
|
|
full_ref = "#{Gitlab::Git::BRANCH_REF_PREFIX}#{branch}"
|
2015-06-02 10:06:40 +00:00
|
|
|
old_sha = commit.parent_id || Gitlab::Git::BLANK_SHA
|
|
|
|
GitPushService.new.execute(project, current_user, old_sha, sha, full_ref)
|
2015-06-02 08:45:13 +00:00
|
|
|
end
|
2015-06-05 13:01:38 +00:00
|
|
|
|
|
|
|
def current_branch
|
|
|
|
@current_branch ||= params[:current_branch]
|
|
|
|
end
|
|
|
|
|
|
|
|
def target_branch
|
|
|
|
@target_branch ||= params[:target_branch]
|
|
|
|
end
|
|
|
|
|
|
|
|
def raise_error(message)
|
|
|
|
raise ValidationError.new(message)
|
|
|
|
end
|
|
|
|
|
|
|
|
def validate
|
|
|
|
allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(@target_branch)
|
|
|
|
|
|
|
|
unless allowed
|
|
|
|
raise_error("You are not allowed to push into this branch")
|
|
|
|
end
|
|
|
|
|
|
|
|
unless project.empty_repo?
|
|
|
|
unless repository.branch_names.include?(@current_branch)
|
|
|
|
raise_error("You can only create files if you are on top of a branch")
|
|
|
|
end
|
|
|
|
|
|
|
|
if @current_branch != @target_branch
|
|
|
|
if repository.branch_names.include?(@target_branch)
|
|
|
|
raise_error("Branch with such name already exists. You need to switch to this branch in order to make changes")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def create_target_branch
|
|
|
|
result = CreateBranchService.new(project, current_user).execute(@target_branch, @current_branch)
|
|
|
|
|
|
|
|
unless result[:status] == :success
|
|
|
|
raise_error("Something went wrong when we tried to create #{@target_branch} for you")
|
|
|
|
end
|
|
|
|
end
|
2013-11-05 10:06:52 +00:00
|
|
|
end
|
|
|
|
end
|