jro_apps/redmine Commit - r4309:faa461c66aed

Merged r4422 from trunk....

Jean-Philippe Lang -

r4309:faa461c66aed

parent child

Context file:

r4309:faa461c66aed

Collapse all files

lib/redmine/scm/adapters/mercurial_adapter.rb +3 -3

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

test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +11 -5

                                "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]}
+                               "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
                    to_test = { [0,9,5] => "0.9.5",
                                [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|
                      test_template_path_for(v, template)
                    end
                end
              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

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