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

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Change < ActiveRecord::Base
               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

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Repository < ActiveRecord::Base
               belongs_to :project
               has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
               has_many :changes, :through => :changesets
               # Removes leading and trailing whitespace
               def url=(arg)
                 write_attribute(:url, arg ? arg.to_s.strip : nil)
               end
               # Removes leading and trailing whitespace
               def root_url=(arg)
                 write_attribute(:root_url, arg ? arg.to_s.strip : nil)
               end
               def scm
                 @scm ||= self.scm_adapter.new url, root_url, login, password
                 update_attribute(:root_url, @scm.root_url) if root_url.blank?
                 @scm
               end
               def scm_name
                 self.class.scm_name
               end
               def supports_cat?
                 scm.supports_cat?
               end
               def supports_annotate?
                 scm.supports_annotate?
               end
               def entries(path=nil, identifier=nil)
                 scm.entries(path, identifier)
               end
               def diff(path, rev, rev_to, type)
                 scm.diff(path, rev, rev_to, type)
               end
               # Default behaviour: we search in cached changesets
               def changesets_for_path(path)
                 path = "/#{path}" unless path.starts_with?('/')
                 Change.find(:all, :include => :changeset,
                   :conditions => ["repository_id = ? AND path = ?", id, path],
                   :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
               def scan_changesets_for_issue_ids
                 self.changesets.each(&:scan_comment_for_issue_ids)
               end
               # fetch new changesets for all repositories
               # can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
               def self.fetch_changesets
                 find(:all).each(&:fetch_changesets)
               end
               # scan changeset comments to find related and fixed issues for all repositories
               def self.scan_changesets_for_issue_ids
                 find(:all).each(&:scan_changesets_for_issue_ids)
               end
               def self.scm_name
                 'Abstract'
               end
               def self.available_scm
                 subclasses.collect {|klass| [klass.scm_name, klass.name]}
               end
               def self.factory(klass_name, *args)
                 klass = "Repository::#{klass_name}".constantize
                 klass.new(*args)
               rescue
                 nil
               end
               private
               def before_save
                 # Strips url and root_url
                 url.strip!
                 root_url.strip!
                 true
               end
             end

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

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/subversion_adapter'
             class Repository::Subversion < Repository
               attr_protected :root_url
               validates_presence_of :url
               validates_format_of :url, :with => /^(http|https|svn|svn\+ssh|file):\/\/.+/i
               def scm_adapter
                 Redmine::Scm::Adapters::SubversionAdapter
               end
               def self.scm_name
                 'Subversion'
               end
               def changesets_for_path(path)
                 revisions = scm.revisions(path)
                 revisions ? changesets.find_all_by_revision(revisions.collect(&:identifier), :order => "committed_on DESC") : []
               end
+              # Returns a path relative to the url of the repository
+              def relative_path(path)
+                path.gsub(Regexp.new("^\/?#{Regexp.escape(relative_url)}"), '')
+              end
               def fetch_changesets
                 scm_info = scm.info
                 if scm_info
                   # latest revision found in database
                   db_revision = latest_changeset ? latest_changeset.revision.to_i : 0
                   # latest revision in the repository
                   scm_revision = scm_info.lastrev.identifier.to_i
                   if db_revision < scm_revision
                     logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
                     identifier_from = db_revision + 1
                     while (identifier_from <= scm_revision)
                       # loads changesets by batches of 200
                       identifier_to = [identifier_from + 199, scm_revision].min
                       revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
                       transaction do
                         revisions.reverse_each do |revision|
                           changeset = Changeset.create(:repository => self,
                                                        :revision => revision.identifier,
                                                        :committer => revision.author,
                                                        :committed_on => revision.time,
                                                        :comments => revision.message)
                           revision.paths.each do |change|
                             Change.create(:changeset => changeset,
                                           :action => change[:action],
                                           :path => change[:path],
                                           :from_path => change[:from_path],
                                           :from_revision => change[:from_revision])
                           end
                         end
                       end unless revisions.nil?
                       identifier_from = identifier_to + 1
                     end
                   end
                 end
               end
+              private
+              # Returns the relative url of the repository
+              # Eg: root_url = file:///var/svn/foo
+              #     url      = file:///var/svn/foo/bar
+              #     => returns /bar
+              def relative_url
+                @relative_url ||= url.gsub(Regexp.new("^#{Regexp.escape(root_url)}"), '')
+              end
             end

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

             <div class="contextual">
               &#171;
               <% unless @changeset.previous.nil? -%>
                 <%= link_to l(:label_previous), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.previous.revision %>
               <% else -%>
                 <%= l(:label_previous) %>
               <% end -%>
             |
               <% unless @changeset.next.nil? -%>
                 <%= link_to l(:label_next), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.next.revision %>
               <% else -%>
                 <%= l(:label_next) %>
               <% end -%>
               &#187;&nbsp;
               <% form_tag do %>
                 <%= text_field_tag 'rev', @rev, :size => 5 %>
                 <%= submit_tag 'OK' %>
               <% end %>
             </div>
             <h2><%= l(:label_revision) %> <%= format_revision(@changeset.revision) %></h2>
             <p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
             <em><%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %></em></p>
             <%= textilizable @changeset.comments %>
             <% if @changeset.issues.any? %>
             <h3><%= l(:label_related_issues) %></h3>
             <ul>
             <% @changeset.issues.each do |issue| %>
               <li><%= link_to_issue issue %>: <%=h issue.subject %></li>
             <% end %>
             </ul>
             <% end %>
             <h3><%= l(:label_attachment_plural) %></h3>
             <div style="float:right;">
             <div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %>&nbsp;</div>
             <div class="square action_M"></div> <div style="float:left;"><%= l(:label_modified) %>&nbsp;</div>
             <div class="square action_D"></div> <div style="float:left;"><%= l(:label_deleted) %>&nbsp;</div>
             </div>
             <p><%= link_to(l(:label_view_diff), :action => 'diff', :id => @project, :path => "", :rev => @changeset.revision) if @changeset.changes.any? %></p>
             <table class="list">
             <tbody>
             <% @changes.each do |change| %>
             <tr class="<%= cycle 'odd', 'even' %>">
             <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>
             <% end %>
             </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @changes_pages %></p>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>
             <% html_title("#{l(:label_revision)} #{@changeset.revision}") -%>

test/fixtures/changes.yml +7 0

             ---
             changes_001:
               id: 1
               changeset_id: 100
               action: A
               path: /test/some/path/in/the/repo
               from_path:
               from_revision:
             changes_002:
               id: 2
               changeset_id: 100
               action: A
               path: /test/some/path/elsewhere/in/the/repo
               from_path:
               from_revision:
+            changes_003:
+              id: 3
+              changeset_id: 101
+              action: M
+              path: /test/some/path/in/the/repo
+              from_path:
+              from_revision:
   No newline at end of file

test/functional/repositories_subversion_controller_test.rb +26 0

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesSubversionControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               # No '..' in the repository path for svn
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/subversion_repository'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 Setting.default_language = 'en'
                 User.current = nil
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 1
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :browse, :id => 1
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   entry = assigns(:entries).detect {|e| e.name == 'subversion_test'}
                   assert_equal 'dir', entry.kind
                 end
                 def test_browse_directory
                   get :browse, :id => 1, :path => ['subversion_test']
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['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
                 end
                 def test_browse_at_given_revision
                   get :browse, :id => 1, :path => ['subversion_test'], :rev => 4
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
                 end
                 def test_entry
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'entry'
                 end
                 def test_entry_not_found
                   get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
                   assert_tag :tag => 'div', :attributes => { :class => /error/ },
                                             :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c'], :format => 'raw'
                   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_revision
+                  get :revision, :id => 1, :rev => 2
+                  assert_response :success
+                  assert_template 'revision'
+                  assert_tag :tag => 'tr',
+                             :child => { :tag => 'td', :content => %r{/test/some/path/in/the/repo} },
+                             :child => { :tag => 'td',
+                                         :child => { :tag => 'a', :attributes => { :href => '/repositories/diff/ecookbook/test/some/path/in/the/repo?rev=2' } }
+                                       }
+                end
+                def test_revision_with_repository_pointing_to_a_subdirectory
+                  r = Project.find(1).repository
+                  # Changes repository url to a subdirectory
+                  r.update_attribute :url, (r.url + '/test/some')
+                  get :revision, :id => 1, :rev => 2
+                  assert_response :success
+                  assert_template 'revision'
+                  assert_tag :tag => 'tr',
+                             :child => { :tag => 'td', :content => %r{/test/some/path/in/the/repo} },
+                             :child => { :tag => 'td',
+                                         :child => { :tag => 'a', :attributes => { :href => '/repositories/diff/ecookbook/path/in/the/repo?rev=2' } }
+                                       }
+                end
                 def test_diff
                   get :diff, :id => 1, :rev => 3
                   assert_response :success
                   assert_template 'diff'
                 end
                 def test_annotate
                   get :annotate, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'annotate'
                 end
               else
                 puts "Subversion test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             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