jro_apps/redmine Commit - r4534:e2df831b537c

scm: mercurial: accept both of revision and nodeid as changeset id (#3724)....

Toshi MARUYAMA -

r4534:e2df831b537c

parent child

Context file:

r4534:e2df831b537c

Collapse all files

app/models/repository/mercurial.rb +11 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
               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/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +11 0

             require File.expand_path('../../../../../../test_helper', __FILE__)
             begin
               require 'mocha'
               class MercurialAdapterTest < ActiveSupport::TestCase
                 TEMPLATES_DIR = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATES_DIR
                 TEMPLATE_NAME = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_NAME
                 TEMPLATE_EXTENSION = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_EXTENSION
                 REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
                 if File.directory?(REPOSITORY_PATH)
                   def setup
                     @adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH)
                   end
                   def test_hgversion
                     to_test = { "Mercurial Distributed SCM (version 0.9.5)\n"  => [0,9,5],
                                 "Mercurial Distributed SCM (1.0)\n"            => [1,0],
                                 "Mercurial Distributed SCM (1e4ddc9ac9f7+20080325)\n" => nil,
                                 "Mercurial Distributed SCM (1.0.1+20080525)\n" => [1,0,1],
                                 "Mercurial Distributed SCM (1916e629a29d)\n"   => nil,
                                 "Mercurial SCM Distribuito (versione 0.9.5)\n" => [0,9,5],
                                 "(1.6)\n(1.7)\n(1.8)"                          => [1,6],
                                 "(1.7.1)\r\n(1.8.1)\r\n(1.9.1)"                => [1,7,1]}
                     to_test.each do |s, v|
                       test_hgversion_for(s, v)
                     end
                   end
                   def test_template_path
                     to_test = { [0,9,5]  => "0.9.5",
                                 [1,0]    => "1.0",
                                 []       => "1.0",
                                 [1,0,1]  => "1.0",
                                 [1,7]    => "1.0",
                                 [1,7,1]  => "1.0" }
                     to_test.each do |v, template|
                       test_template_path_for(v, template)
                     end
                   end
                   def test_cat
                     assert     @adapter.cat("sources/welcome_controller.rb", 2)
                     assert_nil @adapter.cat("sources/welcome_controller.rb")
                   end
+                  def test_access_by_nodeid
+                    path = 'sources/welcome_controller.rb'
+                    assert_equal @adapter.cat(path, 2), @adapter.cat(path, '400bb8672109')
+                  end
+                  def test_access_by_fuzzy_nodeid
+                    path = 'sources/welcome_controller.rb'
+                    # falls back to nodeid
+                    assert_equal @adapter.cat(path, 2), @adapter.cat(path, '400')
+                  end
                   private
                   def test_hgversion_for(hgversion, version)
                     @adapter.class.expects(:hgversion_from_command_line).returns(hgversion)
                     assert_equal version, @adapter.class.hgversion
                   end
                   def test_template_path_for(version, template)
                     assert_equal "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{template}.#{TEMPLATE_EXTENSION}",
                                  @adapter.class.template_path_for(version)
                     assert File.exist?(@adapter.class.template_path_for(version))
                   end
                 else
                   puts "Mercurial test repository NOT FOUND. Skipping unit tests !!!"
                   def test_fake; assert true end
                 end
               end
             rescue LoadError
               class MercurialMochaFake < ActiveSupport::TestCase
                 def test_fake; assert(false, "Requires mocha to run those tests")  end
               end
             end

test/unit/repository_mercurial_test.rb +18 -1

             # 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 File.expand_path('../../test_helper', __FILE__)
             class RepositoryMercurialTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
               def setup
                 @project = Project.find(1)
                 assert @repository = Repository::Mercurial.create(:project => @project, :url => REPOSITORY_PATH)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 17, @repository.changesets.count
                   assert_equal 25, @repository.changes.count
-                  assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find_by_revision('0').comments
+                  assert_equal "Initial import.\nThe repository contains 3 files.",
+                               @repository.changesets.find_by_revision('0').comments
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   # Remove changesets with revision > 2
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
                   @repository.reload
                   assert_equal 3, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal 17, @repository.changesets.count
                 end
                 def test_entries
                   assert_equal 2, @repository.entries("sources", 2).size
+                  assert_equal 2, @repository.entries("sources", '400bb8672109').size
                   assert_equal 1, @repository.entries("sources", 3).size
+                  assert_equal 1, @repository.entries("sources", 'b3a615152df8').size
                 end
                 def test_locate_on_outdated_repository
                   assert_equal 1, @repository.entries("images", 0).size
                   assert_equal 2, @repository.entries("images").size
                   assert_equal 2, @repository.entries("images", 2).size
                 end
                 def test_isodatesec
                   # Template keyword 'isodatesec' supported in Mercurial 1.0 and higher
                   if @repository.scm.class.client_version_above?([1, 0])
                     @repository.fetch_changesets
                     @repository.reload
                     rev0_committed_on = Time.gm(2007, 12, 14, 9, 22, 52)
                     assert_equal @repository.changesets.find_by_revision('0').committed_on, rev0_committed_on
                   end
                 end
                 def test_changeset_order_by_revision
                   @repository.fetch_changesets
                   @repository.reload
                   c0 = @repository.latest_changeset
                   c1 = @repository.changesets.find_by_revision('0')
                   # sorted by revision (id), not by date
                   assert c0.revision.to_i > c1.revision.to_i
                   assert c0.committed_on  < c1.committed_on
                 end
                 def test_latest_changesets
                   @repository.fetch_changesets
                   @repository.reload
                   # with_limit
                   changesets = @repository.latest_changesets('', nil, 2)
                   assert_equal @repository.latest_changesets('', nil)[0, 2], changesets
                   # with_filepath
                   changesets = @repository.latest_changesets('/sql_escape/percent%dir/percent%file1.txt', nil)
                   assert_equal %w|11 10 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('/sql_escape/underscore_dir/understrike_file.txt', nil)
                   assert_equal %w|12 9|, changesets.collect(&:revision)
                 end
                 def test_copied_files
                   @repository.fetch_changesets
                   @repository.reload
                   cs1 = @repository.changesets.find_by_revision('13')
                   assert_not_nil cs1
                   c1  = cs1.changes
                   assert_equal 2, c1.size
                   assert_equal 'A', c1[0].action
                   assert_equal '/sql_escape/percent%dir/percentfile1.txt',  c1[0].path
                   assert_equal '/sql_escape/percent%dir/percent%file1.txt', c1[0].from_path
                   assert_equal 'A', c1[1].action
                   assert_equal '/sql_escape/underscore_dir/understrike-file.txt', c1[1].path
                   assert_equal '/sql_escape/underscore_dir/understrike_file.txt', c1[1].from_path
                   cs2 = @repository.changesets.find_by_revision('15')
                   c2  = cs2.changes
                   assert_equal 1, c2.size
                   assert_equal 'A', c2[0].action
                   assert_equal '/README (1)[2]&,%.-3_4', c2[0].path
                   assert_equal '/README', c2[0].from_path
                 end
+                def test_find_changeset_by_name
+                  @repository.fetch_changesets
+                  @repository.reload
+                  %w|2 400bb8672109 400|.each do |r|
+                    assert_equal @repository.find_changeset_by_name(r).revision, '2'
+                  end
+                end
+                def test_find_changeset_by_invalid_name
+                  @repository.fetch_changesets
+                  @repository.reload
+                  assert_nil @repository.find_changeset_by_name('100000')
+                end
               else
                 puts "Mercurial test repository NOT FOUND. Skipping unit 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