From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 16 Feb 2011 16:06:24 +0000 (+0000)
Subject: scm: mercurial: fix Ruby 1.9 "hg diff" test fails (#7518).
X-Git-Tag: 1.2.0~962
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7a3d385b8e530c66937ddf0f924ca837d9d21076;p=redmine.git

scm: mercurial: fix Ruby 1.9 "hg diff" test fails (#7518).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4859 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 46f3d5246..28f551574 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -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