jro_apps/redmine Commit - r848:b30b6717a271

Commit message parser:...

Jean-Philippe Lang -

r848:b30b6717a271

parent child

Context file:

r848:b30b6717a271

Collapse all files

app/models/changeset.rb +6 -7

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             class Changeset < ActiveRecord::Base
               belongs_to :repository
               has_many :changes, :dependent => :delete_all
               has_and_belongs_to_many :issues
               acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))},
                             :description => :comments,
                             :datetime => :committed_on,
                             :author => :committer,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
               acts_as_searchable :columns => 'comments',
                                  :include => :repository,
                                  :project_key => "#{Repository.table_name}.project_id",
                                  :date_column => 'committed_on'
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_numericality_of :revision, :only_integer => true
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               def comments=(comment)
                 write_attribute(:comments, comment.strip)
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               def after_create
                 scan_comment_for_issue_ids
               end
               def scan_comment_for_issue_ids
                 return if comments.blank?
                 # keywords used to reference issues
-                ref_keywords = Setting.commit_ref_keywords.downcase.split(",")
+                ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
                 # keywords used to fix issues
-                fix_keywords = Setting.commit_fix_keywords.downcase.split(",")
+                fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
                 # status and optional done ratio applied
                 fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
                 done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
-                kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw.strip)}.join("|")
+                kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                 return if kw_regexp.blank?
-                # remove any associated issues
+                referenced_issues = []
-                self.issues.clear
                 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
                   target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
                   if fix_status && fix_keywords.include?(action.downcase)
                     # update status of issues
                     logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
                     target_issues.each do |issue|
                       # don't change the status is the issue is already closed
                       next if issue.status.is_closed?
                       issue.status = fix_status
                       issue.done_ratio = done_ratio if done_ratio
                       issue.save
                     end
                   end
-                  self.issues << target_issues
+                  referenced_issues += target_issues
                 end
+                self.issues = referenced_issues.uniq
               end
             end

test/fixtures/changesets.yml +1 -1

             ---
             changesets_001:
               commit_date: 2007-04-11
               committed_on: 2007-04-11 15:14:44 +02:00
               revision: 1
               id: 100
               comments: My very first commit
               repository_id: 10
               committer: dlopper
             changesets_002:
               commit_date: 2007-04-12
               committed_on: 2007-04-12 15:14:44 +02:00
               revision: 2
               id: 101
-              comments: 'This commit fixes #1, #2 and references #3'
+              comments: 'This commit fixes #1, #2 and references #1 & #3'
               repository_id: 10
               committer: dlopper
             changesets_003:
               commit_date: 2007-04-12
               committed_on: 2007-04-12 15:14:44 +02:00
               revision: 3
               id: 102
               comments: |-
                 A commit with wrong issue ids
                 IssueID 666 3
               repository_id: 10
               committer: dlopper
             changesets_004:
               commit_date: 2007-04-12
               committed_on: 2007-04-12 15:14:44 +02:00
               revision: 4
               id: 103
               comments: |-
                 A commit with an issue id of an other project
                 IssueID 4 2
               repository_id: 10
               committer: dlopper
   No newline at end of file

test/unit/repository_test.rb +2 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require File.dirname(__FILE__) + '/../test_helper'
             class RepositoryTest < Test::Unit::TestCase
               fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes
               def setup
                 @repository = Project.find(1).repository
               end
               def test_create
                 repository = Repository::Subversion.new(:project => Project.find(2))
                 assert !repository.save
                 repository.url = "svn://localhost"
                 assert repository.save
                 repository.reload
                 project = Project.find(2)
                 assert_equal repository, project.repository
               end
               def test_scan_changesets_for_issue_ids
                 # choosing a status to apply to fix issues
                 Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id
                 Setting.commit_fix_done_ratio = "90"
+                Setting.commit_ref_keywords = 'refs , references, IssueID'
+                Setting.commit_fix_keywords = 'fixes , closes'
                 # make sure issue 1 is not already closed
                 assert !Issue.find(1).status.is_closed?
                 Repository.scan_changesets_for_issue_ids
                 assert_equal [101, 102], Issue.find(3).changeset_ids
                 # fixed issues
                 fixed_issue = Issue.find(1)
                 assert fixed_issue.status.is_closed?
                 assert_equal 90, fixed_issue.done_ratio
                 assert_equal [101], fixed_issue.changeset_ids
                 # ignoring commits referencing an issue of another project
                 assert_equal [], Issue.find(4).changesets
               end
               def test_for_changeset_comments_strip
                 repository = Repository::Mercurial.create( :project => Project.find( 4 ), :url => '/foo/bar/baz' )
                 comment = <<-COMMENT
                 This is a loooooooooooooooooooooooooooong comment
                 COMMENT
                 changeset = Changeset.new(
                   :comments => comment, :commit_date => Time.now, :revision => 0, :scmid => 'f39b7922fb3c',
                   :committer => 'foo <foo@example.com>', :committed_on => Time.now, :repository_id => repository )
                 assert( changeset.save )
                 assert_not_equal( comment, changeset.comments )
                 assert_equal( 'This is a loooooooooooooooooooooooooooong comment', changeset.comments )
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages