Commit c8614cbb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Capture pre-receive exception

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 34690142
require 'securerandom' require 'securerandom'
class CommitService class CommitService
class PreReceiveError < StandardError; end
class CommitError < StandardError; end
def self.transaction(project, current_user, ref) def self.transaction(project, current_user, ref)
repository = project.repository repository = project.repository
path_to_repo = repository.path_to_repo path_to_repo = repository.path_to_repo
empty_repo = repository.empty?
# Create temporary ref # Create temporary ref
random_string = SecureRandom.hex random_string = SecureRandom.hex
tmp_ref = "refs/tmp/#{random_string}/head" tmp_ref = "refs/tmp/#{random_string}/head"
target = repository.find_branch(ref).target
repository.rugged.references.create(tmp_ref, target) unless empty_repo
target = repository.find_branch(ref).target
repository.rugged.references.create(tmp_ref, target)
end
# Make commit in tmp ref # Make commit in tmp ref
sha = yield(tmp_ref) sha = yield(tmp_ref)
unless sha unless sha
raise 'Failed to create commit' raise CommitError.new('Failed to create commit')
end end
# Run GitLab pre-receive hook # Run GitLab pre-receive hook
status = PreCommitService.new(project, current_user).execute(sha, ref) status = PreCommitService.new(project, current_user).execute(sha, ref)
if status if status
# Update head if empty_repo
repository.rugged.references.update(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha) # Create branch
repository.rugged.references.create(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
else
# Update head
repository.rugged.references.update(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
end
# Run GitLab post receive hook # Run GitLab post receive hook
PostCommitService.new(project, current_user).execute(sha, ref) PostCommitService.new(project, current_user).execute(sha, ref)
...@@ -31,7 +43,7 @@ class CommitService ...@@ -31,7 +43,7 @@ class CommitService
# Remove tmp ref and return error to user # Remove tmp ref and return error to user
repository.rugged.references.delete(tmp_ref) repository.rugged.references.delete(tmp_ref)
raise 'Commit was rejected by pre-reveive hook' raise PreReceiveError.new('Commit was rejected by pre-reveive hook')
end end
end end
end end
...@@ -26,7 +26,7 @@ module Files ...@@ -26,7 +26,7 @@ module Files
else else
error("Something went wrong. Your changes were not committed") error("Something went wrong. Your changes were not committed")
end end
rescue ValidationError => ex rescue CommitService::CommitError, CommitService::PreReceiveError, ValidationError => ex
error(ex.message) error(ex.message)
end end
......
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