SHA1 Hash:	ac026148036db7afcd882f3760455f02f4f74ce9
Date:	2007-12-02 03:49:11
User:	aku
Comment:	Deactivated caching of the nextmap/premap data, with the indices the retrieval seems to be fast enough to allow us to reduce mem consumption. Tweaked log output, and sql formatting.
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_prev.tcl from [0103dd59f0] to [9054f71640].

@@ -127,22 +127,24 @@
 	return [array get tmp]
     }
 
     # item -> list (item)
     method nextmap {} {
-	if {[llength $mynextmap]} { return $mynextmap }
+	#if {[llength $mynextmap]} { return $mynextmap }
 	$mytypeobj successors tmp $myitems
-	set mynextmap [array get tmp]
-	return $mynextmap
+	return [array get tmp]
+	#set mynextmap [array get tmp]
+	#return $mynextmap
     }
 
     # item -> list (item)
     method premap {} {
-	if {[llength $mypremap]} { return $mypremap }
+	#if {[llength $mypremap]} { return $mypremap }
 	$mytypeobj predecessors tmp $myitems
-	set mypremap [array get tmp]
-	return $mypremap
+	return [array get tmp]
+	#set mypremap [array get tmp]
+	#return $mypremap
     }
 
     method breakinternaldependencies {} {
 
 	##
@@ -364,11 +366,11 @@
 	set mychangesets [lreplace $mychangesets $pos $pos]
 	return
     }
 
     method loopcheck {} {
-	log write 7 csets {Checking [$self str] /[llength $myitems]}
+	log write 7 csets {Checking [$self str] for loops /[llength $myitems]}
 
 	if {![struct::set contains [$self successors] $self]} {
 	    return 0
 	}
 	if {[log verbosity?] < 8} { return 1 }
@@ -737,18 +739,19 @@
 	return
     }
 
     # Print identifying data for a revision (project, file, dotted rev
     # number), for high verbosity log output.
+    # TODO: Replace with call to itemstr (list rev $id)
 
     proc PD {id} {
 	foreach {p f r} [state run {
 		SELECT P.name , F.name, R.rev
 		FROM revision R, file F, project P
 		WHERE R.rid = $id
-		AND   R.fid = F.fid
-		AND   F.pid = P.pid
+		AND   F.fid = R.fid
+		AND   P.pid = F.pid
 	}] break
 	return "'$p : $f/$r'"
     }
 
     # Printing one or more ranges, formatted, and only their border to