From 0f245c0e560197752ec3cae32b74a558a79d5c12 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 15 May 2011 23:01:21 +0000 Subject: [PATCH] remove trailing white-spaces from changeset model source. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5792 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/changeset.rb | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 0bc35a7f..60ab8786 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -1,16 +1,16 @@ # Redmine - project management software -# Copyright (C) 2006-2010 Jean-Philippe Lang +# Copyright (C) 2006-2011 Jean-Philippe Lang # # 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. @@ -27,23 +27,23 @@ class Changeset < ActiveRecord::Base :description => :long_comments, :datetime => :committed_on, :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.identifier}} - + acts_as_searchable :columns => 'comments', :include => {:repository => :project}, :project_key => "#{Repository.table_name}.project_id", :date_column => 'committed_on' - + acts_as_activity_provider :timestamp => "#{table_name}.committed_on", :author_key => :user_id, :find_options => {:include => [:user, {:repository => :project}]} - + validates_presence_of :repository_id, :revision, :committed_on, :commit_date validates_uniqueness_of :revision, :scope => :repository_id validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true - + named_scope :visible, lambda {|*args| { :include => {:repository => :project}, :conditions => Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args) } } - + def revision=(r) write_attribute :revision, (r.nil? ? nil : r.to_s) end @@ -70,7 +70,7 @@ class Changeset < ActiveRecord::Base identifier end end - + def project repository.project end @@ -101,7 +101,7 @@ class Changeset < ActiveRecord::Base (\d+([\.,]\d+)?)h? ) /x - + def scan_comment_for_issue_ids return if comments.blank? # keywords used to reference issues @@ -109,15 +109,15 @@ class Changeset < ActiveRecord::Base ref_keywords_any = ref_keywords.delete('*') # keywords used to fix issues fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip) - + kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|") - + referenced_issues = [] - + comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match| action, refs = match[2], match[3] next unless action.present? || ref_keywords_any - + refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m| issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2] if issue @@ -127,15 +127,15 @@ class Changeset < ActiveRecord::Base end end end - + referenced_issues.uniq! self.issues = referenced_issues unless referenced_issues.empty? end - + def short_comments @short_comments || split_comments.first end - + def long_comments @long_comments || split_comments.last end @@ -189,19 +189,19 @@ class Changeset < ActiveRecord::Base end issue end - + def fix_issue(issue) status = IssueStatus.find_by_id(Setting.commit_fix_status_id.to_i) if status.nil? logger.warn("No status macthes commit_fix_status_id setting (#{Setting.commit_fix_status_id})") if logger return issue end - + # the issue may have been updated by the closure of another one (eg. duplicate) issue.reload # don't change the status is the issue is closed return if issue.status && issue.status.is_closed? - + journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, text_tag)) issue.status = status unless Setting.commit_fix_done_ratio.blank? @@ -225,7 +225,7 @@ class Changeset < ActiveRecord::Base :locale => Setting.default_language) ) time_entry.activity = log_time_activity unless log_time_activity.nil? - + unless time_entry.save logger.warn("TimeEntry could not be created by changeset #{id}: #{time_entry.errors.full_messages}") if logger end -- 2.11.0