| @@ -133,8 +133,7 module Redmine | |||||
| 133 |
|
133 | |||
| 134 | if state=="entry_start" |
|
134 | if state=="entry_start" | |
| 135 | branch_map=Hash.new |
|
135 | branch_map=Hash.new | |
| 136 | # gsub(/^:.*@[^:]+:\d*/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url |
|
136 | if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line | |
| 137 | if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:\d*/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line |
|
|||
| 138 | entry_path = normalize_cvs_path($1) |
|
137 | entry_path = normalize_cvs_path($1) | |
| 139 | entry_name = normalize_path(File.basename($1)) |
|
138 | entry_name = normalize_path(File.basename($1)) | |
| 140 | logger.debug("Path #{entry_path} <=> Name #{entry_name}") |
|
139 | logger.debug("Path #{entry_path} <=> Name #{entry_name}") | |
| @@ -273,6 +272,13 module Redmine | |||||
| 273 | end |
|
272 | end | |
| 274 |
|
273 | |||
| 275 | private |
|
274 | private | |
|
|
275 | ||||
|
|
276 | # Returns the root url without the connexion string | |||
|
|
277 | # :pserver:anonymous@foo.bar:/path => /path | |||
|
|
278 | # :ext:cvsservername:/path => /path | |||
|
|
279 | def root_url_path | |||
|
|
280 | root_url.to_s.gsub(/^:.+:\d*/, '') | |||
|
|
281 | end | |||
| 276 |
|
282 | |||
| 277 | # convert a date/time into the CVS-format |
|
283 | # convert a date/time into the CVS-format | |
| 278 | def time_to_cvstime(time) |
|
284 | def time_to_cvstime(time) | |
General Comments 0
You need to be logged in to leave comments.
Login now