comparison lib/redmine/scm/adapters/mercurial_adapter.rb @ 1116:bb32da3bea34 redmine-2.2-integration

Merge from live
author Chris Cannam
date Mon, 07 Jan 2013 14:41:20 +0000
parents 433d4f72a19b 5e80956cc792
children 51d7f3e06556
comparison
equal deleted inserted replaced
1115:433d4f72a19b 1116:bb32da3bea34
196 output = io.read 196 output = io.read
197 if output.respond_to?(:force_encoding) 197 if output.respond_to?(:force_encoding)
198 output.force_encoding('UTF-8') 198 output.force_encoding('UTF-8')
199 end 199 end
200 begin 200 begin
201 # Mercurial < 1.5 does not support footer template for '</log>' 201 parse_xml("#{output}")['log']
202 parse_xml("#{output}</log>")['log']
203 rescue 202 rescue
204 end 203 end
205 end 204 end
206 as_ary(log['logentry']).each do |le| 205 as_ary(log['logentry']).each do |le|
207 cpalist = as_ary(le['paths']['path-copied']).map do |e| 206 cpalist = as_ary(le['paths']['path-copied']).map do |e|