debian-mirror-gitlab/app/services/merge_requests/refresh_service.rb

216 lines
7.5 KiB
Ruby
Raw Normal View History

2015-04-26 12:48:37 +05:30
module MergeRequests
class RefreshService < MergeRequests::BaseService
def execute(oldrev, newrev, ref)
return true unless Gitlab::Git.branch_ref?(ref)
@oldrev, @newrev = oldrev, newrev
@branch_name = Gitlab::Git.ref_name(ref)
2018-03-17 18:26:18 +05:30
Gitlab::GitalyClient.allow_n_plus_1_calls(&method(:find_new_commits))
2015-11-26 14:37:03 +05:30
# Be sure to close outstanding MRs before reloading them to avoid generating an
# empty diff during a manual merge
2018-03-17 18:26:18 +05:30
close_upon_missing_source_branch_ref
post_merge_manually_merged
2015-04-26 12:48:37 +05:30
reload_merge_requests
2017-08-17 22:00:37 +05:30
reset_merge_when_pipeline_succeeds
2016-06-02 11:05:42 +05:30
mark_pending_todos_done
2016-09-29 09:46:39 +05:30
cache_merge_requests_closing_issues
2015-10-24 18:46:33 +05:30
# Leave a system note if a branch was deleted/added
if branch_added? || branch_removed?
comment_mr_branch_presence_changed
end
2015-11-26 14:37:03 +05:30
comment_mr_with_commits
2017-08-17 22:00:37 +05:30
mark_mr_as_wip_from_commits
2015-09-11 14:41:01 +05:30
execute_mr_web_hooks
2015-04-26 12:48:37 +05:30
true
end
private
2018-03-17 18:26:18 +05:30
def close_upon_missing_source_branch_ref
# MergeRequest#reload_diff ignores not opened MRs. This means it won't
# create an `empty` diff for `closed` MRs without a source branch, keeping
# the latest diff state as the last _valid_ one.
merge_requests_for_source_branch.reject(&:source_branch_exists?).each do |mr|
MergeRequests::CloseService
.new(mr.target_project, @current_user)
.execute(mr)
end
end
2015-04-26 12:48:37 +05:30
# Collect open merge requests that target same branch we push into
# and close if push to master include last commit from merge request
# We need this to close(as merged) merge requests that were merged into
# target branch manually
2018-03-17 18:26:18 +05:30
def post_merge_manually_merged
2015-04-26 12:48:37 +05:30
commit_ids = @commits.map(&:id)
2018-03-17 18:26:18 +05:30
merge_requests = @project.merge_requests.preload(:latest_merge_request_diff).opened.where(target_branch: @branch_name).to_a
2016-08-24 12:49:21 +05:30
merge_requests = merge_requests.select(&:diff_head_commit)
2015-04-26 12:48:37 +05:30
merge_requests = merge_requests.select do |merge_request|
2017-09-10 17:25:29 +05:30
commit_ids.include?(merge_request.diff_head_sha) &&
merge_request.merge_request_diff.state != 'empty'
2015-04-26 12:48:37 +05:30
end
2017-08-17 22:00:37 +05:30
filter_merge_requests(merge_requests).each do |merge_request|
2017-09-10 17:25:29 +05:30
MergeRequests::PostMergeService
.new(merge_request.target_project, @current_user)
.execute(merge_request)
2015-04-26 12:48:37 +05:30
end
end
def force_push?
2016-08-24 12:49:21 +05:30
Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev)
2015-04-26 12:48:37 +05:30
end
# Refresh merge request diff if we push to source or target branch of merge request
# Note: we should update merge requests from forks too
def reload_merge_requests
2017-09-10 17:25:29 +05:30
merge_requests = @project.merge_requests.opened
.by_source_or_target_branch(@branch_name).to_a
2015-04-26 12:48:37 +05:30
2017-08-17 22:00:37 +05:30
# Fork merge requests
merge_requests += MergeRequest.opened
.where(source_branch: @branch_name, source_project: @project)
.where.not(target_project: @project).to_a
filter_merge_requests(merge_requests).each do |merge_request|
2015-04-26 12:48:37 +05:30
if merge_request.source_branch == @branch_name || force_push?
2017-09-10 17:25:29 +05:30
merge_request.reload_diff(current_user)
2015-04-26 12:48:37 +05:30
else
2017-09-10 17:25:29 +05:30
mr_commit_ids = merge_request.commit_shas
2015-04-26 12:48:37 +05:30
push_commit_ids = @commits.map(&:id)
matches = mr_commit_ids & push_commit_ids
2017-09-10 17:25:29 +05:30
merge_request.reload_diff(current_user) if matches.any?
2015-04-26 12:48:37 +05:30
end
2016-08-24 12:49:21 +05:30
merge_request.mark_as_unchecked
2018-03-17 18:26:18 +05:30
UpdateHeadPipelineForMergeRequestWorker.perform_async(merge_request.id)
2015-04-26 12:48:37 +05:30
end
2018-03-17 18:26:18 +05:30
# Upcoming method calls need the refreshed version of
# @source_merge_requests diffs (for MergeRequest#commit_shas for instance).
merge_requests_for_source_branch(reload: true)
2015-04-26 12:48:37 +05:30
end
2017-08-17 22:00:37 +05:30
def reset_merge_when_pipeline_succeeds
merge_requests_for_source_branch.each(&:reset_merge_when_pipeline_succeeds)
2015-12-23 02:04:40 +05:30
end
2016-06-02 11:05:42 +05:30
def mark_pending_todos_done
merge_requests_for_source_branch.each do |merge_request|
todo_service.merge_request_push(merge_request, @current_user)
end
end
2015-10-24 18:46:33 +05:30
def find_new_commits
if branch_added?
@commits = []
merge_request = merge_requests_for_source_branch.first
return unless merge_request
begin
# Since any number of commits could have been made to the restored branch,
# find the common root to see what has been added.
2016-08-24 12:49:21 +05:30
common_ref = @project.repository.merge_base(merge_request.diff_head_sha, @newrev)
2015-10-24 18:46:33 +05:30
# If the a commit no longer exists in this repo, gitlab_git throws
# a Rugged::OdbError. This is fixed in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/52
@commits = @project.repository.commits_between(common_ref, @newrev) if common_ref
rescue
end
elsif branch_removed?
# No commits for a deleted branch.
@commits = []
else
@commits = @project.repository.commits_between(@oldrev, @newrev)
end
end
# Add comment about branches being deleted or added to merge requests
def comment_mr_branch_presence_changed
presence = branch_added? ? :add : :delete
merge_requests_for_source_branch.each do |merge_request|
SystemNoteService.change_branch_presence(
2015-12-23 02:04:40 +05:30
merge_request, merge_request.project, @current_user,
2015-10-24 18:46:33 +05:30
:source, @branch_name, presence)
end
end
2015-04-26 12:48:37 +05:30
# Add comment about pushing new commits to merge requests
def comment_mr_with_commits
2015-10-24 18:46:33 +05:30
return unless @commits.present?
2015-04-26 12:48:37 +05:30
2015-10-24 18:46:33 +05:30
merge_requests_for_source_branch.each do |merge_request|
2017-09-10 17:25:29 +05:30
mr_commit_ids = Set.new(merge_request.commit_shas)
2015-04-26 12:48:37 +05:30
new_commits, existing_commits = @commits.partition do |commit|
mr_commit_ids.include?(commit.id)
end
2015-09-11 14:41:01 +05:30
SystemNoteService.add_commits(merge_request, merge_request.project,
@current_user, new_commits,
existing_commits, @oldrev)
end
end
2017-08-17 22:00:37 +05:30
def mark_mr_as_wip_from_commits
return unless @commits.present?
merge_requests_for_source_branch.each do |merge_request|
2017-09-10 17:25:29 +05:30
commit_shas = merge_request.commit_shas
2017-08-17 22:00:37 +05:30
wip_commit = @commits.detect do |commit|
commit.work_in_progress? && commit_shas.include?(commit.sha)
end
if wip_commit && !merge_request.work_in_progress?
merge_request.update(title: merge_request.wip_title)
SystemNoteService.add_merge_request_wip_from_commit(
merge_request,
merge_request.project,
@current_user,
wip_commit
)
end
end
end
2015-09-11 14:41:01 +05:30
# Call merge request webhook with update branches
def execute_mr_web_hooks
2015-10-24 18:46:33 +05:30
merge_requests_for_source_branch.each do |merge_request|
2018-03-17 18:26:18 +05:30
execute_hooks(merge_request, 'update', old_rev: @oldrev)
2015-04-26 12:48:37 +05:30
end
end
2016-09-29 09:46:39 +05:30
# If the merge requests closes any issues, save this information in the
# `MergeRequestsClosingIssues` model (as a performance optimization).
def cache_merge_requests_closing_issues
@project.merge_requests.where(source_branch: @branch_name).each do |merge_request|
merge_request.cache_merge_request_closes_issues!(@current_user)
end
end
2015-04-26 12:48:37 +05:30
def filter_merge_requests(merge_requests)
merge_requests.uniq.select(&:source_project)
end
2015-10-24 18:46:33 +05:30
2018-03-17 18:26:18 +05:30
def merge_requests_for_source_branch(reload: false)
@source_merge_requests = nil if reload
2017-08-17 22:00:37 +05:30
@source_merge_requests ||= merge_requests_for(@branch_name)
2015-10-24 18:46:33 +05:30
end
def branch_added?
Gitlab::Git.blank_ref?(@oldrev)
end
def branch_removed?
Gitlab::Git.blank_ref?(@newrev)
end
2015-04-26 12:48:37 +05:30
end
end