Fossil SCM

Bugfix in the generation of the initial symbol changesets. Keep entries apart per line-of-development.

aku 2007-11-27 08:59 trunk
Commit 2e07cd71649eebbe6ab666241fe0936d004bc70c
Parent 678765068d56702…
1 file changed +12 -8
~ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
M tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+12 -8
--- tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
@@ -225,28 +225,30 @@
225225
226226
 # First process the tags, then the branches. We know that
227227
 # their ids do not overlap with each other.
228228
229229
 set lastsymbol {}
230
+ set lastlod {}
230231
 set lastproject {}
231232
 set revisions {}
232233
233
- foreach {sid rid pid} [state run {
234
- SELECT S.sid, R.rid, S.pid
234
+ foreach {sid rid lod pid} [state run {
235
+ SELECT S.sid, R.rid, R.lod, S.pid
235236
 FROM tag T, revision R, symbol S -- T ==> R/S, using PK indices of R, S.
236237
 WHERE T.rev = R.rid
237238
 AND T.sid = S.sid
238
- ORDER BY S.sid, R.date
239
+ ORDER BY S.sid, R.lod, R.date
239240
 }] {
240
- if {$lastsymbol != $sid} {
241
+ if {($lastlod != $lod) || ($lastsymbol != $sid)} {
241242
 if {[llength $revisions]} {
242243
 incr n
243244
 set p [repository projectof $lastproject]
244245
 project::rev %AUTO% $p sym $lastsymbol $revisions
245246
 set revisions {}
246247
 }
247248
 set lastsymbol $sid
249
+ set lastlod $lod
248250
 set lastproject $pid
249251
 }
250252
 lappend revisions $rid
251253
 }
252254
@@ -255,28 +257,30 @@
255257
 set p [repository projectof $lastproject]
256258
 project::rev %AUTO% $p sym $lastsymbol $revisions
257259
 }
258260
259261
 set lastsymbol {}
262
+ set lastlod {}
260263
 set lasproject {}
261264
 set revisions {}
262265
263
- foreach {sid rid pid} [state run {
264
- SELECT S.sid, R.rid, S.pid
266
+ foreach {sid rid lod pid} [state run {
267
+ SELECT S.sid, R.rid, R.lod, S.pid
265268
 FROM branch B, revision R, symbol S -- B ==> R/S, using PK indices of R, S.
266269
 WHERE B.root = R.rid
267270
 AND B.sid = S.sid
268
- ORDER BY S.sid, R.date
271
+ ORDER BY S.sid, R.lod, R.date
269272
 }] {
270
- if {$lastsymbol != $sid} {
273
+ if {($lastlod != $lod) || ($lastsymbol != $sid)} {
271274
 if {[llength $revisions]} {
272275
 incr n
273276
 set p [repository projectof $lastproject]
274277
 project::rev %AUTO% $p sym $lastsymbol $revisions
275278
 set revisions {}
276279
 }
277280
 set lastsymbol $sid
281
+ set lastlod $lod
278282
 set lastproject $pid
279283
 }
280284
 lappend revisions $rid
281285
 }
282286
283287
--- tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
@@ -225,28 +225,30 @@
225
226 # First process the tags, then the branches. We know that
227 # their ids do not overlap with each other.
228
229 set lastsymbol {}
 
230 set lastproject {}
231 set revisions {}
232
233 foreach {sid rid pid} [state run {
234 SELECT S.sid, R.rid, S.pid
235 FROM tag T, revision R, symbol S -- T ==> R/S, using PK indices of R, S.
236 WHERE T.rev = R.rid
237 AND T.sid = S.sid
238 ORDER BY S.sid, R.date
239 }] {
240 if {$lastsymbol != $sid} {
241 if {[llength $revisions]} {
242 incr n
243 set p [repository projectof $lastproject]
244 project::rev %AUTO% $p sym $lastsymbol $revisions
245 set revisions {}
246 }
247 set lastsymbol $sid
 
248 set lastproject $pid
249 }
250 lappend revisions $rid
251 }
252
@@ -255,28 +257,30 @@
255 set p [repository projectof $lastproject]
256 project::rev %AUTO% $p sym $lastsymbol $revisions
257 }
258
259 set lastsymbol {}
 
260 set lasproject {}
261 set revisions {}
262
263 foreach {sid rid pid} [state run {
264 SELECT S.sid, R.rid, S.pid
265 FROM branch B, revision R, symbol S -- B ==> R/S, using PK indices of R, S.
266 WHERE B.root = R.rid
267 AND B.sid = S.sid
268 ORDER BY S.sid, R.date
269 }] {
270 if {$lastsymbol != $sid} {
271 if {[llength $revisions]} {
272 incr n
273 set p [repository projectof $lastproject]
274 project::rev %AUTO% $p sym $lastsymbol $revisions
275 set revisions {}
276 }
277 set lastsymbol $sid
 
278 set lastproject $pid
279 }
280 lappend revisions $rid
281 }
282
283
--- tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
@@ -225,28 +225,30 @@
225
226 # First process the tags, then the branches. We know that
227 # their ids do not overlap with each other.
228
229 set lastsymbol {}
230 set lastlod {}
231 set lastproject {}
232 set revisions {}
233
234 foreach {sid rid lod pid} [state run {
235 SELECT S.sid, R.rid, R.lod, S.pid
236 FROM tag T, revision R, symbol S -- T ==> R/S, using PK indices of R, S.
237 WHERE T.rev = R.rid
238 AND T.sid = S.sid
239 ORDER BY S.sid, R.lod, R.date
240 }] {
241 if {($lastlod != $lod) || ($lastsymbol != $sid)} {
242 if {[llength $revisions]} {
243 incr n
244 set p [repository projectof $lastproject]
245 project::rev %AUTO% $p sym $lastsymbol $revisions
246 set revisions {}
247 }
248 set lastsymbol $sid
249 set lastlod $lod
250 set lastproject $pid
251 }
252 lappend revisions $rid
253 }
254
@@ -255,28 +257,30 @@
257 set p [repository projectof $lastproject]
258 project::rev %AUTO% $p sym $lastsymbol $revisions
259 }
260
261 set lastsymbol {}
262 set lastlod {}
263 set lasproject {}
264 set revisions {}
265
266 foreach {sid rid lod pid} [state run {
267 SELECT S.sid, R.rid, R.lod, S.pid
268 FROM branch B, revision R, symbol S -- B ==> R/S, using PK indices of R, S.
269 WHERE B.root = R.rid
270 AND B.sid = S.sid
271 ORDER BY S.sid, R.lod, R.date
272 }] {
273 if {($lastlod != $lod) || ($lastsymbol != $sid)} {
274 if {[llength $revisions]} {
275 incr n
276 set p [repository projectof $lastproject]
277 project::rev %AUTO% $p sym $lastsymbol $revisions
278 set revisions {}
279 }
280 set lastsymbol $sid
281 set lastlod $lod
282 set lastproject $pid
283 }
284 lappend revisions $rid
285 }
286
287

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button