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

scm: cvs: code clean up lib/redmine/scm/adapters/cvs_adapter.rb. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5380 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-04-10 08:10:57 +00:00
parent 572af75c6e
commit c6ec41473e
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ module Redmine
@url = url
@login = login if login && !login.empty?
@password = (password || "") if @login
#TODO: better Exception here (IllegalArgumentException)
# TODO: better Exception here (IllegalArgumentException)
raise CommandFailed if root_url.blank?
@root_url = root_url
end
@ -127,9 +127,9 @@ module Redmine
:lastrev => Revision.new(
{
:revision => fields[-4],
:name => fields[-4],
:time => time,
:author => ''
:name => fields[-4],
:time => time,
:author => ''
})
})
else
@ -163,25 +163,21 @@ module Redmine
cmd_args << "-d" << ">#{time_to_cvstime_rlog(identifier_from)}" if identifier_from
cmd_args << path_with_project
scm_cmd(*cmd_args) do |io|
state="entry_start"
commit_log=String.new
revision=nil
date=nil
author=nil
entry_path=nil
entry_name=nil
file_state=nil
branch_map=nil
state = "entry_start"
commit_log = String.new
revision = nil
date = nil
author = nil
entry_path = nil
entry_name = nil
file_state = nil
branch_map = nil
io.each_line() do |line|
if state!="revision" && /^#{ENDLOG}/ =~ line
commit_log=String.new
revision=nil
state="entry_start"
if state != "revision" && /^#{ENDLOG}/ =~ line
commit_log = String.new
revision = nil
state = "entry_start"
end
if state=="entry_start"
branch_map=Hash.new
if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line