kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: r4417 breaks MercurialAdapter with ruby 1.8.6 (#5117).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4422 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-11-21 14:25:26 +00:00
parent 77c6188ec2
commit cfc3ee4f5a
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redmine/scm/adapters/mercurial_adapter.rb
View File

@ -38,13 +38,13 @@ module Redmine
# release number (eg 0.9.5 or 1.0) or as a revision # release number (eg 0.9.5 or 1.0) or as a revision
# id composed of 12 hexa characters. # id composed of 12 hexa characters.
theversion = hgversion_from_command_line theversion = hgversion_from_command_line
if m = theversion.match(/\b\d+(\.\d+)+\b/) if m = theversion.match(%r{\A(.*?)((\d+\.)+\d+)})
m[0].split(".").collect(&:to_i) m[2].scan(%r{\d+}).collect(&:to_i)
end end
end end
def hgversion_from_command_line def hgversion_from_command_line
%x{#{HG_BIN} --version}.lines.first.to_s shellout("#{HG_BIN} --version") { |io| io.read }.to_s
end end
def template_path def template_path

16
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
View File

@ -16,8 +16,10 @@ begin
"Mercurial Distributed SCM (1e4ddc9ac9f7+20080325)\n" => nil, "Mercurial Distributed SCM (1e4ddc9ac9f7+20080325)\n" => nil,
"Mercurial Distributed SCM (1.0.1+20080525)\n" => [1,0,1], "Mercurial Distributed SCM (1.0.1+20080525)\n" => [1,0,1],
"Mercurial Distributed SCM (1916e629a29d)\n" => nil, "Mercurial Distributed SCM (1916e629a29d)\n" => nil,
"Mercurial SCM Distribuito (versione 0.9.5)\n" => [0,9,5]} "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| to_test.each do |s, v|
test_hgversion_for(s, v) test_hgversion_for(s, v)
end end
@ -27,8 +29,9 @@ begin
to_test = { [0,9,5] => "0.9.5", to_test = { [0,9,5] => "0.9.5",
[1,0] => "1.0", [1,0] => "1.0",
[] => "1.0", [] => "1.0",
[1,0,1] => "1.0"} [1,0,1] => "1.0",
[1,7] => "1.0",
[1,7,1] => "1.0"}
to_test.each do |v, template| to_test.each do |v, template|
test_template_path_for(v, template) test_template_path_for(v, template)
end end
@ -50,5 +53,8 @@ begin
end end
rescue LoadError rescue LoadError
def test_fake; assert(false, "Requires mocha to run those tests") end class MercurialMochaFake < ActiveSupport::TestCase
def test_fake; assert(false, "Requires mocha to run those tests") end
end
end end