Projects / Ohloh SCM

diff --git a/lib/scm/adapters/svn/misc.rb b/lib/scm/adapters/svn/misc.rb index 51cf399..702fbe9 100644 --- a/lib/scm/adapters/svn/misc.rb +++ b/lib/scm/adapters/svn/misc.rb @@ -34,7 +34,6 @@ module Scm::Adapters if list.include? 'trunk/' self.url = File.join(self.url, 'trunk') self.branch_name = File.join(self.branch_name, 'trunk') - return restrict_url_to_trunk elsif list.size == 1 and list.first[-1..-1] == '/' self.url = File.join(self.url, list.first[0..-2]) self.branch_name = File.join(self.branch_name, list.first[0..-2]) diff --git a/test/unit/svn_misc_test.rb b/test/unit/svn_misc_test.rb index fd476dd..0736891 100644 --- a/test/unit/svn_misc_test.rb +++ b/test/unit/svn_misc_test.rb @@ -61,6 +61,18 @@ module Scm::Adapters end end + def test_restrict_url_to_trunk_descend_no_further + with_svn_repository('deep_svn') do |svn| + assert_equal svn.root, svn.url + assert_equal '', svn.branch_name + + svn.restrict_url_to_trunk + + assert_equal svn.root + '/trunk', svn.url + assert_equal "/trunk", svn.branch_name + end + end + def test_restrict_url_to_trunk with_svn_repository('svn') do |svn| assert_equal svn.root, svn.url