jro_apps/redmine Commit - r1539:ca6e69ec247e

Fixed: view file at given revision with CVS....

Jean-Philippe Lang -

r1539:ca6e69ec247e

parent child

Context file:

r1539:ca6e69ec247e

app/controllers/repositories_controller.rb +3 -3

               end
               def changes
-                @entry = @repository.scm.entry(@path, @rev)
+                @entry = @repository.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 @changesets = @repository.changesets_for_path(@path)
               rescue Redmine::Scm::Adapters::CommandFailed => e
               end
               def entry
-                @entry = @repository.scm.entry(@path, @rev)
+                @entry = @repository.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)
+                @content = @repository.cat(@path, @rev)
                 show_error_not_found and return unless @content
                 if 'raw' == params[:format] || @content.is_binary_data?
                   # Force the download if it's a binary file

app/models/repository.rb +8 0

                 scm.supports_annotate?
               end
+              def entry(path=nil, identifier=nil)
+                scm.entry(path, identifier)
+              end
               def entries(path=nil, identifier=nil)
                 scm.entries(path, identifier)
               end
+              def cat(path, identifier=nil)
+                scm.cat(path, identifier)
+              end
               def diff(path, rev, rev_to)
                 scm.diff(path, rev, rev_to)
               end

app/models/repository/cvs.rb +8 -3

                 'CVS'
               end
-              def entry(path, identifier)
+              def entry(path=nil, identifier=nil)
-                e = entries(path, identifier)
+                rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
-                e ? e.first : nil
+                scm.entry(path, rev.nil? ? nil : rev.committed_on)
               end
               def entries(path=nil, identifier=nil)
                 entries
               end
+              def cat(path, identifier=nil)
+                rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+                scm.cat(path, rev.nil? ? nil : rev.committed_on)
+              end
               def diff(path, rev, rev_to)
                 #convert rev to revision. CVS can't handle changesets here
                 diff=[]

lib/redmine/scm/adapters/cvs_adapter.rb +3 -1

                       identifier = (identifier) ? identifier : "HEAD"
                       logger.debug "<cvs> cat path:'#{path}',identifier #{identifier}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
-                      cmd = "#{CVS_BIN} -d #{root_url} co -r#{identifier} -p #{shell_quote path_with_project}"
+                      cmd = "#{CVS_BIN} -d #{root_url} co"
+                      cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
+                      cmd << " -p #{shell_quote path_with_project}"
                       cat = nil
                       shellout(cmd) do |io|
                         cat = io.read

test/functional/repositories_cvs_controller_test.rb +13 0

@@ -89,6 +89,19 class RepositoriesCvsControllerTest < Test::Unit::TestCase
89	get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb']	89	get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb']
90	assert_response :success	90	assert_response :success
91	assert_template 'entry'	91	assert_template 'entry'
		92	assert_no_tag :tag => 'td', :attributes => { :class => /line-code/},
		93	:content => /before_filter/
		94	end
		95
		96	def test_entry_at_given_revision
		97	# changesets must be loaded
		98	Project.find(1).repository.fetch_changesets
		99	get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb'], :rev => 2
		100	assert_response :success
		101	assert_template 'entry'
		102	# this line was removed in r3
		103	assert_tag :tag => 'td', :attributes => { :class => /line-code/},
		104	:content => /before_filter/
92	end	105	end
93		106
94	def test_entry_not_found	107	def test_entry_not_found

test/functional/repositories_subversion_controller_test.rb +9 0

@@ -78,6 +78,15 class RepositoriesSubversionControllerTest < Test::Unit::TestCase
78	assert_template 'entry'	78	assert_template 'entry'
79	end	79	end
80		80
		81	def test_entry_at_given_revision
		82	get :entry, :id => 1, :path => ['subversion_test', 'helloworld.rb'], :rev => 2
		83	assert_response :success
		84	assert_template 'entry'
		85	# this line was removed in r3 and file was moved in r6
		86	assert_tag :tag => 'td', :attributes => { :class => /line-code/},
		87	:content => /Here's the code/
		88	end
		89
81	def test_entry_not_found	90	def test_entry_not_found
82	get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']	91	get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
83	assert_tag :tag => 'div', :attributes => { :class => /error/ },	92	assert_tag :tag => 'div', :attributes => { :class => /error/ },

General Comments 0

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

No TODOs yet

	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