Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 26 deletions

diff --git a/app/services/merge_requests/create_ref_service.rb b/app/services/merge_requests/create_ref_service.rb
index 7e70d634113..b02031ca19c 100644
--- a/app/services/merge_requests/create_ref_service.rb
+++ b/app/services/merge_requests/create_ref_service.rb
@@ -13,31 +13,30 @@ module MergeRequests
     )
       @current_user = current_user
       @merge_request = merge_request
-      @initial_source_sha = source_sha
+      @source_sha = source_sha
       @target_ref = target_ref
       @first_parent_ref = first_parent_ref
       @first_parent_sha = target_project.commit(first_parent_ref)&.sha
     end
 
     def execute
-      commit_sha = initial_source_sha # the SHA to be at HEAD of target_ref
-      source_sha = initial_source_sha # the SHA to be the merged result of the source (minus the merge commit)
-      expected_old_oid = ""           # the SHA we expect target_ref to be at prior to an update (an optimistic lock)
-
       # TODO: Update this message with the removal of FF merge_trains_create_ref_service and update tests
       # This is for compatibility with MergeToRefService during the rollout.
       return ServiceResponse.error(message: '3:Invalid merge source') unless first_parent_sha.present?
 
-      commit_sha, source_sha, expected_old_oid = maybe_squash!(commit_sha, source_sha, expected_old_oid)
-      commit_sha, source_sha, expected_old_oid = maybe_rebase!(commit_sha, source_sha, expected_old_oid)
-      commit_sha, source_sha = maybe_merge!(commit_sha, source_sha, expected_old_oid)
+      result = {
+        commit_sha: source_sha,      # the SHA to be at HEAD of target_ref
+        expected_old_oid: "",        # the SHA we expect target_ref to be at prior to an update (an optimistic lock)
+        source_sha: source_sha,      # for pipeline.source_sha
+        target_sha: first_parent_sha # for pipeline.target_sha
+      }
+
+      result = maybe_squash!(**result)
+      result = maybe_rebase!(**result)
+      result = maybe_merge!(**result)
 
       ServiceResponse.success(
-        payload: {
-          commit_sha: commit_sha,
-          target_sha: first_parent_sha,
-          source_sha: source_sha
-        }
+        payload: result
       )
     rescue CreateRefError => error
       ServiceResponse.error(message: error.message)
@@ -45,52 +44,51 @@ module MergeRequests
 
     private
 
-    attr_reader :current_user, :merge_request, :target_ref, :first_parent_ref, :first_parent_sha, :initial_source_sha
+    attr_reader :current_user, :merge_request, :target_ref, :first_parent_ref, :first_parent_sha, :source_sha
 
     delegate :target_project, to: :merge_request
     delegate :repository, to: :target_project
 
-    def maybe_squash!(commit_sha, source_sha, expected_old_oid)
+    def maybe_squash!(commit_sha:, **rest)
       if merge_request.squash_on_merge?
         squash_result = MergeRequests::SquashService.new(
           merge_request: merge_request,
           current_user: current_user,
           commit_message: squash_commit_message
         ).execute
+
         raise CreateRefError, squash_result[:message] if squash_result[:status] == :error
 
         commit_sha = squash_result[:squash_sha]
-        source_sha = commit_sha
       end
 
       # squash does not overwrite target_ref, so expected_old_oid remains the same
-      [commit_sha, source_sha, expected_old_oid]
+      rest.merge(commit_sha: commit_sha)
     end
 
-    def maybe_rebase!(commit_sha, source_sha, expected_old_oid)
+    def maybe_rebase!(commit_sha:, expected_old_oid:, **rest)
       if target_project.ff_merge_must_be_possible?
         commit_sha = safe_gitaly_operation do
           repository.rebase_to_ref(
             current_user,
-            source_sha: source_sha,
+            source_sha: commit_sha,
             target_ref: target_ref,
             first_parent_ref: first_parent_sha
           )
         end
 
-        source_sha = commit_sha
         expected_old_oid = commit_sha
       end
 
-      [commit_sha, source_sha, expected_old_oid]
+      rest.merge(commit_sha: commit_sha, expected_old_oid: expected_old_oid)
     end
 
-    def maybe_merge!(commit_sha, source_sha, expected_old_oid)
+    def maybe_merge!(commit_sha:, expected_old_oid:, **rest)
       unless target_project.merge_requests_ff_only_enabled
         commit_sha = safe_gitaly_operation do
           repository.merge_to_ref(
             current_user,
-            source_sha: source_sha,
+            source_sha: commit_sha,
             target_ref: target_ref,
             message: merge_commit_message,
             first_parent_ref: first_parent_sha,
@@ -98,11 +96,11 @@ module MergeRequests
             expected_old_oid: expected_old_oid
           )
         end
-        commit = target_project.commit(commit_sha)
-        _, source_sha = commit.parent_ids
+
+        expected_old_oid = commit_sha
       end
 
-      [commit_sha, source_sha]
+      rest.merge(commit_sha: commit_sha, expected_old_oid: expected_old_oid)
     end
 
     def safe_gitaly_operation