2016-02-15 14:51:00 +00:00
|
|
|
class GitPushService < BaseService
|
|
|
|
attr_accessor :push_data, :push_commits
|
2015-01-25 15:33:54 +00:00
|
|
|
include Gitlab::CurrentSettings
|
|
|
|
include Gitlab::Access
|
2013-02-25 19:21:38 +00:00
|
|
|
|
|
|
|
# This method will be called after each git update
|
2016-02-15 14:51:00 +00:00
|
|
|
# and only if the provided user and project are present in GitLab.
|
2013-02-25 19:21:38 +00:00
|
|
|
#
|
|
|
|
# All callbacks for post receive action should be placed here.
|
|
|
|
#
|
2013-05-30 23:16:49 +00:00
|
|
|
# Next, this method:
|
|
|
|
# 1. Creates the push event
|
2015-08-11 12:33:31 +00:00
|
|
|
# 2. Updates merge requests
|
|
|
|
# 3. Recognizes cross-references from commit messages
|
2016-03-10 19:48:29 +00:00
|
|
|
# 4. Executes the project's webhooks
|
2015-08-11 12:33:31 +00:00
|
|
|
# 5. Executes the project's services
|
2016-03-03 10:51:48 +00:00
|
|
|
# 6. Checks if the project's main language has changed
|
2013-02-25 19:21:38 +00:00
|
|
|
#
|
2016-02-11 11:50:27 +00:00
|
|
|
def execute
|
2016-04-28 23:48:37 +00:00
|
|
|
@project.repository.after_create if @project.empty_repo?
|
2016-03-17 15:53:05 +00:00
|
|
|
@project.repository.after_push_commit(branch_name, params[:newrev])
|
2016-02-08 11:50:55 +00:00
|
|
|
|
2016-02-11 11:50:27 +00:00
|
|
|
if push_remove_branch?
|
2016-02-23 11:02:59 +00:00
|
|
|
@project.repository.after_remove_branch
|
2014-12-05 21:56:43 +00:00
|
|
|
@push_commits = []
|
2016-02-11 11:50:27 +00:00
|
|
|
elsif push_to_new_branch?
|
2016-02-23 11:02:59 +00:00
|
|
|
@project.repository.after_create_branch
|
2016-02-08 11:50:55 +00:00
|
|
|
|
2014-12-05 21:56:43 +00:00
|
|
|
# Re-find the pushed commits.
|
2016-02-11 11:50:27 +00:00
|
|
|
if is_default_branch?
|
2014-12-05 21:56:43 +00:00
|
|
|
# Initial push to the default branch. Take the full history of that branch as "newly pushed".
|
2016-02-11 11:50:27 +00:00
|
|
|
process_default_branch
|
2014-12-05 21:56:43 +00:00
|
|
|
else
|
|
|
|
# Use the pushed commits that aren't reachable by the default branch
|
|
|
|
# as a heuristic. This may include more commits than are actually pushed, but
|
2016-02-12 08:16:19 +00:00
|
|
|
# that shouldn't matter because we check for existing cross-references later.
|
2016-02-15 14:51:00 +00:00
|
|
|
@push_commits = @project.repository.commits_between(@project.default_branch, params[:newrev])
|
2014-12-05 21:56:43 +00:00
|
|
|
|
|
|
|
# don't process commits for the initial push to the default branch
|
2016-02-11 11:50:27 +00:00
|
|
|
process_commit_messages
|
2013-05-30 23:16:49 +00:00
|
|
|
end
|
2016-02-11 11:50:27 +00:00
|
|
|
elsif push_to_existing_branch?
|
2014-12-05 21:56:43 +00:00
|
|
|
# Collect data for this git push
|
2016-02-15 14:51:00 +00:00
|
|
|
@push_commits = @project.repository.commits_between(params[:oldrev], params[:newrev])
|
2016-02-11 11:50:27 +00:00
|
|
|
process_commit_messages
|
2016-03-14 23:33:00 +00:00
|
|
|
|
|
|
|
# Update the bare repositories info/attributes file using the contents of the default branches
|
|
|
|
# .gitattributes file
|
|
|
|
update_gitattributes if is_default_branch?
|
2014-12-05 21:56:43 +00:00
|
|
|
end
|
2016-03-14 23:33:00 +00:00
|
|
|
|
2015-10-15 08:41:46 +00:00
|
|
|
# Update merge requests that may be affected by this push. A new branch
|
|
|
|
# could cause the last commit of a merge request to change.
|
2016-02-11 11:50:27 +00:00
|
|
|
update_merge_requests
|
2016-03-14 15:49:24 +00:00
|
|
|
|
|
|
|
perform_housekeeping
|
2016-02-11 11:50:27 +00:00
|
|
|
end
|
2015-10-15 08:41:46 +00:00
|
|
|
|
2016-03-14 23:33:00 +00:00
|
|
|
def update_gitattributes
|
|
|
|
@project.repository.copy_gitattributes(params[:ref])
|
|
|
|
end
|
|
|
|
|
2016-03-03 15:40:05 +00:00
|
|
|
protected
|
|
|
|
|
2016-02-11 11:50:27 +00:00
|
|
|
def update_merge_requests
|
2016-10-10 07:40:14 +00:00
|
|
|
UpdateMergeRequestsWorker.perform_async(@project.id, current_user.id, params[:oldrev], params[:newrev], params[:ref])
|
2015-03-13 13:55:38 +00:00
|
|
|
|
2016-02-15 14:51:00 +00:00
|
|
|
EventCreateService.new.push(@project, current_user, build_push_data)
|
2016-02-11 11:50:27 +00:00
|
|
|
@project.execute_hooks(build_push_data.dup, :push_hooks)
|
|
|
|
@project.execute_services(build_push_data.dup, :push_hooks)
|
2016-10-10 07:40:14 +00:00
|
|
|
Ci::CreatePipelineService.new(@project, current_user, build_push_data).execute
|
2016-02-11 11:50:27 +00:00
|
|
|
ProjectCacheWorker.perform_async(@project.id)
|
2013-02-25 19:21:38 +00:00
|
|
|
end
|
|
|
|
|
2016-03-14 15:49:24 +00:00
|
|
|
def perform_housekeeping
|
|
|
|
housekeeping = Projects::HousekeepingService.new(@project)
|
|
|
|
housekeeping.increment!
|
|
|
|
housekeeping.execute if housekeeping.needed?
|
2016-03-15 10:03:43 +00:00
|
|
|
rescue Projects::HousekeepingService::LeaseTaken
|
2016-03-14 15:49:24 +00:00
|
|
|
end
|
|
|
|
|
2016-02-11 11:50:27 +00:00
|
|
|
def process_default_branch
|
2016-02-15 14:51:00 +00:00
|
|
|
@push_commits = project.repository.commits(params[:newrev])
|
2016-02-11 11:50:27 +00:00
|
|
|
|
|
|
|
# Ensure HEAD points to the default branch in case it is not master
|
|
|
|
project.change_head(branch_name)
|
|
|
|
|
|
|
|
# Set protection on the default branch if configured
|
2016-09-18 03:33:41 +00:00
|
|
|
if current_application_settings.default_branch_protection != PROTECTION_NONE && !@project.protected_branch?(@project.default_branch)
|
2016-07-08 09:15:29 +00:00
|
|
|
|
2016-07-29 06:13:07 +00:00
|
|
|
params = {
|
|
|
|
name: @project.default_branch,
|
2016-08-16 08:04:56 +00:00
|
|
|
push_access_levels_attributes: [{
|
2016-07-29 06:13:07 +00:00
|
|
|
access_level: current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? Gitlab::Access::DEVELOPER : Gitlab::Access::MASTER
|
2016-08-16 08:04:56 +00:00
|
|
|
}],
|
|
|
|
merge_access_levels_attributes: [{
|
2016-07-29 06:13:07 +00:00
|
|
|
access_level: current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_MERGE ? Gitlab::Access::DEVELOPER : Gitlab::Access::MASTER
|
2016-08-16 08:04:56 +00:00
|
|
|
}]
|
2016-07-29 06:13:07 +00:00
|
|
|
}
|
|
|
|
|
2016-07-08 09:15:29 +00:00
|
|
|
ProtectedBranches::CreateService.new(@project, current_user, params).execute
|
2016-02-11 11:50:27 +00:00
|
|
|
end
|
|
|
|
end
|
2013-02-25 19:21:38 +00:00
|
|
|
|
2013-05-30 23:16:49 +00:00
|
|
|
# Extract any GFM references from the pushed commit messages. If the configured issue-closing regex is matched,
|
|
|
|
# close the referenced Issue. Create cross-reference Notes corresponding to any other referenced Mentionables.
|
2016-02-11 11:50:27 +00:00
|
|
|
def process_commit_messages
|
|
|
|
is_default_branch = is_default_branch?
|
2013-05-30 23:16:49 +00:00
|
|
|
|
2015-10-12 09:54:46 +00:00
|
|
|
authors = Hash.new do |hash, commit|
|
|
|
|
email = commit.author_email
|
2015-10-18 12:05:27 +00:00
|
|
|
next hash[email] if hash.has_key?(email)
|
2013-05-30 23:16:49 +00:00
|
|
|
|
2015-10-12 09:54:46 +00:00
|
|
|
hash[email] = commit_user(commit)
|
|
|
|
end
|
2014-11-12 11:59:25 +00:00
|
|
|
|
2015-10-12 09:54:46 +00:00
|
|
|
@push_commits.each do |commit|
|
2015-08-21 13:05:43 +00:00
|
|
|
# Keep track of the issues that will be actually closed because they are on a default branch.
|
|
|
|
# Hence, when creating cross-reference notes, the not-closed issues (on non-default branches)
|
|
|
|
# will also have cross-reference.
|
2015-10-12 09:54:46 +00:00
|
|
|
closed_issues = []
|
|
|
|
|
|
|
|
if is_default_branch
|
|
|
|
# Close issues if these commits were pushed to the project's default branch and the commit message matches the
|
|
|
|
# closing regex. Exclude any mentioned Issues from cross-referencing even if the commits are being pushed to
|
|
|
|
# a different branch.
|
2016-02-15 14:51:00 +00:00
|
|
|
closed_issues = commit.closes_issues(current_user)
|
2015-10-12 09:54:46 +00:00
|
|
|
closed_issues.each do |issue|
|
2016-03-03 13:19:27 +00:00
|
|
|
if can?(current_user, :update_issue, issue)
|
2016-03-17 08:54:16 +00:00
|
|
|
Issues::CloseService.new(project, authors[commit], {}).execute(issue, commit: commit)
|
2016-03-03 13:19:27 +00:00
|
|
|
end
|
2014-04-02 12:38:24 +00:00
|
|
|
end
|
2013-05-30 23:16:49 +00:00
|
|
|
end
|
|
|
|
|
2015-10-12 09:54:46 +00:00
|
|
|
commit.create_cross_references!(authors[commit], closed_issues)
|
Improve performance of the cycle analytics page.
1. These changes bring down page load time for 100 issues from more than
a minute to about 1.5 seconds.
2. This entire commit is composed of these types of performance
enhancements:
- Cache relevant data in `IssueMetrics` wherever possible.
- Cache relevant data in `MergeRequestMetrics` wherever possible.
- Preload metrics
3. Given these improvements, we now only need to make 4 SQL calls:
- Load all issues
- Load all merge requests
- Load all metrics for the issues
- Load all metrics for the merge requests
4. A list of all the data points that are now being pre-calculated:
a. The first time an issue is mentioned in a commit
- In `GitPushService`, find all issues mentioned by the given commit
using `ReferenceExtractor`. Set the `first_mentioned_in_commit_at`
flag for each of them.
- There seems to be a (pre-existing) bug here - files (and
therefore commits) created using the Web CI don't have
cross-references created, and issues are not closed even when
the commit title is "Fixes #xx".
b. The first time a merge request is deployed to production
When a `Deployment` is created, find all merge requests that
were merged in before the deployment, and set the
`first_deployed_to_production_at` flag for each of them.
c. The start / end time for a merge request pipeline
Hook into the `Pipeline` state machine. When the `status` moves to
`running`, find the merge requests whose tip commit matches the
pipeline, and record the `latest_build_started_at` time for each
of them. When the `status` moves to `success`, record the
`latest_build_finished_at` time.
d. The merge requests that close an issue
- This was a big cause of the performance problems we were having
with Cycle Analytics. We need to use `ReferenceExtractor` to make
this calculation, which is slow when we have to run it on a large
number of merge requests.
- When a merge request is created, updated, or refreshed, find the
issues it closes, and create an instance of
`MergeRequestsClosingIssues`, which acts as a join model between
merge requests and issues.
- If a `MergeRequestsClosingIssues` instance links a merge request
and an issue, that issue closes that merge request.
5. The `Queries` module was changed into a class, so we can cache the
results of `issues` and `merge_requests_closing_issues` across
various cycle analytics stages.
6. The code added in this commit is untested. Tests will be added in the
next commit.
2016-09-15 08:59:36 +00:00
|
|
|
update_issue_metrics(commit, authors)
|
2013-05-30 23:16:49 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-02-11 11:50:27 +00:00
|
|
|
def build_push_data
|
2016-08-12 08:09:29 +00:00
|
|
|
@push_data ||= Gitlab::DataBuilder::Push.build(
|
|
|
|
@project,
|
|
|
|
current_user,
|
|
|
|
params[:oldrev],
|
|
|
|
params[:newrev],
|
|
|
|
params[:ref],
|
|
|
|
push_commits)
|
2013-02-25 19:21:38 +00:00
|
|
|
end
|
|
|
|
|
2016-02-11 11:50:27 +00:00
|
|
|
def push_to_existing_branch?
|
2013-02-25 19:21:38 +00:00
|
|
|
# Return if this is not a push to a branch (e.g. new commits)
|
2016-02-15 14:51:00 +00:00
|
|
|
Gitlab::Git.branch_ref?(params[:ref]) && !Gitlab::Git.blank_ref?(params[:oldrev])
|
2013-05-30 23:16:49 +00:00
|
|
|
end
|
|
|
|
|
2016-02-11 11:50:27 +00:00
|
|
|
def push_to_new_branch?
|
2016-02-15 14:51:00 +00:00
|
|
|
Gitlab::Git.branch_ref?(params[:ref]) && Gitlab::Git.blank_ref?(params[:oldrev])
|
2013-05-30 23:16:49 +00:00
|
|
|
end
|
|
|
|
|
2016-02-11 11:50:27 +00:00
|
|
|
def push_remove_branch?
|
2016-02-15 14:51:00 +00:00
|
|
|
Gitlab::Git.branch_ref?(params[:ref]) && Gitlab::Git.blank_ref?(params[:newrev])
|
2014-09-26 07:46:48 +00:00
|
|
|
end
|
|
|
|
|
2016-02-11 11:50:27 +00:00
|
|
|
def push_to_branch?
|
2016-02-15 14:51:00 +00:00
|
|
|
Gitlab::Git.branch_ref?(params[:ref])
|
2013-08-27 10:56:04 +00:00
|
|
|
end
|
|
|
|
|
2016-02-11 11:50:27 +00:00
|
|
|
def is_default_branch?
|
2016-02-15 14:51:00 +00:00
|
|
|
Gitlab::Git.branch_ref?(params[:ref]) &&
|
2016-02-17 09:42:59 +00:00
|
|
|
(Gitlab::Git.ref_name(params[:ref]) == project.default_branch || project.default_branch.nil?)
|
2013-05-30 23:16:49 +00:00
|
|
|
end
|
|
|
|
|
2014-09-25 22:07:40 +00:00
|
|
|
def commit_user(commit)
|
2016-02-15 14:51:00 +00:00
|
|
|
commit.author || current_user
|
2013-02-25 19:21:38 +00:00
|
|
|
end
|
2016-02-11 11:50:27 +00:00
|
|
|
|
|
|
|
def branch_name
|
2016-02-17 09:42:59 +00:00
|
|
|
@branch_name ||= Gitlab::Git.ref_name(params[:ref])
|
2016-02-11 11:50:27 +00:00
|
|
|
end
|
Improve performance of the cycle analytics page.
1. These changes bring down page load time for 100 issues from more than
a minute to about 1.5 seconds.
2. This entire commit is composed of these types of performance
enhancements:
- Cache relevant data in `IssueMetrics` wherever possible.
- Cache relevant data in `MergeRequestMetrics` wherever possible.
- Preload metrics
3. Given these improvements, we now only need to make 4 SQL calls:
- Load all issues
- Load all merge requests
- Load all metrics for the issues
- Load all metrics for the merge requests
4. A list of all the data points that are now being pre-calculated:
a. The first time an issue is mentioned in a commit
- In `GitPushService`, find all issues mentioned by the given commit
using `ReferenceExtractor`. Set the `first_mentioned_in_commit_at`
flag for each of them.
- There seems to be a (pre-existing) bug here - files (and
therefore commits) created using the Web CI don't have
cross-references created, and issues are not closed even when
the commit title is "Fixes #xx".
b. The first time a merge request is deployed to production
When a `Deployment` is created, find all merge requests that
were merged in before the deployment, and set the
`first_deployed_to_production_at` flag for each of them.
c. The start / end time for a merge request pipeline
Hook into the `Pipeline` state machine. When the `status` moves to
`running`, find the merge requests whose tip commit matches the
pipeline, and record the `latest_build_started_at` time for each
of them. When the `status` moves to `success`, record the
`latest_build_finished_at` time.
d. The merge requests that close an issue
- This was a big cause of the performance problems we were having
with Cycle Analytics. We need to use `ReferenceExtractor` to make
this calculation, which is slow when we have to run it on a large
number of merge requests.
- When a merge request is created, updated, or refreshed, find the
issues it closes, and create an instance of
`MergeRequestsClosingIssues`, which acts as a join model between
merge requests and issues.
- If a `MergeRequestsClosingIssues` instance links a merge request
and an issue, that issue closes that merge request.
5. The `Queries` module was changed into a class, so we can cache the
results of `issues` and `merge_requests_closing_issues` across
various cycle analytics stages.
6. The code added in this commit is untested. Tests will be added in the
next commit.
2016-09-15 08:59:36 +00:00
|
|
|
|
|
|
|
def update_issue_metrics(commit, authors)
|
|
|
|
mentioned_issues = commit.all_references(authors[commit]).issues
|
2016-09-20 09:36:54 +00:00
|
|
|
|
|
|
|
Issue::Metrics.where(issue_id: mentioned_issues.map(&:id), first_mentioned_in_commit_at: nil).
|
|
|
|
update_all(first_mentioned_in_commit_at: commit.committed_date)
|
Improve performance of the cycle analytics page.
1. These changes bring down page load time for 100 issues from more than
a minute to about 1.5 seconds.
2. This entire commit is composed of these types of performance
enhancements:
- Cache relevant data in `IssueMetrics` wherever possible.
- Cache relevant data in `MergeRequestMetrics` wherever possible.
- Preload metrics
3. Given these improvements, we now only need to make 4 SQL calls:
- Load all issues
- Load all merge requests
- Load all metrics for the issues
- Load all metrics for the merge requests
4. A list of all the data points that are now being pre-calculated:
a. The first time an issue is mentioned in a commit
- In `GitPushService`, find all issues mentioned by the given commit
using `ReferenceExtractor`. Set the `first_mentioned_in_commit_at`
flag for each of them.
- There seems to be a (pre-existing) bug here - files (and
therefore commits) created using the Web CI don't have
cross-references created, and issues are not closed even when
the commit title is "Fixes #xx".
b. The first time a merge request is deployed to production
When a `Deployment` is created, find all merge requests that
were merged in before the deployment, and set the
`first_deployed_to_production_at` flag for each of them.
c. The start / end time for a merge request pipeline
Hook into the `Pipeline` state machine. When the `status` moves to
`running`, find the merge requests whose tip commit matches the
pipeline, and record the `latest_build_started_at` time for each
of them. When the `status` moves to `success`, record the
`latest_build_finished_at` time.
d. The merge requests that close an issue
- This was a big cause of the performance problems we were having
with Cycle Analytics. We need to use `ReferenceExtractor` to make
this calculation, which is slow when we have to run it on a large
number of merge requests.
- When a merge request is created, updated, or refreshed, find the
issues it closes, and create an instance of
`MergeRequestsClosingIssues`, which acts as a join model between
merge requests and issues.
- If a `MergeRequestsClosingIssues` instance links a merge request
and an issue, that issue closes that merge request.
5. The `Queries` module was changed into a class, so we can cache the
results of `issues` and `merge_requests_closing_issues` across
various cycle analytics stages.
6. The code added in this commit is untested. Tests will be added in the
next commit.
2016-09-15 08:59:36 +00:00
|
|
|
end
|
2013-02-25 19:21:38 +00:00
|
|
|
end
|