jro_apps/redmine Commit - r4579:eda1cd2faa39

scm: mercurial: change two revision diff text of mercurial (#3724)....

Toshi MARUYAMA -

r4579:eda1cd2faa39

parent child

Context file:

r4579:eda1cd2faa39

Collapse all files

app/models/repository/mercurial.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.
             require 'redmine/scm/adapters/mercurial_adapter'
             class Repository::Mercurial < Repository
               # sort changesets by revision number
               has_many :changesets, :order => "#{Changeset.table_name}.id DESC", :foreign_key => 'repository_id'
               attr_protected :root_url
               validates_presence_of :url
               def scm_adapter
                 Redmine::Scm::Adapters::MercurialAdapter
               end
               def self.scm_name
                 'Mercurial'
               end
               # Returns the readable identifier for the given mercurial changeset
               def self.format_changeset_identifier(changeset)
                 "#{changeset.revision}:#{changeset.scmid}"
               end
               # Returns the identifier for the given Mercurial changeset
               def self.changeset_identifier(changeset)
                 changeset.scmid
               end
+              def diff_format_revisions(cs, cs_to, sep=':')
+                super(cs, cs_to, ' ')
+              end
               def entries(path=nil, identifier=nil)
                 entries=scm.entries(path, identifier)
                 if entries
                   entries.each do |entry|
                     next unless entry.is_file?
                     # Set the filesize unless browsing a specific revision
                     if identifier.nil?
                       full_path = File.join(root_url, entry.path)
                       entry.size = File.stat(full_path).size if File.file?(full_path)
                     end
                     # Search the DB for the entry's last change
                     change = changes.find(:first, :conditions => ["path = ?", scm.with_leading_slash(entry.path)], :order => "#{Changeset.table_name}.committed_on DESC")
                     if change
                       entry.lastrev.identifier = change.changeset.revision
                       entry.lastrev.name = change.changeset.revision
                       entry.lastrev.author = change.changeset.committer
                       entry.lastrev.revision = change.revision
                     end
                   end
                 end
                 entries
               end
               # Finds and returns a revision with a number or the beginning of a hash
               def find_changeset_by_name(name)
                 if /[^\d]/ =~ name or name.to_s.size > 8
                   e = changesets.find(:first, :conditions => ['scmid = ?', name.to_s])
                 else
                   e = changesets.find(:first, :conditions => ['revision = ?', name.to_s])
                 end
                 return e if e
                 changesets.find(:first, :conditions => ['scmid LIKE ?', "#{name}%"])  # last ditch
               end
               # Returns the latest changesets for +path+; sorted by revision number
               def latest_changesets(path, rev, limit=10)
                 if path.blank?
                   changesets.find(:all, :include => :user, :limit => limit)
                 else
                   changes.find(:all, :include => {:changeset => :user},
                                      :conditions => ["path = ?", path.with_leading_slash],
                                      :order => "#{Changeset.table_name}.id DESC",
                                      :limit => limit).collect(&:changeset)
                 end
               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 : -1
                   # latest revision in the repository
                   latest_revision = scm_info.lastrev
                   return if latest_revision.nil?
                   scm_revision = latest_revision.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 100
                       identifier_to = [identifier_from + 99, scm_revision].min
                       revisions = scm.revisions('', identifier_from, identifier_to, :with_paths => true)
                       transaction do
                         revisions.each do |revision|
                           changeset = Changeset.create(:repository => self,
                                                        :revision => revision.identifier,
                                                        :scmid => revision.scmid,
                                                        :committer => revision.author,
                                                        :committed_on => revision.time,
                                                        :comments => revision.message)
                           revision.paths.each do |change|
                             changeset.create_change(change)
                           end
                         end
                       end unless revisions.nil?
                       identifier_from = identifier_to + 1
                     end
                   end
                 end
               end
             end

test/functional/repositories_mercurial_controller_test.rb +22 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.expand_path('../../test_helper', __FILE__)
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesMercurialControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
                 assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_show_root
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 4, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images'  && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README'  && e.kind == 'file'}
                 end
                 def test_show_directory
                   get :show, :id => 3, :path => ['images']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                 end
                 def test_show_at_given_revision
                   [0, '0', '0885933ad4f6'].each do |r1|
                     get :show, :id => 3, :path => ['images'], :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                   end
                 end
                 def test_show_directory_sql_escape_percent
                   [13, '13', '3a330eb32958'].each do |r1|
                     get :show, :id => 3, :path => ['sql_escape', 'percent%dir'], :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['percent%file1.txt', 'percentfile1.txt'], assigns(:entries).collect(&:name)
                     changesets = assigns(:changesets)
                     ## This is not yet implemented.
                     # assert_not_nil changesets
                     # assert_equal %w(13 11 10 9), changesets.collect(&:revision)
                   end
                 end
                 def test_changes
                   get :changes, :id => 3, :path => ['images', 'edit.png']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'entry'
                   # Line 10
                   assert_tag :tag => 'th',
                              :content => '10',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_download
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_directory_entry
                   get :entry, :id => 3, :path => ['sources']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
+                  @repository.fetch_changesets
+                  @repository.reload
                   [4, '4', 'def6d2f1254a'].each do |r1|
                     # Full diff of changeset 4
                     get :diff, :id => 3, :rev => 4
                     assert_response :success
                     assert_template 'diff'
                     if @repository.scm.class.client_version_above?([1, 2])
                       # Line 22 removed
                       assert_tag :tag => 'th',
                                  :content => '22',
                                  :sibling => { :tag => 'td',
                                                :attributes => { :class => /diff_out/ },
                                                :content => /def remove/ }
+                      assert_tag :tag => 'h2', :content => /4:def6d2f1254a/
+                    end
+                  end
+                end
+                def test_diff_two_revs
+                  @repository.fetch_changesets
+                  @repository.reload
+                  [2, '400bb8672109', '400', 400].each do |r1|
+                    [4, 'def6d2f1254a'].each do |r2|
+                      get :diff, :id => 3, :rev    => r1,
+                                           :rev_to => r2
+                      assert_response :success
+                      assert_template 'diff'
+                      diff = assigns(:diff)
+                      assert_not_nil diff
+                      assert_tag :tag => 'h2', :content => /4:def6d2f1254a 2:400bb8672109/
                     end
                   end
                 end
                 def test_annotate
                   get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'annotate'
                   # Line 23, revision 4:def6d2f1254a
                   assert_tag :tag => 'th',
                              :content => '23',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                      :tag => 'td',
                                      :attributes => { :class => 'revision' },
                                      :child => { :tag => 'a', :content => '4:def6d2f1254a' }
                                    }
                   assert_tag :tag => 'th',
                              :content => '23',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                       :tag     => 'td'    ,
                                       :content => 'jsmith' ,
                                       :attributes => { :class   => 'author' },
                                     }
                   assert_tag :tag => 'th',
                              :content => '23',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
               else
                 puts "Mercurial 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