SHA1 Hash:	6d4eb24738e9908a7cdca5742a43e4de03a06e06
Date:	2007-11-02 04:29:05
User:	aku
Comment:	Skeleton for pass 3 added, collating the symbols.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

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

Added tools/cvs2fossil/lib/c2f_pcollsym.tcl version [529d76b227]

@@ -1,1 +1,106 @@
+## -*- tcl -*-
+# # ## ### ##### ######## ############# #####################
+## Copyright (c) 2007 Andreas Kupries.
+#
+# This software is licensed as described in the file LICENSE, which
+# you should have received as part of this distribution.
+#
+# This software consists of voluntary contributions made by many
+# individuals.  For exact contribution history, see the revision
+# history and logs, available at http://fossil-scm.hwaci.com/fossil
+# # ## ### ##### ######## ############# #####################
+
+## Pass III. This pass divides the symbols collected by the previous
+## pass into branches, tags, and excludes. The latter are __not__
+## deleted by this pass, only marked. It is the next pass,
+## 'FilterSym', which performs the actual deletion.
+
+# # ## ### ##### ######## ############# #####################
+## Requirements
+
+package require Tcl 8.4                             ; # Required runtime.
+package require snit                                ; # OO system.
+#package require fileutil::traverse                  ; # Directory traversal.
+#package require fileutil                            ; # File & path utilities.
+#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.
+
+# # ## ### ##### ######## ############# #####################
+## Register the pass with the management
+
+vc::fossil::import::cvs::pass define \
+    CollateSymbols \
+    {Collate symbols} \
+    ::vc::fossil::import::cvs::pass::collsym
+
+# # ## ### ##### ######## ############# #####################
+##
+
+snit::type ::vc::fossil::import::cvs::pass::collsym {
+    # # ## ### ##### ######## #############
+    ## Public API
+
+    typemethod setup {} {
+	# Define names and structure of the persistent state of this
+	# pass.
+
+	state reading symbol
+	state reading blocker
+	state reading parent
+
+	return
+    }
+
+    typemethod load {} {
+	# TODO
+	return
+    }
+
+    typemethod run {} {
+	# Pass manager interface. Executed to perform the
+	# functionality of the pass.
+
+	log write 1 collsym "Collation completed"
+	return
+    }
+
+    typemethod discard {} {
+	# Pass manager interface. Executed for all passes after the
+	# run passes, to remove all data of this pass from the state,
+	# as being out of date.
+
+	return
+    }
+
+    # # ## ### ##### ######## #############
+    ## Internal methods
+
+    # # ## ### ##### ######## #############
+    ## Configuration
+
+    pragma -hasinstances   no ; # singleton
+    pragma -hastypeinfo    no ; # no introspection
+    pragma -hastypedestroy no ; # immortal
+
+    # # ## ### ##### ######## #############
+}
+
+namespace eval ::vc::fossil::import::cvs::pass {
+    namespace export collsym
+    namespace eval collsym {
+	#namespace import ::vc::fossil::import::cvs::repository
+	namespace import ::vc::fossil::import::cvs::state
+	#namespace import ::vc::tools::trouble
+	namespace import ::vc::tools::log
+	log register collsym
+    }
+}
+
+# # ## ### ##### ######## ############# #####################
+## Ready
 
+package provide vc::fossil::import::cvs::pass::collsym 1.0
+return

Modified tools/cvs2fossil/lib/cvs2fossil.tcl from [2f50cda658] to [c8735da950].

@@ -24,10 +24,11 @@
 ## important. It is the same order they will register, and then be run
 ## in.
 
 package require vc::fossil::import::cvs::pass::collar  ; # Coll'ect Ar'chives.
 package require vc::fossil::import::cvs::pass::collrev ; # Coll'ect Rev'isions.
+package require vc::fossil::import::cvs::pass::collsym ; # Coll'ate Sym'bols
 
 # # ## ### ##### ######## ############# #####################
 ## Support for passes etc.
 
 package require vc::fossil::import::cvs::option ; # Cmd line parsing & database

Modified tools/cvs2fossil/lib/pkgIndex.tcl from [94c8694e66] to [1cffea0d23].

@@ -11,10 +11,11 @@
 package ifneeded vc::fossil::import::cvs::file::trunk     1.0 [list source [file join $dir c2f_ftrunk.tcl]]
 package ifneeded vc::fossil::import::cvs::option          1.0 [list source [file join $dir c2f_option.tcl]]
 package ifneeded vc::fossil::import::cvs::pass            1.0 [list source [file join $dir c2f_pass.tcl]]
 package ifneeded vc::fossil::import::cvs::pass::collar    1.0 [list source [file join $dir c2f_pcollar.tcl]]
 package ifneeded vc::fossil::import::cvs::pass::collrev   1.0 [list source [file join $dir c2f_pcollrev.tcl]]
+package ifneeded vc::fossil::import::cvs::pass::collsym   1.0 [list source [file join $dir c2f_pcollsym.tcl]]
 package ifneeded vc::fossil::import::cvs::project         1.0 [list source [file join $dir c2f_project.tcl]]
 package ifneeded vc::fossil::import::cvs::project::lodmgr 1.0 [list source [file join $dir c2f_plodmgr.tcl]]
 package ifneeded vc::fossil::import::cvs::project::rev    1.0 [list source [file join $dir c2f_prev.tcl]]
 package ifneeded vc::fossil::import::cvs::project::sym    1.0 [list source [file join $dir c2f_psym.tcl]]
 package ifneeded vc::fossil::import::cvs::project::trunk  1.0 [list source [file join $dir c2f_ptrunk.tcl]]