jro_apps/redmine Commit - r5003:c8ce22c2751a

scm: mercurial: latest changesets improvement and supporting tag (#1981)....

Toshi MARUYAMA -

r5003:c8ce22c2751a

parent child

Context file:

r5003:c8ce22c2751a

Collapse all files

app/models/repository/mercurial.rb +23 -11

             # 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
               FETCH_AT_ONCE = 100  # number of changesets to fetch at once
               ATTRIBUTE_KEY_NAMES = {
                   "url"          => "Root directory",
                 }
               def self.human_attribute_name(attribute_key_name)
                 ATTRIBUTE_KEY_NAMES[attribute_key_name] || super
               end
               def self.scm_adapter_class
                 Redmine::Scm::Adapters::MercurialAdapter
               end
               def self.scm_name
                 'Mercurial'
               end
               def repo_log_encoding
                 'UTF-8'
               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 branches
                 nil
               end
               def tags
                 nil
               end
               def diff_format_revisions(cs, cs_to, sep=':')
                 super(cs, cs_to, ' ')
               end
               # Finds and returns a revision with a number or the beginning of a hash
               def find_changeset_by_name(name)
                 return nil if name.nil? || name.empty?
                 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
-              # Default behavior is to search in cached changesets
               #
               # Because :order => 'id DESC' is defined at 'has_many',
               # there is no need to set 'order'.
               # But, MySQL test fails.
               # Sqlite3 and PostgreSQL pass.
               # Is this MySQL bug?
               def latest_changesets(path, rev, limit=10)
-                if path.blank?
+                changesets.find(:all, :include => :user,
-                  changesets.find(:all, :include => :user, :limit => limit, :order => 'id DESC')
+                                :conditions => latest_changesets_cond(path, rev, limit),
-                else
+                                :limit => limit, :order => "#{Changeset.table_name}.id DESC")
-                  changesets.find(:all, :select => "DISTINCT #{Changeset.table_name}.*",
+              end
-                                  :joins => :changes,
-                                  :conditions => ["#{Change.table_name}.path = ? OR #{Change.table_name}.path LIKE ? ESCAPE ?",
+              def latest_changesets_cond(path, rev, limit)
-                                                  path.with_leading_slash,
+                cond, args = [], []
-                                                  "#{path.with_leading_slash.gsub(/[%_\\]/) { |s| "\\#{s}" }}/%", '\\'],
-                                  :include => :user, :limit => limit,
+                if last = rev ? find_changeset_by_name(scm.tagmap[rev] || rev) : nil
-                                  :order => "#{Changeset.table_name}.id DESC" )
+                  cond << "#{Changeset.table_name}.id <= ?"
+                  args << last.id
                 end
+                unless path.blank?
+                  cond << "EXISTS (SELECT * FROM #{Change.table_name}
+                             WHERE #{Change.table_name}.changeset_id = #{Changeset.table_name}.id
+                             AND (#{Change.table_name}.path = ?
+                                   OR #{Change.table_name}.path LIKE ? ESCAPE ?))"
+                  args << path.with_leading_slash
+                  args << "#{path.with_leading_slash.gsub(/[%_\\]/) { |s| "\\#{s}" }}/%" << '\\'
+                end
+                [cond.join(' AND '), *args] unless cond.empty?
               end
+              private :latest_changesets_cond
               def fetch_changesets
                 scm_rev = scm.info.lastrev.revision.to_i
                 db_rev = latest_changeset ? latest_changeset.revision.to_i : -1
                 return unless db_rev < scm_rev  # already up-to-date
                 logger.debug "Fetching changesets for repository #{url}" if logger
                 (db_rev + 1).step(scm_rev, FETCH_AT_ONCE) do |i|
                   transaction do
                     scm.each_revision('', i, [i + FETCH_AT_ONCE - 1, scm_rev].min) do |re|
                       cs = Changeset.create(:repository => self,
                                             :revision => re.revision,
                                             :scmid => re.scmid,
                                             :committer => re.author,
                                             :committed_on => re.time,
                                             :comments => re.message)
                       re.paths.each { |e| cs.create_change(e) }
                     end
                   end
                 end
                 self
               end
             end

test/functional/repositories_mercurial_controller_test.rb +1 -1

             # 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'
               CHAR_1_HEX = "\xc3\x9c"
               ruby19_non_utf8_pass = (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
               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,
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
                 @diff_c_support = true
                 @char_1        = CHAR_1_HEX.dup
                 @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
                 @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
                 @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
                   @tag_char_1.force_encoding('UTF-8')
                   @branch_char_0.force_encoding('UTF-8')
                   @branch_char_1.force_encoding('UTF-8')
                 end
               end
               if ruby19_non_utf8_pass
                 puts "TODO: Mercurial functional test fails in Ruby 1.9 " +
                      "and Encoding.default_external is not UTF-8. " +
                      "Current value is '#{Encoding.default_external.to_s}'"
                 def test_fake; assert true end
               elsif 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
                   @repository.fetch_changesets
                   @repository.reload
                   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'}
                   assert_not_nil assigns(:changesets)
                   assigns(:changesets).size > 0
                 end
                 def test_show_directory
                   @repository.fetch_changesets
                   @repository.reload
                   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
                   assert_not_nil assigns(:changesets)
                   assigns(:changesets).size > 0
                 end
                 def test_show_at_given_revision
                   @repository.fetch_changesets
                   @repository.reload
                   [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)
                     assert_not_nil assigns(:changesets)
                     assigns(:changesets).size > 0
                   end
                 end
                 def test_show_directory_sql_escape_percent
                   @repository.fetch_changesets
                   @repository.reload
                   [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)
                     assigns(:changesets).size > 0
                     ## This is not yet implemented.
                     # assert_not_nil changesets
                     # assert_equal %w(13 11 10 9), changesets.collect(&:revision)
                   end
                 end
                 def test_show_directory_latin_1
                   @repository.fetch_changesets
                   @repository.reload
                   [21, '21', 'adf805632193'].each do |r1|
                     get :show, :id => 3, :path => ['latin-1-dir'], :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ["make-latin-1-file.rb",
                                   "test-#{@char_1}-1.txt",
                                   "test-#{@char_1}-2.txt",
                                   "test-#{@char_1}.txt"], assigns(:entries).collect(&:name)
                     changesets = assigns(:changesets)
                     assert_not_nil changesets
-                    assert_equal %w(27 21 20 19 18 17), changesets.collect(&:revision)
+                    assert_equal %w(21 20 19 18 17), 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_show_latin_1
                   [21, '21', 'adf805632193'].each do |r1|
                     get :entry, :id => 3, :path => ['latin-1-dir', "test-#{@char_1}-2.txt"], :rev => r1
                     assert_response :success
                     assert_template 'entry'
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /Mercurial is a distributed version control system/ }
                   end
                 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 => r1
                     assert_response :success
                     assert_template 'diff'
                     if @diff_c_support
                       # 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_diff_latin_1
                   [21, 'adf805632193'].each do |r1|
                     get :diff, :id => 3, :rev => r1
                     assert_response :success
                     assert_template 'diff'
                     assert_tag :tag => 'th',
                                :content => '2',
                                :sibling => { :tag => 'td',
                                            :attributes => { :class => /diff_in/ },
                                            :content => /It is written in Python/ }
                   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
                 def test_annotate_at_given_revision
                   @repository.fetch_changesets
                   @repository.reload
                   [2, '400bb8672109', '400', 400].each do |r1|
                     get :annotate, :id => 3, :rev => r1, :path => ['sources', 'watchers_controller.rb']
                     assert_response :success
                     assert_template 'annotate'
                     assert_tag :tag => 'h2', :content => /@ 2:400bb8672109/
                   end
                 end
                 def test_annotate_latin_1
                   [21, '21', 'adf805632193'].each do |r1|
                   get :annotate, :id => 3, :path => ['latin-1-dir', "test-#{@char_1}-2.txt"], :rev => r1
                     assert_response :success
                     assert_template 'annotate'
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                      :tag => 'td',
                                      :attributes => { :class => 'revision' },
                                      :child => { :tag => 'a', :content => '20:709858aafd1b' }
                                    }
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                       :tag     => 'td'    ,
                                       :content => 'jsmith' ,
                                       :attributes => { :class   => 'author' },
                                     }
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /Mercurial is a distributed version control system/ }
                   end
                 end
                 def test_empty_revision
                   @repository.fetch_changesets
                   @repository.reload
                   ['', ' ', nil].each do |r|
                     get :revision, :id => 3, :rev => r
                     assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 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