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

Fixed: CVS connexion string may not contain @. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2096 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-12-06 17:40:54 +00:00
parent e66945cbd8
commit 472ec31662
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,8 +133,7 @@ module Redmine
if state=="entry_start" if state=="entry_start"
branch_map=Hash.new branch_map=Hash.new
# gsub(/^:.*@[^:]+:\d*/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:\d*/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
entry_path = normalize_cvs_path($1) entry_path = normalize_cvs_path($1)
entry_name = normalize_path(File.basename($1)) entry_name = normalize_path(File.basename($1))
logger.debug("Path #{entry_path} <=> Name #{entry_name}") logger.debug("Path #{entry_path} <=> Name #{entry_name}")
@ -274,6 +273,13 @@ module Redmine
private private
# Returns the root url without the connexion string
# :pserver:anonymous@foo.bar:/path => /path
# :ext:cvsservername:/path => /path
def root_url_path
root_url.to_s.gsub(/^:.+:\d*/, '')
end
# convert a date/time into the CVS-format # convert a date/time into the CVS-format
def time_to_cvstime(time) def time_to_cvstime(time)
return nil if time.nil? return nil if time.nil?