|
|
|
@ -133,8 +133,7 @@ module Redmine |
|
|
|
|
|
|
|
|
|
if state=="entry_start" |
|
|
|
|
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.gsub(/^:.*@[^:]+:\d*/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line |
|
|
|
|
if /^RCS file: #{Regexp.escape(root_url_path)}\/#{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}") |
|
|
|
@ -273,6 +272,13 @@ module Redmine |
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
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 |
|
|
|
|
def time_to_cvstime(time) |
|
|
|
|