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