kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: bazaar: convert command line character encoding to @path_encoding (#11834) 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10416 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-09-17 23:45:59 +00:00
parent f230ffbd54
commit a6368733ad
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/redmine/scm/adapters/bazaar_adapter.rb
View File

@ -288,8 +288,13 @@ module Redmine
def scm_cmd(*args, &block) def scm_cmd(*args, &block)
full_args = [] full_args = []
full_args += args full_args += args
full_args_locale = []
full_args.map do |e|
full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
end
ret = shellout( ret = shellout(
self.class.sq_bin + ' ' + full_args.map { |e| shell_quote e.to_s }.join(' '), self.class.sq_bin + ' ' +
full_args_locale.map { |e| shell_quote e.to_s }.join(' '),
&block &block
) )
if $? && $?.exitstatus != 0 if $? && $?.exitstatus != 0
@ -302,8 +307,13 @@ module Redmine
def scm_cmd_no_raise(*args, &block) def scm_cmd_no_raise(*args, &block)
full_args = [] full_args = []
full_args += args full_args += args
full_args_locale = []
full_args.map do |e|
full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
end
ret = shellout( ret = shellout(
self.class.sq_bin + ' ' + full_args.map { |e| shell_quote e.to_s }.join(' '), self.class.sq_bin + ' ' +
full_args_locale.map { |e| shell_quote e.to_s }.join(' '),
&block &block
) )
ret ret