diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-11-16 21:24:22 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-11-16 21:24:22 +0000 |
| commit | 1469a4c8df574d066c49b55f9fd9096638740272 (patch) | |
| tree | 3192299ae7d31fbe1a598a99cad5c2fe2ed86195 /lib | |
| parent | 76cdef46f2902785f67a12680c918371c1491b93 (diff) | |
| download | redmine-1469a4c8df574d066c49b55f9fd9096638740272.tar.gz redmine-1469a4c8df574d066c49b55f9fd9096638740272.zip | |
Fixed (CVS adapter): changes not recorded when using :pserver string.
Updated Russian js calendar (iGor kMeta).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@907 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/scm/adapters/cvs_adapter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index c5f85f1c6..e84c1eea3 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -142,7 +142,8 @@ module Redmine if state=="entry_start" branch_map=Hash.new - if /^RCS file: #{Regexp.escape(root_url)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line + # 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 entry_path = normalize_cvs_path($1) entry_name = normalize_path(File.basename($1)) logger.debug("Path #{entry_path} <=> Name #{entry_name}") |