scm: mercurial: fix exception operation in adapter all methods using xml and io.read (#4455).

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

scm: mercurial: fix exception operation in adapter all methods using xml and io.read (#4455).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4879 e93f8b46-1217-0410-a6f0-8f06a7374b81
dbdbe26f · Toshi MARUYAMA · Eric Davis · b399e185 · dbdbe26f
Commit dbdbe26f authored Feb 18, 2011 by Toshi MARUYAMA Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

mercurial_adapter.rb lib/redmine/scm/adapters/mercurial_adapter.rb +9 -3

No files found.
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -124,7 +124,10 @@ module Redmine
        def entries(path=nil, identifier=nil)
          manifest = hg('rhmanifest', '-r', hgrev(identifier),
                        CGI.escape(without_leading_slash(path.to_s))) do |io|
-            ActiveSupport::XmlMini.parse(io.read)['rhmanifest']['repository']['manifest']
+            begin
+              ActiveSupport::XmlMini.parse(io.read)['rhmanifest']['repository']['manifest']
+            rescue
+            end
          end
          path_prefix = path.blank? ? '' : with_trailling_slash(path)

@@ -164,8 +167,11 @@ module Redmine
          hg_args << '--limit' << options[:limit] if options[:limit]
          hg_args << hgtarget(path) unless path.blank?
          log = hg(*hg_args) do |io|
-            # Mercurial < 1.5 does not support footer template for '</log>'
-            ActiveSupport::XmlMini.parse("#{io.read}</log>")['log']
+            begin
+              # Mercurial < 1.5 does not support footer template for '</log>'
+              ActiveSupport::XmlMini.parse("#{io.read}</log>")['log']
+            rescue
+            end
          end

          as_ary(log['logentry']).each do |le|