##// END OF EJS Templates
jro_apps » redmine
RSS
scm: return if str.blank? in to_utf8(str)....
Toshi MARUYAMA -
r4840:f03e338880e9
parent child
Show More
Side by Side Unified
Context file:
r4840:f03e338880e9 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,228 +1,229
1 1 # redMine - project management software
2 2 # Copyright (C) 2006 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 module RepositoriesHelper
21 21 def format_revision(revision)
22 22 if revision.respond_to? :format_identifier
23 23 revision.format_identifier
24 24 else
25 25 revision.to_s
26 26 end
27 27 end
28 28
29 29 def truncate_at_line_break(text, length = 255)
30 30 if text
31 31 text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
32 32 end
33 33 end
34 34
35 35 def render_properties(properties)
36 36 unless properties.nil? || properties.empty?
37 37 content = ''
38 38 properties.keys.sort.each do |property|
39 39 content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>")
40 40 end
41 41 content_tag('ul', content, :class => 'properties')
42 42 end
43 43 end
44 44
45 45 def render_changeset_changes
46 46 changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
47 47 case change.action
48 48 when 'A'
49 49 # Detects moved/copied files
50 50 if !change.from_path.blank?
51 51 change.action = @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
52 52 end
53 53 change
54 54 when 'D'
55 55 @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
56 56 else
57 57 change
58 58 end
59 59 end.compact
60 60
61 61 tree = { }
62 62 changes.each do |change|
63 63 p = tree
64 64 dirs = change.path.to_s.split('/').select {|d| !d.blank?}
65 65 path = ''
66 66 dirs.each do |dir|
67 67 path += '/' + dir
68 68 p[:s] ||= {}
69 69 p = p[:s]
70 70 p[path] ||= {}
71 71 p = p[path]
72 72 end
73 73 p[:c] = change
74 74 end
75 75
76 76 render_changes_tree(tree[:s])
77 77 end
78 78
79 79 def render_changes_tree(tree)
80 80 return '' if tree.nil?
81 81
82 82 output = ''
83 83 output << '<ul>'
84 84 tree.keys.sort.each do |file|
85 85 style = 'change'
86 86 text = File.basename(h(file))
87 87 if s = tree[file][:s]
88 88 style << ' folder'
89 89 path_param = to_path_param(@repository.relative_path(file))
90 90 text = link_to(text, :controller => 'repositories',
91 91 :action => 'show',
92 92 :id => @project,
93 93 :path => path_param,
94 94 :rev => @changeset.identifier)
95 95 output << "<li class='#{style}'>#{text}</li>"
96 96 output << render_changes_tree(s)
97 97 elsif c = tree[file][:c]
98 98 style << " change-#{c.action}"
99 99 path_param = to_path_param(@repository.relative_path(c.path))
100 100 text = link_to(text, :controller => 'repositories',
101 101 :action => 'entry',
102 102 :id => @project,
103 103 :path => path_param,
104 104 :rev => @changeset.identifier) unless c.action == 'D'
105 105 text << " - #{c.revision}" unless c.revision.blank?
106 106 text << ' (' + link_to('diff', :controller => 'repositories',
107 107 :action => 'diff',
108 108 :id => @project,
109 109 :path => path_param,
110 110 :rev => @changeset.identifier) + ') ' if c.action == 'M'
111 111 text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank?
112 112 output << "<li class='#{style}'>#{text}</li>"
113 113 end
114 114 end
115 115 output << '</ul>'
116 116 output
117 117 end
118 118
119 119 def to_utf8(str)
120 return str if str.blank?
120 121 if str.respond_to?(:force_encoding)
121 122 str.force_encoding('UTF-8')
122 123 else
123 124 # TODO:
124 125 # Japanese Shift_JIS(CP932) is not compatible with ASCII.
125 126 # UTF-7 and Japanese ISO-2022-JP are 7bits clean.
126 127 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
127 128 end
128 129
129 130 @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
130 131 @encodings.each do |encoding|
131 132 begin
132 133 return Iconv.conv('UTF-8', encoding, str)
133 134 rescue Iconv::Failure
134 135 # do nothing here and try the next encoding
135 136 end
136 137 end
137 138 str = replace_invalid_utf8(str)
138 139 end
139 140
140 141 def replace_invalid_utf8(str)
141 142 if str.respond_to?(:force_encoding)
142 143 str.force_encoding('UTF-8')
143 144 if ! str.valid_encoding?
144 145 str = str.encode("US-ASCII", :invalid => :replace,
145 146 :undef => :replace, :replace => '?').encode("UTF-8")
146 147 end
147 148 end
148 149 str
149 150 end
150 151
151 152 def repository_field_tags(form, repository)
152 153 method = repository.class.name.demodulize.underscore + "_field_tags"
153 154 send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method) && method != 'repository_field_tags'
154 155 end
155 156
156 157 def scm_select_tag(repository)
157 158 scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
158 159 Redmine::Scm::Base.all.each do |scm|
159 160 scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
160 161 end
161 162
162 163 select_tag('repository_scm',
163 164 options_for_select(scm_options, repository.class.name.demodulize),
164 165 :disabled => (repository && !repository.new_record?),
165 166 :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
166 167 )
167 168 end
168 169
169 170 def with_leading_slash(path)
170 171 path.to_s.starts_with?('/') ? path : "/#{path}"
171 172 end
172 173
173 174 def without_leading_slash(path)
174 175 path.gsub(%r{^/+}, '')
175 176 end
176 177
177 178 def subversion_field_tags(form, repository)
178 179 content_tag('p', form.text_field(:url, :size => 60, :required => true,
179 180 :disabled => (repository && !repository.root_url.blank?)) +
180 181 '<br />(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
181 182 content_tag('p', form.text_field(:login, :size => 30)) +
182 183 content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
183 184 :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
184 185 :onfocus => "this.value=''; this.name='repository[password]';",
185 186 :onchange => "this.name='repository[password]';"))
186 187 end
187 188
188 189 def darcs_field_tags(form, repository)
189 190 content_tag('p', form.text_field(:url, :label => 'Root directory',
190 191 :size => 60, :required => true,
191 192 :disabled => (repository && !repository.new_record?)))
192 193 end
193 194
194 195 def mercurial_field_tags(form, repository)
195 196 content_tag('p', form.text_field(:url, :label => 'Root directory',
196 197 :size => 60, :required => true,
197 198 :disabled => (repository && !repository.root_url.blank?)))
198 199 end
199 200
200 201 def git_field_tags(form, repository)
201 202 content_tag('p', form.text_field(:url, :label => 'Path to repository',
202 203 :size => 60, :required => true,
203 204 :disabled => (repository && !repository.root_url.blank?)))
204 205 end
205 206
206 207 def cvs_field_tags(form, repository)
207 208 content_tag('p', form.text_field(:root_url,
208 209 :label => 'CVSROOT', :size => 60, :required => true,
209 210 :disabled => !repository.new_record?)) +
210 211 content_tag('p', form.text_field(:url, :label => 'Module',
211 212 :size => 30, :required => true,
212 213 :disabled => !repository.new_record?))
213 214 end
214 215
215 216 def bazaar_field_tags(form, repository)
216 217 content_tag('p', form.text_field(:url, :label => 'Root directory',
217 218 :size => 60, :required => true,
218 219 :disabled => (repository && !repository.new_record?)))
219 220 end
220 221
221 222 def filesystem_field_tags(form, repository)
222 223 content_tag('p', form.text_field(:url, :label => 'Root directory',
223 224 :size => 60, :required => true,
224 225 :disabled => (repository && !repository.root_url.blank?))) +
225 226 content_tag('p', form.select(:path_encoding, [nil] + Setting::ENCODINGS,
226 227 :label => 'Path encoding'))
227 228 end
228 229 end
Show file before | Show file after | Hide comments
@@ -1,274 +1,275
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.format_identifier}" + (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.identifier}}
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 # Returns the identifier of this changeset; depending on repository backends
52 52 def identifier
53 53 if repository.class.respond_to? :changeset_identifier
54 54 repository.class.changeset_identifier self
55 55 else
56 56 revision.to_s
57 57 end
58 58 end
59 59
60 60 def comments=(comment)
61 61 write_attribute(:comments, Changeset.normalize_comments(comment))
62 62 end
63 63
64 64 def committed_on=(date)
65 65 self.commit_date = date
66 66 super
67 67 end
68 68
69 69 # Returns the readable identifier
70 70 def format_identifier
71 71 if repository.class.respond_to? :format_changeset_identifier
72 72 repository.class.format_changeset_identifier self
73 73 else
74 74 identifier
75 75 end
76 76 end
77 77
78 78 def committer=(arg)
79 79 write_attribute(:committer, self.class.to_utf8(arg.to_s))
80 80 end
81 81
82 82 def project
83 83 repository.project
84 84 end
85 85
86 86 def author
87 87 user || committer.to_s.split('<').first
88 88 end
89 89
90 90 def before_create
91 91 self.user = repository.find_committer_user(committer)
92 92 end
93 93
94 94 def after_create
95 95 scan_comment_for_issue_ids
96 96 end
97 97
98 98 TIMELOG_RE = /
99 99 (
100 100 ((\d+)(h|hours?))((\d+)(m|min)?)?
101 101 |
102 102 ((\d+)(h|hours?|m|min))
103 103 |
104 104 (\d+):(\d+)
105 105 |
106 106 (\d+([\.,]\d+)?)h?
107 107 )
108 108 /x
109 109
110 110 def scan_comment_for_issue_ids
111 111 return if comments.blank?
112 112 # keywords used to reference issues
113 113 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
114 114 ref_keywords_any = ref_keywords.delete('*')
115 115 # keywords used to fix issues
116 116 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
117 117
118 118 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
119 119
120 120 referenced_issues = []
121 121
122 122 comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match|
123 123 action, refs = match[2], match[3]
124 124 next unless action.present? || ref_keywords_any
125 125
126 126 refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m|
127 127 issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2]
128 128 if issue
129 129 referenced_issues << issue
130 130 fix_issue(issue) if fix_keywords.include?(action.to_s.downcase)
131 131 log_time(issue, hours) if hours && Setting.commit_logtime_enabled?
132 132 end
133 133 end
134 134 end
135 135
136 136 referenced_issues.uniq!
137 137 self.issues = referenced_issues unless referenced_issues.empty?
138 138 end
139 139
140 140 def short_comments
141 141 @short_comments || split_comments.first
142 142 end
143 143
144 144 def long_comments
145 145 @long_comments || split_comments.last
146 146 end
147 147
148 148 def text_tag
149 149 if scmid?
150 150 "commit:#{scmid}"
151 151 else
152 152 "r#{revision}"
153 153 end
154 154 end
155 155
156 156 # Returns the previous changeset
157 157 def previous
158 158 @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
159 159 end
160 160
161 161 # Returns the next changeset
162 162 def next
163 163 @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
164 164 end
165 165
166 166 # Strips and reencodes a commit log before insertion into the database
167 167 def self.normalize_comments(str)
168 168 to_utf8(str.to_s.strip)
169 169 end
170 170
171 171 # Creates a new Change from it's common parameters
172 172 def create_change(change)
173 173 Change.create(:changeset => self,
174 174 :action => change[:action],
175 175 :path => change[:path],
176 176 :from_path => change[:from_path],
177 177 :from_revision => change[:from_revision])
178 178 end
179 179
180 180 private
181 181
182 182 # Finds an issue that can be referenced by the commit message
183 183 # i.e. an issue that belong to the repository project, a subproject or a parent project
184 184 def find_referenced_issue_by_id(id)
185 185 return nil if id.blank?
186 186 issue = Issue.find_by_id(id.to_i, :include => :project)
187 187 if issue
188 188 unless project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project)
189 189 issue = nil
190 190 end
191 191 end
192 192 issue
193 193 end
194 194
195 195 def fix_issue(issue)
196 196 status = IssueStatus.find_by_id(Setting.commit_fix_status_id.to_i)
197 197 if status.nil?
198 198 logger.warn("No status macthes commit_fix_status_id setting (#{Setting.commit_fix_status_id})") if logger
199 199 return issue
200 200 end
201 201
202 202 # the issue may have been updated by the closure of another one (eg. duplicate)
203 203 issue.reload
204 204 # don't change the status is the issue is closed
205 205 return if issue.status && issue.status.is_closed?
206 206
207 207 journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, text_tag))
208 208 issue.status = status
209 209 unless Setting.commit_fix_done_ratio.blank?
210 210 issue.done_ratio = Setting.commit_fix_done_ratio.to_i
211 211 end
212 212 Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
213 213 { :changeset => self, :issue => issue })
214 214 unless issue.save
215 215 logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
216 216 end
217 217 issue
218 218 end
219 219
220 220 def log_time(issue, hours)
221 221 time_entry = TimeEntry.new(
222 222 :user => user,
223 223 :hours => hours,
224 224 :issue => issue,
225 225 :spent_on => commit_date,
226 226 :comments => l(:text_time_logged_by_changeset, :value => text_tag, :locale => Setting.default_language)
227 227 )
228 228 time_entry.activity = log_time_activity unless log_time_activity.nil?
229 229
230 230 unless time_entry.save
231 231 logger.warn("TimeEntry could not be created by changeset #{id}: #{time_entry.errors.full_messages}") if logger
232 232 end
233 233 time_entry
234 234 end
235 235
236 236 def log_time_activity
237 237 if Setting.commit_logtime_activity_id.to_i > 0
238 238 TimeEntryActivity.find_by_id(Setting.commit_logtime_activity_id.to_i)
239 239 end
240 240 end
241 241
242 242 def split_comments
243 243 comments =~ /\A(.+?)\r?\n(.*)$/m
244 244 @short_comments = $1 || comments
245 245 @long_comments = $2.to_s.strip
246 246 return @short_comments, @long_comments
247 247 end
248 248
249 249 def self.to_utf8(str)
250 return str if str.blank?
250 251 encoding = Setting.commit_logs_encoding.to_s.strip
251 252 unless encoding.blank? || encoding == 'UTF-8'
252 253 begin
253 254 str = Iconv.conv('UTF-8', encoding, str)
254 255 rescue Iconv::Failure
255 256 # do nothing here
256 257 end
257 258 end
258 259 if str.respond_to?(:force_encoding)
259 260 str.force_encoding('UTF-8')
260 261 if ! str.valid_encoding?
261 262 str = str.encode("US-ASCII", :invalid => :replace,
262 263 :undef => :replace, :replace => '?').encode("UTF-8")
263 264 end
264 265 else
265 266 # removes invalid UTF8 sequences
266 267 begin
267 268 str = Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + ' ')[0..-3]
268 269 rescue Iconv::InvalidEncoding
269 270 # "UTF-8//IGNORE" is not supported on some OS
270 271 end
271 272 end
272 273 str
273 274 end
274 275 end
General Comments 0
You need to be logged in to leave comments. Login now