SHA1 Hash:	b6b7ff79ccf41d67015daea1f8baf283c599dda8
Date:	2007-11-25 03:00:50
User:	aku
Comment:	Moved the parts taken over by the top. sort passes out the breaker passes, and renumbered them (comments).
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

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

Modified tools/cvs2fossil/lib/c2f_pbreakrcycle.tcl from [e139c81d89] to [21b55594db].

@@ -47,36 +47,24 @@
 	# this pass.
 
 	state reading revision
 	state reading changeset
 	state reading csrevision
-
-	state writing csorder {
-	    -- Commit order of changesets based on their dependencies
-	    cid INTEGER  NOT NULL  REFERENCES changeset,
-	    pos INTEGER  NOT NULL,
-	    UNIQUE (cid),
-	    UNIQUE (pos)
-	}
 	return
     }
 
     typemethod load {} {
 	# Pass manager interface. Executed to load data computed by
 	# this pass into memory when this pass is skipped instead of
 	# executed.
-
-	state reading changeset
-	project::rev loadcounter
 	return
     }
 
     typemethod run {} {
 	# Pass manager interface. Executed to perform the
 	# functionality of the pass.
 
-	cyclebreaker savecmd  [myproc SaveOrder]
 	cyclebreaker breakcmd {::vc::fossil::import::cvs::cyclebreaker break}
 
 	state transaction {
 	    cyclebreaker run break-rev [myproc Changesets]
 	}
@@ -87,12 +75,10 @@
 
     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.
-
-	state discard csorder
 	return
     }
 
     # # ## ### ##### ######## #############
     ## Internal methods
@@ -100,22 +86,10 @@
     proc Changesets {} {
 	return [struct::list filter [project::rev all] [myproc IsByRevision]]
     }
 
     proc IsByRevision {cset} { $cset byrevision }
-
-    proc SaveOrder {graph at cset} {
-	set cid [$cset id]
-
-	log write 4 breakrcycle "Comitting @ $at: [$cset str]"
-	state run {
-	    INSERT INTO csorder (cid,  pos)
-	    VALUES              ($cid, $at)
-	}
-	# MAYBE TODO: Write the project level changeset dependencies as well.
-	return
-    }
 
     # # ## ### ##### ######## #############
     ## Configuration
 
     pragma -hasinstances   no ; # singleton

Modified tools/cvs2fossil/lib/c2f_pbreakscycle.tcl from [436cc24e8c] to [ec54182159].

@@ -8,11 +8,11 @@
 # 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 VII. This pass goes over the set of symbol based changesets
+## Pass VIII. This pass goes over the set of symbol based changesets
 ## and breaks all dependency cycles they may be in. We need a
 ## dependency tree. Identical to pass VI, except for the selection of
 ## the changesets.
 
 # # ## ### ##### ######## ############# #####################