diff lib/redmine/scm/adapters/mercurial_adapter.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch
author Chris Cannam
date Mon, 07 Jan 2013 12:01:42 +0000
parents cbb26bc654de
children bb32da3bea34 622f24f53b42
line wrap: on
line diff
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb	Wed Jun 27 14:54:18 2012 +0100
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb	Mon Jan 07 12:01:42 2013 +0000
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -135,7 +135,7 @@
               output.force_encoding('UTF-8')
             end
             begin
-              @summary = ActiveSupport::XmlMini.parse(output)['rhsummary']
+              @summary = parse_xml(output)['rhsummary']
             rescue
             end
           end
@@ -151,7 +151,7 @@
               output.force_encoding('UTF-8')
             end
             begin
-              ActiveSupport::XmlMini.parse(output)['rhmanifest']['repository']['manifest']
+              parse_xml(output)['rhmanifest']['repository']['manifest']
             rescue
             end
           end
@@ -199,7 +199,7 @@
             end
             begin
               # Mercurial < 1.5 does not support footer template for '</log>'
-              ActiveSupport::XmlMini.parse("#{output}</log>")['log']
+              parse_xml("#{output}</log>")['log']
             rescue
             end
           end