##// END OF EJS Templates
scm: space and tab cleanup of app/controllers/repositories_controller.rb....
Toshi MARUYAMA -
r4697:3493bb1d3709
parent child
Show More
@@ -1,339 +1,340
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2009 Jean-Philippe Lang
2 # Copyright (C) 2006-2009 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
21
22 class ChangesetNotFound < Exception; end
22 class ChangesetNotFound < Exception; end
23 class InvalidRevisionParam < Exception; end
23 class InvalidRevisionParam < Exception; end
24
24
25 class RepositoriesController < ApplicationController
25 class RepositoriesController < ApplicationController
26 menu_item :repository
26 menu_item :repository
27 menu_item :settings, :only => :edit
27 menu_item :settings, :only => :edit
28 default_search_scope :changesets
28 default_search_scope :changesets
29
29
30 before_filter :find_repository, :except => :edit
30 before_filter :find_repository, :except => :edit
31 before_filter :find_project, :only => :edit
31 before_filter :find_project, :only => :edit
32 before_filter :authorize
32 before_filter :authorize
33 accept_key_auth :revisions
33 accept_key_auth :revisions
34
34
35 rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
35 rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
36
36
37 def edit
37 def edit
38 @repository = @project.repository
38 @repository = @project.repository
39 if !@repository
39 if !@repository
40 @repository = Repository.factory(params[:repository_scm])
40 @repository = Repository.factory(params[:repository_scm])
41 @repository.project = @project if @repository
41 @repository.project = @project if @repository
42 end
42 end
43 if request.post? && @repository
43 if request.post? && @repository
44 @repository.attributes = params[:repository]
44 @repository.attributes = params[:repository]
45 @repository.save
45 @repository.save
46 end
46 end
47 render(:update) do |page|
47 render(:update) do |page|
48 page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'
48 page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'
49 if @repository && !@project.repository
49 if @repository && !@project.repository
50 @project.reload #needed to reload association
50 @project.reload #needed to reload association
51 page.replace_html "main-menu", render_main_menu(@project)
51 page.replace_html "main-menu", render_main_menu(@project)
52 end
52 end
53 end
53 end
54 end
54 end
55
55
56 def committers
56 def committers
57 @committers = @repository.committers
57 @committers = @repository.committers
58 @users = @project.users
58 @users = @project.users
59 additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
59 additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
60 @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
60 @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
61 @users.compact!
61 @users.compact!
62 @users.sort!
62 @users.sort!
63 if request.post? && params[:committers].is_a?(Hash)
63 if request.post? && params[:committers].is_a?(Hash)
64 # Build a hash with repository usernames as keys and corresponding user ids as values
64 # Build a hash with repository usernames as keys and corresponding user ids as values
65 @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h}
65 @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h}
66 flash[:notice] = l(:notice_successful_update)
66 flash[:notice] = l(:notice_successful_update)
67 redirect_to :action => 'committers', :id => @project
67 redirect_to :action => 'committers', :id => @project
68 end
68 end
69 end
69 end
70
70
71 def destroy
71 def destroy
72 @repository.destroy
72 @repository.destroy
73 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
73 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
74 end
74 end
75
75
76 def show
76 def show
77 @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
77 @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
78
78
79 @entries = @repository.entries(@path, @rev)
79 @entries = @repository.entries(@path, @rev)
80 if request.xhr?
80 if request.xhr?
81 @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
81 @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
82 else
82 else
83 (show_error_not_found; return) unless @entries
83 (show_error_not_found; return) unless @entries
84 @changesets = @repository.latest_changesets(@path, @rev)
84 @changesets = @repository.latest_changesets(@path, @rev)
85 @properties = @repository.properties(@path, @rev)
85 @properties = @repository.properties(@path, @rev)
86 render :action => 'show'
86 render :action => 'show'
87 end
87 end
88 end
88 end
89
89
90 alias_method :browse, :show
90 alias_method :browse, :show
91
91
92 def changes
92 def changes
93 @entry = @repository.entry(@path, @rev)
93 @entry = @repository.entry(@path, @rev)
94 (show_error_not_found; return) unless @entry
94 (show_error_not_found; return) unless @entry
95 @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
95 @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
96 @properties = @repository.properties(@path, @rev)
96 @properties = @repository.properties(@path, @rev)
97 @changeset = @repository.find_changeset_by_name(@rev)
97 @changeset = @repository.find_changeset_by_name(@rev)
98 end
98 end
99
99
100 def revisions
100 def revisions
101 @changeset_count = @repository.changesets.count
101 @changeset_count = @repository.changesets.count
102 @changeset_pages = Paginator.new self, @changeset_count,
102 @changeset_pages = Paginator.new self, @changeset_count,
103 per_page_option,
103 per_page_option,
104 params['page']
104 params['page']
105 @changesets = @repository.changesets.find(:all,
105 @changesets = @repository.changesets.find(:all,
106 :limit => @changeset_pages.items_per_page,
106 :limit => @changeset_pages.items_per_page,
107 :offset => @changeset_pages.current.offset,
107 :offset => @changeset_pages.current.offset,
108 :include => [:user, :repository])
108 :include => [:user, :repository])
109
109
110 respond_to do |format|
110 respond_to do |format|
111 format.html { render :layout => false if request.xhr? }
111 format.html { render :layout => false if request.xhr? }
112 format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
112 format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
113 end
113 end
114 end
114 end
115
115
116 def entry
116 def entry
117 @entry = @repository.entry(@path, @rev)
117 @entry = @repository.entry(@path, @rev)
118 (show_error_not_found; return) unless @entry
118 (show_error_not_found; return) unless @entry
119
119
120 # If the entry is a dir, show the browser
120 # If the entry is a dir, show the browser
121 (show; return) if @entry.is_dir?
121 (show; return) if @entry.is_dir?
122
122
123 @content = @repository.cat(@path, @rev)
123 @content = @repository.cat(@path, @rev)
124 (show_error_not_found; return) unless @content
124 (show_error_not_found; return) unless @content
125 if 'raw' == params[:format] || @content.is_binary_data? || (@entry.size && @entry.size > Setting.file_max_size_displayed.to_i.kilobyte)
125 if 'raw' == params[:format] || @content.is_binary_data? ||
126 (@entry.size && @entry.size > Setting.file_max_size_displayed.to_i.kilobyte)
126 # Force the download
127 # Force the download
127 send_data @content, :filename => filename_for_content_disposition(@path.split('/').last)
128 send_data @content, :filename => filename_for_content_disposition(@path.split('/').last)
128 else
129 else
129 # Prevent empty lines when displaying a file with Windows style eol
130 # Prevent empty lines when displaying a file with Windows style eol
130 @content.gsub!("\r\n", "\n")
131 @content.gsub!("\r\n", "\n")
131 @changeset = @repository.find_changeset_by_name(@rev)
132 @changeset = @repository.find_changeset_by_name(@rev)
132 end
133 end
133 end
134 end
134
135
135 def annotate
136 def annotate
136 @entry = @repository.entry(@path, @rev)
137 @entry = @repository.entry(@path, @rev)
137 (show_error_not_found; return) unless @entry
138 (show_error_not_found; return) unless @entry
138
139
139 @annotate = @repository.scm.annotate(@path, @rev)
140 @annotate = @repository.scm.annotate(@path, @rev)
140 (render_error l(:error_scm_annotate); return) if @annotate.nil? || @annotate.empty?
141 (render_error l(:error_scm_annotate); return) if @annotate.nil? || @annotate.empty?
141 @changeset = @repository.find_changeset_by_name(@rev)
142 @changeset = @repository.find_changeset_by_name(@rev)
142 end
143 end
143
144
144 def revision
145 def revision
145 raise ChangesetNotFound if @rev.blank?
146 raise ChangesetNotFound if @rev.blank?
146 @changeset = @repository.find_changeset_by_name(@rev)
147 @changeset = @repository.find_changeset_by_name(@rev)
147 raise ChangesetNotFound unless @changeset
148 raise ChangesetNotFound unless @changeset
148
149
149 respond_to do |format|
150 respond_to do |format|
150 format.html
151 format.html
151 format.js {render :layout => false}
152 format.js {render :layout => false}
152 end
153 end
153 rescue ChangesetNotFound
154 rescue ChangesetNotFound
154 show_error_not_found
155 show_error_not_found
155 end
156 end
156
157
157 def diff
158 def diff
158 if params[:format] == 'diff'
159 if params[:format] == 'diff'
159 @diff = @repository.diff(@path, @rev, @rev_to)
160 @diff = @repository.diff(@path, @rev, @rev_to)
160 (show_error_not_found; return) unless @diff
161 (show_error_not_found; return) unless @diff
161 filename = "changeset_r#{@rev}"
162 filename = "changeset_r#{@rev}"
162 filename << "_r#{@rev_to}" if @rev_to
163 filename << "_r#{@rev_to}" if @rev_to
163 send_data @diff.join, :filename => "#{filename}.diff",
164 send_data @diff.join, :filename => "#{filename}.diff",
164 :type => 'text/x-patch',
165 :type => 'text/x-patch',
165 :disposition => 'attachment'
166 :disposition => 'attachment'
166 else
167 else
167 @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
168 @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
168 @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
169 @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
169
170
170 # Save diff type as user preference
171 # Save diff type as user preference
171 if User.current.logged? && @diff_type != User.current.pref[:diff_type]
172 if User.current.logged? && @diff_type != User.current.pref[:diff_type]
172 User.current.pref[:diff_type] = @diff_type
173 User.current.pref[:diff_type] = @diff_type
173 User.current.preference.save
174 User.current.preference.save
174 end
175 end
175
176
176 @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
177 @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
177 unless read_fragment(@cache_key)
178 unless read_fragment(@cache_key)
178 @diff = @repository.diff(@path, @rev, @rev_to)
179 @diff = @repository.diff(@path, @rev, @rev_to)
179 show_error_not_found unless @diff
180 show_error_not_found unless @diff
180 end
181 end
181
182
182 @changeset = @repository.find_changeset_by_name(@rev)
183 @changeset = @repository.find_changeset_by_name(@rev)
183 @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
184 @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
184 @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to)
185 @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to)
185 end
186 end
186 end
187 end
187
188
188 def stats
189 def stats
189 end
190 end
190
191
191 def graph
192 def graph
192 data = nil
193 data = nil
193 case params[:graph]
194 case params[:graph]
194 when "commits_per_month"
195 when "commits_per_month"
195 data = graph_commits_per_month(@repository)
196 data = graph_commits_per_month(@repository)
196 when "commits_per_author"
197 when "commits_per_author"
197 data = graph_commits_per_author(@repository)
198 data = graph_commits_per_author(@repository)
198 end
199 end
199 if data
200 if data
200 headers["Content-Type"] = "image/svg+xml"
201 headers["Content-Type"] = "image/svg+xml"
201 send_data(data, :type => "image/svg+xml", :disposition => "inline")
202 send_data(data, :type => "image/svg+xml", :disposition => "inline")
202 else
203 else
203 render_404
204 render_404
204 end
205 end
205 end
206 end
206
207
207 private
208 private
208
209
209 REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i
210 REV_PARAM_RE = %r{\A[a-f0-9]*\Z}i
210
211
211 def find_repository
212 def find_repository
212 @project = Project.find(params[:id])
213 @project = Project.find(params[:id])
213 @repository = @project.repository
214 @repository = @project.repository
214 (render_404; return false) unless @repository
215 (render_404; return false) unless @repository
215 @path = params[:path].join('/') unless params[:path].nil?
216 @path = params[:path].join('/') unless params[:path].nil?
216 @path ||= ''
217 @path ||= ''
217 @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].strip
218 @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].strip
218 @rev_to = params[:rev_to]
219 @rev_to = params[:rev_to]
219
220
220 unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
221 unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
221 if @repository.branches.blank?
222 if @repository.branches.blank?
222 raise InvalidRevisionParam
223 raise InvalidRevisionParam
223 end
224 end
224 end
225 end
225 rescue ActiveRecord::RecordNotFound
226 rescue ActiveRecord::RecordNotFound
226 render_404
227 render_404
227 rescue InvalidRevisionParam
228 rescue InvalidRevisionParam
228 show_error_not_found
229 show_error_not_found
229 end
230 end
230
231
231 def show_error_not_found
232 def show_error_not_found
232 render_error :message => l(:error_scm_not_found), :status => 404
233 render_error :message => l(:error_scm_not_found), :status => 404
233 end
234 end
234
235
235 # Handler for Redmine::Scm::Adapters::CommandFailed exception
236 # Handler for Redmine::Scm::Adapters::CommandFailed exception
236 def show_error_command_failed(exception)
237 def show_error_command_failed(exception)
237 render_error l(:error_scm_command_failed, exception.message)
238 render_error l(:error_scm_command_failed, exception.message)
238 end
239 end
239
240
240 def graph_commits_per_month(repository)
241 def graph_commits_per_month(repository)
241 @date_to = Date.today
242 @date_to = Date.today
242 @date_from = @date_to << 11
243 @date_from = @date_to << 11
243 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
244 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
244 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
245 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
245 commits_by_month = [0] * 12
246 commits_by_month = [0] * 12
246 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
247 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
247
248
248 changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
249 changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
249 changes_by_month = [0] * 12
250 changes_by_month = [0] * 12
250 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
251 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
251
252
252 fields = []
253 fields = []
253 12.times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)}
254 12.times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)}
254
255
255 graph = SVG::Graph::Bar.new(
256 graph = SVG::Graph::Bar.new(
256 :height => 300,
257 :height => 300,
257 :width => 800,
258 :width => 800,
258 :fields => fields.reverse,
259 :fields => fields.reverse,
259 :stack => :side,
260 :stack => :side,
260 :scale_integers => true,
261 :scale_integers => true,
261 :step_x_labels => 2,
262 :step_x_labels => 2,
262 :show_data_values => false,
263 :show_data_values => false,
263 :graph_title => l(:label_commits_per_month),
264 :graph_title => l(:label_commits_per_month),
264 :show_graph_title => true
265 :show_graph_title => true
265 )
266 )
266
267
267 graph.add_data(
268 graph.add_data(
268 :data => commits_by_month[0..11].reverse,
269 :data => commits_by_month[0..11].reverse,
269 :title => l(:label_revision_plural)
270 :title => l(:label_revision_plural)
270 )
271 )
271
272
272 graph.add_data(
273 graph.add_data(
273 :data => changes_by_month[0..11].reverse,
274 :data => changes_by_month[0..11].reverse,
274 :title => l(:label_change_plural)
275 :title => l(:label_change_plural)
275 )
276 )
276
277
277 graph.burn
278 graph.burn
278 end
279 end
279
280
280 def graph_commits_per_author(repository)
281 def graph_commits_per_author(repository)
281 commits_by_author = repository.changesets.count(:all, :group => :committer)
282 commits_by_author = repository.changesets.count(:all, :group => :committer)
282 commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}
283 commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}
283
284
284 changes_by_author = repository.changes.count(:all, :group => :committer)
285 changes_by_author = repository.changes.count(:all, :group => :committer)
285 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
286 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
286
287
287 fields = commits_by_author.collect {|r| r.first}
288 fields = commits_by_author.collect {|r| r.first}
288 commits_data = commits_by_author.collect {|r| r.last}
289 commits_data = commits_by_author.collect {|r| r.last}
289 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
290 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
290
291
291 fields = fields + [""]*(10 - fields.length) if fields.length<10
292 fields = fields + [""]*(10 - fields.length) if fields.length<10
292 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
293 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
293 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
294 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
294
295
295 # Remove email adress in usernames
296 # Remove email adress in usernames
296 fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
297 fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
297
298
298 graph = SVG::Graph::BarHorizontal.new(
299 graph = SVG::Graph::BarHorizontal.new(
299 :height => 400,
300 :height => 400,
300 :width => 800,
301 :width => 800,
301 :fields => fields,
302 :fields => fields,
302 :stack => :side,
303 :stack => :side,
303 :scale_integers => true,
304 :scale_integers => true,
304 :show_data_values => false,
305 :show_data_values => false,
305 :rotate_y_labels => false,
306 :rotate_y_labels => false,
306 :graph_title => l(:label_commits_per_author),
307 :graph_title => l(:label_commits_per_author),
307 :show_graph_title => true
308 :show_graph_title => true
308 )
309 )
309
310
310 graph.add_data(
311 graph.add_data(
311 :data => commits_data,
312 :data => commits_data,
312 :title => l(:label_revision_plural)
313 :title => l(:label_revision_plural)
313 )
314 )
314
315
315 graph.add_data(
316 graph.add_data(
316 :data => changes_data,
317 :data => changes_data,
317 :title => l(:label_change_plural)
318 :title => l(:label_change_plural)
318 )
319 )
319
320
320 graph.burn
321 graph.burn
321 end
322 end
322
323
323 end
324 end
324
325
325 class Date
326 class Date
326 def months_ago(date = Date.today)
327 def months_ago(date = Date.today)
327 (date.year - self.year)*12 + (date.month - self.month)
328 (date.year - self.year)*12 + (date.month - self.month)
328 end
329 end
329
330
330 def weeks_ago(date = Date.today)
331 def weeks_ago(date = Date.today)
331 (date.year - self.year)*52 + (date.cweek - self.cweek)
332 (date.year - self.year)*52 + (date.cweek - self.cweek)
332 end
333 end
333 end
334 end
334
335
335 class String
336 class String
336 def with_leading_slash
337 def with_leading_slash
337 starts_with?('/') ? self : "/#{self}"
338 starts_with?('/') ? self : "/#{self}"
338 end
339 end
339 end
340 end
General Comments 0
You need to be logged in to leave comments. Login now