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

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
7934e32e · Toshi MARUYAMA · Eric Davis · 77f64963 · 7934e32e
Commit 7934e32e authored Feb 16, 2011 by Toshi MARUYAMA Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

mercurial_adapter.rb lib/redmine/scm/adapters/mercurial_adapter.rb +5 -2

No files found.
--- 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