Merged r17962, r18206, r18207 and r18211 to 4.0-stable (#30850).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18242 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 346ecf5c761a7cc94dae295e8a9e795ef65724ad..c467def2948baf3e303cf2cac0fd1f85f9569ef8 100644 (file)
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -255,12 +255,13 @@ class RepositoriesController < ApplicationController
                       Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}")
       unless read_fragment(@cache_key)
         @diff = @repository.diff(@path, @rev, @rev_to)
-        show_error_not_found unless @diff
+        (show_error_not_found; return) unless @diff
       end
 
       @changeset = @repository.find_changeset_by_name(@rev)
       @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
       @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to)
+      render :diff, :formats => :html
     end
   end
 

diff --git a/config/routes.rb b/config/routes.rb
index 0344982085f42413079a387e54e4cc96ad2f2726..be9838aeaa8268aa92c67a9967d298545417ea64 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -246,7 +246,7 @@ Rails.application.routes.draw do
   post   'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
   delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
   get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
-  %w(browse show entry raw annotate diff).each do |action|
+  %w(browse show entry raw annotate).each do |action|
     get "projects/:id/repository/:repository_id/revisions/:rev/#{action}(/*path)",
         :controller => 'repositories',
         :action => action,
@@ -254,7 +254,7 @@ Rails.application.routes.draw do
         :constraints => {:rev => /[a-z0-9\.\-_]+/, :path => /.*/}
   end
 
-  %w(browse entry raw changes annotate diff).each do |action|
+  %w(browse entry raw changes annotate).each do |action|
     get "projects/:id/repository/:repository_id/#{action}(/*path)",
         :controller => 'repositories',
         :action => action,
@@ -262,6 +262,15 @@ Rails.application.routes.draw do
         :constraints => {:path => /.*/}
   end
 
+  get "projects/:id/repository/:repository_id/revisions/:rev/diff(/*path)",
+      :to => 'repositories#diff',
+      :format => false,
+      :constraints => {:rev => /[a-z0-9\.\-_]+/, :path => /.*/}
+  get "projects/:id/repository/:repository_id/diff(/*path)",
+      :to => 'repositories#diff',
+      :format => false,
+      :constraints => {:path => /.*/}
+
   get 'projects/:id/repository/:repository_id/show/*path', :to => 'repositories#show', :format => 'html', :constraints => {:path => /.*/}
 
   get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil

diff --git a/test/integration/repositories_git_test.rb b/test/integration/repositories_git_test.rb
index ba1922240818e7d80a0e3fb48aece53a4f479efc..b436d0e5c997011a08ab0a827693567652172fbc 100644 (file)
--- a/test/integration/repositories_git_test.rb
+++ b/test/integration/repositories_git_test.rb
@@ -24,6 +24,7 @@ class RepositoriesGitTest < Redmine::IntegrationTest
   REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
   REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
   PRJ_ID     = 3
+  NUM_REV = 28
 
   def setup
     User.current = nil
@@ -46,5 +47,62 @@ class RepositoriesGitTest < Redmine::IntegrationTest
       get "/projects/subproject1/repository/#{@repository.id}/diff?rev=61b685fbe&rev_to=2f9c0091"
       assert_response :success
     end
+
+    def test_get_raw_diff_of_a_whole_revision
+      @repository.fetch_changesets
+      assert_equal NUM_REV, @repository.changesets.count
+
+      get "/projects/subproject1/repository/#{@repository.id}/revisions/deff712f05a90d96edbd70facc47d944be5897e3/diff"
+      assert_response :success
+
+      assert a = css_select("a.diff").first
+      assert_equal 'Unified diff', a.text
+      get a['href']
+      assert_response :success
+      assert_match /\Acommit deff712f05a90d96edbd70facc47d944be5897e3/, response.body
+    end
+
+    def test_get_raw_diff_of_a_single_file_change
+      @repository.fetch_changesets
+      assert_equal NUM_REV, @repository.changesets.count
+
+      get "/projects/subproject1/repository/#{@repository.id}/revisions/deff712f05a90d96edbd70facc47d944be5897e3/diff/sources/watchers_controller.rb"
+      assert_response :success
+
+      assert a = css_select("a.diff").first
+      assert_equal 'Unified diff', a.text
+      get a['href']
+      assert_response :success
+      assert_match /\Acommit deff712f05a90d96edbd70facc47d944be5897e3/, response.body
+    end
+
+    def test_get_diff_with_format_text_should_return_html
+      @repository.fetch_changesets
+      assert_equal NUM_REV, @repository.changesets.count
+
+      get "/projects/subproject1/repository/#{@repository.id}/revisions/deff712f05a90d96edbd70facc47d944be5897e3/diff/sources/watchers_controller.rb", :params => { :format => 'txt' }
+      assert_response :success
+
+      assert a = css_select("a.diff").first
+      assert_equal 'Unified diff', a.text
+      get a['href']
+      assert_response :success
+      assert_match /\Acommit deff712f05a90d96edbd70facc47d944be5897e3/, response.body
+    end
+
+    def test_entry_txt_should_return_html
+      @repository.fetch_changesets
+      assert_equal NUM_REV, @repository.changesets.count
+
+      get "/projects/subproject1/repository/#{@repository.id}/revisions/deff712f05a90d96edbd70facc47d944be5897e3/entry/new_file.txt"
+      assert_response :success
+
+      assert l1      = css_select("#L1").first
+      assert l1_code = css_select(l1, "td.line-code").first
+      assert_match 'This is a brand new file', l1_code.text
+    end
+  else
+    puts "Git test repository NOT FOUND. Skipping integration tests !!!"
+    def test_fake; assert true end
   end
 end

diff --git a/test/integration/routing/repositories_test.rb b/test/integration/routing/repositories_test.rb
index 15f707091dfff31302bd3a7ad38098c27bb3f937..2d5a66ff135a26164a28084bb94dad132b1adf9b 100644 (file)
--- a/test/integration/routing/repositories_test.rb
+++ b/test/integration/routing/repositories_test.rb
@@ -20,7 +20,9 @@ require File.expand_path('../../../test_helper', __FILE__)
 class RoutingRepositoriesTest < Redmine::RoutingTest
 
   def setup
-    @paths = ['path/to/file.c', 'path/to/index.html', 'raw/file.c']
+    @paths = ['path/to/index.html',
+              'path/to/file.c', 'path/to/file.yaml', 'path/to/file.txt',
+              'raw/file.c']
   end
 
   def test_repositories_resources
@@ -52,25 +54,33 @@ class RoutingRepositoriesTest < Redmine::RoutingTest
 
     should_route 'GET /projects/foo/repository/foo/revisions/2457' => 'repositories#revision', :id => 'foo', :repository_id => 'foo', :rev => '2457'
     should_route 'GET /projects/foo/repository/foo/revisions/2457/show' => 'repositories#show', :id => 'foo', :repository_id => 'foo', :rev => '2457', :format => 'html'
-    should_route 'GET /projects/foo/repository/foo/revisions/2457/diff' => 'repositories#diff', :id => 'foo', :repository_id => 'foo', :rev => '2457', :format => 'html'
+    should_route 'GET /projects/foo/repository/foo/revisions/2457/diff' => 'repositories#diff', :id => 'foo', :repository_id => 'foo', :rev => '2457'
 
-    %w(show diff entry raw annotate).each do |action|
+    %w(show entry raw annotate).each do |action|
       @paths.each do |path|
         should_route "GET /projects/foo/repository/foo/revisions/2457/#{action}/#{path}" => "repositories##{action}",
           :id => 'foo', :repository_id => 'foo', :rev => '2457', :path => path, :format => 'html'
       end
     end
+    @paths.each do |path|
+      should_route "GET /projects/foo/repository/foo/revisions/2457/diff/#{path}" => "repositories#diff",
+        :id => 'foo', :repository_id => 'foo', :rev => '2457', :path => path
+    end
   end
 
   def test_repositories_non_revisions_path_with_repository_id
     should_route 'GET /projects/foo/repository/svn/changes' => 'repositories#changes', :id => 'foo', :repository_id => 'svn', :format => 'html'
 
-    %w(changes diff browse entry raw annotate).each do |action|
+    %w(changes browse entry raw annotate).each do |action|
       @paths.each do |path|
         should_route "GET /projects/foo/repository/svn/#{action}/#{path}" => "repositories##{action}",
           :id => 'foo', :repository_id => 'svn', :path => path, :format => 'html'
       end
     end
+    @paths.each do |path|
+      should_route "GET /projects/foo/repository/svn/diff/#{path}" => "repositories#diff",
+        :id => 'foo', :repository_id => 'svn', :path => path
+    end
   end
 
   def test_repositories_related_issues_with_repository_id