Class: MergeRequests::MergeStrategies::FromSourceBranch

Inherits:
Object
  • Object
show all
Includes:
Gitlab::Utils::StrongMemoize
Defined in:
app/services/merge_requests/merge_strategies/from_source_branch.rb

Overview

FromSourceBranch performs a git merge from a merge request’s source branch to the target branch, including a squash if needed.

Instance Method Summary collapse

Constructor Details

#initialize(merge_request, current_user, merge_params: {}, options: {}) ⇒ FromSourceBranch

Returns a new instance of FromSourceBranch.



12
13
14
15
16
17
18
 
# File 'app/services/merge_requests/merge_strategies/from_source_branch.rb', line 12

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

Instance Method Details

#execute_git_merge! ⇒ Object 



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
 
# File 'app/services/merge_requests/merge_strategies/from_source_branch.rb', line 38

def execute_git_merge!
  if use_create_ref_service?
    create_ref_result = MergeRequests::CreateRefService.new(
      current_user: current_user,
      merge_request: merge_request,
      source_sha: merge_request.diff_head_sha,
      target_ref: merge_request.rebase_on_merge_path,
      first_parent_ref: merge_request.target_branch_ref,
      merge_params: merge_params
    ).execute

    payload = create_ref_result.payload

    src_sha = payload[:commit_sha]

    payload[:commit_sha] = fast_forward!(src_sha)[:commit_sha]

    merge_request.schedule_cleanup_refs(only: [:rebase_on_merge_path])

    log_info("Used new from source branch merge")

    payload
  else
    result = if project.merge_requests_ff_only_enabled
               fast_forward!(source_sha)
             else
               merge_commit!
             end

    result[:squash_commit_sha] = source_sha if merge_request.squash_on_merge?

    result
  end
end

#validate! ⇒ Object 



20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 
# File 'app/services/merge_requests/merge_strategies/from_source_branch.rb', line 20

def validate!
  if use_create_ref_service?
    raise_error('No source for merge') if merge_request.diff_head_sha.blank?
  else
    raise_error('No source for merge') if source_sha.blank?

    if merge_request.should_be_rebased?
      raise_error('Only fast-forward merge is allowed for your project. Please update your source branch')
    end
  end

  raise_error('Merge request is not mergeable') unless mergeable?

  return unless merge_request.missing_required_squash?

  raise_error('This project requires squashing commits when merge requests are accepted.')
end