Fossil SCM

Fixed bug made in [f46458d5bd] which prevented the saving of the changesets generated by the breaking of the internal dependencies.

aku 2008-02-23 06:33 trunk
Commit b3d61d78293d38c3bbd4cad27db3c05228d1052b
Parent f46458d5bdc2218…
2 files changed +4 -2 +4 -2
~ tools/cvs2fossil/lib/c2f_pinitcsets.tcl ~ tools/cvs2fossil/lib/c2f_prev.tcl
M tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+4 -2
--- tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
@@ -211,13 +211,14 @@
211211
 set p [repository projectof $lastproject]
212212
 log write 14 initcsets meta_cset_begin
213213
 mem::mark
214214
 set cset [project::rev %AUTO% $p rev $lastmeta $revisions]
215215
 log write 14 initcsets meta_cset_done
216
- $cset breakinternaldependencies nx
216
+ set spawned [$cset breakinternaldependencies nx]
217217
 $cset persist
218218
 $cset destroy
219
+ foreach cset $spawned { $cset persist ; $cset destroy }
219220
 mem::mark
220221
 set revisions {}
221222
 }
222223
 set lastmeta $mid
223224
 set lastproject $pid
@@ -230,13 +231,14 @@
230231
 set p [repository projectof $lastproject]
231232
 log write 14 initcsets meta_cset_begin
232233
 mem::mark
233234
 set cset [project::rev %AUTO% $p rev $lastmeta $revisions]
234235
 log write 14 initcsets meta_cset_done
235
- $cset breakinternaldependencies nx
236
+ set spawned [$cset breakinternaldependencies nx]
236237
 $cset persist
237238
 $cset destroy
239
+ foreach cset $spawned { $cset persist ; $cset destroy }
238240
 mem::mark
239241
 }
240242
241243
 log write 14 initcsets meta_done
242244
 mem::mark
243245
--- tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
@@ -211,13 +211,14 @@
211 set p [repository projectof $lastproject]
212 log write 14 initcsets meta_cset_begin
213 mem::mark
214 set cset [project::rev %AUTO% $p rev $lastmeta $revisions]
215 log write 14 initcsets meta_cset_done
216 $cset breakinternaldependencies nx
217 $cset persist
218 $cset destroy
 
219 mem::mark
220 set revisions {}
221 }
222 set lastmeta $mid
223 set lastproject $pid
@@ -230,13 +231,14 @@
230 set p [repository projectof $lastproject]
231 log write 14 initcsets meta_cset_begin
232 mem::mark
233 set cset [project::rev %AUTO% $p rev $lastmeta $revisions]
234 log write 14 initcsets meta_cset_done
235 $cset breakinternaldependencies nx
236 $cset persist
237 $cset destroy
 
238 mem::mark
239 }
240
241 log write 14 initcsets meta_done
242 mem::mark
243
--- tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
@@ -211,13 +211,14 @@
211 set p [repository projectof $lastproject]
212 log write 14 initcsets meta_cset_begin
213 mem::mark
214 set cset [project::rev %AUTO% $p rev $lastmeta $revisions]
215 log write 14 initcsets meta_cset_done
216 set spawned [$cset breakinternaldependencies nx]
217 $cset persist
218 $cset destroy
219 foreach cset $spawned { $cset persist ; $cset destroy }
220 mem::mark
221 set revisions {}
222 }
223 set lastmeta $mid
224 set lastproject $pid
@@ -230,13 +231,14 @@
231 set p [repository projectof $lastproject]
232 log write 14 initcsets meta_cset_begin
233 mem::mark
234 set cset [project::rev %AUTO% $p rev $lastmeta $revisions]
235 log write 14 initcsets meta_cset_done
236 set spawned [$cset breakinternaldependencies nx]
237 $cset persist
238 $cset destroy
239 foreach cset $spawned { $cset persist ; $cset destroy }
240 mem::mark
241 }
242
243 log write 14 initcsets meta_done
244 mem::mark
245
M tools/cvs2fossil/lib/c2f_prev.tcl
+4 -2
--- tools/cvs2fossil/lib/c2f_prev.tcl
+++ tools/cvs2fossil/lib/c2f_prev.tcl
@@ -184,11 +184,11 @@
184184
 # the state, and limited to successors within the changeset.
185185
186186
 array set dependencies {}
187187
 $mytypeobj internalsuccessors dependencies $myitems
188188
 if {![array size dependencies]} {
189
- return 0
189
+ return {}
190190
 } ; # Nothing to break.
191191
192192
 log write 5 csets ...[$self str].......................................................
193193
 vc::tools::mem::mark
194194
@@ -290,10 +290,11 @@
290290
291291
 # Create changesets for the fragments, reusing the current one
292292
 # for the first fragment. We sort them in order to allow
293293
 # checking for gaps and nice messages.
294294
295
+ set newcsets {}
295296
 set fragments [lsort -index 0 -integer $fragments]
296297
297298
 #puts \t.[join [PRs $fragments] .\n\t.].
298299
299300
 Border [lindex $fragments 0] firsts firste
@@ -304,10 +305,11 @@
304305
 foreach fragment [lrange $fragments 1 end] {
305306
 Border $fragment s e
306307
 integrity assert {$laste == ($s - 1)} {Bad fragment border <$laste | $s>, gap or overlap}
307308
308309
 set new [$type %AUTO% $myproject $mytype $mysrcid [lrange $myitems $s $e]]
310
+ lappend newcsets $new
309311
 incr counter
310312
311313
 log write 4 csets "Breaking [$self str ] @ $laste, new [$new str], cutting $breaks($laste)"
312314
313315
 set laste $e
@@ -329,11 +331,11 @@
329331
 set key [list $mytype $iid]
330332
 set myitemmap($key) $self
331333
 log write 8 csets {MAP+ item <$key> $self = [$self str]}
332334
 }
333335
334
- return 1
336
+ return $newcsets
335337
 }
336338
337339
 method persist {} {
338340
 set tid $mycstype($mytype)
339341
 set pid [$myproject id]
340342
--- tools/cvs2fossil/lib/c2f_prev.tcl
+++ tools/cvs2fossil/lib/c2f_prev.tcl
@@ -184,11 +184,11 @@
184 # the state, and limited to successors within the changeset.
185
186 array set dependencies {}
187 $mytypeobj internalsuccessors dependencies $myitems
188 if {![array size dependencies]} {
189 return 0
190 } ; # Nothing to break.
191
192 log write 5 csets ...[$self str].......................................................
193 vc::tools::mem::mark
194
@@ -290,10 +290,11 @@
290
291 # Create changesets for the fragments, reusing the current one
292 # for the first fragment. We sort them in order to allow
293 # checking for gaps and nice messages.
294
 
295 set fragments [lsort -index 0 -integer $fragments]
296
297 #puts \t.[join [PRs $fragments] .\n\t.].
298
299 Border [lindex $fragments 0] firsts firste
@@ -304,10 +305,11 @@
304 foreach fragment [lrange $fragments 1 end] {
305 Border $fragment s e
306 integrity assert {$laste == ($s - 1)} {Bad fragment border <$laste | $s>, gap or overlap}
307
308 set new [$type %AUTO% $myproject $mytype $mysrcid [lrange $myitems $s $e]]
 
309 incr counter
310
311 log write 4 csets "Breaking [$self str ] @ $laste, new [$new str], cutting $breaks($laste)"
312
313 set laste $e
@@ -329,11 +331,11 @@
329 set key [list $mytype $iid]
330 set myitemmap($key) $self
331 log write 8 csets {MAP+ item <$key> $self = [$self str]}
332 }
333
334 return 1
335 }
336
337 method persist {} {
338 set tid $mycstype($mytype)
339 set pid [$myproject id]
340
--- tools/cvs2fossil/lib/c2f_prev.tcl
+++ tools/cvs2fossil/lib/c2f_prev.tcl
@@ -184,11 +184,11 @@
184 # the state, and limited to successors within the changeset.
185
186 array set dependencies {}
187 $mytypeobj internalsuccessors dependencies $myitems
188 if {![array size dependencies]} {
189 return {}
190 } ; # Nothing to break.
191
192 log write 5 csets ...[$self str].......................................................
193 vc::tools::mem::mark
194
@@ -290,10 +290,11 @@
290
291 # Create changesets for the fragments, reusing the current one
292 # for the first fragment. We sort them in order to allow
293 # checking for gaps and nice messages.
294
295 set newcsets {}
296 set fragments [lsort -index 0 -integer $fragments]
297
298 #puts \t.[join [PRs $fragments] .\n\t.].
299
300 Border [lindex $fragments 0] firsts firste
@@ -304,10 +305,11 @@
305 foreach fragment [lrange $fragments 1 end] {
306 Border $fragment s e
307 integrity assert {$laste == ($s - 1)} {Bad fragment border <$laste | $s>, gap or overlap}
308
309 set new [$type %AUTO% $myproject $mytype $mysrcid [lrange $myitems $s $e]]
310 lappend newcsets $new
311 incr counter
312
313 log write 4 csets "Breaking [$self str ] @ $laste, new [$new str], cutting $breaks($laste)"
314
315 set laste $e
@@ -329,11 +331,11 @@
331 set key [list $mytype $iid]
332 set myitemmap($key) $self
333 log write 8 csets {MAP+ item <$key> $self = [$self str]}
334 }
335
336 return $newcsets
337 }
338
339 method persist {} {
340 set tid $mycstype($mytype)
341 set pid [$myproject id]
342

Keyboard Shortcuts

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