jro_apps/redmine Commit - r1350:a73f68a185df

0

app/controllers/repositories_controller.rb +8 -1

                 if request.xhr?
                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
-                  show_error_not_found unless @entries
+                  show_error_not_found and return unless @entries
+                  render :action => 'browse'
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def entry
+                @entry = @repository.scm.entry(@path, @rev)
+                show_error_not_found and return unless @entry
+                # If the entry is a dir, show the browser
+                browse and return if @entry.is_dir?
                 @content = @repository.scm.cat(@path, @rev)
                 show_error_not_found and return unless @content
                 if 'raw' == params[:format] || @content.is_binary_data?

0

lib/redmine/scm/adapters/abstract_adapter.rb +11 -2

@@ -59,8 +59,17 module Redmine
59	# Returns the entry identified by path and revision identifier	59	# Returns the entry identified by path and revision identifier
60	# or nil if entry doesn't exist in the repository	60	# or nil if entry doesn't exist in the repository
61	def entry(path=nil, identifier=nil)	61	def entry(path=nil, identifier=nil)
62	e = entries(path, identifier)	62	parts = path.to_s.split(%r{[\/\\]}).select {\|n\| !n.blank?}
63	e ? e.first : nil	63	search_path = parts[0..-2].join('/')
		64	search_name = parts[-1]
		65	if search_path.blank? && search_name.blank?
		66	# Root entry
		67	Entry.new(:path => '', :kind => 'dir')
		68	else
		69	# Search for the entry in the parent directory
		70	es = entries(search_path, identifier)
		71	es ? es.detect {\|e\| e.name == search_name} : nil
		72	end
64	end	73	end
65		74
66	# Returns an Entries collection	75	# Returns an Entries collection

0

lib/redmine/scm/adapters/bazaar_adapter.rb 0 -12

@@ -44,18 +44,6 module Redmine
44	return nil	44	return nil
45	end	45	end
46		46
47	# Returns the entry identified by path and revision identifier
48	# or nil if entry doesn't exist in the repository
49	def entry(path=nil, identifier=nil)
50	path \|\|= ''
51	parts = path.split(%r{[\/\\]}).select {\|p\| !p.blank?}
52	if parts.size > 0
53	parent = parts[0..-2].join('/')
54	entries = entries(parent, identifier)
55	entries ? entries.detect {\|e\| e.name == parts.last} : nil
56	end
57	end
58
59	# Returns an Entries collection	47	# Returns an Entries collection
60	# or nil if the given path doesn't exist in the repository	48	# or nil if the given path doesn't exist in the repository
61	def entries(path=nil, identifier=nil)	49	def entries(path=nil, identifier=nil)

0

lib/redmine/scm/adapters/cvs_adapter.rb 0 -9

@@ -55,15 +55,6 module Redmine
55	def get_previous_revision(revision)	55	def get_previous_revision(revision)
56	CvsRevisionHelper.new(revision).prevRev	56	CvsRevisionHelper.new(revision).prevRev
57	end	57	end
58
59	# Returns the entry identified by path and revision identifier
60	# or nil if entry doesn't exist in the repository
61	# this method returns all revisions from one single SCM-Entry
62	def entry(path=nil, identifier="HEAD")
63	e = entries(path, identifier)
64	logger.debug("<cvs-result> #{e.first.inspect}") if e
65	e ? e.first : nil
66	end
67		58
68	# Returns an Entries collection	59	# Returns an Entries collection
69	# or nil if the given path doesn't exist in the repository	60	# or nil if the given path doesn't exist in the repository

0

lib/redmine/scm/adapters/darcs_adapter.rb 0 -7

                       rev ? Info.new({:root_url => @url, :lastrev => rev.last}) : nil
                     end
-                    # Returns the entry identified by path and revision identifier
-                    # or nil if entry doesn't exist in the repository
-                    def entry(path=nil, identifier=nil)
-                      e = entries(path, identifier)
-                      e ? e.first : nil
-                    end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)

0

lib/redmine/scm/adapters/git_adapter.rb 0 -8

                       entries.sort_by_name
                     end
-                    def entry(path=nil, identifier=nil)
-                      path ||= ''
-                      search_path = path.split('/')[0..-2].join('/')
-                      entry_name = path.split('/').last
-                      e = entries(search_path, identifier)
-                      e ? e.detect{|entry| entry.name == entry_name} : nil
-                    end
                     def revisions(path, identifier_from, identifier_to, options={})
                       revisions = Revisions.new
                       cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw "

0

lib/redmine/scm/adapters/mercurial_adapter.rb 0 -8

                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
-                    def entry(path=nil, identifier=nil)
-                      path ||= ''
-                      search_path = path.split('/')[0..-2].join('/')
-                      entry_name = path.split('/').last
-                      e = entries(search_path, identifier)
-                      e ? e.detect{|entry| entry.name == entry_name} : nil
-                    end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       revisions = Revisions.new

0

lib/redmine/scm/adapters/subversion_adapter.rb 0 -7

                       return nil
                     end
-                    # Returns the entry identified by path and revision identifier
-                    # or nil if entry doesn't exist in the repository
-                    def entry(path=nil, identifier=nil)
-                      e = entries(path, identifier)
-                      e ? e.first : nil
-                    end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)

0

test/functional/repositories_bazaar_controller_test.rb +8 0

                   assert @response.body.include?('Show help message')
                 end
+                def test_directory_entry
+                  get :entry, :id => 3, :path => ['directory']
+                  assert_response :success
+                  assert_template 'browse'
+                  assert_not_nil assigns(:entry)
+                  assert_equal 'directory', assigns(:entry).name
+                end
                 def test_diff
                   # Full diff of changeset 3
                   get :diff, :id => 3, :rev => 3

0

test/functional/repositories_cvs_controller_test.rb +8 0

                   get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                 end
+                def test_directory_entry
+                  get :entry, :id => 1, :path => ['sources']
+                  assert_response :success
+                  assert_template 'browse'
+                  assert_not_nil assigns(:entry)
+                  assert_equal 'sources', assigns(:entry).name
+                end
                 def test_diff
                   Project.find(1).repository.fetch_changesets

0

test/functional/repositories_git_controller_test.rb +8 0

                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
+                def test_directory_entry
+                  get :entry, :id => 3, :path => ['sources']
+                  assert_response :success
+                  assert_template 'browse'
+                  assert_not_nil assigns(:entry)
+                  assert_equal 'sources', assigns(:entry).name
+                end
                 def test_diff
                   # Full diff of changeset 2f9c0091
                   get :diff, :id => 3, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'

0

test/functional/repositories_mercurial_controller_test.rb +9 -1

@@ -99,7 +99,15 class RepositoriesMercurialControllerTest < Test::Unit::TestCase
99	# File content	99	# File content
100	assert @response.body.include?('WITHOUT ANY WARRANTY')	100	assert @response.body.include?('WITHOUT ANY WARRANTY')
101	end	101	end
102		102
		103	def test_directory_entry
		104	get :entry, :id => 3, :path => ['sources']
		105	assert_response :success
		106	assert_template 'browse'
		107	assert_not_nil assigns(:entry)
		108	assert_equal 'sources', assigns(:entry).name
		109	end
		110
103	def test_diff	111	def test_diff
104	# Full diff of changeset 4	112	# Full diff of changeset 4
105	get :diff, :id => 3, :rev => 4	113	get :diff, :id => 3, :rev => 4

0

test/functional/repositories_subversion_controller_test.rb +8 0

                   assert_response :success
                 end
+                def test_directory_entry
+                  get :entry, :id => 1, :path => ['subversion_test', 'folder']
+                  assert_response :success
+                  assert_template 'browse'
+                  assert_not_nil assigns(:entry)
+                  assert_equal 'folder', assigns(:entry).name
+                end
                 def test_diff
                   get :diff, :id => 1, :rev => 3
                   assert_response :success

	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