2011-11-20 20:32:12 +00:00
|
|
|
class Commit
|
2012-01-28 14:47:55 +00:00
|
|
|
extend ActiveModel::Naming
|
2015-05-03 03:11:21 +00:00
|
|
|
|
|
|
|
include ActiveModel::Conversion
|
2015-04-21 13:23:20 +00:00
|
|
|
include Participable
|
2015-10-14 14:20:11 +00:00
|
|
|
include Mentionable
|
2015-05-03 03:11:21 +00:00
|
|
|
include Referable
|
|
|
|
include StaticModel
|
2013-05-30 23:16:49 +00:00
|
|
|
|
2015-10-22 13:40:02 +00:00
|
|
|
attr_mentionable :safe_message, pipeline: :single_line
|
2016-05-26 11:38:28 +00:00
|
|
|
|
|
|
|
participant :author
|
|
|
|
participant :committer
|
|
|
|
participant :notes_with_associations
|
2011-11-28 09:46:41 +00:00
|
|
|
|
2015-04-21 13:09:15 +00:00
|
|
|
attr_accessor :project
|
|
|
|
|
2016-03-03 17:38:44 +00:00
|
|
|
DIFF_SAFE_LINES = Gitlab::Git::DiffCollection::DEFAULT_LIMITS[:max_lines]
|
2014-07-15 15:28:21 +00:00
|
|
|
|
2013-09-04 07:33:09 +00:00
|
|
|
# Commits above this size will not be rendered in HTML
|
2016-04-19 09:48:10 +00:00
|
|
|
DIFF_HARD_LIMIT_FILES = 1000
|
|
|
|
DIFF_HARD_LIMIT_LINES = 50000
|
2012-10-25 09:16:14 +00:00
|
|
|
|
2014-02-03 16:13:24 +00:00
|
|
|
class << self
|
2015-04-21 13:09:15 +00:00
|
|
|
def decorate(commits, project)
|
2014-10-10 14:39:29 +00:00
|
|
|
commits.map do |commit|
|
|
|
|
if commit.kind_of?(Commit)
|
|
|
|
commit
|
|
|
|
else
|
2015-04-21 13:09:15 +00:00
|
|
|
self.new(commit, project)
|
2014-10-10 14:39:29 +00:00
|
|
|
end
|
|
|
|
end
|
2014-02-03 16:13:24 +00:00
|
|
|
end
|
2013-04-01 13:04:35 +00:00
|
|
|
|
2014-02-03 16:13:24 +00:00
|
|
|
# Calculate number of lines to render for diffs
|
|
|
|
def diff_line_count(diffs)
|
2016-03-03 17:38:44 +00:00
|
|
|
diffs.reduce(0) { |sum, d| sum + Gitlab::Git::Util.count_lines(d.diff) }
|
2014-02-03 16:13:24 +00:00
|
|
|
end
|
2014-10-10 12:39:48 +00:00
|
|
|
|
2014-10-10 13:30:14 +00:00
|
|
|
# Truncate sha to 8 characters
|
2014-10-10 12:39:48 +00:00
|
|
|
def truncate_sha(sha)
|
2014-10-10 13:30:14 +00:00
|
|
|
sha[0..7]
|
2014-10-10 12:39:48 +00:00
|
|
|
end
|
2016-03-03 17:38:44 +00:00
|
|
|
|
|
|
|
def max_diff_options
|
|
|
|
{
|
|
|
|
max_files: DIFF_HARD_LIMIT_FILES,
|
|
|
|
max_lines: DIFF_HARD_LIMIT_LINES,
|
|
|
|
}
|
|
|
|
end
|
2016-11-24 14:07:44 +00:00
|
|
|
|
|
|
|
def from_hash(hash, project)
|
|
|
|
new(Gitlab::Git::Commit.new(hash), project)
|
|
|
|
end
|
2013-09-04 07:33:09 +00:00
|
|
|
end
|
|
|
|
|
2013-03-31 15:49:58 +00:00
|
|
|
attr_accessor :raw
|
2012-09-27 06:20:36 +00:00
|
|
|
|
2015-04-21 13:09:15 +00:00
|
|
|
def initialize(raw_commit, project)
|
2013-01-04 22:35:38 +00:00
|
|
|
raise "Nil as raw commit passed" unless raw_commit
|
|
|
|
|
2013-03-31 15:49:58 +00:00
|
|
|
@raw = raw_commit
|
2015-04-21 13:09:15 +00:00
|
|
|
@project = project
|
2012-11-22 19:49:01 +00:00
|
|
|
end
|
2013-03-21 20:50:18 +00:00
|
|
|
|
2013-03-31 16:00:45 +00:00
|
|
|
def id
|
|
|
|
@raw.id
|
|
|
|
end
|
|
|
|
|
2015-05-03 02:41:37 +00:00
|
|
|
def ==(other)
|
|
|
|
(self.class === other) && (raw == other.raw)
|
|
|
|
end
|
|
|
|
|
2015-05-14 20:59:39 +00:00
|
|
|
def self.reference_prefix
|
|
|
|
'@'
|
|
|
|
end
|
|
|
|
|
|
|
|
# Pattern used to extract commit references from text
|
|
|
|
#
|
2016-01-30 00:49:07 +00:00
|
|
|
# The SHA can be between 7 and 40 hex characters.
|
2015-05-14 20:59:39 +00:00
|
|
|
#
|
|
|
|
# This pattern supports cross-project references.
|
|
|
|
def self.reference_pattern
|
2016-03-24 15:41:48 +00:00
|
|
|
@reference_pattern ||= %r{
|
2015-05-15 20:10:55 +00:00
|
|
|
(?:#{Project.reference_pattern}#{reference_prefix})?
|
2016-01-30 00:49:07 +00:00
|
|
|
(?<commit>\h{7,40})
|
2015-05-15 20:10:55 +00:00
|
|
|
}x
|
2015-05-14 20:59:39 +00:00
|
|
|
end
|
|
|
|
|
2015-11-30 20:14:46 +00:00
|
|
|
def self.link_reference_pattern
|
2016-03-24 15:41:48 +00:00
|
|
|
@link_reference_pattern ||= super("commit", /(?<commit>\h{7,40})/)
|
2015-11-30 20:14:46 +00:00
|
|
|
end
|
|
|
|
|
2015-05-03 03:11:21 +00:00
|
|
|
def to_reference(from_project = nil)
|
2016-11-02 23:49:13 +00:00
|
|
|
commit_reference(from_project, id)
|
2015-12-01 11:58:45 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def reference_link_text(from_project = nil)
|
2016-11-02 23:49:13 +00:00
|
|
|
commit_reference(from_project, short_id)
|
2015-05-03 03:11:21 +00:00
|
|
|
end
|
|
|
|
|
2013-09-04 07:33:09 +00:00
|
|
|
def diff_line_count
|
2016-07-27 17:00:34 +00:00
|
|
|
@diff_line_count ||= Commit::diff_line_count(raw_diffs)
|
2013-09-04 07:33:09 +00:00
|
|
|
@diff_line_count
|
|
|
|
end
|
|
|
|
|
2013-03-31 20:48:12 +00:00
|
|
|
# Returns the commits title.
|
|
|
|
#
|
|
|
|
# Usually, the commit title is the first line of the commit message.
|
2013-08-12 19:28:31 +00:00
|
|
|
# In case this first line is longer than 100 characters, it is cut off
|
|
|
|
# after 80 characters and ellipses (`&hellp;`) are appended.
|
2013-03-31 20:48:12 +00:00
|
|
|
def title
|
2016-07-26 04:49:06 +00:00
|
|
|
full_title.length > 100 ? full_title[0..79] << "…" : full_title
|
|
|
|
end
|
2013-03-31 20:48:12 +00:00
|
|
|
|
2016-07-26 04:49:06 +00:00
|
|
|
# Returns the full commits title
|
|
|
|
def full_title
|
|
|
|
return @full_title if @full_title
|
2013-03-31 20:48:12 +00:00
|
|
|
|
2016-07-26 04:49:06 +00:00
|
|
|
if safe_message.blank?
|
|
|
|
@full_title = no_commit_message
|
2013-03-31 20:48:12 +00:00
|
|
|
else
|
2016-07-26 04:49:06 +00:00
|
|
|
@full_title = safe_message.split("\n", 2).first
|
2013-03-31 20:48:12 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
# Returns the commits description
|
|
|
|
#
|
|
|
|
# cut off, ellipses (`&hellp;`) are prepended to the commit message.
|
|
|
|
def description
|
2014-10-19 14:09:38 +00:00
|
|
|
title_end = safe_message.index("\n")
|
2015-02-03 05:38:50 +00:00
|
|
|
@description ||=
|
|
|
|
if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
|
2015-04-14 13:45:06 +00:00
|
|
|
"…" << safe_message[80..-1]
|
2015-02-03 05:38:50 +00:00
|
|
|
else
|
|
|
|
safe_message.split("\n", 2)[1].try(:chomp)
|
|
|
|
end
|
2014-02-25 13:54:30 +00:00
|
|
|
end
|
2013-03-31 20:48:12 +00:00
|
|
|
|
2014-02-25 13:54:30 +00:00
|
|
|
def description?
|
|
|
|
description.present?
|
2013-03-31 20:48:12 +00:00
|
|
|
end
|
|
|
|
|
2015-12-07 13:13:06 +00:00
|
|
|
def hook_attrs(with_changed_files: false)
|
2015-12-07 12:11:15 +00:00
|
|
|
data = {
|
2014-09-15 07:10:35 +00:00
|
|
|
id: id,
|
|
|
|
message: safe_message,
|
|
|
|
timestamp: committed_date.xmlschema,
|
2016-04-13 09:25:42 +00:00
|
|
|
url: Gitlab::UrlBuilder.build(self),
|
2014-09-15 07:10:35 +00:00
|
|
|
author: {
|
|
|
|
name: author_name,
|
|
|
|
email: author_email
|
|
|
|
}
|
|
|
|
}
|
2015-12-07 12:11:15 +00:00
|
|
|
|
|
|
|
if with_changed_files
|
2015-12-07 13:13:06 +00:00
|
|
|
data.merge!(repo_changes)
|
2015-12-07 12:11:15 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
data
|
2014-09-15 07:10:35 +00:00
|
|
|
end
|
|
|
|
|
2013-05-30 23:16:49 +00:00
|
|
|
# Discover issues should be closed when this commit is pushed to a project's
|
|
|
|
# default branch.
|
2015-04-21 13:15:49 +00:00
|
|
|
def closes_issues(current_user = self.committer)
|
2015-04-03 16:03:26 +00:00
|
|
|
Gitlab::ClosingIssueExtractor.new(project, current_user).closed_by_message(safe_message)
|
2013-05-30 23:16:49 +00:00
|
|
|
end
|
|
|
|
|
2015-03-27 11:16:34 +00:00
|
|
|
def author
|
2016-07-27 23:42:38 +00:00
|
|
|
if RequestStore.active?
|
|
|
|
key = "commit_author:#{author_email.downcase}"
|
|
|
|
# nil is a valid value since no author may exist in the system
|
|
|
|
if RequestStore.store.has_key?(key)
|
|
|
|
@author = RequestStore.store[key]
|
|
|
|
else
|
|
|
|
@author = find_author_by_any_email
|
|
|
|
RequestStore.store[key] = @author
|
|
|
|
end
|
|
|
|
else
|
|
|
|
@author ||= find_author_by_any_email
|
2016-07-27 22:35:53 +00:00
|
|
|
end
|
2015-03-27 11:16:34 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def committer
|
2015-12-04 21:54:25 +00:00
|
|
|
@committer ||= User.find_by_any_email(committer_email.downcase)
|
2015-03-27 11:16:34 +00:00
|
|
|
end
|
|
|
|
|
2015-10-20 12:23:56 +00:00
|
|
|
def parents
|
|
|
|
@parents ||= parent_ids.map { |id| project.commit(id) }
|
|
|
|
end
|
|
|
|
|
|
|
|
def parent
|
|
|
|
@parent ||= project.commit(self.parent_id) if self.parent_id
|
|
|
|
end
|
|
|
|
|
2015-04-21 13:15:49 +00:00
|
|
|
def notes
|
2015-04-15 13:56:21 +00:00
|
|
|
project.notes.for_commit_id(self.id)
|
|
|
|
end
|
|
|
|
|
2016-05-26 11:38:28 +00:00
|
|
|
def notes_with_associations
|
2016-06-03 18:47:09 +00:00
|
|
|
notes.includes(:author)
|
2016-05-26 11:38:28 +00:00
|
|
|
end
|
|
|
|
|
2013-03-31 15:49:58 +00:00
|
|
|
def method_missing(m, *args, &block)
|
|
|
|
@raw.send(m, *args, &block)
|
2013-03-21 20:50:18 +00:00
|
|
|
end
|
2013-03-31 20:48:12 +00:00
|
|
|
|
2015-05-23 22:38:44 +00:00
|
|
|
def respond_to_missing?(method, include_private = false)
|
|
|
|
@raw.respond_to?(method, include_private) || super
|
2013-03-31 20:48:12 +00:00
|
|
|
end
|
2014-09-25 09:19:26 +00:00
|
|
|
|
2014-10-10 13:30:14 +00:00
|
|
|
# Truncate sha to 8 characters
|
|
|
|
def short_id
|
|
|
|
@raw.short_id(7)
|
|
|
|
end
|
|
|
|
|
2016-06-20 16:51:48 +00:00
|
|
|
def diff_refs
|
|
|
|
Gitlab::Diff::DiffRefs.new(
|
2016-08-19 14:05:47 +00:00
|
|
|
base_sha: self.parent_id || Gitlab::Git::BLANK_SHA,
|
2016-06-20 16:51:48 +00:00
|
|
|
head_sha: self.sha
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
2016-06-02 14:19:18 +00:00
|
|
|
def pipelines
|
2016-10-26 16:48:32 +00:00
|
|
|
project.pipelines.where(sha: sha)
|
2015-10-06 10:01:16 +00:00
|
|
|
end
|
|
|
|
|
2016-11-03 15:39:37 +00:00
|
|
|
def status(ref = nil)
|
2016-11-03 15:43:17 +00:00
|
|
|
@statuses ||= {}
|
|
|
|
|
2016-10-27 19:12:12 +00:00
|
|
|
if @statuses.key?(ref)
|
|
|
|
@statuses[ref]
|
2016-10-26 16:48:32 +00:00
|
|
|
elsif ref
|
2016-10-27 19:12:12 +00:00
|
|
|
@statuses[ref] = pipelines.where(ref: ref).status
|
2016-10-26 16:48:32 +00:00
|
|
|
else
|
2016-10-27 19:12:12 +00:00
|
|
|
@statuses[ref] = pipelines.status
|
2016-10-26 16:48:32 +00:00
|
|
|
end
|
2015-10-06 10:01:16 +00:00
|
|
|
end
|
2015-12-04 14:23:21 +00:00
|
|
|
|
2016-02-03 23:28:40 +00:00
|
|
|
def revert_branch_name
|
2016-02-12 15:08:42 +00:00
|
|
|
"revert-#{short_id}"
|
2016-02-03 23:28:40 +00:00
|
|
|
end
|
2016-05-26 11:38:28 +00:00
|
|
|
|
2016-04-18 07:39:07 +00:00
|
|
|
def cherry_pick_branch_name
|
|
|
|
project.repository.next_branch("cherry-pick-#{short_id}", mild: true)
|
|
|
|
end
|
2016-02-03 23:28:40 +00:00
|
|
|
|
2016-02-15 03:36:30 +00:00
|
|
|
def revert_description
|
|
|
|
if merged_merge_request
|
|
|
|
"This reverts merge request #{merged_merge_request.to_reference}"
|
|
|
|
else
|
|
|
|
"This reverts commit #{sha}"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-02-03 23:28:40 +00:00
|
|
|
def revert_message
|
2016-03-22 23:01:31 +00:00
|
|
|
%Q{Revert "#{title.strip}"\n\n#{revert_description}}
|
2016-02-15 03:36:30 +00:00
|
|
|
end
|
2016-02-11 15:03:13 +00:00
|
|
|
|
2016-02-15 03:36:30 +00:00
|
|
|
def reverts_commit?(commit)
|
2016-02-22 14:46:39 +00:00
|
|
|
description? && description.include?(commit.revert_description)
|
2016-02-03 23:28:40 +00:00
|
|
|
end
|
|
|
|
|
2016-02-09 19:50:25 +00:00
|
|
|
def merge_commit?
|
2016-02-05 23:49:45 +00:00
|
|
|
parents.size > 1
|
|
|
|
end
|
|
|
|
|
2016-02-08 20:37:27 +00:00
|
|
|
def merged_merge_request
|
|
|
|
return @merged_merge_request if defined?(@merged_merge_request)
|
|
|
|
|
2016-02-18 16:58:04 +00:00
|
|
|
@merged_merge_request = project.merge_requests.find_by(merge_commit_sha: id) if merge_commit?
|
2016-02-08 20:37:27 +00:00
|
|
|
end
|
|
|
|
|
2016-02-15 03:36:30 +00:00
|
|
|
def has_been_reverted?(current_user = nil, noteable = self)
|
2016-05-26 11:38:28 +00:00
|
|
|
ext = all_references(current_user)
|
|
|
|
|
|
|
|
noteable.notes_with_associations.system.each do |note|
|
|
|
|
note.all_references(current_user, extractor: ext)
|
|
|
|
end
|
|
|
|
|
|
|
|
ext.commits.any? { |commit_ref| commit_ref.reverts_commit?(self) }
|
2016-02-15 03:36:30 +00:00
|
|
|
end
|
|
|
|
|
2016-04-18 07:39:07 +00:00
|
|
|
def change_type_title
|
|
|
|
merged_merge_request ? 'merge request' : 'commit'
|
|
|
|
end
|
|
|
|
|
2016-06-21 14:53:16 +00:00
|
|
|
# Get the URI type of the given path
|
|
|
|
#
|
|
|
|
# Used to build URLs to files in the repository in GFM.
|
|
|
|
#
|
|
|
|
# path - String path to check
|
|
|
|
#
|
|
|
|
# Examples:
|
|
|
|
#
|
|
|
|
# uri_type('doc/README.md') # => :blob
|
|
|
|
# uri_type('doc/logo.png') # => :raw
|
|
|
|
# uri_type('doc/api') # => :tree
|
|
|
|
# uri_type('not/found') # => :nil
|
|
|
|
#
|
|
|
|
# Returns a symbol
|
|
|
|
def uri_type(path)
|
|
|
|
entry = @raw.tree.path(path)
|
|
|
|
if entry[:type] == :blob
|
2016-07-25 15:08:36 +00:00
|
|
|
blob = ::Blob.decorate(Gitlab::Git::Blob.new(name: entry[:name]))
|
|
|
|
blob.image? || blob.video? ? :raw : :blob
|
2016-06-21 14:53:16 +00:00
|
|
|
else
|
|
|
|
entry[:type]
|
|
|
|
end
|
|
|
|
rescue Rugged::TreeError
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
|
2016-07-27 17:00:34 +00:00
|
|
|
def raw_diffs(*args)
|
|
|
|
raw.diffs(*args)
|
|
|
|
end
|
|
|
|
|
|
|
|
def diffs(diff_options = nil)
|
2016-07-26 07:21:42 +00:00
|
|
|
Gitlab::Diff::FileCollection::Commit.new(self, diff_options: diff_options)
|
|
|
|
end
|
|
|
|
|
2015-12-04 14:23:21 +00:00
|
|
|
private
|
|
|
|
|
2016-11-02 23:49:13 +00:00
|
|
|
def commit_reference(from_project, referable_commit_id)
|
|
|
|
reference = project.to_reference(from_project)
|
|
|
|
|
|
|
|
if reference.present?
|
|
|
|
"#{reference}#{self.class.reference_prefix}#{referable_commit_id}"
|
|
|
|
else
|
|
|
|
referable_commit_id
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-27 23:42:38 +00:00
|
|
|
def find_author_by_any_email
|
|
|
|
User.find_by_any_email(author_email.downcase)
|
|
|
|
end
|
|
|
|
|
2015-12-04 14:23:21 +00:00
|
|
|
def repo_changes
|
|
|
|
changes = { added: [], modified: [], removed: [] }
|
|
|
|
|
2016-07-29 17:31:37 +00:00
|
|
|
raw_diffs(deltas_only: true).each do |diff|
|
2015-12-07 13:13:06 +00:00
|
|
|
if diff.deleted_file
|
|
|
|
changes[:removed] << diff.old_path
|
|
|
|
elsif diff.renamed_file || diff.new_file
|
|
|
|
changes[:added] << diff.new_path
|
|
|
|
else
|
|
|
|
changes[:modified] << diff.new_path
|
2015-12-04 14:23:21 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
changes
|
|
|
|
end
|
2011-11-20 20:32:12 +00:00
|
|
|
end
|