From bea085c3ba21e660cace018929b3ee3cc818c72e Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 3 Mar 2011 12:44:14 +0000 Subject: [PATCH] scm: mercurial: convert copied file path encoding (#2664). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4995 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/mercurial_adapter.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index d41ed7a3..6a2613fc 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -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]