1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
# frozen_string_literal: true
module MergeRequests
module MergeStrategies
# FromSourceBranch performs a git merge from a merge request's source branch
# to the target branch, including a squash if needed.
class FromSourceBranch
include Gitlab::Utils::StrongMemoize
delegate :repository, to: :project
def initialize(merge_request, current_user, merge_params: {}, options: {})
@merge_request = merge_request
@current_user = current_user
@project = merge_request.project
@merge_params = merge_params
@options = options
end
def validate!
error_message =
if source_sha.blank?
'No source for merge'
elsif merge_request.should_be_rebased?
'Only fast-forward merge is allowed for your project. Please update your source branch'
elsif !merge_request.mergeable?(
skip_discussions_check: @options[:skip_discussions_check],
check_mergeability_retry_lease: @options[:check_mergeability_retry_lease]
)
'Merge request is not mergeable'
elsif !merge_request.squash && project.squash_always?
'This project requires squashing commits when merge requests are accepted.'
end
raise_error(error_message) if error_message
end
def execute_git_merge!
result =
if project.merge_requests_ff_only_enabled
fast_forward!
else
merge_commit!
end
result[:squash_commit_sha] = source_sha if merge_request.squash_on_merge?
result
end
private
attr_reader :merge_request, :current_user, :merge_params, :options, :project
def source_sha
if merge_request.squash_on_merge?
squash_sha!
else
merge_request.diff_head_sha
end
end
strong_memoize_attr :source_sha
def squash_sha!
squash_result = ::MergeRequests::SquashService
.new(
merge_request: merge_request,
current_user: current_user,
commit_message: merge_params[:squash_commit_message]
).execute
case squash_result[:status]
when :success
squash_result[:squash_sha]
when :error
raise_error(squash_result[:message])
end
end
def fast_forward!
commit_sha = repository.ff_merge(
current_user,
source_sha,
merge_request.target_branch,
merge_request: merge_request
)
{ commit_sha: commit_sha }
end
def merge_commit!
commit_sha = repository.merge(
current_user,
source_sha,
merge_request,
merge_commit_message
)
{ commit_sha: commit_sha, merge_commit_sha: commit_sha }
end
def merge_commit_message
merge_params[:commit_message] ||
merge_request.default_merge_commit_message(user: current_user)
end
def raise_error(message)
raise ::MergeRequests::MergeStrategies::StrategyError, message
end
end
end
end
|
