diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-16 16:06:24 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-16 16:06:24 +0000 |
| commit | 7a3d385b8e530c66937ddf0f924ca837d9d21076 (patch) | |
| tree | 3fae1b0b1c1ab782ffb26125648d55debd25a460 | |
| parent | 0a8704150437cf395621e2c2f1c2635112b88bd5 (diff) | |
| download | redmine-7a3d385b8e530c66937ddf0f924ca837d9d21076.tar.gz redmine-7a3d385b8e530c66937ddf0f924ca837d9d21076.zip | |
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
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial_adapter.rb | 7 |
1 files changed, 5 insertions, 2 deletions
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 |