Differences From:

File tools/cvs2fossil/lib/c2f_option.tcl part of check-in [591151532206c] - Added the pass management, integrated with application and option processor. by aku on 2007-10-02 06:48:55. [view]

To:

File tools/cvs2fossil/lib/c2f_option.tcl part of check-in [47740cc1f6] - Added stub for repository management, added most of pass I, collecting archives in the repository. by aku on 2007-10-03 04:18:18. [view]

@@ -17,12 +17,14 @@
 
 # # ## ### ##### ######## ############# #####################
 ## Requirements
 
-package require Tcl 8.4                         ; # Required runtime.
-package require snit                            ; # OO system.
-package require vc::tools::trouble              ; # Error reporting.
-package require vc::fossil::import::cvs::pass   ; # Pass management
+package require Tcl 8.4                               ; # Required runtime.
+package require snit                                  ; # OO system.
+package require vc::tools::trouble                    ; # Error reporting.
+package require vc::fossil::import::cvs::pass         ; # Pass management
+package require vc::fossil::import::cvs::pass::collar ; # Pass I.
+package require vc::fossil::import::cvs::repository   ; # Repository management
 
 # # ## ### ##### ######## ############# #####################
 ##
 
@@ -32,8 +34,9 @@
 
     # --help, --help-passes, -h
     # --version
     # -p, --pass, --passes
+    # --ignore-conflicting-attics
 
     # --project
     # --cache (conversion status, ala config.cache)
     # -o, --output
@@ -63,10 +66,13 @@
 		--pass        -
 		--passes      {
 		    pass select [Value arguments]
 		}
+		--ignore-conflicting-attics {
+		    collar ignore_conflicting_attics
+		}
 		--project     {
-		    #cvs::repository addproject [Value arguments]
+		    repository add [Value arguments]
 		}
 		--cache       {
 		    # [Value arguments]
 		}
@@ -77,9 +83,9 @@
 	}
 
 	if {[llength $arguments] > 1} Usage
 	if {[llength $arguments] < 1} { Usage $nocvs }
-	#cvs::repository setbase [lindex $arguments 0]
+	repository base [lindex $arguments 0]
 
 	Validate
 	return
     }
@@ -104,8 +110,13 @@
 	trouble info "                               inclusive."
 	trouble info ""
 	trouble info "                               Passes are specified by name."
 	trouble info ""
+	trouble info "    --ignore-conflicting-attics"
+	trouble info "                               Prevent abort when conflicting archives"
+	trouble info "                               were found in both regular and Attic."
+	trouble info ""
+
 	# --project, --cache
 	# ...
 	return
     }
@@ -154,8 +165,9 @@
     proc Validate {} {
 	# Prevent in-depth validation if the options were already bad.
 	trouble abort?
 
+	repository validate
 
 	trouble abort?
 	return
     }
@@ -169,14 +181,19 @@
 
     # # ## ### ##### ######## #############
 }
 
-namespace eval ::vc::fossil::import::cvs::option {
-    namespace import ::vc::tools::trouble
-    namespace import ::vc::fossil::import::cvs::pass
+namespace eval ::vc::fossil::import::cvs {
+    namespace export option
+    namespace eval option {
+	namespace import ::vc::tools::trouble
+	namespace import ::vc::fossil::import::cvs::pass
+	namespace import ::vc::fossil::import::cvs::pass::collar
+	namespace import ::vc::fossil::import::cvs::repository
+    }
 }
 
 # # ## ### ##### ######## ############# #####################
 ## Ready
 
 package provide vc::fossil::import::cvs::option 1.0
 return