diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-02-16 18:09:26 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-02-16 18:09:26 +0000 |
| commit | 53a04b0a44ca8cc8a2be369234377d6625892e84 (patch) | |
| tree | 001f88c48cf08f7ba6e13b51ebb5aa0624caa4e1 /lib | |
| parent | 0153954ebb6abde6b1021ad6e80d3bb0dd99aade (diff) | |
| download | redmine-53a04b0a44ca8cc8a2be369234377d6625892e84.tar.gz redmine-53a04b0a44ca8cc8a2be369234377d6625892e84.zip | |
Fixed: CVS repository doesn't work if port is used in the url (#653).
Added functional tests for CVS adapter.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1156 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/scm/adapters/cvs_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index 73dc9b6c4..c0f60c02a 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -140,8 +140,8 @@ module Redmine if state=="entry_start" branch_map=Hash.new - # gsub(/^:.*@[^:]+:/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url - if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line + # gsub(/^:.*@[^:]+:\d*/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url + if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:\d*/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line entry_path = normalize_cvs_path($1) entry_name = normalize_path(File.basename($1)) logger.debug("Path #{entry_path} <=> Name #{entry_name}") |