diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-03-03 12:44:14 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-03-03 12:44:14 +0000 |
| commit | 32e69dcaca6cb62ad974936ecd3f38f93d7329a1 (patch) | |
| tree | ce5af6f6a2ddb6ef5a37cac972bb05de24902592 /lib/redmine/scm/adapters/mercurial_adapter.rb | |
| parent | 5c3caf2e6b348fe32f6a18b6bc76d26a8017bfc1 (diff) | |
| download | redmine-32e69dcaca6cb62ad974936ecd3f38f93d7329a1.tar.gz redmine-32e69dcaca6cb62ad974936ecd3f38f93d7329a1.zip | |
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
Diffstat (limited to 'lib/redmine/scm/adapters/mercurial_adapter.rb')
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial_adapter.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index d41ed7a3f..6a2613fcf 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] |