debian-mirror-gitlab/app/services/merge_requests/rebase_service.rb

43 lines
1.1 KiB
Ruby
Raw Normal View History

2018-11-18 11:00:15 +05:30
# frozen_string_literal: true
2018-03-17 18:26:18 +05:30
module MergeRequests
class RebaseService < MergeRequests::WorkingCopyBaseService
REBASE_ERROR = 'Rebase failed. Please rebase locally'.freeze
def execute(merge_request)
@merge_request = merge_request
if rebase
success
else
error(REBASE_ERROR)
end
end
def rebase
if merge_request.rebase_in_progress?
log_error('Rebase task canceled: Another rebase is already in progress', save_message_on_model: true)
return false
end
2018-11-08 19:23:39 +05:30
log_prefix = "#{self.class.name} info (#{merge_request.to_reference(full: true)}):"
Gitlab::GitLogger.info("#{log_prefix} rebase started")
2018-03-17 18:26:18 +05:30
rebase_sha = repository.rebase(current_user, merge_request)
2018-11-08 19:23:39 +05:30
Gitlab::GitLogger.info("#{log_prefix} rebased to #{rebase_sha}")
2018-11-18 11:00:15 +05:30
merge_request.update(rebase_commit_sha: rebase_sha)
2018-03-17 18:26:18 +05:30
2018-11-08 19:23:39 +05:30
Gitlab::GitLogger.info("#{log_prefix} rebase SHA saved: #{rebase_sha}")
2018-03-17 18:26:18 +05:30
true
rescue => e
log_error(REBASE_ERROR, save_message_on_model: true)
log_error(e.message)
false
end
end
end