Fossil SCM
Removed the automatic destruction of the traversed graph from the traversal core and put it into the caller (import only, currently).
Commit
b59cdc7f8a605c0baa16c27e603fbbb912f4347f
Parent
08f8085700fef99…
2 files changed
+5
-2
-2
| --- tools/cvs2fossil/lib/c2f_file.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_file.tcl | ||
| @@ -352,11 +352,11 @@ | ||
| 352 | 352 | gtcore datacmd [mymethod ExpandData] |
| 353 | 353 | gtcore formatcmd [mymethod ExpandFormat] |
| 354 | 354 | gtcore sortcmd [mymethod ExpandSort] |
| 355 | 355 | gtcore savecmd [mymethod Expand1 $ac $dir $max] |
| 356 | 356 | |
| 357 | - gtcore traverse $ex ; # The graph is gone after the call | |
| 357 | + gtcore traverse $ex | |
| 358 | 358 | close $ac |
| 359 | 359 | |
| 360 | 360 | # Now traverse the import graph, this builds the instruction |
| 361 | 361 | # map for the fossil deltas. |
| 362 | 362 | |
| @@ -364,15 +364,18 @@ | ||
| 364 | 364 | gtcore formatcmd [mymethod ExpandFormat] |
| 365 | 365 | gtcore sortcmd [mymethod ExpandSort] |
| 366 | 366 | gtcore savecmd [mymethod Expand2] |
| 367 | 367 | |
| 368 | 368 | set myimport {} |
| 369 | - gtcore traverse $zp ; # The graph is gone after the call | |
| 369 | + gtcore traverse $zp | |
| 370 | 370 | set filemap $myimport |
| 371 | 371 | unset myimport |
| 372 | 372 | |
| 373 | 373 | # And back to import control |
| 374 | + | |
| 375 | + $ex destroy | |
| 376 | + $zp destroy | |
| 374 | 377 | |
| 375 | 378 | return [list $filemap $revmap] |
| 376 | 379 | } |
| 377 | 380 | |
| 378 | 381 | method ExpandData {graph node} { return [$graph node get $node revnr] } |
| 379 | 382 |
| --- tools/cvs2fossil/lib/c2f_file.tcl | |
| +++ tools/cvs2fossil/lib/c2f_file.tcl | |
| @@ -352,11 +352,11 @@ | |
| 352 | gtcore datacmd [mymethod ExpandData] |
| 353 | gtcore formatcmd [mymethod ExpandFormat] |
| 354 | gtcore sortcmd [mymethod ExpandSort] |
| 355 | gtcore savecmd [mymethod Expand1 $ac $dir $max] |
| 356 | |
| 357 | gtcore traverse $ex ; # The graph is gone after the call |
| 358 | close $ac |
| 359 | |
| 360 | # Now traverse the import graph, this builds the instruction |
| 361 | # map for the fossil deltas. |
| 362 | |
| @@ -364,15 +364,18 @@ | |
| 364 | gtcore formatcmd [mymethod ExpandFormat] |
| 365 | gtcore sortcmd [mymethod ExpandSort] |
| 366 | gtcore savecmd [mymethod Expand2] |
| 367 | |
| 368 | set myimport {} |
| 369 | gtcore traverse $zp ; # The graph is gone after the call |
| 370 | set filemap $myimport |
| 371 | unset myimport |
| 372 | |
| 373 | # And back to import control |
| 374 | |
| 375 | return [list $filemap $revmap] |
| 376 | } |
| 377 | |
| 378 | method ExpandData {graph node} { return [$graph node get $node revnr] } |
| 379 |
| --- tools/cvs2fossil/lib/c2f_file.tcl | |
| +++ tools/cvs2fossil/lib/c2f_file.tcl | |
| @@ -352,11 +352,11 @@ | |
| 352 | gtcore datacmd [mymethod ExpandData] |
| 353 | gtcore formatcmd [mymethod ExpandFormat] |
| 354 | gtcore sortcmd [mymethod ExpandSort] |
| 355 | gtcore savecmd [mymethod Expand1 $ac $dir $max] |
| 356 | |
| 357 | gtcore traverse $ex |
| 358 | close $ac |
| 359 | |
| 360 | # Now traverse the import graph, this builds the instruction |
| 361 | # map for the fossil deltas. |
| 362 | |
| @@ -364,15 +364,18 @@ | |
| 364 | gtcore formatcmd [mymethod ExpandFormat] |
| 365 | gtcore sortcmd [mymethod ExpandSort] |
| 366 | gtcore savecmd [mymethod Expand2] |
| 367 | |
| 368 | set myimport {} |
| 369 | gtcore traverse $zp |
| 370 | set filemap $myimport |
| 371 | unset myimport |
| 372 | |
| 373 | # And back to import control |
| 374 | |
| 375 | $ex destroy |
| 376 | $zp destroy |
| 377 | |
| 378 | return [list $filemap $revmap] |
| 379 | } |
| 380 | |
| 381 | method ExpandData {graph node} { return [$graph node get $node revnr] } |
| 382 |
| --- tools/cvs2fossil/lib/c2f_gtcore.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_gtcore.tcl | ||
| @@ -61,12 +61,10 @@ | ||
| 61 | 61 | |
| 62 | 62 | CycleHook $graph |
| 63 | 63 | InitializeCandidates $graph |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - $graph destroy | |
| 67 | - | |
| 68 | 66 | log write 3 gtcore Done. |
| 69 | 67 | ClearHooks |
| 70 | 68 | return |
| 71 | 69 | } |
| 72 | 70 | |
| 73 | 71 |
| --- tools/cvs2fossil/lib/c2f_gtcore.tcl | |
| +++ tools/cvs2fossil/lib/c2f_gtcore.tcl | |
| @@ -61,12 +61,10 @@ | |
| 61 | |
| 62 | CycleHook $graph |
| 63 | InitializeCandidates $graph |
| 64 | } |
| 65 | |
| 66 | $graph destroy |
| 67 | |
| 68 | log write 3 gtcore Done. |
| 69 | ClearHooks |
| 70 | return |
| 71 | } |
| 72 | |
| 73 |
| --- tools/cvs2fossil/lib/c2f_gtcore.tcl | |
| +++ tools/cvs2fossil/lib/c2f_gtcore.tcl | |
| @@ -61,12 +61,10 @@ | |
| 61 | |
| 62 | CycleHook $graph |
| 63 | InitializeCandidates $graph |
| 64 | } |
| 65 | |
| 66 | log write 3 gtcore Done. |
| 67 | ClearHooks |
| 68 | return |
| 69 | } |
| 70 | |
| 71 |