##// END OF EJS Templates
jro_apps » redmine
RSS
Commit message parser:...
Jean-Philippe Lang -
r848:b30b6717a271
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,86 +1,85
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class Changeset < ActiveRecord::Base
19 19 belongs_to :repository
20 20 has_many :changes, :dependent => :delete_all
21 21 has_and_belongs_to_many :issues
22 22
23 23 acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))},
24 24 :description => :comments,
25 25 :datetime => :committed_on,
26 26 :author => :committer,
27 27 :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
28 28
29 29 acts_as_searchable :columns => 'comments',
30 30 :include => :repository,
31 31 :project_key => "#{Repository.table_name}.project_id",
32 32 :date_column => 'committed_on'
33 33
34 34 validates_presence_of :repository_id, :revision, :committed_on, :commit_date
35 35 validates_numericality_of :revision, :only_integer => true
36 36 validates_uniqueness_of :revision, :scope => :repository_id
37 37 validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
38 38
39 39 def comments=(comment)
40 40 write_attribute(:comments, comment.strip)
41 41 end
42 42
43 43 def committed_on=(date)
44 44 self.commit_date = date
45 45 super
46 46 end
47 47
48 48 def after_create
49 49 scan_comment_for_issue_ids
50 50 end
51 51
52 52 def scan_comment_for_issue_ids
53 53 return if comments.blank?
54 54 # keywords used to reference issues
55 ref_keywords = Setting.commit_ref_keywords.downcase.split(",")
55 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
56 56 # keywords used to fix issues
57 fix_keywords = Setting.commit_fix_keywords.downcase.split(",")
57 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
58 58 # status and optional done ratio applied
59 59 fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
60 60 done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
61 61
62 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw.strip)}.join("|")
62 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
63 63 return if kw_regexp.blank?
64 64
65 # remove any associated issues
66 self.issues.clear
67
65 referenced_issues = []
68 66 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
69 67 action = match[0]
70 68 target_issue_ids = match[1].scan(/\d+/)
71 69 target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
72 70 if fix_status && fix_keywords.include?(action.downcase)
73 71 # update status of issues
74 72 logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
75 73 target_issues.each do |issue|
76 74 # don't change the status is the issue is already closed
77 75 next if issue.status.is_closed?
78 76 issue.status = fix_status
79 77 issue.done_ratio = done_ratio if done_ratio
80 78 issue.save
81 79 end
82 80 end
83 self.issues << target_issues
81 referenced_issues += target_issues
84 82 end
83 self.issues = referenced_issues.uniq
85 84 end
86 85 end
Show file before | Show file after | Hide comments
@@ -1,38 +1,38
1 1 ---
2 2 changesets_001:
3 3 commit_date: 2007-04-11
4 4 committed_on: 2007-04-11 15:14:44 +02:00
5 5 revision: 1
6 6 id: 100
7 7 comments: My very first commit
8 8 repository_id: 10
9 9 committer: dlopper
10 10 changesets_002:
11 11 commit_date: 2007-04-12
12 12 committed_on: 2007-04-12 15:14:44 +02:00
13 13 revision: 2
14 14 id: 101
15 comments: 'This commit fixes #1, #2 and references #3'
15 comments: 'This commit fixes #1, #2 and references #1 & #3'
16 16 repository_id: 10
17 17 committer: dlopper
18 18 changesets_003:
19 19 commit_date: 2007-04-12
20 20 committed_on: 2007-04-12 15:14:44 +02:00
21 21 revision: 3
22 22 id: 102
23 23 comments: |-
24 24 A commit with wrong issue ids
25 25 IssueID 666 3
26 26 repository_id: 10
27 27 committer: dlopper
28 28 changesets_004:
29 29 commit_date: 2007-04-12
30 30 committed_on: 2007-04-12 15:14:44 +02:00
31 31 revision: 4
32 32 id: 103
33 33 comments: |-
34 34 A commit with an issue id of an other project
35 35 IssueID 4 2
36 36 repository_id: 10
37 37 committer: dlopper
38 38 No newline at end of file
Show file before | Show file after | Hide comments
@@ -1,74 +1,76
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.dirname(__FILE__) + '/../test_helper'
19 19
20 20 class RepositoryTest < Test::Unit::TestCase
21 21 fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes
22 22
23 23 def setup
24 24 @repository = Project.find(1).repository
25 25 end
26 26
27 27 def test_create
28 28 repository = Repository::Subversion.new(:project => Project.find(2))
29 29 assert !repository.save
30 30
31 31 repository.url = "svn://localhost"
32 32 assert repository.save
33 33 repository.reload
34 34
35 35 project = Project.find(2)
36 36 assert_equal repository, project.repository
37 37 end
38 38
39 39 def test_scan_changesets_for_issue_ids
40 40 # choosing a status to apply to fix issues
41 41 Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id
42 42 Setting.commit_fix_done_ratio = "90"
43 Setting.commit_ref_keywords = 'refs , references, IssueID'
44 Setting.commit_fix_keywords = 'fixes , closes'
43 45
44 46 # make sure issue 1 is not already closed
45 47 assert !Issue.find(1).status.is_closed?
46 48
47 49 Repository.scan_changesets_for_issue_ids
48 50 assert_equal [101, 102], Issue.find(3).changeset_ids
49 51
50 52 # fixed issues
51 53 fixed_issue = Issue.find(1)
52 54 assert fixed_issue.status.is_closed?
53 55 assert_equal 90, fixed_issue.done_ratio
54 56 assert_equal [101], fixed_issue.changeset_ids
55 57
56 58 # ignoring commits referencing an issue of another project
57 59 assert_equal [], Issue.find(4).changesets
58 60 end
59 61
60 62 def test_for_changeset_comments_strip
61 63 repository = Repository::Mercurial.create( :project => Project.find( 4 ), :url => '/foo/bar/baz' )
62 64 comment = <<-COMMENT
63 65 This is a loooooooooooooooooooooooooooong comment
64 66
65 67
66 68 COMMENT
67 69 changeset = Changeset.new(
68 70 :comments => comment, :commit_date => Time.now, :revision => 0, :scmid => 'f39b7922fb3c',
69 71 :committer => 'foo <foo@example.com>', :committed_on => Time.now, :repository_id => repository )
70 72 assert( changeset.save )
71 73 assert_not_equal( comment, changeset.comments )
72 74 assert_equal( 'This is a loooooooooooooooooooooooooooong comment', changeset.comments )
73 75 end
74 76 end
General Comments 0
You need to be logged in to leave comments. Login now