Fossil SCM
More realignment of variable names with their content, in pass 5.
Commit
27f093d23cfd9236e28fdf9afb083b33378f1221
Parent
39e19c0cf304c7b…
1 file changed
+16
-16
+16
-16
| --- tools/cvs2fossil/lib/c2f_pinitcsets.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl | ||
| @@ -233,64 +233,64 @@ | ||
| 233 | 233 | # First process the tags, then the branches. We know that |
| 234 | 234 | # their ids do not overlap with each other. |
| 235 | 235 | |
| 236 | 236 | set lastsymbol {} |
| 237 | 237 | set lastproject {} |
| 238 | - set revisions {} | |
| 238 | + set tags {} | |
| 239 | 239 | |
| 240 | - foreach {sid rid pid} [state run { | |
| 240 | + foreach {sid tid pid} [state run { | |
| 241 | 241 | SELECT S.sid, T.tid, S.pid |
| 242 | 242 | FROM tag T, symbol S -- T ==> R/S, using PK indices of R, S. |
| 243 | 243 | WHERE T.sid = S.sid |
| 244 | 244 | ORDER BY S.sid, T.tid |
| 245 | 245 | }] { |
| 246 | 246 | if {$lastsymbol != $sid} { |
| 247 | - if {[llength $revisions]} { | |
| 247 | + if {[llength $tags]} { | |
| 248 | 248 | incr n |
| 249 | 249 | set p [repository projectof $lastproject] |
| 250 | - project::rev %AUTO% $p sym::tag $lastsymbol $revisions | |
| 251 | - set revisions {} | |
| 250 | + project::rev %AUTO% $p sym::tag $lastsymbol $tags | |
| 251 | + set tags {} | |
| 252 | 252 | } |
| 253 | 253 | set lastsymbol $sid |
| 254 | 254 | set lastproject $pid |
| 255 | 255 | } |
| 256 | - lappend revisions $rid | |
| 256 | + lappend tags $tid | |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | - if {[llength $revisions]} { | |
| 259 | + if {[llength $tags]} { | |
| 260 | 260 | incr n |
| 261 | 261 | set p [repository projectof $lastproject] |
| 262 | - project::rev %AUTO% $p sym::tag $lastsymbol $revisions | |
| 262 | + project::rev %AUTO% $p sym::tag $lastsymbol $tags | |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | set lastsymbol {} |
| 266 | 266 | set lasproject {} |
| 267 | - set revisions {} | |
| 267 | + set branches {} | |
| 268 | 268 | |
| 269 | - foreach {sid rid pid} [state run { | |
| 269 | + foreach {sid bid pid} [state run { | |
| 270 | 270 | SELECT S.sid, B.bid, S.pid |
| 271 | 271 | FROM branch B, symbol S -- B ==> R/S, using PK indices of R, S. |
| 272 | 272 | WHERE B.sid = S.sid |
| 273 | 273 | ORDER BY S.sid, B.bid |
| 274 | 274 | }] { |
| 275 | 275 | if {$lastsymbol != $sid} { |
| 276 | - if {[llength $revisions]} { | |
| 276 | + if {[llength $branches]} { | |
| 277 | 277 | incr n |
| 278 | 278 | set p [repository projectof $lastproject] |
| 279 | - project::rev %AUTO% $p sym::branch $lastsymbol $revisions | |
| 280 | - set revisions {} | |
| 279 | + project::rev %AUTO% $p sym::branch $lastsymbol $branches | |
| 280 | + set branches {} | |
| 281 | 281 | } |
| 282 | 282 | set lastsymbol $sid |
| 283 | 283 | set lastproject $pid |
| 284 | 284 | } |
| 285 | - lappend revisions $rid | |
| 285 | + lappend branches $bid | |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | - if {[llength $revisions]} { | |
| 288 | + if {[llength $branches]} { | |
| 289 | 289 | incr n |
| 290 | 290 | set p [repository projectof $lastproject] |
| 291 | - project::rev %AUTO% $p sym::branch $lastsymbol $revisions | |
| 291 | + project::rev %AUTO% $p sym::branch $lastsymbol $branches | |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | log write 4 initcsets "Created [nsp $n {symbol changeset}]" |
| 295 | 295 | return |
| 296 | 296 | } |
| 297 | 297 |
| --- tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| @@ -233,64 +233,64 @@ | |
| 233 | # First process the tags, then the branches. We know that |
| 234 | # their ids do not overlap with each other. |
| 235 | |
| 236 | set lastsymbol {} |
| 237 | set lastproject {} |
| 238 | set revisions {} |
| 239 | |
| 240 | foreach {sid rid pid} [state run { |
| 241 | SELECT S.sid, T.tid, S.pid |
| 242 | FROM tag T, symbol S -- T ==> R/S, using PK indices of R, S. |
| 243 | WHERE T.sid = S.sid |
| 244 | ORDER BY S.sid, T.tid |
| 245 | }] { |
| 246 | if {$lastsymbol != $sid} { |
| 247 | if {[llength $revisions]} { |
| 248 | incr n |
| 249 | set p [repository projectof $lastproject] |
| 250 | project::rev %AUTO% $p sym::tag $lastsymbol $revisions |
| 251 | set revisions {} |
| 252 | } |
| 253 | set lastsymbol $sid |
| 254 | set lastproject $pid |
| 255 | } |
| 256 | lappend revisions $rid |
| 257 | } |
| 258 | |
| 259 | if {[llength $revisions]} { |
| 260 | incr n |
| 261 | set p [repository projectof $lastproject] |
| 262 | project::rev %AUTO% $p sym::tag $lastsymbol $revisions |
| 263 | } |
| 264 | |
| 265 | set lastsymbol {} |
| 266 | set lasproject {} |
| 267 | set revisions {} |
| 268 | |
| 269 | foreach {sid rid pid} [state run { |
| 270 | SELECT S.sid, B.bid, S.pid |
| 271 | FROM branch B, symbol S -- B ==> R/S, using PK indices of R, S. |
| 272 | WHERE B.sid = S.sid |
| 273 | ORDER BY S.sid, B.bid |
| 274 | }] { |
| 275 | if {$lastsymbol != $sid} { |
| 276 | if {[llength $revisions]} { |
| 277 | incr n |
| 278 | set p [repository projectof $lastproject] |
| 279 | project::rev %AUTO% $p sym::branch $lastsymbol $revisions |
| 280 | set revisions {} |
| 281 | } |
| 282 | set lastsymbol $sid |
| 283 | set lastproject $pid |
| 284 | } |
| 285 | lappend revisions $rid |
| 286 | } |
| 287 | |
| 288 | if {[llength $revisions]} { |
| 289 | incr n |
| 290 | set p [repository projectof $lastproject] |
| 291 | project::rev %AUTO% $p sym::branch $lastsymbol $revisions |
| 292 | } |
| 293 | |
| 294 | log write 4 initcsets "Created [nsp $n {symbol changeset}]" |
| 295 | return |
| 296 | } |
| 297 |
| --- tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| @@ -233,64 +233,64 @@ | |
| 233 | # First process the tags, then the branches. We know that |
| 234 | # their ids do not overlap with each other. |
| 235 | |
| 236 | set lastsymbol {} |
| 237 | set lastproject {} |
| 238 | set tags {} |
| 239 | |
| 240 | foreach {sid tid pid} [state run { |
| 241 | SELECT S.sid, T.tid, S.pid |
| 242 | FROM tag T, symbol S -- T ==> R/S, using PK indices of R, S. |
| 243 | WHERE T.sid = S.sid |
| 244 | ORDER BY S.sid, T.tid |
| 245 | }] { |
| 246 | if {$lastsymbol != $sid} { |
| 247 | if {[llength $tags]} { |
| 248 | incr n |
| 249 | set p [repository projectof $lastproject] |
| 250 | project::rev %AUTO% $p sym::tag $lastsymbol $tags |
| 251 | set tags {} |
| 252 | } |
| 253 | set lastsymbol $sid |
| 254 | set lastproject $pid |
| 255 | } |
| 256 | lappend tags $tid |
| 257 | } |
| 258 | |
| 259 | if {[llength $tags]} { |
| 260 | incr n |
| 261 | set p [repository projectof $lastproject] |
| 262 | project::rev %AUTO% $p sym::tag $lastsymbol $tags |
| 263 | } |
| 264 | |
| 265 | set lastsymbol {} |
| 266 | set lasproject {} |
| 267 | set branches {} |
| 268 | |
| 269 | foreach {sid bid pid} [state run { |
| 270 | SELECT S.sid, B.bid, S.pid |
| 271 | FROM branch B, symbol S -- B ==> R/S, using PK indices of R, S. |
| 272 | WHERE B.sid = S.sid |
| 273 | ORDER BY S.sid, B.bid |
| 274 | }] { |
| 275 | if {$lastsymbol != $sid} { |
| 276 | if {[llength $branches]} { |
| 277 | incr n |
| 278 | set p [repository projectof $lastproject] |
| 279 | project::rev %AUTO% $p sym::branch $lastsymbol $branches |
| 280 | set branches {} |
| 281 | } |
| 282 | set lastsymbol $sid |
| 283 | set lastproject $pid |
| 284 | } |
| 285 | lappend branches $bid |
| 286 | } |
| 287 | |
| 288 | if {[llength $branches]} { |
| 289 | incr n |
| 290 | set p [repository projectof $lastproject] |
| 291 | project::rev %AUTO% $p sym::branch $lastsymbol $branches |
| 292 | } |
| 293 | |
| 294 | log write 4 initcsets "Created [nsp $n {symbol changeset}]" |
| 295 | return |
| 296 | } |
| 297 |