jro_apps/redmine Commit - r3686:c5863c0ad08c

Support listing directories in svn which include square brackets. #5548...

Eric Davis -

r3686:c5863c0ad08c

parent child

Context file:

r3686:c5863c0ad08c

Collapse all files

lib/redmine/scm/adapters/subversion_adapter.rb +14 -7

                      # Get info about the svn repository
                      def info
-                       cmd = "#{SVN_BIN} info --xml #{target('')}"
+                       cmd = "#{SVN_BIN} info --xml #{target}"
                        cmd << credentials_string
                        info = nil
                        shellout(cmd) do |io|
                        path ||= ''
                        identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                        entries = Entries.new
-                       cmd = "#{SVN_BIN} list --xml #{target(URI.escape(path))}@#{identifier}"
+                       cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
                        cmd << credentials_string
                        shellout(cmd) do |io|
                          output = io.read
                        return nil unless self.class.client_version_above?([1, 5, 0])
                        identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
-                       cmd = "#{SVN_BIN} proplist --verbose --xml #{target(URI.escape(path))}@#{identifier}"
+                       cmd = "#{SVN_BIN} proplist --verbose --xml #{target(path)}@#{identifier}"
                        cmd << credentials_string
                        properties = {}
                        shellout(cmd) do |io|
                        cmd << credentials_string
                        cmd << " --verbose " if  options[:with_paths]
                        cmd << " --limit #{options[:limit].to_i}" if options[:limit]
-                       cmd << ' ' + target(URI.escape(path))
+                       cmd << ' ' + target(path)
                        shellout(cmd) do |io|
                          output = io.read
                          begin
                        cmd = "#{SVN_BIN} diff -r "
                        cmd << "#{identifier_to}:"
                        cmd << "#{identifier_from}"
-                       cmd << " #{target(URI.escape(path))}@#{identifier_from}"
+                       cmd << " #{target(path)}@#{identifier_from}"
                        cmd << credentials_string
                        diff = []
                        shellout(cmd) do |io|
                      def cat(path, identifier=nil)
                        identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
-                       cmd = "#{SVN_BIN} cat #{target(URI.escape(path))}@#{identifier}"
+                       cmd = "#{SVN_BIN} cat #{target(path)}@#{identifier}"
                        cmd << credentials_string
                        cat = nil
                        shellout(cmd) do |io|
                      def annotate(path, identifier=nil)
                        identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
-                       cmd = "#{SVN_BIN} blame #{target(URI.escape(path))}@#{identifier}"
+                       cmd = "#{SVN_BIN} blame #{target(path)}@#{identifier}"
                        cmd << credentials_string
                        blame = Annotate.new
                        shellout(cmd) do |io|
                          end
                        end
                      end
+                     def target(path = '')
+                       base = path.match(/^\//) ? root_url : url
+                       uri = "#{base}/#{path}"
+                       uri = URI.escape(URI.escape(uri), '[]')
+                       shell_quote(uri.gsub(/[?<>\*]/, ''))
+                     end
                    end
                  end
                end

test/fixtures/repositories/subversion_repository.dump.gz binary modified 0 0

NO CONTENT: modified file, binary diff hidden

test/functional/repositories_subversion_controller_test.rb +1 -1

                    assert_response :success
                    assert_template 'show'
                    assert_not_nil assigns(:entries)
-                   assert_equal ['folder', '.project', 'helloworld.c', 'textfile.txt'], assigns(:entries).collect(&:name)
+                   assert_equal ['[folder_with_brackets]', 'folder', '.project', 'helloworld.c', 'textfile.txt'], assigns(:entries).collect(&:name)
                    entry = assigns(:entries).detect {|e| e.name == 'helloworld.c'}
                    assert_equal 'file', entry.kind
                    assert_equal 'subversion_test/helloworld.c', entry.path

test/unit/repository_subversion_test.rb +30 -4

              require File.dirname(__FILE__) + '/../test_helper'
              class RepositorySubversionTest < ActiveSupport::TestCase
-               fixtures :projects
+               fixtures :projects, :repositories
                def setup
                  @project = Project.find(1)
                    @repository.fetch_changesets
                    @repository.reload
-                   assert_equal 10, @repository.changesets.count
-                   assert_equal 18, @repository.changes.count
+                   assert_equal 11, @repository.changesets.count
+                   assert_equal 20, @repository.changes.count
                    assert_equal 'Initial import.', @repository.changesets.find_by_revision('1').comments
                  end
                    assert_equal 5, @repository.changesets.count
                    @repository.fetch_changesets
-                   assert_equal 10, @repository.changesets.count
+                   assert_equal 11, @repository.changesets.count
                  end
                  def test_latest_changesets
                    changesets = @repository.latest_changesets('subversion_test/folder', 8)
                    assert_equal ["7", "6", "5", "2"], changesets.collect(&:revision)
                  end
+                 def test_directory_listing_with_square_brackets_in_path
+                   @repository.fetch_changesets
+                   @repository.reload
+                   entries = @repository.entries('subversion_test/[folder_with_brackets]')
+                   assert_not_nil entries, 'Expect to find entries in folder_with_brackets'
+                   assert_equal 1, entries.size, 'Expect one entry in folder_with_brackets'
+                   assert_equal 'README.txt', entries.first.name
+                 end
+                 def test_directory_listing_with_square_brackets_in_base
+                   @project = Project.find(1)
+                   @repository = Repository::Subversion.create(:project => @project, :url => "file:///#{self.class.repository_path('subversion')}/subversion_test/[folder_with_brackets]")
+                   @repository.fetch_changesets
+                   @repository.reload
+                   assert_equal 1, @repository.changesets.count, 'Expected to see 1 revision'
+                   assert_equal 2, @repository.changes.count, 'Expected to see 2 changes, dir add and file add'
+                   entries = @repository.entries('')
+                   assert_not_nil entries, 'Expect to find entries'
+                   assert_equal 1, entries.size, 'Expect a single entry'
+                   assert_equal 'README.txt', entries.first.name
+                 end
                else
                  puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"
                  def test_fake; assert true end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages