SHA1 Hash:	9e1b461b2f7fd630e20515806ed0d3ed147f91ce
Date:	2008-01-30 08:23:36
User:	aku
Comment:	Broke package dependency cycle introduced when moving the cset load code from the InitCsets pass to the cset class.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified tools/cvs2fossil/lib/c2f_pinitcsets.tcl from [0ab46f96ec] to [97c1e14340].

@@ -114,11 +114,11 @@
 
 	# Need the types first, the constructor used inside of the
 	# 'load' below uses them to assert the correctness of type
 	# names.
 	project::rev getcstypes
-	project::rev load
+	project::rev load ::vc::fossil::import::cvs::repository
 	project::rev loadcounter
 	return
     }
 
     typemethod run {} {

Modified tools/cvs2fossil/lib/c2f_prev.tcl from [6bd4e14405] to [079c4b0014].

@@ -20,11 +20,10 @@
 package require snit                                  ; # OO system.
 package require struct::set                           ; # Set operations.
 package require vc::tools::misc                       ; # Text formatting
 package require vc::tools::trouble                    ; # Error reporting.
 package require vc::tools::log                        ; # User feedback.
-package require vc::fossil::import::cvs::repository   ; # Repository management.
 package require vc::fossil::import::cvs::state        ; # State storage.
 package require vc::fossil::import::cvs::integrity    ; # State integrity checks.
 
 # # ## ### ##### ######## ############# #####################
 ##
@@ -550,21 +549,21 @@
 	    SELECT tid, name FROM cstype;
 	}] { set mycstype($name) $tid }
 	return
     }
 
-    typemethod load {} {
+    typemethod load {repository} {
 	set n 0
 	log write 2 csets {Loading the changesets}
 	foreach {id pid cstype srcid} [state run {
 	    SELECT C.cid, C.pid, CS.name, C.src
 	    FROM   changeset C, cstype CS
 	    WHERE  C.type = CS.tid
 	    ORDER BY C.cid
 	}] {
 	    log progress 2 csets $n {}
-	    set r [$type %AUTO% [repository projectof $pid] $cstype $srcid [state run {
+	    set r [$type %AUTO% [$repository projectof $pid] $cstype $srcid [state run {
 		SELECT C.iid
 		FROM   csitem C
 		WHERE  C.cid = $id
 		ORDER BY C.pos
 	    }] $id]
@@ -1358,11 +1357,10 @@
 ##
 
 namespace eval ::vc::fossil::import::cvs::project {
     namespace export rev
     namespace eval rev {
-	namespace import ::vc::fossil::import::cvs::repository
 	namespace import ::vc::fossil::import::cvs::state
 	namespace import ::vc::fossil::import::cvs::integrity
 	namespace import ::vc::tools::misc::*
 	namespace import ::vc::tools::trouble
 	namespace import ::vc::tools::log