kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Toshi MARUYAMA 2011-02-18 14:49:31 +00:00
parent 96f82be2f4
commit c6e1d4f39d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/redmine/scm/adapters/mercurial_adapter.rb
View File

@ -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|