Differences From:

File tools/cvs2fossil/lib/c2f_fsym.tcl part of check-in [da9295c6f6] - Continued to flesh out revision and symbol processing. Started on the project level classses. by aku on 2007-10-12 07:18:27. [view]

To:

File tools/cvs2fossil/lib/c2f_fsym.tcl part of check-in [cb70cf4ad6] - The basic work of setting up and linking revisions, tags, and branches is complete. by aku on 2007-10-13 05:39:00. [view]

@@ -16,8 +16,10 @@
 ## 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::file::rev  ; # CVS per file revisions.
 
 # # ## ### ##### ######## ############# #####################
 ##
 
@@ -28,22 +30,84 @@
     constructor {symtype nr symbol} {
 	set mytype   $symtype
 	set mynr     $nr
 	set mysymbol $symbol
+
+	switch -exact -- $mytype {
+	    branch  { SetupBranch }
+	    tag     { }
+	    default { trouble internal "Bad symbol type '$mytype'" }
+	}
+	return
+    }
+
+    # Symbol acessor methods.
+
+    delegate method name to mysymbol
+
+    # Branch acessor methods.
+
+    method setchildrevnr  {revnr} {
+	if {$mybranchchildrevnr ne ""} { trouble internal "Child already defined" }
+	set mybranchchildrevnr $revnr
 	return
     }
 
-    delegate method name to mysymbol
+    method setposition {n} { set mybranchposition $n }
+
+    method branchnr    {} { return $mynr }
+    method parentrevnr {} { return $mybranchparentrevnr }
+    method childrevnr  {} { return $mybranchchildrevnr }
+
+    method haschild    {} { return [expr {$mybranchchildrevnr ne ""}] }
+    method child       {} { return $mybranchchild }
+
+    method position {} { return $mybranchposition }
+
+    # Tag acessor methods.
+
+    method tagrevnr {} { return $mynr }
 
     # # ## ### ##### ######## #############
     ## State
 
+    ## Basic, all symbols _________________
+
     variable mytype   {} ; # Symbol type, 'tag', or 'branch'.
-    variable mynr     {} ; # Revision number of a 'tag', branch number of a 'branch'.
-    variable mysymbol {} ; # Ref to symbol object at project level.
+    variable mynr     {} ; # Revision number of a 'tag', branch number
+			   # of a 'branch'.
+    variable mysymbol {} ; # Reference to the symbol object of this
+			   # symbol at the project level.
+
+    ## Branch symbols _____________________
+
+    variable mybranchparentrevnr {} ; # The number of the parent
+				      # revision, derived from our
+				      # branch number (mynr).
+    variable mybranchparent      {} ; # Reference to the revision
+				      # (object) which spawns the
+				      # branch.
+    variable mybranchchildrevnr  {} ; # Number of the first revision
+				      # committed on this branch.
+    variable mybranchchild       {} ; # Reference to the revision
+				      # (object) first committed on
+				      # this branch.
+    variable mybranchposition    {} ; # Relative id of the branch in
+				      # the file, to sort into
+				      # creation order.
+
+    ## Tag symbols ________________________
+
+    # ... nothing special ... (only mynr, see basic)
 
     # # ## ### ##### ######## #############
     ## Internal methods
+
+    proc SetupBranch {} {
+	upvar 1 mybranchparentrevnr mybranchparentrevnr mynr mynr
+	set mybranchparentrevnr [rev 2branchparentrevnr  $mynr]
+	return
+    }
 
     # # ## ### ##### ######## #############
     ## Configuration
 
@@ -55,11 +119,15 @@
 }
 
 namespace eval ::vc::fossil::import::cvs::file {
     namespace export sym
+    namespace eval sym {
+	namespace import ::vc::fossil::import::cvs::file::rev
+	namespace import ::vc::tools::trouble
+    }
 }
 
 # # ## ### ##### ######## ############# #####################
 ## Ready
 
 package provide vc::fossil::import::cvs::file::sym 1.0
 return