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

scm: cvs: convert encoding paths in entries() of adapter (#3462). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5464 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-04-15 07:17:26 +00:00
parent c84d2e6699
commit da2c511cd1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/redmine/scm/adapters/cvs_adapter.rb
View File

@ -92,6 +92,8 @@ module Redmine
# this method is used by the repository-browser (aka LIST) # this method is used by the repository-browser (aka LIST)
def entries(path=nil, identifier=nil) def entries(path=nil, identifier=nil)
logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'" logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'"
path_locale = scm_iconv(@path_encoding, 'UTF-8', path)
path_locale.force_encoding("ASCII-8BIT") if path_locale.respond_to?(:force_encoding)
entries = Entries.new entries = Entries.new
cmd_args = %w|-q rls -e| cmd_args = %w|-q rls -e|
cmd_args << "-D" << time_to_cvstime_rlog(identifier) if identifier cmd_args << "-D" << time_to_cvstime_rlog(identifier) if identifier
@ -113,15 +115,15 @@ module Redmine
end end
entries << Entry.new( entries << Entry.new(
{ {
:name => fields[-5], :name => scm_iconv('UTF-8', @path_encoding, fields[-5]),
#:path => fields[-4].include?(path)?fields[-4]:(path + "/"+ fields[-4]), #:path => fields[-4].include?(path)?fields[-4]:(path + "/"+ fields[-4]),
:path => "#{path}/#{fields[-5]}", :path => scm_iconv('UTF-8', @path_encoding, "#{path_locale}/#{fields[-5]}"),
:kind => 'file', :kind => 'file',
:size => nil, :size => nil,
:lastrev => Revision.new( :lastrev => Revision.new(
{ {
:revision => fields[-4], :revision => fields[-4],
:name => fields[-4], :name => scm_iconv('UTF-8', @path_encoding, fields[-4]),
:time => time, :time => time,
:author => '' :author => ''
}) })
@ -129,8 +131,8 @@ module Redmine
else else
entries << Entry.new( entries << Entry.new(
{ {
:name => fields[1], :name => scm_iconv('UTF-8', @path_encoding, fields[1]),
:path => "#{path}/#{fields[1]}", :path => scm_iconv('UTF-8', @path_encoding, "#{path_locale}/#{fields[1]}"),
:kind => 'dir', :kind => 'dir',
:size => nil, :size => nil,
:lastrev => nil :lastrev => nil