comparison app/controllers/.svn/text-base/repositories_controller.rb.svn-base @ 128:07fa8a8b56a8

Update to Redmine trunk rev 4732
author Chris Cannam
date Wed, 19 Jan 2011 15:04:22 +0000
parents 8661b858af72
children 5e974759e8b2 0579821a129a
comparison
equal deleted inserted replaced
119:8661b858af72 128:07fa8a8b56a8
137 @annotate = @repository.scm.annotate(@path, @rev) 137 @annotate = @repository.scm.annotate(@path, @rev)
138 (render_error l(:error_scm_annotate); return) if @annotate.nil? || @annotate.empty? 138 (render_error l(:error_scm_annotate); return) if @annotate.nil? || @annotate.empty?
139 end 139 end
140 140
141 def revision 141 def revision
142 raise ChangesetNotFound if @rev.nil? || @rev.empty? 142 raise ChangesetNotFound if @rev.blank?
143 @changeset = @repository.find_changeset_by_name(@rev) 143 @changeset = @repository.find_changeset_by_name(@rev)
144 raise ChangesetNotFound unless @changeset 144 raise ChangesetNotFound unless @changeset
145 145
146 respond_to do |format| 146 respond_to do |format|
147 format.html 147 format.html
224 rescue InvalidRevisionParam 224 rescue InvalidRevisionParam
225 show_error_not_found 225 show_error_not_found
226 end 226 end
227 227
228 def show_error_not_found 228 def show_error_not_found
229 render_error l(:error_scm_not_found) 229 render_error :message => l(:error_scm_not_found), :status => 404
230 end 230 end
231 231
232 # Handler for Redmine::Scm::Adapters::CommandFailed exception 232 # Handler for Redmine::Scm::Adapters::CommandFailed exception
233 def show_error_command_failed(exception) 233 def show_error_command_failed(exception)
234 render_error l(:error_scm_command_failed, exception.message) 234 render_error l(:error_scm_command_failed, exception.message)