From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 23 Feb 2011 00:34:27 +0000 (+0000)
Subject: scm: mercurial: path encoding support for "cat" in adapter (#2664).
X-Git-Tag: 1.2.0~895
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7dfd0bf67920c000ff1f3a268d2596930f35af4f;p=redmine.git

scm: mercurial: path encoding support for "cat" in adapter (#2664).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4928 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index a71ae7bd2..683a5731f 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -228,7 +228,8 @@ module Redmine
         end
 
         def cat(path, identifier=nil)
-          hg 'cat', '-r', hgrev(identifier), hgtarget(path) do |io|
+          p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
+          hg 'rhcat', '-r', hgrev(identifier), hgtarget(p) do |io|
             io.binmode
             io.read
           end