Differences From:

File tools/cvs2fossil/lib/c2f_prev.tcl part of check-in [be2f99e6a4] - Merge with aku's branch. by drh on 2008-02-13 14:44:50. Also file tools/cvs2fossil/lib/c2f_prev.tcl part of check-in [6d5de5f1c1] - Tuned the handling of the vendor branch in case we have multiple different symbols representing it. The import pass now effectively merges these symbols into a single line of development. by aku on 2008-02-13 04:57:43. [view]

To:

File tools/cvs2fossil/lib/c2f_prev.tcl part of check-in [27ed4f7dc3] - Extended pass InitCsets and underlying code with more log output geared towards memory introspection, and added markers for special locations. Extended my notes with general observations from the first test runs over my example CVS repositories. by aku on 2008-02-16 06:46:41. [view]

@@ -134,9 +134,10 @@
 	return [array get tmp]
     }
 
     method breakinternaldependencies {} {
-
+	log write 14 csets {[$self str] BID}
+	vc::tools::mem::mark
 	##
 	## NOTE: This method, maybe in conjunction with its caller
 	##       seems to be a memory hog, especially for large
 	##       changesets, with 'large' meaning to have a 'long list
@@ -167,11 +168,14 @@
 	# the state, and limited to successors within the changeset.
 
 	array set dependencies {}
 	$mytypeobj internalsuccessors dependencies $myitems
-	if {![array size dependencies]} {return 0} ; # Nothing to break.
+	if {![array size dependencies]} {
+	    return 0
+	} ; # Nothing to break.
 
 	log write 5 csets ...[$self str].......................................................
+	vc::tools::mem::mark
 
 	# We have internal dependencies to break. We now iterate over
 	# all positions in the list (which is chronological, at least
 	# as far as the timestamps are correct and unique) and
@@ -1061,8 +1065,10 @@
     typemethod internalsuccessors {dv revisions} {
 	upvar 1 $dv dependencies
 	set theset ('[join $revisions {','}]')
 
+	log write 14 cset internalsuccessors
+
 	# See 'successors' below for the main explanation of
 	# the various cases. This piece is special in that it
 	# restricts the successors we look for to the same set of
 	# revisions we start from. Sensible as we are looking for
@@ -1122,8 +1128,10 @@
 	# We allow revisions to be far apart in time in the same
 	# changeset, but in turn need the pseudo-dependencies to
 	# handle this.
 
+	log write 14 cset pseudo-internalsuccessors
+
 	array set fids {}
 	foreach {rid fid} [state run [subst -nocommands -nobackslashes {
 	    SELECT R.rid, R.fid
             FROM   revision R
@@ -1142,8 +1150,10 @@
 		    set dep($b,$a) .
 		}
 	    }
 	}
+
+	log write 14 cset complete
 	return
     }
 
     # result = 4-list (itemtype itemid nextitemtype nextitemid ...)
@@ -1612,16 +1622,19 @@
 	# Set up the helper singletons
 	namespace eval rev {
 	    namespace import ::vc::fossil::import::cvs::state
 	    namespace import ::vc::fossil::import::cvs::integrity
+	    namespace import ::vc::tools::log
 	}
 	namespace eval sym::tag {
 	    namespace import ::vc::fossil::import::cvs::state
 	    namespace import ::vc::fossil::import::cvs::integrity
+	    namespace import ::vc::tools::log
 	}
 	namespace eval sym::branch {
 	    namespace import ::vc::fossil::import::cvs::state
 	    namespace import ::vc::fossil::import::cvs::integrity
+	    namespace import ::vc::tools::log
 	}
     }
 }