| @@ -170,8 +170,8 module Redmine | |||||
| 170 | revision = nil |
|
170 | revision = nil | |
| 171 | state = "entry_start" |
|
171 | state = "entry_start" | |
| 172 | end |
|
172 | end | |
| 173 | if state=="entry_start" |
|
173 | if state == "entry_start" | |
| 174 | branch_map=Hash.new |
|
174 | branch_map = Hash.new | |
| 175 | if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_proj(path))}(.+),v$/ =~ line |
|
175 | if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_proj(path))}(.+),v$/ =~ line | |
| 176 | entry_path = normalize_cvs_path($1) |
|
176 | entry_path = normalize_cvs_path($1) | |
| 177 | entry_name = normalize_path(File.basename($1)) |
|
177 | entry_name = normalize_path(File.basename($1)) | |
| @@ -185,29 +185,29 module Redmine | |||||
| 185 | state = "revision" |
|
185 | state = "revision" | |
| 186 | end |
|
186 | end | |
| 187 | next |
|
187 | next | |
| 188 | elsif state=="symbolic" |
|
188 | elsif state == "symbolic" | |
| 189 | if /^(.*):\s(.*)/ =~ (line.strip) |
|
189 | if /^(.*):\s(.*)/ =~ (line.strip) | |
| 190 | branch_map[$1]=$2 |
|
190 | branch_map[$1] = $2 | |
| 191 | else |
|
191 | else | |
| 192 | state="tags" |
|
192 | state = "tags" | |
| 193 | next |
|
193 | next | |
| 194 | end |
|
194 | end | |
| 195 | elsif state=="tags" |
|
195 | elsif state == "tags" | |
| 196 | if /^#{STARTLOG}/ =~ line |
|
196 | if /^#{STARTLOG}/ =~ line | |
| 197 | commit_log = "" |
|
197 | commit_log = "" | |
| 198 | state="revision" |
|
198 | state = "revision" | |
| 199 | elsif /^#{ENDLOG}/ =~ line |
|
199 | elsif /^#{ENDLOG}/ =~ line | |
| 200 | state="head" |
|
200 | state = "head" | |
| 201 | end |
|
201 | end | |
| 202 | next |
|
202 | next | |
| 203 | elsif state=="revision" |
|
203 | elsif state == "revision" | |
| 204 | if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line |
|
204 | if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line | |
| 205 | if revision |
|
205 | if revision | |
| 206 | revHelper = CvsRevisionHelper.new(revision) |
|
206 | revHelper = CvsRevisionHelper.new(revision) | |
| 207 | revBranch = "HEAD" |
|
207 | revBranch = "HEAD" | |
| 208 | branch_map.each() do |branch_name, branch_point| |
|
208 | branch_map.each() do |branch_name, branch_point| | |
| 209 | if revHelper.is_in_branch_with_symbol(branch_point) |
|
209 | if revHelper.is_in_branch_with_symbol(branch_point) | |
| 210 | revBranch=branch_name |
|
210 | revBranch = branch_name | |
| 211 | end |
|
211 | end | |
| 212 | end |
|
212 | end | |
| 213 | logger.debug("********** YIELD Revision #{revision}::#{revBranch}") |
|
213 | logger.debug("********** YIELD Revision #{revision}::#{revBranch}") | |
| @@ -222,8 +222,8 module Redmine | |||||
| 222 | :name => entry_name, |
|
222 | :name => entry_name, | |
| 223 | :kind => 'file', |
|
223 | :kind => 'file', | |
| 224 | :action => file_state |
|
224 | :action => file_state | |
| 225 | }] |
|
225 | }] | |
| 226 | }) |
|
226 | }) | |
| 227 | end |
|
227 | end | |
| 228 | commit_log = String.new |
|
228 | commit_log = String.new | |
| 229 | revision = nil |
|
229 | revision = nil | |
General Comments 0
You need to be logged in to leave comments.
Login now