2018-07-17 16:50:37 +00:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2018-05-29 09:51:43 +00:00
|
|
|
module MergeRequests
|
2019-11-15 18:06:24 +00:00
|
|
|
class SquashService < MergeRequests::BaseService
|
2019-02-06 12:33:11 +00:00
|
|
|
def execute
|
|
|
|
# If performing a squash would result in no change, then
|
|
|
|
# immediately return a success message without performing a squash
|
2021-12-31 09:15:53 +00:00
|
|
|
if merge_request.commits_count == 1 && message&.strip == merge_request.first_commit.safe_message&.strip
|
2020-08-06 21:10:15 +00:00
|
|
|
return success(squash_sha: merge_request.diff_head_sha)
|
|
|
|
end
|
2018-05-29 09:51:43 +00:00
|
|
|
|
2022-02-07 15:15:53 +00:00
|
|
|
return error(s_("MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging.")) if squash_forbidden?
|
2020-06-30 18:09:13 +00:00
|
|
|
|
2022-02-07 15:15:53 +00:00
|
|
|
squash! || error(s_('MergeRequests|Squashing failed: Squash the commits locally, resolve any conflicts, then push the branch.'))
|
2019-02-06 12:33:11 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def squash!
|
2021-11-19 18:12:50 +00:00
|
|
|
squash_sha = repository.squash(current_user, merge_request, message)
|
2018-05-29 09:51:43 +00:00
|
|
|
|
|
|
|
success(squash_sha: squash_sha)
|
2021-04-26 12:09:44 +00:00
|
|
|
rescue StandardError => e
|
2020-05-07 15:09:29 +00:00
|
|
|
log_error(exception: e, message: 'Failed to squash merge request')
|
|
|
|
|
2018-05-29 09:51:43 +00:00
|
|
|
false
|
|
|
|
end
|
2019-02-06 12:33:11 +00:00
|
|
|
|
2020-06-30 18:09:13 +00:00
|
|
|
def squash_forbidden?
|
|
|
|
target_project.squash_never?
|
|
|
|
end
|
|
|
|
|
2019-02-06 12:33:11 +00:00
|
|
|
def repository
|
|
|
|
target_project.repository
|
|
|
|
end
|
|
|
|
|
|
|
|
def merge_request
|
|
|
|
params[:merge_request]
|
|
|
|
end
|
|
|
|
|
|
|
|
def message
|
2021-12-21 12:14:15 +00:00
|
|
|
params[:squash_commit_message].presence || merge_request.default_squash_commit_message(user: current_user)
|
2019-02-06 12:33:11 +00:00
|
|
|
end
|
2018-05-29 09:51:43 +00:00
|
|
|
end
|
|
|
|
end
|