Differences From:

File tools/cvs2fossil/lib/c2f_file.tcl part of check-in [66235f2430] - Updated the copyright information of all files touched in the new year. by aku on 2008-02-06 05:04:12. Also file tools/cvs2fossil/lib/c2f_file.tcl part of check-in [6b78df3861] - Merge in changes from Andreas's branch. by drh on 2008-02-08 21:52:21. [view]

To:

File tools/cvs2fossil/lib/c2f_file.tcl part of check-in [f637d42206] - Updated my notes regarding memory usage. Converted more locations to incremental query processing via 'state foreachrow', now throughout the importer. by aku on 2008-02-24 18:01:40. [view]

@@ -315,30 +315,36 @@
 	set earcs   {} ; # Arcs for expansion graph
 	set zarcs   {} ; # Arcs for zip graph
 	set revmap  {} ; # path -> rid map to later merge uuid information
 
-	foreach {rid revnr parent child coff clen cid cparent} [state run {
-	    SELECT B.rid, R.rev, R.parent, R.child, B.coff, B.clen, B.bid, B.pid
+	state foreachrow {
+	    SELECT B.rid    AS xrid,
+	           R.rev    AS revnr,
+	           R.child  AS xchild,
+	           B.coff   AS xcoff,
+	           B.clen   AS xclen,
+	           B.bid    AS cid,
+	           B.pid    AS cparent
 	    FROM            blob B
 	    LEFT OUTER JOIN revision R
 	    ON              B.rid = R.rid
 	    WHERE  B.fid = $myid
-	}] {
+	} {
 	    # Main data are blobs, most will have revisions, but not
 	    # all. The expansion graph is blob based, whereas the
 	    # recompression graph is revision based.
 
 	    if {$revnr ne ""} {
 		# Blob has revision, extend recompression graph.
 
-		lappend revmap r$revnr $rid
-
-		$zp node insert $rid
-		$zp node set    $rid revnr $revnr
-		$zp node set    $rid label <$revnr>
-
-		if {$child ne ""} {
-		    lappend zarcs $child $rid
+		lappend revmap r$revnr $xrid
+
+		$zp node insert $xrid
+		$zp node set    $xrid revnr $revnr
+		$zp node set    $xrid label <$revnr>
+
+		if {$xchild ne ""} {
+		    lappend zarcs $xchild $xrid
 		}
 	    } else {
 		# We fake a revnr for the blobs which have no
 		# revision, for use in the expansion graph.
@@ -347,9 +353,9 @@
 
 	    # Now the expansion graph.
 
 	    $ex node insert $cid
-	    $ex node set    $cid text  [list $coff $clen]
+	    $ex node set    $cid text  [list $xcoff $xclen]
 	    $ex node set    $cid revnr $revnr
 	    $ex node set    $cid label <$revnr>
 
 	    if {$cparent ne ""} {