@@ -1,433 +1,433 | |||||
1 | # Redmine - project management software |
|
1 | # Redmine - project management software | |
2 | # Copyright (C) 2006-2012 Jean-Philippe Lang |
|
2 | # Copyright (C) 2006-2012 Jean-Philippe Lang | |
3 | # |
|
3 | # | |
4 | # This program is free software; you can redistribute it and/or |
|
4 | # This program is free software; you can redistribute it and/or | |
5 | # modify it under the terms of the GNU General Public License |
|
5 | # modify it under the terms of the GNU General Public License | |
6 | # as published by the Free Software Foundation; either version 2 |
|
6 | # as published by the Free Software Foundation; either version 2 | |
7 | # of the License, or (at your option) any later version. |
|
7 | # of the License, or (at your option) any later version. | |
8 | # |
|
8 | # | |
9 | # This program is distributed in the hope that it will be useful, |
|
9 | # This program is distributed in the hope that it will be useful, | |
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 | # GNU General Public License for more details. |
|
12 | # GNU General Public License for more details. | |
13 | # |
|
13 | # | |
14 | # You should have received a copy of the GNU General Public License |
|
14 | # You should have received a copy of the GNU General Public License | |
15 | # along with this program; if not, write to the Free Software |
|
15 | # along with this program; if not, write to the Free Software | |
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | require 'SVG/Graph/Bar' |
|
18 | require 'SVG/Graph/Bar' | |
19 | require 'SVG/Graph/BarHorizontal' |
|
19 | require 'SVG/Graph/BarHorizontal' | |
20 | require 'digest/sha1' |
|
20 | require 'digest/sha1' | |
21 | require 'redmine/scm/adapters/abstract_adapter' |
|
21 | require 'redmine/scm/adapters/abstract_adapter' | |
22 |
|
22 | |||
23 | class ChangesetNotFound < Exception; end |
|
23 | class ChangesetNotFound < Exception; end | |
24 | class InvalidRevisionParam < Exception; end |
|
24 | class InvalidRevisionParam < Exception; end | |
25 |
|
25 | |||
26 | class RepositoriesController < ApplicationController |
|
26 | class RepositoriesController < ApplicationController | |
27 | menu_item :repository |
|
27 | menu_item :repository | |
28 | menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers] |
|
28 | menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers] | |
29 | default_search_scope :changesets |
|
29 | default_search_scope :changesets | |
30 |
|
30 | |||
31 | before_filter :find_project_by_project_id, :only => [:new, :create] |
|
31 | before_filter :find_project_by_project_id, :only => [:new, :create] | |
32 | before_filter :find_repository, :only => [:edit, :update, :destroy, :committers] |
|
32 | before_filter :find_repository, :only => [:edit, :update, :destroy, :committers] | |
33 | before_filter :find_project_repository, :except => [:new, :create, :edit, :update, :destroy, :committers] |
|
33 | before_filter :find_project_repository, :except => [:new, :create, :edit, :update, :destroy, :committers] | |
34 | before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue] |
|
34 | before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue] | |
35 | before_filter :authorize |
|
35 | before_filter :authorize | |
36 | accept_rss_auth :revisions |
|
36 | accept_rss_auth :revisions | |
37 |
|
37 | |||
38 | rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed |
|
38 | rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed | |
39 |
|
39 | |||
40 | def new |
|
40 | def new | |
41 | scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first |
|
41 | scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first | |
42 | @repository = Repository.factory(scm) |
|
42 | @repository = Repository.factory(scm) | |
43 | @repository.is_default = @project.repository.nil? |
|
43 | @repository.is_default = @project.repository.nil? | |
44 | @repository.project = @project |
|
44 | @repository.project = @project | |
45 | end |
|
45 | end | |
46 |
|
46 | |||
47 | def create |
|
47 | def create | |
48 | attrs = pickup_extra_info |
|
48 | attrs = pickup_extra_info | |
49 | @repository = Repository.factory(params[:repository_scm]) |
|
49 | @repository = Repository.factory(params[:repository_scm]) | |
50 | @repository.safe_attributes = params[:repository] |
|
50 | @repository.safe_attributes = params[:repository] | |
51 | if attrs[:attrs_extra].keys.any? |
|
51 | if attrs[:attrs_extra].keys.any? | |
52 | @repository.merge_extra_info(attrs[:attrs_extra]) |
|
52 | @repository.merge_extra_info(attrs[:attrs_extra]) | |
53 | end |
|
53 | end | |
54 | @repository.project = @project |
|
54 | @repository.project = @project | |
55 | if request.post? && @repository.save |
|
55 | if request.post? && @repository.save | |
56 | redirect_to settings_project_path(@project, :tab => 'repositories') |
|
56 | redirect_to settings_project_path(@project, :tab => 'repositories') | |
57 | else |
|
57 | else | |
58 | render :action => 'new' |
|
58 | render :action => 'new' | |
59 | end |
|
59 | end | |
60 | end |
|
60 | end | |
61 |
|
61 | |||
62 | def edit |
|
62 | def edit | |
63 | end |
|
63 | end | |
64 |
|
64 | |||
65 | def update |
|
65 | def update | |
66 | attrs = pickup_extra_info |
|
66 | attrs = pickup_extra_info | |
67 | @repository.safe_attributes = attrs[:attrs] |
|
67 | @repository.safe_attributes = attrs[:attrs] | |
68 | if attrs[:attrs_extra].keys.any? |
|
68 | if attrs[:attrs_extra].keys.any? | |
69 | @repository.merge_extra_info(attrs[:attrs_extra]) |
|
69 | @repository.merge_extra_info(attrs[:attrs_extra]) | |
70 | end |
|
70 | end | |
71 | @repository.project = @project |
|
71 | @repository.project = @project | |
72 | if request.put? && @repository.save |
|
72 | if request.put? && @repository.save | |
73 | redirect_to settings_project_path(@project, :tab => 'repositories') |
|
73 | redirect_to settings_project_path(@project, :tab => 'repositories') | |
74 | else |
|
74 | else | |
75 | render :action => 'edit' |
|
75 | render :action => 'edit' | |
76 | end |
|
76 | end | |
77 | end |
|
77 | end | |
78 |
|
78 | |||
79 | def pickup_extra_info |
|
79 | def pickup_extra_info | |
80 | p = {} |
|
80 | p = {} | |
81 | p_extra = {} |
|
81 | p_extra = {} | |
82 | params[:repository].each do |k, v| |
|
82 | params[:repository].each do |k, v| | |
83 | if k =~ /^extra_/ |
|
83 | if k =~ /^extra_/ | |
84 | p_extra[k] = v |
|
84 | p_extra[k] = v | |
85 | else |
|
85 | else | |
86 | p[k] = v |
|
86 | p[k] = v | |
87 | end |
|
87 | end | |
88 | end |
|
88 | end | |
89 | {:attrs => p, :attrs_extra => p_extra} |
|
89 | {:attrs => p, :attrs_extra => p_extra} | |
90 | end |
|
90 | end | |
91 | private :pickup_extra_info |
|
91 | private :pickup_extra_info | |
92 |
|
92 | |||
93 | def committers |
|
93 | def committers | |
94 | @committers = @repository.committers |
|
94 | @committers = @repository.committers | |
95 | @users = @project.users |
|
95 | @users = @project.users | |
96 | additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id) |
|
96 | additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id) | |
97 | @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty? |
|
97 | @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty? | |
98 | @users.compact! |
|
98 | @users.compact! | |
99 | @users.sort! |
|
99 | @users.sort! | |
100 | if request.post? && params[:committers].is_a?(Hash) |
|
100 | if request.post? && params[:committers].is_a?(Hash) | |
101 | # Build a hash with repository usernames as keys and corresponding user ids as values |
|
101 | # Build a hash with repository usernames as keys and corresponding user ids as values | |
102 | @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h} |
|
102 | @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h} | |
103 | flash[:notice] = l(:notice_successful_update) |
|
103 | flash[:notice] = l(:notice_successful_update) | |
104 | redirect_to settings_project_path(@project, :tab => 'repositories') |
|
104 | redirect_to settings_project_path(@project, :tab => 'repositories') | |
105 | end |
|
105 | end | |
106 | end |
|
106 | end | |
107 |
|
107 | |||
108 | def destroy |
|
108 | def destroy | |
109 | @repository.destroy if request.delete? |
|
109 | @repository.destroy if request.delete? | |
110 | redirect_to settings_project_path(@project, :tab => 'repositories') |
|
110 | redirect_to settings_project_path(@project, :tab => 'repositories') | |
111 | end |
|
111 | end | |
112 |
|
112 | |||
113 | def show |
|
113 | def show | |
114 | @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? |
|
114 | @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? | |
115 |
|
115 | |||
116 | @entries = @repository.entries(@path, @rev) |
|
116 | @entries = @repository.entries(@path, @rev) | |
117 | @changeset = @repository.find_changeset_by_name(@rev) |
|
117 | @changeset = @repository.find_changeset_by_name(@rev) | |
118 | if request.xhr? |
|
118 | if request.xhr? | |
119 | @entries ? render(:partial => 'dir_list_content') : render(:nothing => true) |
|
119 | @entries ? render(:partial => 'dir_list_content') : render(:nothing => true) | |
120 | else |
|
120 | else | |
121 | (show_error_not_found; return) unless @entries |
|
121 | (show_error_not_found; return) unless @entries | |
122 | @changesets = @repository.latest_changesets(@path, @rev) |
|
122 | @changesets = @repository.latest_changesets(@path, @rev) | |
123 | @properties = @repository.properties(@path, @rev) |
|
123 | @properties = @repository.properties(@path, @rev) | |
124 | @repositories = @project.repositories |
|
124 | @repositories = @project.repositories | |
125 | render :action => 'show' |
|
125 | render :action => 'show' | |
126 | end |
|
126 | end | |
127 | end |
|
127 | end | |
128 |
|
128 | |||
129 | alias_method :browse, :show |
|
129 | alias_method :browse, :show | |
130 |
|
130 | |||
131 | def changes |
|
131 | def changes | |
132 | @entry = @repository.entry(@path, @rev) |
|
132 | @entry = @repository.entry(@path, @rev) | |
133 | (show_error_not_found; return) unless @entry |
|
133 | (show_error_not_found; return) unless @entry | |
134 | @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i) |
|
134 | @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i) | |
135 | @properties = @repository.properties(@path, @rev) |
|
135 | @properties = @repository.properties(@path, @rev) | |
136 | @changeset = @repository.find_changeset_by_name(@rev) |
|
136 | @changeset = @repository.find_changeset_by_name(@rev) | |
137 | end |
|
137 | end | |
138 |
|
138 | |||
139 | def revisions |
|
139 | def revisions | |
140 | @changeset_count = @repository.changesets.count |
|
140 | @changeset_count = @repository.changesets.count | |
141 | @changeset_pages = Paginator.new self, @changeset_count, |
|
141 | @changeset_pages = Paginator.new self, @changeset_count, | |
142 | per_page_option, |
|
142 | per_page_option, | |
143 | params['page'] |
|
143 | params['page'] | |
144 | @changesets = @repository.changesets.find(:all, |
|
144 | @changesets = @repository.changesets.find(:all, | |
145 | :limit => @changeset_pages.items_per_page, |
|
145 | :limit => @changeset_pages.items_per_page, | |
146 | :offset => @changeset_pages.current.offset, |
|
146 | :offset => @changeset_pages.current.offset, | |
147 | :include => [:user, :repository, :parents]) |
|
147 | :include => [:user, :repository, :parents]) | |
148 |
|
148 | |||
149 | respond_to do |format| |
|
149 | respond_to do |format| | |
150 | format.html { render :layout => false if request.xhr? } |
|
150 | format.html { render :layout => false if request.xhr? } | |
151 | format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") } |
|
151 | format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") } | |
152 | end |
|
152 | end | |
153 | end |
|
153 | end | |
154 |
|
154 | |||
155 | def raw |
|
155 | def raw | |
156 | entry_and_raw(true) |
|
156 | entry_and_raw(true) | |
157 | end |
|
157 | end | |
158 |
|
158 | |||
159 | def entry |
|
159 | def entry | |
160 | entry_and_raw(false) |
|
160 | entry_and_raw(false) | |
161 | end |
|
161 | end | |
162 |
|
162 | |||
163 | def entry_and_raw(is_raw) |
|
163 | def entry_and_raw(is_raw) | |
164 | @entry = @repository.entry(@path, @rev) |
|
164 | @entry = @repository.entry(@path, @rev) | |
165 | (show_error_not_found; return) unless @entry |
|
165 | (show_error_not_found; return) unless @entry | |
166 |
|
166 | |||
167 | # If the entry is a dir, show the browser |
|
167 | # If the entry is a dir, show the browser | |
168 | (show; return) if @entry.is_dir? |
|
168 | (show; return) if @entry.is_dir? | |
169 |
|
169 | |||
170 | @content = @repository.cat(@path, @rev) |
|
170 | @content = @repository.cat(@path, @rev) | |
171 | (show_error_not_found; return) unless @content |
|
171 | (show_error_not_found; return) unless @content | |
172 | if is_raw || |
|
172 | if is_raw || | |
173 | (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) || |
|
173 | (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) || | |
174 | ! is_entry_text_data?(@content, @path) |
|
174 | ! is_entry_text_data?(@content, @path) | |
175 | # Force the download |
|
175 | # Force the download | |
176 | send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) } |
|
176 | send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) } | |
177 | send_type = Redmine::MimeType.of(@path) |
|
177 | send_type = Redmine::MimeType.of(@path) | |
178 | send_opt[:type] = send_type.to_s if send_type |
|
178 | send_opt[:type] = send_type.to_s if send_type | |
179 | send_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) && !is_raw ? 'inline' : 'attachment') |
|
179 | send_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) && !is_raw ? 'inline' : 'attachment') | |
180 | send_data @content, send_opt |
|
180 | send_data @content, send_opt | |
181 | else |
|
181 | else | |
182 | # Prevent empty lines when displaying a file with Windows style eol |
|
182 | # Prevent empty lines when displaying a file with Windows style eol | |
183 | # TODO: UTF-16 |
|
183 | # TODO: UTF-16 | |
184 | # Is this needs? AttachmentsController reads file simply. |
|
184 | # Is this needs? AttachmentsController reads file simply. | |
185 | @content.gsub!("\r\n", "\n") |
|
185 | @content.gsub!("\r\n", "\n") | |
186 | @changeset = @repository.find_changeset_by_name(@rev) |
|
186 | @changeset = @repository.find_changeset_by_name(@rev) | |
187 | end |
|
187 | end | |
188 | end |
|
188 | end | |
189 | private :entry_and_raw |
|
189 | private :entry_and_raw | |
190 |
|
190 | |||
191 | def is_entry_text_data?(ent, path) |
|
191 | def is_entry_text_data?(ent, path) | |
192 | # UTF-16 contains "\x00". |
|
192 | # UTF-16 contains "\x00". | |
193 | # It is very strict that file contains less than 30% of ascii symbols |
|
193 | # It is very strict that file contains less than 30% of ascii symbols | |
194 | # in non Western Europe. |
|
194 | # in non Western Europe. | |
195 | return true if Redmine::MimeType.is_type?('text', path) |
|
195 | return true if Redmine::MimeType.is_type?('text', path) | |
196 | # Ruby 1.8.6 has a bug of integer divisions. |
|
196 | # Ruby 1.8.6 has a bug of integer divisions. | |
197 | # http://apidock.com/ruby/v1_8_6_287/String/is_binary_data%3F |
|
197 | # http://apidock.com/ruby/v1_8_6_287/String/is_binary_data%3F | |
198 | return false if ent.is_binary_data? |
|
198 | return false if ent.is_binary_data? | |
199 | true |
|
199 | true | |
200 | end |
|
200 | end | |
201 | private :is_entry_text_data? |
|
201 | private :is_entry_text_data? | |
202 |
|
202 | |||
203 | def annotate |
|
203 | def annotate | |
204 | @entry = @repository.entry(@path, @rev) |
|
204 | @entry = @repository.entry(@path, @rev) | |
205 | (show_error_not_found; return) unless @entry |
|
205 | (show_error_not_found; return) unless @entry | |
206 |
|
206 | |||
207 | @annotate = @repository.scm.annotate(@path, @rev) |
|
207 | @annotate = @repository.scm.annotate(@path, @rev) | |
208 | if @annotate.nil? || @annotate.empty? |
|
208 | if @annotate.nil? || @annotate.empty? | |
209 | (render_error l(:error_scm_annotate); return) |
|
209 | (render_error l(:error_scm_annotate); return) | |
210 | end |
|
210 | end | |
211 | ann_buf_size = 0 |
|
211 | ann_buf_size = 0 | |
212 | @annotate.lines.each do |buf| |
|
212 | @annotate.lines.each do |buf| | |
213 | ann_buf_size += buf.size |
|
213 | ann_buf_size += buf.size | |
214 | end |
|
214 | end | |
215 | if ann_buf_size > Setting.file_max_size_displayed.to_i.kilobyte |
|
215 | if ann_buf_size > Setting.file_max_size_displayed.to_i.kilobyte | |
216 | (render_error l(:error_scm_annotate_big_text_file); return) |
|
216 | (render_error l(:error_scm_annotate_big_text_file); return) | |
217 | end |
|
217 | end | |
218 | @changeset = @repository.find_changeset_by_name(@rev) |
|
218 | @changeset = @repository.find_changeset_by_name(@rev) | |
219 | end |
|
219 | end | |
220 |
|
220 | |||
221 | def revision |
|
221 | def revision | |
222 | respond_to do |format| |
|
222 | respond_to do |format| | |
223 | format.html |
|
223 | format.html | |
224 | format.js {render :layout => false} |
|
224 | format.js {render :layout => false} | |
225 | end |
|
225 | end | |
226 | end |
|
226 | end | |
227 |
|
227 | |||
228 | # Adds a related issue to a changeset |
|
228 | # Adds a related issue to a changeset | |
229 | # POST /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues |
|
229 | # POST /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues | |
230 | def add_related_issue |
|
230 | def add_related_issue | |
231 | @issue = @changeset.find_referenced_issue_by_id(params[:issue_id]) |
|
231 | @issue = @changeset.find_referenced_issue_by_id(params[:issue_id]) | |
232 | if @issue && (!@issue.visible? || @changeset.issues.include?(@issue)) |
|
232 | if @issue && (!@issue.visible? || @changeset.issues.include?(@issue)) | |
233 | @issue = nil |
|
233 | @issue = nil | |
234 | end |
|
234 | end | |
235 |
|
235 | |||
236 | if @issue |
|
236 | if @issue | |
237 | @changeset.issues << @issue |
|
237 | @changeset.issues << @issue | |
238 | end |
|
238 | end | |
239 | end |
|
239 | end | |
240 |
|
240 | |||
241 | # Removes a related issue from a changeset |
|
241 | # Removes a related issue from a changeset | |
242 | # DELETE /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues/:issue_id |
|
242 | # DELETE /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues/:issue_id | |
243 | def remove_related_issue |
|
243 | def remove_related_issue | |
244 | @issue = Issue.visible.find_by_id(params[:issue_id]) |
|
244 | @issue = Issue.visible.find_by_id(params[:issue_id]) | |
245 |
if @issue |
|
245 | if @issue | |
246 | @changeset.issues.delete(@issue) |
|
246 | @changeset.issues.delete(@issue) | |
247 | end |
|
247 | end | |
248 | end |
|
248 | end | |
249 |
|
249 | |||
250 | def diff |
|
250 | def diff | |
251 | if params[:format] == 'diff' |
|
251 | if params[:format] == 'diff' | |
252 | @diff = @repository.diff(@path, @rev, @rev_to) |
|
252 | @diff = @repository.diff(@path, @rev, @rev_to) | |
253 | (show_error_not_found; return) unless @diff |
|
253 | (show_error_not_found; return) unless @diff | |
254 | filename = "changeset_r#{@rev}" |
|
254 | filename = "changeset_r#{@rev}" | |
255 | filename << "_r#{@rev_to}" if @rev_to |
|
255 | filename << "_r#{@rev_to}" if @rev_to | |
256 | send_data @diff.join, :filename => "#{filename}.diff", |
|
256 | send_data @diff.join, :filename => "#{filename}.diff", | |
257 | :type => 'text/x-patch', |
|
257 | :type => 'text/x-patch', | |
258 | :disposition => 'attachment' |
|
258 | :disposition => 'attachment' | |
259 | else |
|
259 | else | |
260 | @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline' |
|
260 | @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline' | |
261 | @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type) |
|
261 | @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type) | |
262 |
|
262 | |||
263 | # Save diff type as user preference |
|
263 | # Save diff type as user preference | |
264 | if User.current.logged? && @diff_type != User.current.pref[:diff_type] |
|
264 | if User.current.logged? && @diff_type != User.current.pref[:diff_type] | |
265 | User.current.pref[:diff_type] = @diff_type |
|
265 | User.current.pref[:diff_type] = @diff_type | |
266 | User.current.preference.save |
|
266 | User.current.preference.save | |
267 | end |
|
267 | end | |
268 | @cache_key = "repositories/diff/#{@repository.id}/" + |
|
268 | @cache_key = "repositories/diff/#{@repository.id}/" + | |
269 | Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}") |
|
269 | Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}") | |
270 | unless read_fragment(@cache_key) |
|
270 | unless read_fragment(@cache_key) | |
271 | @diff = @repository.diff(@path, @rev, @rev_to) |
|
271 | @diff = @repository.diff(@path, @rev, @rev_to) | |
272 | show_error_not_found unless @diff |
|
272 | show_error_not_found unless @diff | |
273 | end |
|
273 | end | |
274 |
|
274 | |||
275 | @changeset = @repository.find_changeset_by_name(@rev) |
|
275 | @changeset = @repository.find_changeset_by_name(@rev) | |
276 | @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil |
|
276 | @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil | |
277 | @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to) |
|
277 | @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to) | |
278 | end |
|
278 | end | |
279 | end |
|
279 | end | |
280 |
|
280 | |||
281 | def stats |
|
281 | def stats | |
282 | end |
|
282 | end | |
283 |
|
283 | |||
284 | def graph |
|
284 | def graph | |
285 | data = nil |
|
285 | data = nil | |
286 | case params[:graph] |
|
286 | case params[:graph] | |
287 | when "commits_per_month" |
|
287 | when "commits_per_month" | |
288 | data = graph_commits_per_month(@repository) |
|
288 | data = graph_commits_per_month(@repository) | |
289 | when "commits_per_author" |
|
289 | when "commits_per_author" | |
290 | data = graph_commits_per_author(@repository) |
|
290 | data = graph_commits_per_author(@repository) | |
291 | end |
|
291 | end | |
292 | if data |
|
292 | if data | |
293 | headers["Content-Type"] = "image/svg+xml" |
|
293 | headers["Content-Type"] = "image/svg+xml" | |
294 | send_data(data, :type => "image/svg+xml", :disposition => "inline") |
|
294 | send_data(data, :type => "image/svg+xml", :disposition => "inline") | |
295 | else |
|
295 | else | |
296 | render_404 |
|
296 | render_404 | |
297 | end |
|
297 | end | |
298 | end |
|
298 | end | |
299 |
|
299 | |||
300 | private |
|
300 | private | |
301 |
|
301 | |||
302 | def find_repository |
|
302 | def find_repository | |
303 | @repository = Repository.find(params[:id]) |
|
303 | @repository = Repository.find(params[:id]) | |
304 | @project = @repository.project |
|
304 | @project = @repository.project | |
305 | rescue ActiveRecord::RecordNotFound |
|
305 | rescue ActiveRecord::RecordNotFound | |
306 | render_404 |
|
306 | render_404 | |
307 | end |
|
307 | end | |
308 |
|
308 | |||
309 | REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i |
|
309 | REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i | |
310 |
|
310 | |||
311 | def find_project_repository |
|
311 | def find_project_repository | |
312 | @project = Project.find(params[:id]) |
|
312 | @project = Project.find(params[:id]) | |
313 | if params[:repository_id].present? |
|
313 | if params[:repository_id].present? | |
314 | @repository = @project.repositories.find_by_identifier_param(params[:repository_id]) |
|
314 | @repository = @project.repositories.find_by_identifier_param(params[:repository_id]) | |
315 | else |
|
315 | else | |
316 | @repository = @project.repository |
|
316 | @repository = @project.repository | |
317 | end |
|
317 | end | |
318 | (render_404; return false) unless @repository |
|
318 | (render_404; return false) unless @repository | |
319 | @path = params[:path].is_a?(Array) ? params[:path].join('/') : params[:path].to_s |
|
319 | @path = params[:path].is_a?(Array) ? params[:path].join('/') : params[:path].to_s | |
320 | @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip |
|
320 | @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip | |
321 | @rev_to = params[:rev_to] |
|
321 | @rev_to = params[:rev_to] | |
322 |
|
322 | |||
323 | unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.to_s.match(REV_PARAM_RE) |
|
323 | unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.to_s.match(REV_PARAM_RE) | |
324 | if @repository.branches.blank? |
|
324 | if @repository.branches.blank? | |
325 | raise InvalidRevisionParam |
|
325 | raise InvalidRevisionParam | |
326 | end |
|
326 | end | |
327 | end |
|
327 | end | |
328 | rescue ActiveRecord::RecordNotFound |
|
328 | rescue ActiveRecord::RecordNotFound | |
329 | render_404 |
|
329 | render_404 | |
330 | rescue InvalidRevisionParam |
|
330 | rescue InvalidRevisionParam | |
331 | show_error_not_found |
|
331 | show_error_not_found | |
332 | end |
|
332 | end | |
333 |
|
333 | |||
334 | def find_changeset |
|
334 | def find_changeset | |
335 | if @rev.present? |
|
335 | if @rev.present? | |
336 | @changeset = @repository.find_changeset_by_name(@rev) |
|
336 | @changeset = @repository.find_changeset_by_name(@rev) | |
337 | end |
|
337 | end | |
338 | show_error_not_found unless @changeset |
|
338 | show_error_not_found unless @changeset | |
339 | end |
|
339 | end | |
340 |
|
340 | |||
341 | def show_error_not_found |
|
341 | def show_error_not_found | |
342 | render_error :message => l(:error_scm_not_found), :status => 404 |
|
342 | render_error :message => l(:error_scm_not_found), :status => 404 | |
343 | end |
|
343 | end | |
344 |
|
344 | |||
345 | # Handler for Redmine::Scm::Adapters::CommandFailed exception |
|
345 | # Handler for Redmine::Scm::Adapters::CommandFailed exception | |
346 | def show_error_command_failed(exception) |
|
346 | def show_error_command_failed(exception) | |
347 | render_error l(:error_scm_command_failed, exception.message) |
|
347 | render_error l(:error_scm_command_failed, exception.message) | |
348 | end |
|
348 | end | |
349 |
|
349 | |||
350 | def graph_commits_per_month(repository) |
|
350 | def graph_commits_per_month(repository) | |
351 | @date_to = Date.today |
|
351 | @date_to = Date.today | |
352 | @date_from = @date_to << 11 |
|
352 | @date_from = @date_to << 11 | |
353 | @date_from = Date.civil(@date_from.year, @date_from.month, 1) |
|
353 | @date_from = Date.civil(@date_from.year, @date_from.month, 1) | |
354 | commits_by_day = Changeset.count( |
|
354 | commits_by_day = Changeset.count( | |
355 | :all, :group => :commit_date, |
|
355 | :all, :group => :commit_date, | |
356 | :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to]) |
|
356 | :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to]) | |
357 | commits_by_month = [0] * 12 |
|
357 | commits_by_month = [0] * 12 | |
358 | commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last } |
|
358 | commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last } | |
359 |
|
359 | |||
360 | changes_by_day = Change.count( |
|
360 | changes_by_day = Change.count( | |
361 | :all, :group => :commit_date, :include => :changeset, |
|
361 | :all, :group => :commit_date, :include => :changeset, | |
362 | :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to]) |
|
362 | :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to]) | |
363 | changes_by_month = [0] * 12 |
|
363 | changes_by_month = [0] * 12 | |
364 | changes_by_day.each {|c| changes_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last } |
|
364 | changes_by_day.each {|c| changes_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last } | |
365 |
|
365 | |||
366 | fields = [] |
|
366 | fields = [] | |
367 | 12.times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)} |
|
367 | 12.times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)} | |
368 |
|
368 | |||
369 | graph = SVG::Graph::Bar.new( |
|
369 | graph = SVG::Graph::Bar.new( | |
370 | :height => 300, |
|
370 | :height => 300, | |
371 | :width => 800, |
|
371 | :width => 800, | |
372 | :fields => fields.reverse, |
|
372 | :fields => fields.reverse, | |
373 | :stack => :side, |
|
373 | :stack => :side, | |
374 | :scale_integers => true, |
|
374 | :scale_integers => true, | |
375 | :step_x_labels => 2, |
|
375 | :step_x_labels => 2, | |
376 | :show_data_values => false, |
|
376 | :show_data_values => false, | |
377 | :graph_title => l(:label_commits_per_month), |
|
377 | :graph_title => l(:label_commits_per_month), | |
378 | :show_graph_title => true |
|
378 | :show_graph_title => true | |
379 | ) |
|
379 | ) | |
380 |
|
380 | |||
381 | graph.add_data( |
|
381 | graph.add_data( | |
382 | :data => commits_by_month[0..11].reverse, |
|
382 | :data => commits_by_month[0..11].reverse, | |
383 | :title => l(:label_revision_plural) |
|
383 | :title => l(:label_revision_plural) | |
384 | ) |
|
384 | ) | |
385 |
|
385 | |||
386 | graph.add_data( |
|
386 | graph.add_data( | |
387 | :data => changes_by_month[0..11].reverse, |
|
387 | :data => changes_by_month[0..11].reverse, | |
388 | :title => l(:label_change_plural) |
|
388 | :title => l(:label_change_plural) | |
389 | ) |
|
389 | ) | |
390 |
|
390 | |||
391 | graph.burn |
|
391 | graph.burn | |
392 | end |
|
392 | end | |
393 |
|
393 | |||
394 | def graph_commits_per_author(repository) |
|
394 | def graph_commits_per_author(repository) | |
395 | commits_by_author = Changeset.count(:all, :group => :committer, :conditions => ["repository_id = ?", repository.id]) |
|
395 | commits_by_author = Changeset.count(:all, :group => :committer, :conditions => ["repository_id = ?", repository.id]) | |
396 | commits_by_author.to_a.sort! {|x, y| x.last <=> y.last} |
|
396 | commits_by_author.to_a.sort! {|x, y| x.last <=> y.last} | |
397 |
|
397 | |||
398 | changes_by_author = Change.count(:all, :group => :committer, :include => :changeset, :conditions => ["#{Changeset.table_name}.repository_id = ?", repository.id]) |
|
398 | changes_by_author = Change.count(:all, :group => :committer, :include => :changeset, :conditions => ["#{Changeset.table_name}.repository_id = ?", repository.id]) | |
399 | h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o} |
|
399 | h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o} | |
400 |
|
400 | |||
401 | fields = commits_by_author.collect {|r| r.first} |
|
401 | fields = commits_by_author.collect {|r| r.first} | |
402 | commits_data = commits_by_author.collect {|r| r.last} |
|
402 | commits_data = commits_by_author.collect {|r| r.last} | |
403 | changes_data = commits_by_author.collect {|r| h[r.first] || 0} |
|
403 | changes_data = commits_by_author.collect {|r| h[r.first] || 0} | |
404 |
|
404 | |||
405 | fields = fields + [""]*(10 - fields.length) if fields.length<10 |
|
405 | fields = fields + [""]*(10 - fields.length) if fields.length<10 | |
406 | commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10 |
|
406 | commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10 | |
407 | changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10 |
|
407 | changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10 | |
408 |
|
408 | |||
409 | # Remove email adress in usernames |
|
409 | # Remove email adress in usernames | |
410 | fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') } |
|
410 | fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') } | |
411 |
|
411 | |||
412 | graph = SVG::Graph::BarHorizontal.new( |
|
412 | graph = SVG::Graph::BarHorizontal.new( | |
413 | :height => 400, |
|
413 | :height => 400, | |
414 | :width => 800, |
|
414 | :width => 800, | |
415 | :fields => fields, |
|
415 | :fields => fields, | |
416 | :stack => :side, |
|
416 | :stack => :side, | |
417 | :scale_integers => true, |
|
417 | :scale_integers => true, | |
418 | :show_data_values => false, |
|
418 | :show_data_values => false, | |
419 | :rotate_y_labels => false, |
|
419 | :rotate_y_labels => false, | |
420 | :graph_title => l(:label_commits_per_author), |
|
420 | :graph_title => l(:label_commits_per_author), | |
421 | :show_graph_title => true |
|
421 | :show_graph_title => true | |
422 | ) |
|
422 | ) | |
423 | graph.add_data( |
|
423 | graph.add_data( | |
424 | :data => commits_data, |
|
424 | :data => commits_data, | |
425 | :title => l(:label_revision_plural) |
|
425 | :title => l(:label_revision_plural) | |
426 | ) |
|
426 | ) | |
427 | graph.add_data( |
|
427 | graph.add_data( | |
428 | :data => changes_data, |
|
428 | :data => changes_data, | |
429 | :title => l(:label_change_plural) |
|
429 | :title => l(:label_change_plural) | |
430 | ) |
|
430 | ) | |
431 | graph.burn |
|
431 | graph.burn | |
432 | end |
|
432 | end | |
433 | end |
|
433 | end |
General Comments 0
You need to be logged in to leave comments.
Login now