summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm/adapters/mercurial_adapter.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-02-23 00:34:27 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-02-23 00:34:27 +0000
commit7dfd0bf67920c000ff1f3a268d2596930f35af4f (patch)
treea9a65a6151902cc87c3788f12ff3d81aca304fc7 /lib/redmine/scm/adapters/mercurial_adapter.rb
parentbb248fb0372910486b7d2dc30974317a9bc4ad36 (diff)
downloadredmine-7dfd0bf67920c000ff1f3a268d2596930f35af4f.tar.gz
redmine-7dfd0bf67920c000ff1f3a268d2596930f35af4f.zip
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
Diffstat (limited to 'lib/redmine/scm/adapters/mercurial_adapter.rb')
-rw-r--r--lib/redmine/scm/adapters/mercurial_adapter.rb3
1 files changed, 2 insertions, 1 deletions
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