kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/services/merge_requests/merge_to_ref_service.rb

70 lines
1.8 KiB
Ruby
Raw Normal View History

Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
# frozen_string_literal: true
module MergeRequests
# Performs the merge between source SHA and the target branch. Instead
# of writing the result to the MR target branch, it targets the `target_ref`.
#
# Ideally this should leave the `target_ref` state with the same state the
# target branch would have if we used the regular `MergeService`, but without
# every side-effect that comes with it (MR updates, mails, source branch
# deletion, etc). This service should be kept idempotent (i.e. can
# be executed regardless of the `target_ref` current state).
#
class MergeToRefService < MergeRequests::MergeBaseService
Automatically update MR merge-ref along merge status This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
2019-05-21 17:14:22 -04:00
extend ::Gitlab::Utils::Override
Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
def execute(merge_request)
@merge_request = merge_request
Check authorization in merge services Move authorization checks to merge services instead relying solely on external checks.
2019-02-11 10:14:11 -05:00
validate!
Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
commit_id = commit
Check authorization in merge services Move authorization checks to merge services instead relying solely on external checks.
2019-02-11 10:14:11 -05:00
raise_error('Conflicts detected during merge') unless commit_id
Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
Revert "Automatically update MR merge-ref along merge status"
2019-06-11 12:08:25 -04:00
commit = project.commit(commit_id)
target_id, source_id = commit.parent_ids
success(commit_id: commit.id,
target_id: target_id,
source_id: source_id)
Automatically update MR merge-ref along merge status This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
2019-05-21 17:14:22 -04:00
rescue MergeError, ArgumentError => error
Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
error(error.message)
end
private
Automatically update MR merge-ref along merge status This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
2019-05-21 17:14:22 -04:00
override :source
def source
merge_request.diff_head_sha
end
Check authorization in merge services Move authorization checks to merge services instead relying solely on external checks.
2019-02-11 10:14:11 -05:00
def validate!
error_check!
end
Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
def error_check!
Extend error checking to be overwritten in EE
2019-02-12 16:21:14 -05:00
super
Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
error =
Check mergeability in merge to ref service and add spec Add changelog ok ok
2019-03-29 03:56:40 -04:00
if !hooks_validation_pass?(merge_request)
Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
hooks_validation_error(merge_request)
Automatically update MR merge-ref along merge status This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
2019-05-21 17:14:22 -04:00
elsif source.blank?
Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
'No source for merge'
end
Check authorization in merge services Move authorization checks to merge services instead relying solely on external checks.
2019-02-11 10:14:11 -05:00
raise_error(error) if error
end
Support merge to ref for merge-commit and squash Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
2019-01-31 13:32:44 -05:00
def target_ref
merge_request.merge_ref_path
end
def commit
repository.merge_to_ref(current_user, source, merge_request, target_ref, commit_message)
rescue Gitlab::Git::PreReceiveError => error
raise MergeError, error.message
end
end
end
Copy permalink