| @@ -1,437 +1,438 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2013 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 'SVG/Graph/Bar' |
|
|
19 | 19 | require 'SVG/Graph/BarHorizontal' |
|
|
20 | 20 | require 'digest/sha1' |
|
|
21 | 21 | require 'redmine/scm/adapters/abstract_adapter' |
|
|
22 | 22 | |
|
|
23 | 23 | class ChangesetNotFound < Exception; end |
|
|
24 | 24 | class InvalidRevisionParam < Exception; end |
|
|
25 | 25 | |
|
|
26 | 26 | class RepositoriesController < ApplicationController |
|
|
27 | 27 | menu_item :repository |
|
|
28 | 28 | menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers] |
|
|
29 | 29 | default_search_scope :changesets |
|
|
30 | 30 | |
|
|
31 | 31 | before_filter :find_project_by_project_id, :only => [:new, :create] |
|
|
32 | 32 | before_filter :find_repository, :only => [:edit, :update, :destroy, :committers] |
|
|
33 | 33 | before_filter :find_project_repository, :except => [:new, :create, :edit, :update, :destroy, :committers] |
|
|
34 | 34 | before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue] |
|
|
35 | 35 | before_filter :authorize |
|
|
36 | 36 | accept_rss_auth :revisions |
|
|
37 | 37 | |
|
|
38 | 38 | rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed |
|
|
39 | 39 | |
|
|
40 | 40 | def new |
|
|
41 | 41 | scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first |
|
|
42 | 42 | @repository = Repository.factory(scm) |
|
|
43 | 43 | @repository.is_default = @project.repository.nil? |
|
|
44 | 44 | @repository.project = @project |
|
|
45 | 45 | end |
|
|
46 | 46 | |
|
|
47 | 47 | def create |
|
|
48 | 48 | attrs = pickup_extra_info |
|
|
49 | 49 | @repository = Repository.factory(params[:repository_scm]) |
|
|
50 | 50 | @repository.safe_attributes = params[:repository] |
|
|
51 | 51 | if attrs[:attrs_extra].keys.any? |
|
|
52 | 52 | @repository.merge_extra_info(attrs[:attrs_extra]) |
|
|
53 | 53 | end |
|
|
54 | 54 | @repository.project = @project |
|
|
55 | 55 | if request.post? && @repository.save |
|
|
56 | 56 | redirect_to settings_project_path(@project, :tab => 'repositories') |
|
|
57 | 57 | else |
|
|
58 | 58 | render :action => 'new' |
|
|
59 | 59 | end |
|
|
60 | 60 | end |
|
|
61 | 61 | |
|
|
62 | 62 | def edit |
|
|
63 | 63 | end |
|
|
64 | 64 | |
|
|
65 | 65 | def update |
|
|
66 | 66 | attrs = pickup_extra_info |
|
|
67 | 67 | @repository.safe_attributes = attrs[:attrs] |
|
|
68 | 68 | if attrs[:attrs_extra].keys.any? |
|
|
69 | 69 | @repository.merge_extra_info(attrs[:attrs_extra]) |
|
|
70 | 70 | end |
|
|
71 | 71 | @repository.project = @project |
|
|
72 | 72 | if request.put? && @repository.save |
|
|
73 | 73 | redirect_to settings_project_path(@project, :tab => 'repositories') |
|
|
74 | 74 | else |
|
|
75 | 75 | render :action => 'edit' |
|
|
76 | 76 | end |
|
|
77 | 77 | end |
|
|
78 | 78 | |
|
|
79 | 79 | def pickup_extra_info |
|
|
80 | 80 | p = {} |
|
|
81 | 81 | p_extra = {} |
|
|
82 | 82 | params[:repository].each do |k, v| |
|
|
83 | 83 | if k =~ /^extra_/ |
|
|
84 | 84 | p_extra[k] = v |
|
|
85 | 85 | else |
|
|
86 | 86 | p[k] = v |
|
|
87 | 87 | end |
|
|
88 | 88 | end |
|
|
89 | 89 | {:attrs => p, :attrs_extra => p_extra} |
|
|
90 | 90 | end |
|
|
91 | 91 | private :pickup_extra_info |
|
|
92 | 92 | |
|
|
93 | 93 | def committers |
|
|
94 | 94 | @committers = @repository.committers |
|
|
95 | 95 | @users = @project.users |
|
|
96 | 96 | additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id) |
|
|
97 | 97 | @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty? |
|
|
98 | 98 | @users.compact! |
|
|
99 | 99 | @users.sort! |
|
|
100 | 100 | if request.post? && params[:committers].is_a?(Hash) |
|
|
101 | 101 | # Build a hash with repository usernames as keys and corresponding user ids as values |
|
|
102 | 102 | @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h} |
|
|
103 | 103 | flash[:notice] = l(:notice_successful_update) |
|
|
104 | 104 | redirect_to settings_project_path(@project, :tab => 'repositories') |
|
|
105 | 105 | end |
|
|
106 | 106 | end |
|
|
107 | 107 | |
|
|
108 | 108 | def destroy |
|
|
109 | 109 | @repository.destroy if request.delete? |
|
|
110 | 110 | redirect_to settings_project_path(@project, :tab => 'repositories') |
|
|
111 | 111 | end |
|
|
112 | 112 | |
|
|
113 | 113 | def show |
|
|
114 | 114 | @repository.fetch_changesets if @project.active? && Setting.autofetch_changesets? && @path.empty? |
|
|
115 | 115 | |
|
|
116 | 116 | @entries = @repository.entries(@path, @rev) |
|
|
117 | 117 | @changeset = @repository.find_changeset_by_name(@rev) |
|
|
118 | 118 | if request.xhr? |
|
|
119 | 119 | @entries ? render(:partial => 'dir_list_content') : render(:nothing => true) |
|
|
120 | 120 | else |
|
|
121 | 121 | (show_error_not_found; return) unless @entries |
|
|
122 | 122 | @changesets = @repository.latest_changesets(@path, @rev) |
|
|
123 | 123 | @properties = @repository.properties(@path, @rev) |
|
|
124 | 124 | @repositories = @project.repositories |
|
|
125 | 125 | render :action => 'show' |
|
|
126 | 126 | end |
|
|
127 | 127 | end |
|
|
128 | 128 | |
|
|
129 | 129 | alias_method :browse, :show |
|
|
130 | 130 | |
|
|
131 | 131 | def changes |
|
|
132 | 132 | @entry = @repository.entry(@path, @rev) |
|
|
133 | 133 | (show_error_not_found; return) unless @entry |
|
|
134 | 134 | @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i) |
|
|
135 | 135 | @properties = @repository.properties(@path, @rev) |
|
|
136 | 136 | @changeset = @repository.find_changeset_by_name(@rev) |
|
|
137 | 137 | end |
|
|
138 | 138 | |
|
|
139 | 139 | def revisions |
|
|
140 | 140 | @changeset_count = @repository.changesets.count |
|
|
141 | 141 | @changeset_pages = Paginator.new @changeset_count, |
|
|
142 | 142 | per_page_option, |
|
|
143 | 143 | params['page'] |
|
|
144 | 144 | @changesets = @repository.changesets. |
|
|
145 | 145 | limit(@changeset_pages.per_page). |
|
|
146 | 146 | offset(@changeset_pages.offset). |
|
|
147 | 147 | includes(:user, :repository, :parents). |
|
|
148 | 148 | all |
|
|
149 | 149 | |
|
|
150 | 150 | respond_to do |format| |
|
|
151 | 151 | format.html { render :layout => false if request.xhr? } |
|
|
152 | 152 | format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") } |
|
|
153 | 153 | end |
|
|
154 | 154 | end |
|
|
155 | 155 | |
|
|
156 | 156 | def raw |
|
|
157 | 157 | entry_and_raw(true) |
|
|
158 | 158 | end |
|
|
159 | 159 | |
|
|
160 | 160 | def entry |
|
|
161 | 161 | entry_and_raw(false) |
|
|
162 | 162 | end |
|
|
163 | 163 | |
|
|
164 | 164 | def entry_and_raw(is_raw) |
|
|
165 | 165 | @entry = @repository.entry(@path, @rev) |
|
|
166 | 166 | (show_error_not_found; return) unless @entry |
|
|
167 | 167 | |
|
|
168 | 168 | # If the entry is a dir, show the browser |
|
|
169 | 169 | (show; return) if @entry.is_dir? |
|
|
170 | 170 | |
|
|
171 | 171 | @content = @repository.cat(@path, @rev) |
|
|
172 | 172 | (show_error_not_found; return) unless @content |
|
|
173 | 173 | if is_raw || |
|
|
174 | 174 | (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) || |
|
|
175 | 175 | ! is_entry_text_data?(@content, @path) |
|
|
176 | 176 | # Force the download |
|
|
177 | 177 | send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) } |
|
|
178 | 178 | send_type = Redmine::MimeType.of(@path) |
|
|
179 | 179 | send_opt[:type] = send_type.to_s if send_type |
|
|
180 | 180 | send_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) && !is_raw ? 'inline' : 'attachment') |
|
|
181 | 181 | send_data @content, send_opt |
|
|
182 | 182 | else |
|
|
183 | 183 | # Prevent empty lines when displaying a file with Windows style eol |
|
|
184 | 184 | # TODO: UTF-16 |
|
|
185 | 185 | # Is this needs? AttachmentsController reads file simply. |
|
|
186 | 186 | @content.gsub!("\r\n", "\n") |
|
|
187 | 187 | @changeset = @repository.find_changeset_by_name(@rev) |
|
|
188 | 188 | end |
|
|
189 | 189 | end |
|
|
190 | 190 | private :entry_and_raw |
|
|
191 | 191 | |
|
|
192 | 192 | def is_entry_text_data?(ent, path) |
|
|
193 | 193 | # UTF-16 contains "\x00". |
|
|
194 | 194 | # It is very strict that file contains less than 30% of ascii symbols |
|
|
195 | 195 | # in non Western Europe. |
|
|
196 | 196 | return true if Redmine::MimeType.is_type?('text', path) |
|
|
197 | 197 | # Ruby 1.8.6 has a bug of integer divisions. |
|
|
198 | 198 | # http://apidock.com/ruby/v1_8_6_287/String/is_binary_data%3F |
|
|
199 | 199 | return false if ent.is_binary_data? |
|
|
200 | 200 | true |
|
|
201 | 201 | end |
|
|
202 | 202 | private :is_entry_text_data? |
|
|
203 | 203 | |
|
|
204 | 204 | def annotate |
|
|
205 | 205 | @entry = @repository.entry(@path, @rev) |
|
|
206 | 206 | (show_error_not_found; return) unless @entry |
|
|
207 | 207 | |
|
|
208 | 208 | @annotate = @repository.scm.annotate(@path, @rev) |
|
|
209 | 209 | if @annotate.nil? || @annotate.empty? |
|
|
210 | 210 | (render_error l(:error_scm_annotate); return) |
|
|
211 | 211 | end |
|
|
212 | 212 | ann_buf_size = 0 |
|
|
213 | 213 | @annotate.lines.each do |buf| |
|
|
214 | 214 | ann_buf_size += buf.size |
|
|
215 | 215 | end |
|
|
216 | 216 | if ann_buf_size > Setting.file_max_size_displayed.to_i.kilobyte |
|
|
217 | 217 | (render_error l(:error_scm_annotate_big_text_file); return) |
|
|
218 | 218 | end |
|
|
219 | 219 | @changeset = @repository.find_changeset_by_name(@rev) |
|
|
220 | 220 | end |
|
|
221 | 221 | |
|
|
222 | 222 | def revision |
|
|
223 | 223 | respond_to do |format| |
|
|
224 | 224 | format.html |
|
|
225 | 225 | format.js {render :layout => false} |
|
|
226 | 226 | end |
|
|
227 | 227 | end |
|
|
228 | 228 | |
|
|
229 | 229 | # Adds a related issue to a changeset |
|
|
230 | 230 | # POST /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues |
|
|
231 | 231 | def add_related_issue |
|
|
232 | @issue = @changeset.find_referenced_issue_by_id(params[:issue_id]) | |
|
|
232 | issue_id = params[:issue_id].to_s.sub(/^#/,'') | |
|
|
233 | @issue = @changeset.find_referenced_issue_by_id(issue_id) | |
|
|
233 | 234 | if @issue && (!@issue.visible? || @changeset.issues.include?(@issue)) |
|
|
234 | 235 | @issue = nil |
|
|
235 | 236 | end |
|
|
236 | 237 | |
|
|
237 | 238 | if @issue |
|
|
238 | 239 | @changeset.issues << @issue |
|
|
239 | 240 | end |
|
|
240 | 241 | end |
|
|
241 | 242 | |
|
|
242 | 243 | # Removes a related issue from a changeset |
|
|
243 | 244 | # DELETE /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues/:issue_id |
|
|
244 | 245 | def remove_related_issue |
|
|
245 | 246 | @issue = Issue.visible.find_by_id(params[:issue_id]) |
|
|
246 | 247 | if @issue |
|
|
247 | 248 | @changeset.issues.delete(@issue) |
|
|
248 | 249 | end |
|
|
249 | 250 | end |
|
|
250 | 251 | |
|
|
251 | 252 | def diff |
|
|
252 | 253 | if params[:format] == 'diff' |
|
|
253 | 254 | @diff = @repository.diff(@path, @rev, @rev_to) |
|
|
254 | 255 | (show_error_not_found; return) unless @diff |
|
|
255 | 256 | filename = "changeset_r#{@rev}" |
|
|
256 | 257 | filename << "_r#{@rev_to}" if @rev_to |
|
|
257 | 258 | send_data @diff.join, :filename => "#{filename}.diff", |
|
|
258 | 259 | :type => 'text/x-patch', |
|
|
259 | 260 | :disposition => 'attachment' |
|
|
260 | 261 | else |
|
|
261 | 262 | @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline' |
|
|
262 | 263 | @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type) |
|
|
263 | 264 | |
|
|
264 | 265 | # Save diff type as user preference |
|
|
265 | 266 | if User.current.logged? && @diff_type != User.current.pref[:diff_type] |
|
|
266 | 267 | User.current.pref[:diff_type] = @diff_type |
|
|
267 | 268 | User.current.preference.save |
|
|
268 | 269 | end |
|
|
269 | 270 | @cache_key = "repositories/diff/#{@repository.id}/" + |
|
|
270 | 271 | Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}") |
|
|
271 | 272 | unless read_fragment(@cache_key) |
|
|
272 | 273 | @diff = @repository.diff(@path, @rev, @rev_to) |
|
|
273 | 274 | show_error_not_found unless @diff |
|
|
274 | 275 | end |
|
|
275 | 276 | |
|
|
276 | 277 | @changeset = @repository.find_changeset_by_name(@rev) |
|
|
277 | 278 | @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil |
|
|
278 | 279 | @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to) |
|
|
279 | 280 | end |
|
|
280 | 281 | end |
|
|
281 | 282 | |
|
|
282 | 283 | def stats |
|
|
283 | 284 | end |
|
|
284 | 285 | |
|
|
285 | 286 | def graph |
|
|
286 | 287 | data = nil |
|
|
287 | 288 | case params[:graph] |
|
|
288 | 289 | when "commits_per_month" |
|
|
289 | 290 | data = graph_commits_per_month(@repository) |
|
|
290 | 291 | when "commits_per_author" |
|
|
291 | 292 | data = graph_commits_per_author(@repository) |
|
|
292 | 293 | end |
|
|
293 | 294 | if data |
|
|
294 | 295 | headers["Content-Type"] = "image/svg+xml" |
|
|
295 | 296 | send_data(data, :type => "image/svg+xml", :disposition => "inline") |
|
|
296 | 297 | else |
|
|
297 | 298 | render_404 |
|
|
298 | 299 | end |
|
|
299 | 300 | end |
|
|
300 | 301 | |
|
|
301 | 302 | private |
|
|
302 | 303 | |
|
|
303 | 304 | def find_repository |
|
|
304 | 305 | @repository = Repository.find(params[:id]) |
|
|
305 | 306 | @project = @repository.project |
|
|
306 | 307 | rescue ActiveRecord::RecordNotFound |
|
|
307 | 308 | render_404 |
|
|
308 | 309 | end |
|
|
309 | 310 | |
|
|
310 | 311 | REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i |
|
|
311 | 312 | |
|
|
312 | 313 | def find_project_repository |
|
|
313 | 314 | @project = Project.find(params[:id]) |
|
|
314 | 315 | if params[:repository_id].present? |
|
|
315 | 316 | @repository = @project.repositories.find_by_identifier_param(params[:repository_id]) |
|
|
316 | 317 | else |
|
|
317 | 318 | @repository = @project.repository |
|
|
318 | 319 | end |
|
|
319 | 320 | (render_404; return false) unless @repository |
|
|
320 | 321 | @path = params[:path].is_a?(Array) ? params[:path].join('/') : params[:path].to_s |
|
|
321 | 322 | @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip |
|
|
322 | 323 | @rev_to = params[:rev_to] |
|
|
323 | 324 | |
|
|
324 | 325 | unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.to_s.match(REV_PARAM_RE) |
|
|
325 | 326 | if @repository.branches.blank? |
|
|
326 | 327 | raise InvalidRevisionParam |
|
|
327 | 328 | end |
|
|
328 | 329 | end |
|
|
329 | 330 | rescue ActiveRecord::RecordNotFound |
|
|
330 | 331 | render_404 |
|
|
331 | 332 | rescue InvalidRevisionParam |
|
|
332 | 333 | show_error_not_found |
|
|
333 | 334 | end |
|
|
334 | 335 | |
|
|
335 | 336 | def find_changeset |
|
|
336 | 337 | if @rev.present? |
|
|
337 | 338 | @changeset = @repository.find_changeset_by_name(@rev) |
|
|
338 | 339 | end |
|
|
339 | 340 | show_error_not_found unless @changeset |
|
|
340 | 341 | end |
|
|
341 | 342 | |
|
|
342 | 343 | def show_error_not_found |
|
|
343 | 344 | render_error :message => l(:error_scm_not_found), :status => 404 |
|
|
344 | 345 | end |
|
|
345 | 346 | |
|
|
346 | 347 | # Handler for Redmine::Scm::Adapters::CommandFailed exception |
|
|
347 | 348 | def show_error_command_failed(exception) |
|
|
348 | 349 | render_error l(:error_scm_command_failed, exception.message) |
|
|
349 | 350 | end |
|
|
350 | 351 | |
|
|
351 | 352 | def graph_commits_per_month(repository) |
|
|
352 | 353 | @date_to = Date.today |
|
|
353 | 354 | @date_from = @date_to << 11 |
|
|
354 | 355 | @date_from = Date.civil(@date_from.year, @date_from.month, 1) |
|
|
355 | 356 | commits_by_day = Changeset. |
|
|
356 | 357 | where("repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to). |
|
|
357 | 358 | group(:commit_date). |
|
|
358 | 359 | count |
|
|
359 | 360 | commits_by_month = [0] * 12 |
|
|
360 | 361 | commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last } |
|
|
361 | 362 | |
|
|
362 | 363 | changes_by_day = Change. |
|
|
363 | 364 | joins(:changeset). |
|
|
364 | 365 | where("#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to). |
|
|
365 | 366 | group(:commit_date). |
|
|
366 | 367 | count |
|
|
367 | 368 | changes_by_month = [0] * 12 |
|
|
368 | 369 | changes_by_day.each {|c| changes_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last } |
|
|
369 | 370 | |
|
|
370 | 371 | fields = [] |
|
|
371 | 372 | 12.times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)} |
|
|
372 | 373 | |
|
|
373 | 374 | graph = SVG::Graph::Bar.new( |
|
|
374 | 375 | :height => 300, |
|
|
375 | 376 | :width => 800, |
|
|
376 | 377 | :fields => fields.reverse, |
|
|
377 | 378 | :stack => :side, |
|
|
378 | 379 | :scale_integers => true, |
|
|
379 | 380 | :step_x_labels => 2, |
|
|
380 | 381 | :show_data_values => false, |
|
|
381 | 382 | :graph_title => l(:label_commits_per_month), |
|
|
382 | 383 | :show_graph_title => true |
|
|
383 | 384 | ) |
|
|
384 | 385 | |
|
|
385 | 386 | graph.add_data( |
|
|
386 | 387 | :data => commits_by_month[0..11].reverse, |
|
|
387 | 388 | :title => l(:label_revision_plural) |
|
|
388 | 389 | ) |
|
|
389 | 390 | |
|
|
390 | 391 | graph.add_data( |
|
|
391 | 392 | :data => changes_by_month[0..11].reverse, |
|
|
392 | 393 | :title => l(:label_change_plural) |
|
|
393 | 394 | ) |
|
|
394 | 395 | |
|
|
395 | 396 | graph.burn |
|
|
396 | 397 | end |
|
|
397 | 398 | |
|
|
398 | 399 | def graph_commits_per_author(repository) |
|
|
399 | 400 | commits_by_author = Changeset.where("repository_id = ?", repository.id).group(:committer).count |
|
|
400 | 401 | commits_by_author.to_a.sort! {|x, y| x.last <=> y.last} |
|
|
401 | 402 | |
|
|
402 | 403 | changes_by_author = Change.joins(:changeset).where("#{Changeset.table_name}.repository_id = ?", repository.id).group(:committer).count |
|
|
403 | 404 | h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o} |
|
|
404 | 405 | |
|
|
405 | 406 | fields = commits_by_author.collect {|r| r.first} |
|
|
406 | 407 | commits_data = commits_by_author.collect {|r| r.last} |
|
|
407 | 408 | changes_data = commits_by_author.collect {|r| h[r.first] || 0} |
|
|
408 | 409 | |
|
|
409 | 410 | fields = fields + [""]*(10 - fields.length) if fields.length<10 |
|
|
410 | 411 | commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10 |
|
|
411 | 412 | changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10 |
|
|
412 | 413 | |
|
|
413 | 414 | # Remove email adress in usernames |
|
|
414 | 415 | fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') } |
|
|
415 | 416 | |
|
|
416 | 417 | graph = SVG::Graph::BarHorizontal.new( |
|
|
417 | 418 | :height => 30 * commits_data.length, |
|
|
418 | 419 | :width => 800, |
|
|
419 | 420 | :fields => fields, |
|
|
420 | 421 | :stack => :side, |
|
|
421 | 422 | :scale_integers => true, |
|
|
422 | 423 | :show_data_values => false, |
|
|
423 | 424 | :rotate_y_labels => false, |
|
|
424 | 425 | :graph_title => l(:label_commits_per_author), |
|
|
425 | 426 | :show_graph_title => true |
|
|
426 | 427 | ) |
|
|
427 | 428 | graph.add_data( |
|
|
428 | 429 | :data => commits_data, |
|
|
429 | 430 | :title => l(:label_revision_plural) |
|
|
430 | 431 | ) |
|
|
431 | 432 | graph.add_data( |
|
|
432 | 433 | :data => changes_data, |
|
|
433 | 434 | :title => l(:label_change_plural) |
|
|
434 | 435 | ) |
|
|
435 | 436 | graph.burn |
|
|
436 | 437 | end |
|
|
437 | 438 | end |
| @@ -1,289 +1,297 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2013 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.expand_path('../../test_helper', __FILE__) |
|
|
19 | 19 | |
|
|
20 | 20 | class RepositoriesControllerTest < ActionController::TestCase |
|
|
21 | 21 | fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, |
|
|
22 | 22 | :repositories, :issues, :issue_statuses, :changesets, :changes, |
|
|
23 | 23 | :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers |
|
|
24 | 24 | |
|
|
25 | 25 | def setup |
|
|
26 | 26 | User.current = nil |
|
|
27 | 27 | end |
|
|
28 | 28 | |
|
|
29 | 29 | def test_new |
|
|
30 | 30 | @request.session[:user_id] = 1 |
|
|
31 | 31 | get :new, :project_id => 'subproject1' |
|
|
32 | 32 | assert_response :success |
|
|
33 | 33 | assert_template 'new' |
|
|
34 | 34 | assert_kind_of Repository::Subversion, assigns(:repository) |
|
|
35 | 35 | assert assigns(:repository).new_record? |
|
|
36 | 36 | assert_tag 'input', :attributes => {:name => 'repository[url]', :disabled => nil} |
|
|
37 | 37 | end |
|
|
38 | 38 | |
|
|
39 | 39 | def test_new_should_propose_enabled_scm_only |
|
|
40 | 40 | @request.session[:user_id] = 1 |
|
|
41 | 41 | with_settings :enabled_scm => ['Mercurial', 'Git'] do |
|
|
42 | 42 | get :new, :project_id => 'subproject1' |
|
|
43 | 43 | end |
|
|
44 | 44 | assert_response :success |
|
|
45 | 45 | assert_template 'new' |
|
|
46 | 46 | assert_kind_of Repository::Mercurial, assigns(:repository) |
|
|
47 | 47 | assert_tag 'select', :attributes => {:name => 'repository_scm'}, |
|
|
48 | 48 | :children => {:count => 3} |
|
|
49 | 49 | assert_tag 'select', :attributes => {:name => 'repository_scm'}, |
|
|
50 | 50 | :child => {:tag => 'option', :attributes => {:value => 'Mercurial', :selected => 'selected'}} |
|
|
51 | 51 | assert_tag 'select', :attributes => {:name => 'repository_scm'}, |
|
|
52 | 52 | :child => {:tag => 'option', :attributes => {:value => 'Git', :selected => nil}} |
|
|
53 | 53 | end |
|
|
54 | 54 | |
|
|
55 | 55 | def test_create |
|
|
56 | 56 | @request.session[:user_id] = 1 |
|
|
57 | 57 | assert_difference 'Repository.count' do |
|
|
58 | 58 | post :create, :project_id => 'subproject1', |
|
|
59 | 59 | :repository_scm => 'Subversion', |
|
|
60 | 60 | :repository => {:url => 'file:///test', :is_default => '1', :identifier => ''} |
|
|
61 | 61 | end |
|
|
62 | 62 | assert_response 302 |
|
|
63 | 63 | repository = Repository.first(:order => 'id DESC') |
|
|
64 | 64 | assert_kind_of Repository::Subversion, repository |
|
|
65 | 65 | assert_equal 'file:///test', repository.url |
|
|
66 | 66 | end |
|
|
67 | 67 | |
|
|
68 | 68 | def test_create_with_failure |
|
|
69 | 69 | @request.session[:user_id] = 1 |
|
|
70 | 70 | assert_no_difference 'Repository.count' do |
|
|
71 | 71 | post :create, :project_id => 'subproject1', |
|
|
72 | 72 | :repository_scm => 'Subversion', |
|
|
73 | 73 | :repository => {:url => 'invalid'} |
|
|
74 | 74 | end |
|
|
75 | 75 | assert_response :success |
|
|
76 | 76 | assert_template 'new' |
|
|
77 | 77 | assert_kind_of Repository::Subversion, assigns(:repository) |
|
|
78 | 78 | assert assigns(:repository).new_record? |
|
|
79 | 79 | end |
|
|
80 | 80 | |
|
|
81 | 81 | def test_edit |
|
|
82 | 82 | @request.session[:user_id] = 1 |
|
|
83 | 83 | get :edit, :id => 11 |
|
|
84 | 84 | assert_response :success |
|
|
85 | 85 | assert_template 'edit' |
|
|
86 | 86 | assert_equal Repository.find(11), assigns(:repository) |
|
|
87 | 87 | assert_tag 'input', :attributes => {:name => 'repository[url]', :value => 'svn://localhost/test', :disabled => 'disabled'} |
|
|
88 | 88 | end |
|
|
89 | 89 | |
|
|
90 | 90 | def test_update |
|
|
91 | 91 | @request.session[:user_id] = 1 |
|
|
92 | 92 | put :update, :id => 11, :repository => {:password => 'test_update'} |
|
|
93 | 93 | assert_response 302 |
|
|
94 | 94 | assert_equal 'test_update', Repository.find(11).password |
|
|
95 | 95 | end |
|
|
96 | 96 | |
|
|
97 | 97 | def test_update_with_failure |
|
|
98 | 98 | @request.session[:user_id] = 1 |
|
|
99 | 99 | put :update, :id => 11, :repository => {:password => 'x'*260} |
|
|
100 | 100 | assert_response :success |
|
|
101 | 101 | assert_template 'edit' |
|
|
102 | 102 | assert_equal Repository.find(11), assigns(:repository) |
|
|
103 | 103 | end |
|
|
104 | 104 | |
|
|
105 | 105 | def test_destroy |
|
|
106 | 106 | @request.session[:user_id] = 1 |
|
|
107 | 107 | assert_difference 'Repository.count', -1 do |
|
|
108 | 108 | delete :destroy, :id => 11 |
|
|
109 | 109 | end |
|
|
110 | 110 | assert_response 302 |
|
|
111 | 111 | assert_nil Repository.find_by_id(11) |
|
|
112 | 112 | end |
|
|
113 | 113 | |
|
|
114 | 114 | def test_show_with_autofetch_changesets_enabled_should_fetch_changesets |
|
|
115 | 115 | Repository::Subversion.any_instance.expects(:fetch_changesets).once |
|
|
116 | 116 | |
|
|
117 | 117 | with_settings :autofetch_changesets => '1' do |
|
|
118 | 118 | get :show, :id => 1 |
|
|
119 | 119 | end |
|
|
120 | 120 | end |
|
|
121 | 121 | |
|
|
122 | 122 | def test_show_with_autofetch_changesets_disabled_should_not_fetch_changesets |
|
|
123 | 123 | Repository::Subversion.any_instance.expects(:fetch_changesets).never |
|
|
124 | 124 | |
|
|
125 | 125 | with_settings :autofetch_changesets => '0' do |
|
|
126 | 126 | get :show, :id => 1 |
|
|
127 | 127 | end |
|
|
128 | 128 | end |
|
|
129 | 129 | |
|
|
130 | 130 | def test_show_with_closed_project_should_not_fetch_changesets |
|
|
131 | 131 | Repository::Subversion.any_instance.expects(:fetch_changesets).never |
|
|
132 | 132 | Project.find(1).close |
|
|
133 | 133 | |
|
|
134 | 134 | with_settings :autofetch_changesets => '1' do |
|
|
135 | 135 | get :show, :id => 1 |
|
|
136 | 136 | end |
|
|
137 | 137 | end |
|
|
138 | 138 | |
|
|
139 | 139 | def test_revisions |
|
|
140 | 140 | get :revisions, :id => 1 |
|
|
141 | 141 | assert_response :success |
|
|
142 | 142 | assert_template 'revisions' |
|
|
143 | 143 | assert_equal Repository.find(10), assigns(:repository) |
|
|
144 | 144 | assert_not_nil assigns(:changesets) |
|
|
145 | 145 | end |
|
|
146 | 146 | |
|
|
147 | 147 | def test_revisions_for_other_repository |
|
|
148 | 148 | repository = Repository::Subversion.create!(:project_id => 1, :identifier => 'foo', :url => 'file:///foo') |
|
|
149 | 149 | |
|
|
150 | 150 | get :revisions, :id => 1, :repository_id => 'foo' |
|
|
151 | 151 | assert_response :success |
|
|
152 | 152 | assert_template 'revisions' |
|
|
153 | 153 | assert_equal repository, assigns(:repository) |
|
|
154 | 154 | assert_not_nil assigns(:changesets) |
|
|
155 | 155 | end |
|
|
156 | 156 | |
|
|
157 | 157 | def test_revisions_for_invalid_repository |
|
|
158 | 158 | get :revisions, :id => 1, :repository_id => 'foo' |
|
|
159 | 159 | assert_response 404 |
|
|
160 | 160 | end |
|
|
161 | 161 | |
|
|
162 | 162 | def test_revision |
|
|
163 | 163 | get :revision, :id => 1, :rev => 1 |
|
|
164 | 164 | assert_response :success |
|
|
165 | 165 | assert_not_nil assigns(:changeset) |
|
|
166 | 166 | assert_equal "1", assigns(:changeset).revision |
|
|
167 | 167 | end |
|
|
168 | 168 | |
|
|
169 | 169 | def test_revision_should_not_change_the_project_menu_link |
|
|
170 | 170 | get :revision, :id => 1, :rev => 1 |
|
|
171 | 171 | assert_response :success |
|
|
172 | 172 | |
|
|
173 | 173 | assert_tag 'a', :attributes => {:href => '/projects/ecookbook/repository', :class => /repository/}, |
|
|
174 | 174 | :ancestor => {:attributes => {:id => 'main-menu'}} |
|
|
175 | 175 | end |
|
|
176 | 176 | |
|
|
177 | 177 | def test_revision_with_before_nil_and_afer_normal |
|
|
178 | 178 | get :revision, {:id => 1, :rev => 1} |
|
|
179 | 179 | assert_response :success |
|
|
180 | 180 | assert_template 'revision' |
|
|
181 | 181 | assert_no_tag :tag => "div", :attributes => { :class => "contextual" }, |
|
|
182 | 182 | :child => { :tag => "a", :attributes => { :href => '/projects/ecookbook/repository/revisions/0'} |
|
|
183 | 183 | } |
|
|
184 | 184 | assert_tag :tag => "div", :attributes => { :class => "contextual" }, |
|
|
185 | 185 | :child => { :tag => "a", :attributes => { :href => '/projects/ecookbook/repository/revisions/2'} |
|
|
186 | 186 | } |
|
|
187 | 187 | end |
|
|
188 | 188 | |
|
|
189 | 189 | def test_add_related_issue |
|
|
190 | 190 | @request.session[:user_id] = 2 |
|
|
191 | 191 | assert_difference 'Changeset.find(103).issues.size' do |
|
|
192 | 192 | xhr :post, :add_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js' |
|
|
193 | 193 | assert_response :success |
|
|
194 | 194 | assert_template 'add_related_issue' |
|
|
195 | 195 | assert_equal 'text/javascript', response.content_type |
|
|
196 | 196 | end |
|
|
197 | 197 | assert_equal [2], Changeset.find(103).issue_ids |
|
|
198 | 198 | assert_include 'related-issues', response.body |
|
|
199 | 199 | assert_include 'Feature request #2', response.body |
|
|
200 | 200 | end |
|
|
201 | 201 | |
|
|
202 | def test_add_related_issue_should_accept_issue_id_with_sharp | |
|
|
203 | @request.session[:user_id] = 2 | |
|
|
204 | assert_difference 'Changeset.find(103).issues.size' do | |
|
|
205 | xhr :post, :add_related_issue, :id => 1, :rev => 4, :issue_id => "#2", :format => 'js' | |
|
|
206 | end | |
|
|
207 | assert_equal [2], Changeset.find(103).issue_ids | |
|
|
208 | end | |
|
|
209 | ||
|
|
202 | 210 | def test_add_related_issue_with_invalid_issue_id |
|
|
203 | 211 | @request.session[:user_id] = 2 |
|
|
204 | 212 | assert_no_difference 'Changeset.find(103).issues.size' do |
|
|
205 | 213 | xhr :post, :add_related_issue, :id => 1, :rev => 4, :issue_id => 9999, :format => 'js' |
|
|
206 | 214 | assert_response :success |
|
|
207 | 215 | assert_template 'add_related_issue' |
|
|
208 | 216 | assert_equal 'text/javascript', response.content_type |
|
|
209 | 217 | end |
|
|
210 | 218 | assert_include 'alert("Issue is invalid")', response.body |
|
|
211 | 219 | end |
|
|
212 | 220 | |
|
|
213 | 221 | def test_remove_related_issue |
|
|
214 | 222 | Changeset.find(103).issues << Issue.find(1) |
|
|
215 | 223 | Changeset.find(103).issues << Issue.find(2) |
|
|
216 | 224 | |
|
|
217 | 225 | @request.session[:user_id] = 2 |
|
|
218 | 226 | assert_difference 'Changeset.find(103).issues.size', -1 do |
|
|
219 | 227 | xhr :delete, :remove_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js' |
|
|
220 | 228 | assert_response :success |
|
|
221 | 229 | assert_template 'remove_related_issue' |
|
|
222 | 230 | assert_equal 'text/javascript', response.content_type |
|
|
223 | 231 | end |
|
|
224 | 232 | assert_equal [1], Changeset.find(103).issue_ids |
|
|
225 | 233 | assert_include 'related-issue-2', response.body |
|
|
226 | 234 | end |
|
|
227 | 235 | |
|
|
228 | 236 | def test_graph_commits_per_month |
|
|
229 | 237 | # Make sure there's some data to display |
|
|
230 | 238 | latest = Project.find(1).repository.changesets.maximum(:commit_date) |
|
|
231 | 239 | assert_not_nil latest |
|
|
232 | 240 | Date.stubs(:today).returns(latest.to_date + 10) |
|
|
233 | 241 | |
|
|
234 | 242 | get :graph, :id => 1, :graph => 'commits_per_month' |
|
|
235 | 243 | assert_response :success |
|
|
236 | 244 | assert_equal 'image/svg+xml', @response.content_type |
|
|
237 | 245 | end |
|
|
238 | 246 | |
|
|
239 | 247 | def test_graph_commits_per_author |
|
|
240 | 248 | get :graph, :id => 1, :graph => 'commits_per_author' |
|
|
241 | 249 | assert_response :success |
|
|
242 | 250 | assert_equal 'image/svg+xml', @response.content_type |
|
|
243 | 251 | end |
|
|
244 | 252 | |
|
|
245 | 253 | def test_get_committers |
|
|
246 | 254 | @request.session[:user_id] = 2 |
|
|
247 | 255 | # add a commit with an unknown user |
|
|
248 | 256 | Changeset.create!( |
|
|
249 | 257 | :repository => Project.find(1).repository, |
|
|
250 | 258 | :committer => 'foo', |
|
|
251 | 259 | :committed_on => Time.now, |
|
|
252 | 260 | :revision => 100, |
|
|
253 | 261 | :comments => 'Committed by foo.' |
|
|
254 | 262 | ) |
|
|
255 | 263 | |
|
|
256 | 264 | get :committers, :id => 10 |
|
|
257 | 265 | assert_response :success |
|
|
258 | 266 | assert_template 'committers' |
|
|
259 | 267 | |
|
|
260 | 268 | assert_tag :td, :content => 'dlopper', |
|
|
261 | 269 | :sibling => { :tag => 'td', |
|
|
262 | 270 | :child => { :tag => 'select', :attributes => { :name => %r{^committers\[\d+\]\[\]$} }, |
|
|
263 | 271 | :child => { :tag => 'option', :content => 'Dave Lopper', |
|
|
264 | 272 | :attributes => { :value => '3', :selected => 'selected' }}}} |
|
|
265 | 273 | assert_tag :td, :content => 'foo', |
|
|
266 | 274 | :sibling => { :tag => 'td', |
|
|
267 | 275 | :child => { :tag => 'select', :attributes => { :name => %r{^committers\[\d+\]\[\]$} }}} |
|
|
268 | 276 | assert_no_tag :td, :content => 'foo', |
|
|
269 | 277 | :sibling => { :tag => 'td', |
|
|
270 | 278 | :descendant => { :tag => 'option', :attributes => { :selected => 'selected' }}} |
|
|
271 | 279 | end |
|
|
272 | 280 | |
|
|
273 | 281 | def test_post_committers |
|
|
274 | 282 | @request.session[:user_id] = 2 |
|
|
275 | 283 | # add a commit with an unknown user |
|
|
276 | 284 | c = Changeset.create!( |
|
|
277 | 285 | :repository => Project.find(1).repository, |
|
|
278 | 286 | :committer => 'foo', |
|
|
279 | 287 | :committed_on => Time.now, |
|
|
280 | 288 | :revision => 100, |
|
|
281 | 289 | :comments => 'Committed by foo.' |
|
|
282 | 290 | ) |
|
|
283 | 291 | assert_no_difference "Changeset.where(:user_id => 3).count" do |
|
|
284 | 292 | post :committers, :id => 10, :committers => { '0' => ['foo', '2'], '1' => ['dlopper', '3']} |
|
|
285 | 293 | assert_response 302 |
|
|
286 | 294 | assert_equal User.find(2), c.reload.user |
|
|
287 | 295 | end |
|
|
288 | 296 | end |
|
|
289 | 297 | end |
General Comments 0
You need to be logged in to leave comments.
Login now