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

scm: cvs: use scm_cmd() in adapter entries().

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5083 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-03-11 00:42:59 +00:00
parent d3d7ea08f4
commit b5bf2fb322
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,10 +99,10 @@ module Redmine
logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'" logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'"
path_with_project="#{url}#{with_leading_slash(path)}" path_with_project="#{url}#{with_leading_slash(path)}"
entries = Entries.new entries = Entries.new
cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rls -e" cmd_args = %w|rls -e|
cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier cmd_args << "-D" << time_to_cvstime(identifier) if identifier
cmd << " #{shell_quote path_with_project}" cmd_args << path_with_project
shellout(cmd) do |io| scm_cmd(*cmd_args) do |io|
io.each_line(){|line| io.each_line(){|line|
fields=line.chop.split('/',-1) fields=line.chop.split('/',-1)
logger.debug(">>InspectLine #{fields.inspect}") logger.debug(">>InspectLine #{fields.inspect}")
@ -130,8 +130,9 @@ module Redmine
end end
} }
end end
return nil if $? && $?.exitstatus != 0
entries.sort_by_name entries.sort_by_name
rescue ScmCommandAborted
nil
end end
STARTLOG="----------------------------" STARTLOG="----------------------------"