2011-11-20 15:32:12 -05:00
|
|
|
class Commit
|
2012-01-28 09:47:55 -05:00
|
|
|
extend ActiveModel::Naming
|
2015-05-02 23:11:21 -04:00
|
|
|
|
|
|
|
include ActiveModel::Conversion
|
2017-03-09 20:29:11 -05:00
|
|
|
include Noteable
|
2015-04-21 09:23:20 -04:00
|
|
|
include Participable
|
2015-10-14 10:20:11 -04:00
|
|
|
include Mentionable
|
2015-05-02 23:11:21 -04:00
|
|
|
include Referable
|
|
|
|
include StaticModel
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2015-10-22 09:40:02 -04:00
|
|
|
attr_mentionable :safe_message, pipeline: :single_line
|
2016-05-26 07:38:28 -04:00
|
|
|
|
|
|
|
participant :author
|
|
|
|
participant :committer
|
|
|
|
participant :notes_with_associations
|
2011-11-28 04:46:41 -05:00
|
|
|
|
2015-04-21 09:09:15 -04:00
|
|
|
attr_accessor :project
|
|
|
|
|
2016-03-03 12:38:44 -05:00
|
|
|
DIFF_SAFE_LINES = Gitlab::Git::DiffCollection::DEFAULT_LIMITS[:max_lines]
|
2014-07-15 11:28:21 -04:00
|
|
|
|
2013-09-04 03:33:09 -04:00
|
|
|
# Commits above this size will not be rendered in HTML
|
2016-04-19 05:48:10 -04:00
|
|
|
DIFF_HARD_LIMIT_FILES = 1000
|
|
|
|
DIFF_HARD_LIMIT_LINES = 50000
|
2012-10-25 05:16:14 -04:00
|
|
|
|
2016-12-08 09:54:45 -05:00
|
|
|
# The SHA can be between 7 and 40 hex characters.
|
2017-02-21 18:32:18 -05:00
|
|
|
COMMIT_SHA_PATTERN = '\h{7,40}'.freeze
|
2016-12-08 09:54:45 -05:00
|
|
|
|
2014-02-03 11:13:24 -05:00
|
|
|
class << self
|
2015-04-21 09:09:15 -04:00
|
|
|
def decorate(commits, project)
|
2014-10-10 10:39:29 -04:00
|
|
|
commits.map do |commit|
|
2017-02-22 12:25:50 -05:00
|
|
|
if commit.is_a?(Commit)
|
2014-10-10 10:39:29 -04:00
|
|
|
commit
|
|
|
|
else
|
2015-04-21 09:09:15 -04:00
|
|
|
self.new(commit, project)
|
2014-10-10 10:39:29 -04:00
|
|
|
end
|
|
|
|
end
|
2014-02-03 11:13:24 -05:00
|
|
|
end
|
2013-04-01 09:04:35 -04:00
|
|
|
|
2014-02-03 11:13:24 -05:00
|
|
|
# Calculate number of lines to render for diffs
|
|
|
|
def diff_line_count(diffs)
|
2016-03-03 12:38:44 -05:00
|
|
|
diffs.reduce(0) { |sum, d| sum + Gitlab::Git::Util.count_lines(d.diff) }
|
2014-02-03 11:13:24 -05:00
|
|
|
end
|
2014-10-10 08:39:48 -04:00
|
|
|
|
2014-10-10 09:30:14 -04:00
|
|
|
# Truncate sha to 8 characters
|
2014-10-10 08:39:48 -04:00
|
|
|
def truncate_sha(sha)
|
2014-10-10 09:30:14 -04:00
|
|
|
sha[0..7]
|
2014-10-10 08:39:48 -04:00
|
|
|
end
|
2016-03-03 12:38:44 -05:00
|
|
|
|
|
|
|
def max_diff_options
|
|
|
|
{
|
|
|
|
max_files: DIFF_HARD_LIMIT_FILES,
|
|
|
|
max_lines: DIFF_HARD_LIMIT_LINES,
|
|
|
|
}
|
|
|
|
end
|
2016-11-24 09:07:44 -05:00
|
|
|
|
|
|
|
def from_hash(hash, project)
|
|
|
|
new(Gitlab::Git::Commit.new(hash), project)
|
|
|
|
end
|
2016-12-08 09:54:45 -05:00
|
|
|
|
|
|
|
def valid_hash?(key)
|
|
|
|
!!(/\A#{COMMIT_SHA_PATTERN}\z/ =~ key)
|
|
|
|
end
|
2013-09-04 03:33:09 -04:00
|
|
|
end
|
|
|
|
|
2013-03-31 11:49:58 -04:00
|
|
|
attr_accessor :raw
|
2012-09-27 02:20:36 -04:00
|
|
|
|
2015-04-21 09:09:15 -04:00
|
|
|
def initialize(raw_commit, project)
|
2013-01-04 17:35:38 -05:00
|
|
|
raise "Nil as raw commit passed" unless raw_commit
|
|
|
|
|
2013-03-31 11:49:58 -04:00
|
|
|
@raw = raw_commit
|
2015-04-21 09:09:15 -04:00
|
|
|
@project = project
|
2012-11-22 14:49:01 -05:00
|
|
|
end
|
2013-03-21 16:50:18 -04:00
|
|
|
|
2013-03-31 12:00:45 -04:00
|
|
|
def id
|
|
|
|
@raw.id
|
|
|
|
end
|
|
|
|
|
2015-05-02 22:41:37 -04:00
|
|
|
def ==(other)
|
|
|
|
(self.class === other) && (raw == other.raw)
|
|
|
|
end
|
|
|
|
|
2015-05-14 16:59:39 -04:00
|
|
|
def self.reference_prefix
|
|
|
|
'@'
|
|
|
|
end
|
|
|
|
|
|
|
|
# Pattern used to extract commit references from text
|
|
|
|
#
|
|
|
|
# This pattern supports cross-project references.
|
|
|
|
def self.reference_pattern
|
2016-03-24 11:41:48 -04:00
|
|
|
@reference_pattern ||= %r{
|
2015-05-15 16:10:55 -04:00
|
|
|
(?:#{Project.reference_pattern}#{reference_prefix})?
|
2016-01-29 19:49:07 -05:00
|
|
|
(?<commit>\h{7,40})
|
2015-05-15 16:10:55 -04:00
|
|
|
}x
|
2015-05-14 16:59:39 -04:00
|
|
|
end
|
|
|
|
|
2015-11-30 15:14:46 -05:00
|
|
|
def self.link_reference_pattern
|
2016-12-08 09:54:45 -05:00
|
|
|
@link_reference_pattern ||= super("commit", /(?<commit>#{COMMIT_SHA_PATTERN})/)
|
2015-11-30 15:14:46 -05:00
|
|
|
end
|
|
|
|
|
2016-12-21 11:41:33 -05:00
|
|
|
def to_reference(from_project = nil, full: false)
|
|
|
|
commit_reference(from_project, id, full: full)
|
2015-12-01 06:58:45 -05:00
|
|
|
end
|
|
|
|
|
2017-01-10 18:53:51 -05:00
|
|
|
def reference_link_text(from_project = nil, full: false)
|
|
|
|
commit_reference(from_project, short_id, full: full)
|
2015-05-02 23:11:21 -04:00
|
|
|
end
|
|
|
|
|
2013-09-04 03:33:09 -04:00
|
|
|
def diff_line_count
|
2017-02-21 19:51:36 -05:00
|
|
|
@diff_line_count ||= Commit.diff_line_count(raw_diffs)
|
2013-09-04 03:33:09 -04:00
|
|
|
@diff_line_count
|
|
|
|
end
|
|
|
|
|
2013-03-31 16:48:12 -04:00
|
|
|
# Returns the commits title.
|
|
|
|
#
|
|
|
|
# Usually, the commit title is the first line of the commit message.
|
2013-08-12 15:28:31 -04: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 16:48:12 -04:00
|
|
|
def title
|
2016-07-26 00:49:06 -04:00
|
|
|
full_title.length > 100 ? full_title[0..79] << "…" : full_title
|
|
|
|
end
|
2013-03-31 16:48:12 -04:00
|
|
|
|
2016-07-26 00:49:06 -04:00
|
|
|
# Returns the full commits title
|
|
|
|
def full_title
|
|
|
|
return @full_title if @full_title
|
2013-03-31 16:48:12 -04:00
|
|
|
|
2017-02-22 10:10:32 -05:00
|
|
|
@full_title =
|
|
|
|
if safe_message.blank?
|
|
|
|
no_commit_message
|
|
|
|
else
|
|
|
|
safe_message.split("\n", 2).first
|
|
|
|
end
|
2013-03-31 16:48:12 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
# Returns the commits description
|
|
|
|
#
|
|
|
|
# cut off, ellipses (`&hellp;`) are prepended to the commit message.
|
|
|
|
def description
|
2014-10-19 10:09:38 -04:00
|
|
|
title_end = safe_message.index("\n")
|
2015-02-03 00:38:50 -05:00
|
|
|
@description ||=
|
|
|
|
if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
|
2015-04-14 09:45:06 -04:00
|
|
|
"…" << safe_message[80..-1]
|
2015-02-03 00:38:50 -05:00
|
|
|
else
|
|
|
|
safe_message.split("\n", 2)[1].try(:chomp)
|
|
|
|
end
|
2014-02-25 08:54:30 -05:00
|
|
|
end
|
2013-03-31 16:48:12 -04:00
|
|
|
|
2014-02-25 08:54:30 -05:00
|
|
|
def description?
|
|
|
|
description.present?
|
2013-03-31 16:48:12 -04:00
|
|
|
end
|
|
|
|
|
2015-12-07 08:13:06 -05:00
|
|
|
def hook_attrs(with_changed_files: false)
|
2015-12-07 07:11:15 -05:00
|
|
|
data = {
|
2014-09-15 03:10:35 -04:00
|
|
|
id: id,
|
|
|
|
message: safe_message,
|
|
|
|
timestamp: committed_date.xmlschema,
|
2016-04-13 05:25:42 -04:00
|
|
|
url: Gitlab::UrlBuilder.build(self),
|
2014-09-15 03:10:35 -04:00
|
|
|
author: {
|
|
|
|
name: author_name,
|
|
|
|
email: author_email
|
|
|
|
}
|
|
|
|
}
|
2015-12-07 07:11:15 -05:00
|
|
|
|
|
|
|
if with_changed_files
|
2015-12-07 08:13:06 -05:00
|
|
|
data.merge!(repo_changes)
|
2015-12-07 07:11:15 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
data
|
2014-09-15 03:10:35 -04:00
|
|
|
end
|
|
|
|
|
2013-05-30 19:16:49 -04:00
|
|
|
# Discover issues should be closed when this commit is pushed to a project's
|
|
|
|
# default branch.
|
2015-04-21 09:15:49 -04:00
|
|
|
def closes_issues(current_user = self.committer)
|
2015-04-03 12:03:26 -04:00
|
|
|
Gitlab::ClosingIssueExtractor.new(project, current_user).closed_by_message(safe_message)
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
|
|
|
|
2015-03-27 07:16:34 -04:00
|
|
|
def author
|
2016-07-27 19:42:38 -04: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 18:35:53 -04:00
|
|
|
end
|
2015-03-27 07:16:34 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def committer
|
2015-12-04 16:54:25 -05:00
|
|
|
@committer ||= User.find_by_any_email(committer_email.downcase)
|
2015-03-27 07:16:34 -04:00
|
|
|
end
|
|
|
|
|
2015-10-20 08:23:56 -04: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 09:15:49 -04:00
|
|
|
def notes
|
2015-04-15 09:56:21 -04:00
|
|
|
project.notes.for_commit_id(self.id)
|
|
|
|
end
|
|
|
|
|
2017-03-09 20:29:11 -05:00
|
|
|
def discussion_notes
|
|
|
|
notes.non_diff_notes
|
|
|
|
end
|
|
|
|
|
2016-05-26 07:38:28 -04:00
|
|
|
def notes_with_associations
|
2016-06-03 14:47:09 -04:00
|
|
|
notes.includes(:author)
|
2016-05-26 07:38:28 -04:00
|
|
|
end
|
|
|
|
|
2013-03-31 11:49:58 -04:00
|
|
|
def method_missing(m, *args, &block)
|
|
|
|
@raw.send(m, *args, &block)
|
2013-03-21 16:50:18 -04:00
|
|
|
end
|
2013-03-31 16:48:12 -04:00
|
|
|
|
2015-05-23 18:38:44 -04:00
|
|
|
def respond_to_missing?(method, include_private = false)
|
|
|
|
@raw.respond_to?(method, include_private) || super
|
2013-03-31 16:48:12 -04:00
|
|
|
end
|
2014-09-25 05:19:26 -04:00
|
|
|
|
2014-10-10 09:30:14 -04:00
|
|
|
# Truncate sha to 8 characters
|
|
|
|
def short_id
|
|
|
|
@raw.short_id(7)
|
|
|
|
end
|
|
|
|
|
2016-06-20 12:51:48 -04:00
|
|
|
def diff_refs
|
|
|
|
Gitlab::Diff::DiffRefs.new(
|
2016-08-19 10:05:47 -04:00
|
|
|
base_sha: self.parent_id || Gitlab::Git::BLANK_SHA,
|
2016-06-20 12:51:48 -04:00
|
|
|
head_sha: self.sha
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
2016-06-02 10:19:18 -04:00
|
|
|
def pipelines
|
2016-10-26 12:48:32 -04:00
|
|
|
project.pipelines.where(sha: sha)
|
2015-10-06 06:01:16 -04:00
|
|
|
end
|
|
|
|
|
2017-03-15 20:44:31 -04:00
|
|
|
def latest_pipeline
|
|
|
|
pipelines.last
|
|
|
|
end
|
|
|
|
|
2016-11-03 11:39:37 -04:00
|
|
|
def status(ref = nil)
|
2016-11-03 11:43:17 -04:00
|
|
|
@statuses ||= {}
|
|
|
|
|
2016-11-07 10:44:11 -05:00
|
|
|
return @statuses[ref] if @statuses.key?(ref)
|
|
|
|
|
2016-12-14 08:00:06 -05:00
|
|
|
@statuses[ref] = pipelines.latest_status(ref)
|
2015-10-06 06:01:16 -04:00
|
|
|
end
|
2015-12-04 09:23:21 -05:00
|
|
|
|
2016-02-03 18:28:40 -05:00
|
|
|
def revert_branch_name
|
2016-02-12 10:08:42 -05:00
|
|
|
"revert-#{short_id}"
|
2016-02-03 18:28:40 -05:00
|
|
|
end
|
2016-05-26 07:38:28 -04:00
|
|
|
|
2016-04-18 03:39:07 -04:00
|
|
|
def cherry_pick_branch_name
|
|
|
|
project.repository.next_branch("cherry-pick-#{short_id}", mild: true)
|
|
|
|
end
|
2016-02-03 18:28:40 -05:00
|
|
|
|
2016-11-29 08:47:43 -05:00
|
|
|
def revert_description(user)
|
|
|
|
if merged_merge_request?(user)
|
|
|
|
"This reverts merge request #{merged_merge_request(user).to_reference}"
|
2016-02-14 22:36:30 -05:00
|
|
|
else
|
|
|
|
"This reverts commit #{sha}"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-11-29 08:47:43 -05:00
|
|
|
def revert_message(user)
|
2017-02-22 17:39:43 -05:00
|
|
|
%Q{Revert "#{title.strip}"\n\n#{revert_description(user)}}
|
2016-02-14 22:36:30 -05:00
|
|
|
end
|
2016-02-11 10:03:13 -05:00
|
|
|
|
2016-11-29 08:47:43 -05:00
|
|
|
def reverts_commit?(commit, user)
|
|
|
|
description? && description.include?(commit.revert_description(user))
|
2016-02-03 18:28:40 -05:00
|
|
|
end
|
|
|
|
|
2016-02-09 14:50:25 -05:00
|
|
|
def merge_commit?
|
2016-02-05 18:49:45 -05:00
|
|
|
parents.size > 1
|
|
|
|
end
|
|
|
|
|
2016-11-29 08:47:43 -05:00
|
|
|
def merged_merge_request(current_user)
|
|
|
|
# Memoize with per-user access check
|
|
|
|
@merged_merge_request_hash ||= Hash.new do |hash, user|
|
|
|
|
hash[user] = merged_merge_request_no_cache(user)
|
|
|
|
end
|
2016-12-14 08:00:06 -05:00
|
|
|
|
2016-11-29 08:47:43 -05:00
|
|
|
@merged_merge_request_hash[current_user]
|
2016-02-08 15:37:27 -05:00
|
|
|
end
|
|
|
|
|
2016-11-29 08:47:43 -05:00
|
|
|
def has_been_reverted?(current_user, noteable = self)
|
2016-05-26 07:38:28 -04:00
|
|
|
ext = all_references(current_user)
|
|
|
|
|
|
|
|
noteable.notes_with_associations.system.each do |note|
|
|
|
|
note.all_references(current_user, extractor: ext)
|
|
|
|
end
|
|
|
|
|
2016-11-29 08:47:43 -05:00
|
|
|
ext.commits.any? { |commit_ref| commit_ref.reverts_commit?(self, current_user) }
|
2016-02-14 22:36:30 -05:00
|
|
|
end
|
|
|
|
|
2016-11-29 08:47:43 -05:00
|
|
|
def change_type_title(user)
|
|
|
|
merged_merge_request?(user) ? 'merge request' : 'commit'
|
2016-04-18 03:39:07 -04:00
|
|
|
end
|
|
|
|
|
2016-06-21 10:53:16 -04: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
|
2017-04-13 12:59:52 -04:00
|
|
|
blob = ::Blob.decorate(Gitlab::Git::Blob.new(name: entry[:name]), @project)
|
2016-07-25 11:08:36 -04:00
|
|
|
blob.image? || blob.video? ? :raw : :blob
|
2016-06-21 10:53:16 -04:00
|
|
|
else
|
|
|
|
entry[:type]
|
|
|
|
end
|
|
|
|
rescue Rugged::TreeError
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
|
2016-07-27 13:00:34 -04:00
|
|
|
def raw_diffs(*args)
|
2017-03-28 21:23:45 -04:00
|
|
|
# NOTE: This feature is intentionally disabled until
|
|
|
|
# https://gitlab.com/gitlab-org/gitaly/issues/178 is resolved
|
|
|
|
# if Gitlab::GitalyClient.feature_enabled?(:commit_raw_diffs)
|
|
|
|
# Gitlab::GitalyClient::Commit.diff_from_parent(self, *args)
|
|
|
|
# else
|
|
|
|
raw.diffs(*args)
|
|
|
|
# end
|
2016-07-27 13:00:34 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def diffs(diff_options = nil)
|
2016-07-26 03:21:42 -04:00
|
|
|
Gitlab::Diff::FileCollection::Commit.new(self, diff_options: diff_options)
|
|
|
|
end
|
|
|
|
|
2016-04-18 04:27:51 -04:00
|
|
|
def persisted?
|
|
|
|
true
|
|
|
|
end
|
|
|
|
|
|
|
|
def touch
|
|
|
|
# no-op but needs to be defined since #persisted? is defined
|
|
|
|
end
|
|
|
|
|
2016-12-15 15:48:26 -05:00
|
|
|
WIP_REGEX = /\A\s*(((?i)(\[WIP\]|WIP:|WIP)\s|WIP$))|(fixup!|squash!)\s/.freeze
|
|
|
|
|
|
|
|
def work_in_progress?
|
|
|
|
!!(title =~ WIP_REGEX)
|
|
|
|
end
|
|
|
|
|
2015-12-04 09:23:21 -05:00
|
|
|
private
|
|
|
|
|
2016-12-21 11:41:33 -05:00
|
|
|
def commit_reference(from_project, referable_commit_id, full: false)
|
|
|
|
reference = project.to_reference(from_project, full: full)
|
2016-11-02 19:49:13 -04:00
|
|
|
|
|
|
|
if reference.present?
|
|
|
|
"#{reference}#{self.class.reference_prefix}#{referable_commit_id}"
|
|
|
|
else
|
|
|
|
referable_commit_id
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-27 19:42:38 -04:00
|
|
|
def find_author_by_any_email
|
|
|
|
User.find_by_any_email(author_email.downcase)
|
|
|
|
end
|
|
|
|
|
2015-12-04 09:23:21 -05:00
|
|
|
def repo_changes
|
|
|
|
changes = { added: [], modified: [], removed: [] }
|
|
|
|
|
2016-07-29 13:31:37 -04:00
|
|
|
raw_diffs(deltas_only: true).each do |diff|
|
2015-12-07 08:13:06 -05: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 09:23:21 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
changes
|
|
|
|
end
|
2016-11-29 08:47:43 -05:00
|
|
|
|
|
|
|
def merged_merge_request?(user)
|
|
|
|
!!merged_merge_request(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
def merged_merge_request_no_cache(user)
|
|
|
|
MergeRequestsFinder.new(user, project_id: project.id).find_by(merge_commit_sha: id) if merge_commit?
|
|
|
|
end
|
2011-11-20 15:32:12 -05:00
|
|
|
end
|