Fixed RepositoriesController: undefined local variable or method `show_error' (broken...

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1104 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 542eb93eacdc55b640065185a873907dabf8574b..13d3eaa321c9070c250084494b42c3e2e0a5e051 100644 (file)
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -55,7 +55,7 @@ class RepositoriesController < ApplicationController
     @entries = @repository.entries('')    
     # latest changesets
     @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
-    show_error and return unless @entries || @changesets.any?
+    show_error_not_found unless @entries || @changesets.any?
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
   end
@@ -65,7 +65,7 @@ class RepositoriesController < ApplicationController
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      show_error unless @entries
+      show_error_not_found unless @entries
     end
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
@@ -73,7 +73,7 @@ class RepositoriesController < ApplicationController
   
   def changes
     @entry = @repository.scm.entry(@path, @rev)
-    show_error and return unless @entry
+    show_error_not_found and return unless @entry
     @changesets = @repository.changesets_for_path(@path)
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
@@ -96,7 +96,7 @@ class RepositoriesController < ApplicationController
   
   def entry
     @content = @repository.scm.cat(@path, @rev)
-    show_error and return unless @content
+    show_error_not_found and return unless @content
     if 'raw' == params[:format]      
       send_data @content, :filename => @path.split('/').last
     else
@@ -109,7 +109,7 @@ class RepositoriesController < ApplicationController
   
   def annotate
     @annotate = @repository.scm.annotate(@path, @rev)
-    show_error and return if @annotate.nil? || @annotate.empty?
+    show_error_not_found and return if @annotate.nil? || @annotate.empty?
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
   end
@@ -128,7 +128,7 @@ class RepositoriesController < ApplicationController
       format.js {render :layout => false}
     end
   rescue ChangesetNotFound
-    show_error
+    show_error_not_found
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
   end
@@ -147,7 +147,7 @@ class RepositoriesController < ApplicationController
     @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")    
     unless read_fragment(@cache_key)
       @diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
-      show_error and return unless @diff
+      show_error_not_found unless @diff
     end
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)

diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index d7ce45640de05286fde8b232d30fdc93cc3efa73..ab5ec14ca7bb9b8111dce3c08b714f545443f206 100644 (file)
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -67,6 +67,12 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
       assert_response :success
       assert_template 'entry'
     end
+    
+    def test_entry_not_found
+      get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
+      assert_tag :tag => 'div', :attributes => { :class => /error/ },
+                                :content => /Entry and\/or revision doesn't exist/
+    end
   
     def test_entry_download
       get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c'], :format => 'raw'