diff lib/redmine/scm/adapters/subversion_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 51d7f3e06556 622f24f53b42
line wrap: on
line diff
--- a/lib/redmine/scm/adapters/subversion_adapter.rb	Wed Jun 27 14:54:18 2012 +0100
+++ b/lib/redmine/scm/adapters/subversion_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
@@ -71,7 +71,7 @@
               output.force_encoding('UTF-8')
             end
             begin
-              doc = ActiveSupport::XmlMini.parse(output)
+              doc = parse_xml(output)
               # root_url = doc.elements["info/entry/repository/root"].text
               info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'],
                                :lastrev => Revision.new({
@@ -103,7 +103,7 @@
               output.force_encoding('UTF-8')
             end
             begin
-              doc = ActiveSupport::XmlMini.parse(output)
+              doc = parse_xml(output)
               each_xml_element(doc['lists']['list'], 'entry') do |entry|
                 commit = entry['commit']
                 commit_date = commit['date']
@@ -146,7 +146,7 @@
               output.force_encoding('UTF-8')
             end
             begin
-              doc = ActiveSupport::XmlMini.parse(output)
+              doc = parse_xml(output)
               each_xml_element(doc['properties']['target'], 'property') do |property|
                 properties[ property['name'] ] = property['__content__'].to_s
               end
@@ -173,7 +173,7 @@
               output.force_encoding('UTF-8')
             end
             begin
-              doc = ActiveSupport::XmlMini.parse(output)
+              doc = parse_xml(output)
               each_xml_element(doc['log'], 'logentry') do |logentry|
                 paths = []
                 each_xml_element(logentry['paths'], 'path') do |path|
@@ -199,7 +199,7 @@
           revisions
         end
 
-        def diff(path, identifier_from, identifier_to=nil, type="inline")
+        def diff(path, identifier_from, identifier_to=nil)
           path ||= ''
           identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''