Differences From:

File tools/import-cvs.tcl part of check-in [86a7f249c1] - Started to restructure the namespace hierarchy, beginning at the bottom, with the log module. by aku on 2007-09-09 00:58:18. [view]

To:

File tools/import-cvs.tcl part of check-in [9671b65174] - Continued restructuring of the code (namespace hierarchy, import control). by aku on 2007-09-13 05:43:56. [view]

@@ -41,16 +41,20 @@
 # -----------------------------------------------------------------------------
 # Requirements
 
 package require Tcl 8.4
-package require vc::tools::log ; # User Feedback
-package require import::cvs    ; # Importer Control
+package require vc::tools::log          ; # User Feedback
+package require vc::fossil::import::cvs ; # Importer Control
+
+namespace eval ::import {
+    namespace import ::vc::fossil::import::cvs::*
+}
 
 # -----------------------------------------------------------------------------
 
 proc main {} {
-    commandline    -> cvs  fossil
-    import::cvs::run $cvs $fossil
+    commandline -> cvs  fossil
+    import::run   $cvs $fossil
     return
 }
 
 # -----------------------------------------------------------------------------
@@ -63,11 +67,11 @@
 
     clinit
     while {[string match "-*" [set opt [this]]]} {
 	switch -exact -- $opt {
-	    --nosign      {        import::cvs::configure -nosign      1 }
-	    --debugcommit {        import::cvs::configure -debugcommit 1 }
-	    --stopat      { next ; import::cvs::configure -stopat [this] }
+	    --nosign      {        import::configure -nosign      1 }
+	    --debugcommit {        import::configure -debugcommit 1 }
+	    --stopat      { next ; import::configure -stopat [this] }
 	    -v            { incr verbosity ; ::vc::tools::log::verbosity $verbosity }
 	    default usage
 	}
 	next