Fossil SCM

Broke package dependency cycle introduced when moving the cset load code from the InitCsets pass to the cset class.

aku 2008-01-30 08:23 trunk
Commit 9e1b461b2f7fd630e20515806ed0d3ed147f91ce
Parent 81a297a66a31822…
2 files changed +1 -1 +2 -4
~ tools/cvs2fossil/lib/c2f_pinitcsets.tcl ~ tools/cvs2fossil/lib/c2f_prev.tcl
M tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+1 -1
--- tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
@@ -114,11 +114,11 @@
114114
115115
 # Need the types first, the constructor used inside of the
116116
 # 'load' below uses them to assert the correctness of type
117117
 # names.
118118
 project::rev getcstypes
119
- project::rev load
119
+ project::rev load ::vc::fossil::import::cvs::repository
120120
 project::rev loadcounter
121121
 return
122122
 }
123123
124124
 typemethod run {} {
125125
--- tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
@@ -114,11 +114,11 @@
114
115 # Need the types first, the constructor used inside of the
116 # 'load' below uses them to assert the correctness of type
117 # names.
118 project::rev getcstypes
119 project::rev load
120 project::rev loadcounter
121 return
122 }
123
124 typemethod run {} {
125
--- tools/cvs2fossil/lib/c2f_pinitcsets.tcl
+++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl
@@ -114,11 +114,11 @@
114
115 # Need the types first, the constructor used inside of the
116 # 'load' below uses them to assert the correctness of type
117 # names.
118 project::rev getcstypes
119 project::rev load ::vc::fossil::import::cvs::repository
120 project::rev loadcounter
121 return
122 }
123
124 typemethod run {} {
125
M tools/cvs2fossil/lib/c2f_prev.tcl
+2 -4
--- tools/cvs2fossil/lib/c2f_prev.tcl
+++ tools/cvs2fossil/lib/c2f_prev.tcl
@@ -20,11 +20,10 @@
2020
 package require snit ; # OO system.
2121
 package require struct::set ; # Set operations.
2222
 package require vc::tools::misc ; # Text formatting
2323
 package require vc::tools::trouble ; # Error reporting.
2424
 package require vc::tools::log ; # User feedback.
25
-package require vc::fossil::import::cvs::repository ; # Repository management.
2625
 package require vc::fossil::import::cvs::state ; # State storage.
2726
 package require vc::fossil::import::cvs::integrity ; # State integrity checks.
2827
2928
 # # ## ### ##### ######## ############# #####################
3029
 ##
@@ -550,21 +549,21 @@
550549
 SELECT tid, name FROM cstype;
551550
 }] { set mycstype($name) $tid }
552551
 return
553552
 }
554553
555
- typemethod load {} {
554
+ typemethod load {repository} {
556555
 set n 0
557556
 log write 2 csets {Loading the changesets}
558557
 foreach {id pid cstype srcid} [state run {
559558
 SELECT C.cid, C.pid, CS.name, C.src
560559
 FROM changeset C, cstype CS
561560
 WHERE C.type = CS.tid
562561
 ORDER BY C.cid
563562
 }] {
564563
 log progress 2 csets $n {}
565
- set r [$type %AUTO% [repository projectof $pid] $cstype $srcid [state run {
564
+ set r [$type %AUTO% [$repository projectof $pid] $cstype $srcid [state run {
566565
 SELECT C.iid
567566
 FROM csitem C
568567
 WHERE C.cid = $id
569568
 ORDER BY C.pos
570569
 }] $id]
@@ -1358,11 +1357,10 @@
13581357
 ##
13591358
13601359
 namespace eval ::vc::fossil::import::cvs::project {
13611360
 namespace export rev
13621361
 namespace eval rev {
1363
- namespace import ::vc::fossil::import::cvs::repository
13641362
 namespace import ::vc::fossil::import::cvs::state
13651363
 namespace import ::vc::fossil::import::cvs::integrity
13661364
 namespace import ::vc::tools::misc::*
13671365
 namespace import ::vc::tools::trouble
13681366
 namespace import ::vc::tools::log
13691367
--- tools/cvs2fossil/lib/c2f_prev.tcl
+++ tools/cvs2fossil/lib/c2f_prev.tcl
@@ -20,11 +20,10 @@
20 package require snit ; # OO system.
21 package require struct::set ; # Set operations.
22 package require vc::tools::misc ; # Text formatting
23 package require vc::tools::trouble ; # Error reporting.
24 package require vc::tools::log ; # User feedback.
25 package require vc::fossil::import::cvs::repository ; # Repository management.
26 package require vc::fossil::import::cvs::state ; # State storage.
27 package require vc::fossil::import::cvs::integrity ; # State integrity checks.
28
29 # # ## ### ##### ######## ############# #####################
30 ##
@@ -550,21 +549,21 @@
550 SELECT tid, name FROM cstype;
551 }] { set mycstype($name) $tid }
552 return
553 }
554
555 typemethod load {} {
556 set n 0
557 log write 2 csets {Loading the changesets}
558 foreach {id pid cstype srcid} [state run {
559 SELECT C.cid, C.pid, CS.name, C.src
560 FROM changeset C, cstype CS
561 WHERE C.type = CS.tid
562 ORDER BY C.cid
563 }] {
564 log progress 2 csets $n {}
565 set r [$type %AUTO% [repository projectof $pid] $cstype $srcid [state run {
566 SELECT C.iid
567 FROM csitem C
568 WHERE C.cid = $id
569 ORDER BY C.pos
570 }] $id]
@@ -1358,11 +1357,10 @@
1358 ##
1359
1360 namespace eval ::vc::fossil::import::cvs::project {
1361 namespace export rev
1362 namespace eval rev {
1363 namespace import ::vc::fossil::import::cvs::repository
1364 namespace import ::vc::fossil::import::cvs::state
1365 namespace import ::vc::fossil::import::cvs::integrity
1366 namespace import ::vc::tools::misc::*
1367 namespace import ::vc::tools::trouble
1368 namespace import ::vc::tools::log
1369
--- tools/cvs2fossil/lib/c2f_prev.tcl
+++ tools/cvs2fossil/lib/c2f_prev.tcl
@@ -20,11 +20,10 @@
20 package require snit ; # OO system.
21 package require struct::set ; # Set operations.
22 package require vc::tools::misc ; # Text formatting
23 package require vc::tools::trouble ; # Error reporting.
24 package require vc::tools::log ; # User feedback.
 
25 package require vc::fossil::import::cvs::state ; # State storage.
26 package require vc::fossil::import::cvs::integrity ; # State integrity checks.
27
28 # # ## ### ##### ######## ############# #####################
29 ##
@@ -550,21 +549,21 @@
549 SELECT tid, name FROM cstype;
550 }] { set mycstype($name) $tid }
551 return
552 }
553
554 typemethod load {repository} {
555 set n 0
556 log write 2 csets {Loading the changesets}
557 foreach {id pid cstype srcid} [state run {
558 SELECT C.cid, C.pid, CS.name, C.src
559 FROM changeset C, cstype CS
560 WHERE C.type = CS.tid
561 ORDER BY C.cid
562 }] {
563 log progress 2 csets $n {}
564 set r [$type %AUTO% [$repository projectof $pid] $cstype $srcid [state run {
565 SELECT C.iid
566 FROM csitem C
567 WHERE C.cid = $id
568 ORDER BY C.pos
569 }] $id]
@@ -1358,11 +1357,10 @@
1357 ##
1358
1359 namespace eval ::vc::fossil::import::cvs::project {
1360 namespace export rev
1361 namespace eval rev {
 
1362 namespace import ::vc::fossil::import::cvs::state
1363 namespace import ::vc::fossil::import::cvs::integrity
1364 namespace import ::vc::tools::misc::*
1365 namespace import ::vc::tools::trouble
1366 namespace import ::vc::tools::log
1367

Keyboard Shortcuts

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