Differences From:

File tools/cvs2fossil/lib/c2f_pcollrev.tcl part of check-in [c3d5104084] - Added code for the loading of pass II data (currently only the smybols) from the state when pass II is skipped. by aku on 2007-11-02 04:26:32. [view]

To:

File tools/cvs2fossil/lib/c2f_pcollrev.tcl part of check-in [f888f06fe3] - Continued work on pass 3, added code to determine the type of symbols based on the tag-, branch-, and commit-counts. Hook for handling data coming from the option processoris present (UserConfig), but only as a placeholder. by aku on 2007-11-02 06:06:24. [view]

@@ -15,16 +15,17 @@
 
 # # ## ### ##### ######## ############# #####################
 ## Requirements
 
-package require Tcl 8.4                             ; # Required runtime.
-package require snit                                ; # OO system.
-package require vc::tools::trouble                  ; # Error reporting.
-package require vc::tools::log                      ; # User feedback.
-package require vc::fossil::import::cvs::pass       ; # Pass management.
-package require vc::fossil::import::cvs::repository ; # Repository management.
-package require vc::fossil::import::cvs::state      ; # State storage.
-package require vc::rcs::parser                     ; # Rcs archive data extraction.
+package require Tcl 8.4                               ; # Required runtime.
+package require snit                                  ; # OO system.
+package require vc::tools::trouble                    ; # Error reporting.
+package require vc::tools::log                        ; # User feedback.
+package require vc::fossil::import::cvs::pass         ; # Pass management.
+package require vc::fossil::import::cvs::repository   ; # Repository management.
+package require vc::fossil::import::cvs::state        ; # State storage.
+package require vc::fossil::import::cvs::project::sym ; # Project level symbols
+package require vc::rcs::parser                       ; # Rcs archive data extraction.
 
 # # ## ### ##### ######## ############# #####################
 ## Register the pass with the management
 
@@ -204,11 +205,13 @@
 	    UNIQUE (sid, pid)
 	}
 
 	state writing symtype {
-	    tid   INTEGER  NOT NULL  PRIMARY KEY,
-	    name  TEXT     NOT NULL,
+	    tid    INTEGER  NOT NULL  PRIMARY KEY,
+	    name   TEXT     NOT NULL,
+	    plural TEXT     NOT NULL,
 	    UNIQUE (name)
+	    UNIQUE (plural)
 	}
 	state run {
 	    INSERT INTO symtype VALUES (0,'excluded');
 	    INSERT INTO symtype VALUES (1,'tag');
@@ -256,15 +259,18 @@
 	    cid  INTEGER  NOT NULL  PRIMARY KEY  AUTOINCREMENT,
 	    text TEXT     NOT NULL  UNIQUE
 	}
 
+	project::sym getsymtypes
 	return
     }
 
     typemethod load {} {
 	state reading symbol
-
-	repository loadsymbols
+	state reading symtype
+
+	project::sym getsymtypes
+	repository   loadsymbols
 	return
     }
 
     typemethod run {} {
@@ -590,8 +596,11 @@
     namespace eval collrev {
 	namespace import ::vc::rcs::parser
 	namespace import ::vc::fossil::import::cvs::repository
 	namespace import ::vc::fossil::import::cvs::state
+	namespace eval project {
+	    namespace import ::vc::fossil::import::cvs::project::sym
+	}
 	namespace import ::vc::tools::trouble
 	namespace import ::vc::tools::log
 	log register collrev
     }