Remove trailing (revision nn) from filenames in subversion diffs.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10425 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/unified_diff.rb b/lib/redmine/unified_diff.rb
index 69fdaa6fd8d96e820dfd7d5d593e5c86dd8fd272..7649ed6532e9c678164196653ddd28097faef63e 100644 (file)
--- a/lib/redmine/unified_diff.rb
+++ b/lib/redmine/unified_diff.rb
@@ -124,6 +124,9 @@ module Redmine
           # remove leading a/ b/
           @file_name = arg.sub(%r{^(a|b)/}, '')
         end
+      when "Subversion"
+        # removing trailing "(revision nn)"
+        @file_name = arg.sub(%r{\t+\(.*\)$}, '')
       else
         @file_name = arg
       end

diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 42e4863c5231dcb498b5d5eee622b3114e2fd1f2..52352a816853b422a0e1f90c407addf65390078b 100644 (file)
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -315,8 +315,8 @@ class RepositoriesSubversionControllerTest < ActionController::TestCase
         get :diff, :id => PRJ_ID, :rev => 3, :type => dt
         assert_response :success
         assert_template 'diff'
-        assert_tag :tag => 'h2',
-                   :content => / 3/
+        assert_select 'h2', :text => /Revision 3/
+        assert_select 'th.filename', :text => 'subversion_test/textfile.txt'
       end
     end