2008-11-10 21:59:06 +03:00
|
|
|
# Redmine - project management software
|
2010-02-20 14:24:41 +03:00
|
|
|
# Copyright (C) 2006-2010 Jean-Philippe Lang
|
2007-03-25 16:12:15 +04:00
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or
|
|
|
|
# modify it under the terms of the GNU General Public License
|
|
|
|
# as published by the Free Software Foundation; either version 2
|
|
|
|
# of the License, or (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software
|
|
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
2008-08-26 16:13:15 +04:00
|
|
|
require 'iconv'
|
|
|
|
|
2007-03-25 16:12:15 +04:00
|
|
|
class Changeset < ActiveRecord::Base
|
|
|
|
belongs_to :repository
|
2008-11-10 21:59:06 +03:00
|
|
|
belongs_to :user
|
2007-03-25 16:12:15 +04:00
|
|
|
has_many :changes, :dependent => :delete_all
|
2007-04-24 17:57:27 +04:00
|
|
|
has_and_belongs_to_many :issues
|
2007-08-29 20:52:35 +04:00
|
|
|
|
2009-02-01 18:48:56 +03:00
|
|
|
acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},
|
|
|
|
:description => :long_comments,
|
2007-08-29 20:52:35 +04:00
|
|
|
:datetime => :committed_on,
|
2009-04-07 21:30:56 +04:00
|
|
|
:url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.revision}}
|
2007-09-27 21:28:22 +04:00
|
|
|
|
|
|
|
acts_as_searchable :columns => 'comments',
|
2008-05-18 20:15:22 +04:00
|
|
|
:include => {:repository => :project},
|
2007-09-27 21:28:22 +04:00
|
|
|
:project_key => "#{Repository.table_name}.project_id",
|
|
|
|
:date_column => 'committed_on'
|
2008-07-27 21:54:09 +04:00
|
|
|
|
|
|
|
acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
|
2008-11-30 14:18:22 +03:00
|
|
|
:author_key => :user_id,
|
2009-04-07 21:30:56 +04:00
|
|
|
:find_options => {:include => [:user, {:repository => :project}]}
|
2007-03-25 16:12:15 +04:00
|
|
|
|
2007-03-25 21:11:46 +04:00
|
|
|
validates_presence_of :repository_id, :revision, :committed_on, :commit_date
|
2007-03-25 16:12:15 +04:00
|
|
|
validates_uniqueness_of :revision, :scope => :repository_id
|
2007-06-24 23:30:38 +04:00
|
|
|
validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
|
2007-03-25 21:11:46 +04:00
|
|
|
|
2010-01-31 19:25:06 +03:00
|
|
|
named_scope :visible, lambda {|*args| { :include => {:repository => :project},
|
|
|
|
:conditions => Project.allowed_to_condition(args.first || User.current, :view_changesets) } }
|
|
|
|
|
2008-04-26 21:56:26 +04:00
|
|
|
def revision=(r)
|
|
|
|
write_attribute :revision, (r.nil? ? nil : r.to_s)
|
|
|
|
end
|
|
|
|
|
2007-08-25 18:41:55 +04:00
|
|
|
def comments=(comment)
|
2008-08-26 16:28:15 +04:00
|
|
|
write_attribute(:comments, Changeset.normalize_comments(comment))
|
2007-08-25 18:41:55 +04:00
|
|
|
end
|
|
|
|
|
2007-03-25 21:11:46 +04:00
|
|
|
def committed_on=(date)
|
|
|
|
self.commit_date = date
|
|
|
|
super
|
|
|
|
end
|
2007-04-24 17:57:27 +04:00
|
|
|
|
2010-02-20 14:24:41 +03:00
|
|
|
def committer=(arg)
|
|
|
|
write_attribute(:committer, self.class.to_utf8(arg.to_s))
|
|
|
|
end
|
|
|
|
|
2008-03-11 22:33:38 +03:00
|
|
|
def project
|
|
|
|
repository.project
|
|
|
|
end
|
|
|
|
|
2008-11-10 21:59:06 +03:00
|
|
|
def author
|
|
|
|
user || committer.to_s.split('<').first
|
|
|
|
end
|
|
|
|
|
|
|
|
def before_create
|
|
|
|
self.user = repository.find_committer_user(committer)
|
|
|
|
end
|
|
|
|
|
2007-04-24 17:57:27 +04:00
|
|
|
def after_create
|
|
|
|
scan_comment_for_issue_ids
|
|
|
|
end
|
2008-02-06 23:02:30 +03:00
|
|
|
require 'pp'
|
2007-04-24 17:57:27 +04:00
|
|
|
|
|
|
|
def scan_comment_for_issue_ids
|
2007-04-25 19:06:20 +04:00
|
|
|
return if comments.blank?
|
2007-04-24 17:57:27 +04:00
|
|
|
# keywords used to reference issues
|
2007-10-22 20:52:36 +04:00
|
|
|
ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
|
2007-04-24 17:57:27 +04:00
|
|
|
# keywords used to fix issues
|
2007-10-22 20:52:36 +04:00
|
|
|
fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
|
2007-04-24 17:57:27 +04:00
|
|
|
|
2007-10-22 20:52:36 +04:00
|
|
|
kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
|
2007-04-24 17:57:27 +04:00
|
|
|
return if kw_regexp.blank?
|
|
|
|
|
2007-10-22 20:52:36 +04:00
|
|
|
referenced_issues = []
|
2007-11-20 15:07:28 +03:00
|
|
|
|
|
|
|
if ref_keywords.delete('*')
|
|
|
|
# find any issue ID in the comments
|
|
|
|
target_issue_ids = []
|
2009-09-03 05:21:11 +04:00
|
|
|
comments.scan(%r{([\s\(\[,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
|
2010-01-31 19:25:06 +03:00
|
|
|
referenced_issues += find_referenced_issues_by_id(target_issue_ids)
|
2007-11-20 15:07:28 +03:00
|
|
|
end
|
|
|
|
|
2007-04-25 19:06:20 +04:00
|
|
|
comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
|
2007-04-24 17:57:27 +04:00
|
|
|
action = match[0]
|
|
|
|
target_issue_ids = match[1].scan(/\d+/)
|
2010-01-31 19:25:06 +03:00
|
|
|
target_issues = find_referenced_issues_by_id(target_issue_ids)
|
2010-02-21 17:43:45 +03:00
|
|
|
if fix_keywords.include?(action.downcase) && fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
|
2007-04-24 17:57:27 +04:00
|
|
|
# update status of issues
|
|
|
|
logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
|
|
|
|
target_issues.each do |issue|
|
2008-03-01 12:00:02 +03:00
|
|
|
# the issue may have been updated by the closure of another one (eg. duplicate)
|
|
|
|
issue.reload
|
2008-02-06 23:02:30 +03:00
|
|
|
# don't change the status is the issue is closed
|
2007-04-24 17:57:27 +04:00
|
|
|
next if issue.status.is_closed?
|
2008-03-12 23:28:49 +03:00
|
|
|
csettext = "r#{self.revision}"
|
|
|
|
if self.scmid && (! (csettext =~ /^r[0-9]+$/))
|
|
|
|
csettext = "commit:\"#{self.scmid}\""
|
|
|
|
end
|
2009-02-21 14:04:50 +03:00
|
|
|
journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))
|
2007-04-24 17:57:27 +04:00
|
|
|
issue.status = fix_status
|
2010-02-21 17:43:45 +03:00
|
|
|
unless Setting.commit_fix_done_ratio.blank?
|
|
|
|
issue.done_ratio = Setting.commit_fix_done_ratio.to_i
|
|
|
|
end
|
2009-05-31 02:34:27 +04:00
|
|
|
Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
|
|
|
|
{ :changeset => self, :issue => issue })
|
2007-04-24 17:57:27 +04:00
|
|
|
issue.save
|
|
|
|
end
|
|
|
|
end
|
2007-10-22 20:52:36 +04:00
|
|
|
referenced_issues += target_issues
|
2007-04-24 17:57:27 +04:00
|
|
|
end
|
2007-11-20 15:07:28 +03:00
|
|
|
|
2010-02-21 17:43:45 +03:00
|
|
|
referenced_issues.uniq!
|
|
|
|
self.issues = referenced_issues unless referenced_issues.empty?
|
2007-04-24 17:57:27 +04:00
|
|
|
end
|
2008-02-06 23:02:30 +03:00
|
|
|
|
2009-02-01 18:48:56 +03:00
|
|
|
def short_comments
|
|
|
|
@short_comments || split_comments.first
|
|
|
|
end
|
|
|
|
|
|
|
|
def long_comments
|
|
|
|
@long_comments || split_comments.last
|
|
|
|
end
|
|
|
|
|
2007-12-01 20:15:42 +03:00
|
|
|
# Returns the previous changeset
|
|
|
|
def previous
|
2008-03-12 23:28:49 +03:00
|
|
|
@previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
|
2007-12-01 20:15:42 +03:00
|
|
|
end
|
|
|
|
|
|
|
|
# Returns the next changeset
|
|
|
|
def next
|
2008-03-12 23:28:49 +03:00
|
|
|
@next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
|
2007-12-01 20:15:42 +03:00
|
|
|
end
|
2008-08-26 16:13:15 +04:00
|
|
|
|
2008-08-26 16:28:15 +04:00
|
|
|
# Strips and reencodes a commit log before insertion into the database
|
|
|
|
def self.normalize_comments(str)
|
|
|
|
to_utf8(str.to_s.strip)
|
|
|
|
end
|
2010-02-02 20:02:32 +03:00
|
|
|
|
|
|
|
# Creates a new Change from it's common parameters
|
|
|
|
def create_change(change)
|
|
|
|
Change.create(:changeset => self,
|
|
|
|
:action => change[:action],
|
|
|
|
:path => change[:path],
|
|
|
|
:from_path => change[:from_path],
|
|
|
|
:from_revision => change[:from_revision])
|
|
|
|
end
|
2008-08-26 16:28:15 +04:00
|
|
|
|
2008-08-26 16:13:15 +04:00
|
|
|
private
|
2008-11-10 21:59:06 +03:00
|
|
|
|
2010-01-31 19:25:06 +03:00
|
|
|
# Finds issues that can be referenced by the commit message
|
|
|
|
# i.e. issues that belong to the repository project, a subproject or a parent project
|
|
|
|
def find_referenced_issues_by_id(ids)
|
2010-02-21 17:43:45 +03:00
|
|
|
return [] if ids.compact.empty?
|
2010-01-31 19:25:06 +03:00
|
|
|
Issue.find_all_by_id(ids, :include => :project).select {|issue|
|
|
|
|
project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project)
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
2009-02-01 18:48:56 +03:00
|
|
|
def split_comments
|
|
|
|
comments =~ /\A(.+?)\r?\n(.*)$/m
|
|
|
|
@short_comments = $1 || comments
|
|
|
|
@long_comments = $2.to_s.strip
|
|
|
|
return @short_comments, @long_comments
|
|
|
|
end
|
2008-11-10 21:59:06 +03:00
|
|
|
|
2008-08-26 16:28:15 +04:00
|
|
|
def self.to_utf8(str)
|
2008-08-26 16:13:15 +04:00
|
|
|
return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
|
|
|
|
encoding = Setting.commit_logs_encoding.to_s.strip
|
|
|
|
unless encoding.blank? || encoding == 'UTF-8'
|
|
|
|
begin
|
2010-02-20 14:24:41 +03:00
|
|
|
str = Iconv.conv('UTF-8', encoding, str)
|
2008-08-26 16:13:15 +04:00
|
|
|
rescue Iconv::Failure
|
|
|
|
# do nothing here
|
|
|
|
end
|
|
|
|
end
|
2010-02-20 14:24:41 +03:00
|
|
|
# removes invalid UTF8 sequences
|
2010-04-11 17:55:30 +04:00
|
|
|
begin
|
|
|
|
Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + ' ')[0..-3]
|
|
|
|
rescue Iconv::InvalidEncoding
|
|
|
|
# "UTF-8//IGNORE" is not supported on some OS
|
|
|
|
str
|
|
|
|
end
|
2008-08-26 16:13:15 +04:00
|
|
|
end
|
2007-03-25 16:12:15 +04:00
|
|
|
end
|