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
|
|
|
|
|
|
|
attr_mentionable :safe_message
|
2015-10-14 14:20:11 +00:00
|
|
|
participant :author, :committer, :notes
|
2011-11-28 09:46:41 +00:00
|
|
|
|
2015-04-21 13:09:15 +00:00
|
|
|
attr_accessor :project
|
|
|
|
|
2013-09-04 07:33:09 +00:00
|
|
|
# Safe amount of changes (files and lines) in one commit to render
|
2012-10-25 09:16:14 +00:00
|
|
|
# Used to prevent 500 error on huge commits by suppressing diff
|
|
|
|
#
|
2013-09-04 07:33:09 +00:00
|
|
|
# User can force display of diff above this size
|
2014-12-14 14:13:09 +00:00
|
|
|
DIFF_SAFE_FILES = 100 unless defined?(DIFF_SAFE_FILES)
|
|
|
|
DIFF_SAFE_LINES = 5000 unless defined?(DIFF_SAFE_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
|
2014-12-14 14:13:09 +00:00
|
|
|
DIFF_HARD_LIMIT_FILES = 1000 unless defined?(DIFF_HARD_LIMIT_FILES)
|
|
|
|
DIFF_HARD_LIMIT_LINES = 50000 unless defined?(DIFF_HARD_LIMIT_LINES)
|
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)
|
2014-07-15 15:28:21 +00:00
|
|
|
diffs.reduce(0) { |sum, d| sum + d.diff.lines.count }
|
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
|
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
|
|
|
|
#
|
|
|
|
# The SHA can be between 6 and 40 hex characters.
|
|
|
|
#
|
|
|
|
# This pattern supports cross-project references.
|
|
|
|
def self.reference_pattern
|
2015-05-15 20:10:55 +00:00
|
|
|
%r{
|
|
|
|
(?:#{Project.reference_pattern}#{reference_prefix})?
|
|
|
|
(?<commit>\h{6,40})
|
|
|
|
}x
|
2015-05-14 20:59:39 +00:00
|
|
|
end
|
|
|
|
|
2015-05-03 03:11:21 +00:00
|
|
|
def to_reference(from_project = nil)
|
|
|
|
if cross_project_reference?(from_project)
|
|
|
|
"#{project.to_reference}@#{id}"
|
|
|
|
else
|
|
|
|
id
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2013-09-04 07:33:09 +00:00
|
|
|
def diff_line_count
|
|
|
|
@diff_line_count ||= Commit::diff_line_count(self.diffs)
|
|
|
|
@diff_line_count
|
|
|
|
end
|
|
|
|
|
2013-03-31 20:48:12 +00:00
|
|
|
# Returns a string describing the commit for use in a link title
|
|
|
|
#
|
|
|
|
# Example
|
|
|
|
#
|
|
|
|
# "Commit: Alex Denisov - Project git clone panel"
|
|
|
|
def link_title
|
|
|
|
"Commit: #{author_name} - #{title}"
|
|
|
|
end
|
|
|
|
|
|
|
|
# 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
|
|
|
|
title = safe_message
|
|
|
|
|
|
|
|
return no_commit_message if title.blank?
|
|
|
|
|
2014-10-19 14:09:38 +00:00
|
|
|
title_end = title.index("\n")
|
2013-08-12 19:28:31 +00:00
|
|
|
if (!title_end && title.length > 100) || (title_end && title_end > 100)
|
2015-04-14 13:45:06 +00:00
|
|
|
title[0..79] << "…"
|
2013-03-31 20:48:12 +00:00
|
|
|
else
|
2014-10-19 14:09:38 +00:00
|
|
|
title.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-04-21 13:15:49 +00:00
|
|
|
def hook_attrs
|
2014-09-15 07:10:35 +00:00
|
|
|
path_with_namespace = project.path_with_namespace
|
|
|
|
|
|
|
|
{
|
|
|
|
id: id,
|
|
|
|
message: safe_message,
|
|
|
|
timestamp: committed_date.xmlschema,
|
|
|
|
url: "#{Gitlab.config.gitlab.url}/#{path_with_namespace}/commit/#{id}",
|
|
|
|
author: {
|
|
|
|
name: author_name,
|
|
|
|
email: author_email
|
|
|
|
}
|
|
|
|
}
|
|
|
|
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
|
2015-06-23 22:04:21 +00:00
|
|
|
@author ||= User.find_by_any_email(author_email)
|
2015-03-27 11:16:34 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def committer
|
2015-06-23 22:04:21 +00:00
|
|
|
@committer ||= User.find_by_any_email(committer_email)
|
2015-03-27 11:16:34 +00:00
|
|
|
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
|
|
|
|
|
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
|
|
|
|
|
2014-09-25 09:19:26 +00:00
|
|
|
def parents
|
2015-04-21 13:09:15 +00:00
|
|
|
@parents ||= Commit.decorate(super, project)
|
2014-09-25 09:19:26 +00:00
|
|
|
end
|
2015-10-06 10:01:16 +00:00
|
|
|
|
|
|
|
def ci_commit
|
|
|
|
project.ci_commit(sha)
|
|
|
|
end
|
|
|
|
|
|
|
|
def status
|
|
|
|
ci_commit.try(:status) || :not_found
|
|
|
|
end
|
2011-11-20 20:32:12 +00:00
|
|
|
end
|