]> source.dussan.org Git - redmine.git/commitdiff
scm: mercurial: convert copied file path encoding (#2664).
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 3 Mar 2011 12:44:14 +0000 (12:44 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 3 Mar 2011 12:44:14 +0000 (12:44 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4995 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/redmine/scm/adapters/mercurial_adapter.rb

index d41ed7a3f6fbf0202aab5c4ce20c152118c844b1..6a2613fcfe1e7ec4d8bc22e1d4b099aa3490ac73 100644 (file)
@@ -196,7 +196,9 @@ module Redmine
 
           as_ary(log['logentry']).each do |le|
             cpalist = as_ary(le['paths']['path-copied']).map do |e|
-              [e['__content__'], e['copyfrom-path']].map { |s| CGI.unescape(s) }
+              [e['__content__'], e['copyfrom-path']].map do |s|
+                scm_iconv('UTF-8', @path_encoding, CGI.unescape(s))
+              end
             end
             cpmap = Hash[*cpalist.flatten]