##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: Update of Subversion changesets broken by r3466 under Solaris (#5255)....
Jean-Philippe Lang -
r3521:5163904a3a85
parent child
Show More
Side by Side Unified
Context file:
r3521:5163904a3a85 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,196 +1,201
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2010 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 'iconv'
19 19
20 20 class Changeset < ActiveRecord::Base
21 21 belongs_to :repository
22 22 belongs_to :user
23 23 has_many :changes, :dependent => :delete_all
24 24 has_and_belongs_to_many :issues
25 25
26 26 acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},
27 27 :description => :long_comments,
28 28 :datetime => :committed_on,
29 29 :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.revision}}
30 30
31 31 acts_as_searchable :columns => 'comments',
32 32 :include => {:repository => :project},
33 33 :project_key => "#{Repository.table_name}.project_id",
34 34 :date_column => 'committed_on'
35 35
36 36 acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
37 37 :author_key => :user_id,
38 38 :find_options => {:include => [:user, {:repository => :project}]}
39 39
40 40 validates_presence_of :repository_id, :revision, :committed_on, :commit_date
41 41 validates_uniqueness_of :revision, :scope => :repository_id
42 42 validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
43 43
44 44 named_scope :visible, lambda {|*args| { :include => {:repository => :project},
45 45 :conditions => Project.allowed_to_condition(args.first || User.current, :view_changesets) } }
46 46
47 47 def revision=(r)
48 48 write_attribute :revision, (r.nil? ? nil : r.to_s)
49 49 end
50 50
51 51 def comments=(comment)
52 52 write_attribute(:comments, Changeset.normalize_comments(comment))
53 53 end
54 54
55 55 def committed_on=(date)
56 56 self.commit_date = date
57 57 super
58 58 end
59 59
60 60 def committer=(arg)
61 61 write_attribute(:committer, self.class.to_utf8(arg.to_s))
62 62 end
63 63
64 64 def project
65 65 repository.project
66 66 end
67 67
68 68 def author
69 69 user || committer.to_s.split('<').first
70 70 end
71 71
72 72 def before_create
73 73 self.user = repository.find_committer_user(committer)
74 74 end
75 75
76 76 def after_create
77 77 scan_comment_for_issue_ids
78 78 end
79 79 require 'pp'
80 80
81 81 def scan_comment_for_issue_ids
82 82 return if comments.blank?
83 83 # keywords used to reference issues
84 84 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
85 85 # keywords used to fix issues
86 86 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
87 87
88 88 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
89 89 return if kw_regexp.blank?
90 90
91 91 referenced_issues = []
92 92
93 93 if ref_keywords.delete('*')
94 94 # find any issue ID in the comments
95 95 target_issue_ids = []
96 96 comments.scan(%r{([\s\(\[,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
97 97 referenced_issues += find_referenced_issues_by_id(target_issue_ids)
98 98 end
99 99
100 100 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
101 101 action = match[0]
102 102 target_issue_ids = match[1].scan(/\d+/)
103 103 target_issues = find_referenced_issues_by_id(target_issue_ids)
104 104 if fix_keywords.include?(action.downcase) && fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
105 105 # update status of issues
106 106 logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
107 107 target_issues.each do |issue|
108 108 # the issue may have been updated by the closure of another one (eg. duplicate)
109 109 issue.reload
110 110 # don't change the status is the issue is closed
111 111 next if issue.status.is_closed?
112 112 csettext = "r#{self.revision}"
113 113 if self.scmid && (! (csettext =~ /^r[0-9]+$/))
114 114 csettext = "commit:\"#{self.scmid}\""
115 115 end
116 116 journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))
117 117 issue.status = fix_status
118 118 unless Setting.commit_fix_done_ratio.blank?
119 119 issue.done_ratio = Setting.commit_fix_done_ratio.to_i
120 120 end
121 121 Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
122 122 { :changeset => self, :issue => issue })
123 123 issue.save
124 124 end
125 125 end
126 126 referenced_issues += target_issues
127 127 end
128 128
129 129 referenced_issues.uniq!
130 130 self.issues = referenced_issues unless referenced_issues.empty?
131 131 end
132 132
133 133 def short_comments
134 134 @short_comments || split_comments.first
135 135 end
136 136
137 137 def long_comments
138 138 @long_comments || split_comments.last
139 139 end
140 140
141 141 # Returns the previous changeset
142 142 def previous
143 143 @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
144 144 end
145 145
146 146 # Returns the next changeset
147 147 def next
148 148 @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
149 149 end
150 150
151 151 # Strips and reencodes a commit log before insertion into the database
152 152 def self.normalize_comments(str)
153 153 to_utf8(str.to_s.strip)
154 154 end
155 155
156 156 # Creates a new Change from it's common parameters
157 157 def create_change(change)
158 158 Change.create(:changeset => self,
159 159 :action => change[:action],
160 160 :path => change[:path],
161 161 :from_path => change[:from_path],
162 162 :from_revision => change[:from_revision])
163 163 end
164 164
165 165 private
166 166
167 167 # Finds issues that can be referenced by the commit message
168 168 # i.e. issues that belong to the repository project, a subproject or a parent project
169 169 def find_referenced_issues_by_id(ids)
170 170 return [] if ids.compact.empty?
171 171 Issue.find_all_by_id(ids, :include => :project).select {|issue|
172 172 project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project)
173 173 }
174 174 end
175 175
176 176 def split_comments
177 177 comments =~ /\A(.+?)\r?\n(.*)$/m
178 178 @short_comments = $1 || comments
179 179 @long_comments = $2.to_s.strip
180 180 return @short_comments, @long_comments
181 181 end
182 182
183 183 def self.to_utf8(str)
184 184 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
185 185 encoding = Setting.commit_logs_encoding.to_s.strip
186 186 unless encoding.blank? || encoding == 'UTF-8'
187 187 begin
188 188 str = Iconv.conv('UTF-8', encoding, str)
189 189 rescue Iconv::Failure
190 190 # do nothing here
191 191 end
192 192 end
193 193 # removes invalid UTF8 sequences
194 Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + ' ')[0..-3]
194 begin
195 Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + ' ')[0..-3]
196 rescue Iconv::InvalidEncoding
197 # "UTF-8//IGNORE" is not supported on some OS
198 str
199 end
195 200 end
196 201 end
General Comments 0
You need to be logged in to leave comments. Login now