jro_apps/redmine Commit - r1432:193b2450f47a

Fixed: View differences for individual file of a changeset fails if the subversion repository URL doesn't point to the repository root (#1209, #1262, #1275)....

Jean-Philippe Lang -

r1432:193b2450f47a

parent child

Context file:

r1432:193b2450f47a

Collapse all files

app/models/change.rb +4 0

               belongs_to :changeset
               validates_presence_of :changeset_id, :action, :path
+              def relative_path
+                changeset.repository.relative_path(path)
+              end
             end

app/models/repository.rb +5 0

                   :order => "committed_on DESC, #{Changeset.table_name}.id DESC").collect(&:changeset)
               end
+              # Returns a path relative to the url of the repository
+              def relative_path(path)
+                path
+              end
               def latest_changeset
                 @latest_changeset ||= changesets.find(:first)
               end

app/models/repository/subversion.rb +15 0

@@ -35,6 +35,11 class Repository::Subversion < Repository
35	revisions ? changesets.find_all_by_revision(revisions.collect(&:identifier), :order => "committed_on DESC") : []	35	revisions ? changesets.find_all_by_revision(revisions.collect(&:identifier), :order => "committed_on DESC") : []
36	end	36	end
37		37
		38	# Returns a path relative to the url of the repository
		39	def relative_path(path)
		40	path.gsub(Regexp.new("^\/?#{Regexp.escape(relative_url)}"), '')
		41	end
		42
38	def fetch_changesets	43	def fetch_changesets
39	scm_info = scm.info	44	scm_info = scm.info
40	if scm_info	45	if scm_info
@@ -71,4 +76,14 class Repository::Subversion < Repository
71	end	76	end
72	end	77	end
73	end	78	end
		79
		80	private
		81
		82	# Returns the relative url of the repository
		83	# Eg: root_url = file:///var/svn/foo
		84	# url = file:///var/svn/foo/bar
		85	# => returns /bar
		86	def relative_url
		87	@relative_url \|\|= url.gsub(Regexp.new("^#{Regexp.escape(root_url)}"), '')
		88	end
74	end	89	end

app/views/repositories/revision.rhtml +1 -1

             <td><div class="square action_<%= change.action %>"></div> <%= change.path %> <%= "(#{change.revision})" unless change.revision.blank?  %></td>
             <td align="right">
             <% if change.action == "M" %>
-            <%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.path), :rev => @changeset.revision %>
+            <%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.relative_path), :rev => @changeset.revision %>
             <% end %>
             </td>
             </tr>

test/fixtures/changes.yml +7 0

@@ -13,4 +13,11 changes_002:
13	path: /test/some/path/elsewhere/in/the/repo	13	path: /test/some/path/elsewhere/in/the/repo
14	from_path:	14	from_path:
15	from_revision:	15	from_revision:
		16	changes_003:
		17	id: 3
		18	changeset_id: 101
		19	action: M
		20	path: /test/some/path/in/the/repo
		21	from_path:
		22	from_revision:
16	No newline at end of file	23

test/functional/repositories_subversion_controller_test.rb +26 0

@@ -97,6 +97,32 class RepositoriesSubversionControllerTest < Test::Unit::TestCase
97	assert_equal 'folder', assigns(:entry).name	97	assert_equal 'folder', assigns(:entry).name
98	end	98	end
99		99
		100	def test_revision
		101	get :revision, :id => 1, :rev => 2
		102	assert_response :success
		103	assert_template 'revision'
		104	assert_tag :tag => 'tr',
		105	:child => { :tag => 'td', :content => %r{/test/some/path/in/the/repo} },
		106	:child => { :tag => 'td',
		107	:child => { :tag => 'a', :attributes => { :href => '/repositories/diff/ecookbook/test/some/path/in/the/repo?rev=2' } }
		108	}
		109	end
		110
		111	def test_revision_with_repository_pointing_to_a_subdirectory
		112	r = Project.find(1).repository
		113	# Changes repository url to a subdirectory
		114	r.update_attribute :url, (r.url + '/test/some')
		115
		116	get :revision, :id => 1, :rev => 2
		117	assert_response :success
		118	assert_template 'revision'
		119	assert_tag :tag => 'tr',
		120	:child => { :tag => 'td', :content => %r{/test/some/path/in/the/repo} },
		121	:child => { :tag => 'td',
		122	:child => { :tag => 'a', :attributes => { :href => '/repositories/diff/ecookbook/path/in/the/repo?rev=2' } }
		123	}
		124	end
		125
100	def test_diff	126	def test_diff
101	get :diff, :id => 1, :rev => 3	127	get :diff, :id => 1, :rev => 3
102	assert_response :success	128	assert_response :success

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