991bf24ec8
Compared to the merge_request_diff association: 1. It's simpler to query. The query uses a foreign key to the merge_request_diffs table, so no ordering is necessary. 2. It's faster for preloading. The merge_request_diff association has to load every diff for the MRs in the set, then discard all but the most recent for each. This association means that Rails can just query for N diffs from N MRs. 3. It's more complicated to update. This is a bidirectional foreign key, so we need to update two tables when adding a diff record. This also means we need to handle this as a special case when importing a GitLab project. There is some juggling with this association in the merge request model: * `MergeRequest#latest_merge_request_diff` is _always_ the latest diff. * `MergeRequest#merge_request_diff` reuses `MergeRequest#latest_merge_request_diff` unless: * Arguments are passed. These are typically to force-reload the association. * It doesn't exist. That means we might be trying to implicitly create a diff. This only seems to happen in specs. * The association is already loaded. This is important for the reasons explained in the comment, which I'll reiterate here: if we a) load a non-latest diff, then b) get its `merge_request`, then c) get that MR's `merge_request_diff`, we should get the diff we loaded in c), even though that's not the latest diff. Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases, but not quite all.
197 lines
6.6 KiB
Ruby
197 lines
6.6 KiB
Ruby
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)
|
|
|
|
find_new_commits
|
|
# Be sure to close outstanding MRs before reloading them to avoid generating an
|
|
# empty diff during a manual merge
|
|
close_merge_requests
|
|
reload_merge_requests
|
|
reset_merge_when_pipeline_succeeds
|
|
mark_pending_todos_done
|
|
cache_merge_requests_closing_issues
|
|
|
|
# Leave a system note if a branch was deleted/added
|
|
if branch_added? || branch_removed?
|
|
comment_mr_branch_presence_changed
|
|
end
|
|
|
|
comment_mr_with_commits
|
|
mark_mr_as_wip_from_commits
|
|
execute_mr_web_hooks
|
|
|
|
true
|
|
end
|
|
|
|
private
|
|
|
|
# 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
|
|
def close_merge_requests
|
|
commit_ids = @commits.map(&:id)
|
|
merge_requests = @project.merge_requests.preload(:latest_merge_request_diff).opened.where(target_branch: @branch_name).to_a
|
|
merge_requests = merge_requests.select(&:diff_head_commit)
|
|
|
|
merge_requests = merge_requests.select do |merge_request|
|
|
commit_ids.include?(merge_request.diff_head_sha) &&
|
|
merge_request.merge_request_diff.state != 'empty'
|
|
end
|
|
|
|
filter_merge_requests(merge_requests).each do |merge_request|
|
|
MergeRequests::PostMergeService
|
|
.new(merge_request.target_project, @current_user)
|
|
.execute(merge_request)
|
|
end
|
|
end
|
|
|
|
def force_push?
|
|
Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev)
|
|
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
|
|
merge_requests = @project.merge_requests.opened
|
|
.by_source_or_target_branch(@branch_name).to_a
|
|
|
|
# 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|
|
|
if merge_request.source_branch == @branch_name || force_push?
|
|
merge_request.reload_diff(current_user)
|
|
else
|
|
mr_commit_ids = merge_request.commit_shas
|
|
push_commit_ids = @commits.map(&:id)
|
|
matches = mr_commit_ids & push_commit_ids
|
|
merge_request.reload_diff(current_user) if matches.any?
|
|
end
|
|
|
|
merge_request.mark_as_unchecked
|
|
end
|
|
end
|
|
|
|
def reset_merge_when_pipeline_succeeds
|
|
merge_requests_for_source_branch.each(&:reset_merge_when_pipeline_succeeds)
|
|
end
|
|
|
|
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
|
|
|
|
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.
|
|
common_ref = @project.repository.merge_base(merge_request.diff_head_sha, @newrev)
|
|
# 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(
|
|
merge_request, merge_request.project, @current_user,
|
|
:source, @branch_name, presence)
|
|
end
|
|
end
|
|
|
|
# Add comment about pushing new commits to merge requests
|
|
def comment_mr_with_commits
|
|
return unless @commits.present?
|
|
|
|
merge_requests_for_source_branch.each do |merge_request|
|
|
mr_commit_ids = Set.new(merge_request.commit_shas)
|
|
|
|
new_commits, existing_commits = @commits.partition do |commit|
|
|
mr_commit_ids.include?(commit.id)
|
|
end
|
|
|
|
SystemNoteService.add_commits(merge_request, merge_request.project,
|
|
@current_user, new_commits,
|
|
existing_commits, @oldrev)
|
|
end
|
|
end
|
|
|
|
def mark_mr_as_wip_from_commits
|
|
return unless @commits.present?
|
|
|
|
merge_requests_for_source_branch.each do |merge_request|
|
|
commit_shas = merge_request.commit_shas
|
|
|
|
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
|
|
|
|
# Call merge request webhook with update branches
|
|
def execute_mr_web_hooks
|
|
merge_requests_for_source_branch.each do |merge_request|
|
|
execute_hooks(merge_request, 'update', old_rev: @oldrev)
|
|
end
|
|
end
|
|
|
|
# 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
|
|
|
|
def filter_merge_requests(merge_requests)
|
|
merge_requests.uniq.select(&:source_project)
|
|
end
|
|
|
|
def merge_requests_for_source_branch
|
|
@source_merge_requests ||= merge_requests_for(@branch_name)
|
|
end
|
|
|
|
def branch_added?
|
|
Gitlab::Git.blank_ref?(@oldrev)
|
|
end
|
|
|
|
def branch_removed?
|
|
Gitlab::Git.blank_ref?(@newrev)
|
|
end
|
|
end
|
|
end
|