From add4b117ccf2ebca5ada7b1dea46cc91603585d5 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 18 Feb 2011 12:44:43 +0000
Subject: [PATCH] scm: mercurial: fix exception operation in adapter "summary"
method (#4455).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4876 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
lib/redmine/scm/adapters/mercurial_adapter.rb | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 6903f80cf..80ad02f58 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -110,9 +110,16 @@ module Redmine
end
def summary
- @summary ||= hg 'rhsummary' do |io|
- ActiveSupport::XmlMini.parse(io.read)['rhsummary']
+ return @summary if @summary
+ doc = nil
+ hg 'rhsummary' do |io|
+ output = io.read
+ begin
+ doc = ActiveSupport::XmlMini.parse(output)['rhsummary']
+ rescue
+ end
end
+ @summary = doc
end
private :summary
--
GitLab