OSDN Git Service

scm: mercurial: fix Ruby 1.9 "hg diff" test fails (#7518).
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 16 Feb 2011 16:06:24 +0000 (16:06 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 16 Feb 2011 16:06:24 +0000 (16:06 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4859 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/redmine/scm/adapters/mercurial_adapter.rb

index 46f3d52..28f5515 100644 (file)
@@ -170,10 +170,13 @@ module Redmine
             hg_args << '-c' << hgrev(identifier_from)
           end
           hg_args << CGI.escape(hgtarget(path)) unless path.blank?
-
+          diff = []
           hg *hg_args do |io|
-            io.collect
+            io.each_line do |line|
+              diff << line
+            end
           end
+          diff
         rescue HgCommandAborted
           nil  # means not found
         end