From 7934e32ee107e2861ef6a5c5c26d4f20de02da1e Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 16 Feb 2011 16:06:24 +0000
Subject: [PATCH] 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
---
 lib/redmine/scm/adapters/mercurial_adapter.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 46f3d524..28f55157 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