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

scm: cvs: code clean up adapter.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5389 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-04-11 04:18:55 +00:00
parent f690341d9e
commit 5778d3c51e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,6 @@ module Redmine
def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &block) def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &block)
logger.debug "<cvs> revisions path:" + logger.debug "<cvs> revisions path:" +
"'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}" "'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
path_with_project = "#{url}#{with_leading_slash(path)}" path_with_project = "#{url}#{with_leading_slash(path)}"
cmd_args = %w|rlog| cmd_args = %w|rlog|
cmd_args << "-d" << ">#{time_to_cvstime_rlog(identifier_from)}" if identifier_from cmd_args << "-d" << ">#{time_to_cvstime_rlog(identifier_from)}" if identifier_from
@ -212,8 +211,8 @@ module Redmine
elsif state=="revision" elsif state=="revision"
if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line
if revision if revision
revHelper=CvsRevisionHelper.new(revision) revHelper = CvsRevisionHelper.new(revision)
revBranch="HEAD" revBranch = "HEAD"
branch_map.each() do |branch_name, branch_point| branch_map.each() do |branch_name, branch_point|
if revHelper.is_in_branch_with_symbol(branch_point) if revHelper.is_in_branch_with_symbol(branch_point)
revBranch=branch_name revBranch=branch_name
@ -237,19 +236,19 @@ module Redmine
commit_log = String.new commit_log = String.new
revision = nil revision = nil
if /^#{ENDLOG}/ =~ line if /^#{ENDLOG}/ =~ line
state="entry_start" state = "entry_start"
end end
next next
end end
if /^branches: (.+)$/ =~ line if /^branches: (.+)$/ =~ line
#TODO: version.branch = $1 # TODO: version.branch = $1
elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line
revision = $1 revision = $1
elsif /^date:\s+(\d+.\d+.\d+\s+\d+:\d+:\d+)/ =~ line elsif /^date:\s+(\d+.\d+.\d+\s+\d+:\d+:\d+)/ =~ line
date = Time.parse($1) date = Time.parse($1)
author = /author: ([^;]+)/.match(line)[1] author = /author: ([^;]+)/.match(line)[1]
file_state = /state: ([^;]+)/.match(line)[1] file_state = /state: ([^;]+)/.match(line)[1]
# TODO: # TODO:
# linechanges only available in CVS.... # linechanges only available in CVS....
# maybe a feature our SVN implementation. # maybe a feature our SVN implementation.
@ -273,7 +272,8 @@ module Redmine
end end
def diff(path, identifier_from, identifier_to=nil) def diff(path, identifier_from, identifier_to=nil)
logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}" logger.debug "<cvs> diff path:'#{path}'" +
",identifier_from #{identifier_from}, identifier_to #{identifier_to}"
path_with_project="#{url}#{with_leading_slash(path)}" path_with_project="#{url}#{with_leading_slash(path)}"
cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{shell_quote path_with_project}" cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{shell_quote path_with_project}"
diff = [] diff = []