SHA1 Hash:	89e9b357edc1bcbc6eac3a3cf17385782fae070e
Date:	2007-10-25 05:16:57
User:	aku
Comment:	Fixed saving of authors, log messages, meta data. This was wrong since revision 99e165d5c4, when the id databases were introduced. Simplified meta saving due to changed trunk coding (no NULL).
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_repository.tcl from [e30942cde8] to [f4ffdfa30f].

@@ -268,11 +268,11 @@
 	return $res
     }
 
     proc SaveAuthors {} {
 	::variable myauthor
-	foreach {name aid} [array get myauthor] {
+	foreach {name aid} [$myauthor get] {
 	    state run {
 		INSERT INTO author ( aid,  name)
 		VALUES             ($aid, $name);
 	    }
 	}
@@ -279,11 +279,11 @@
 	return
     }
 
     proc SaveCommitMessages {} {
 	::variable mycmsg
-	foreach {text cid} [array get mycmsg] {
+	foreach {text cid} [$mycmsg get] {
 	    state run {
 		INSERT INTO cmessage ( cid,  text)
 		VALUES               ($cid, $text);
 	    }
 	}
@@ -290,23 +290,15 @@
 	return
     }
 
     proc SaveMeta {} {
 	::variable mymeta
-	foreach {key mid} [array get mymeta] {
+	foreach {key mid} [$mymeta get] {
 	    struct::list assign $key pid bid aid cid
-	    if {$bid eq ""} {
-		# Trunk. Encoded as NULL.
-		state run {
-		    INSERT INTO meta ( mid,  pid,  bid,  aid,  cid)
-		    VALUES           ($mid, $pid, NULL, $aid, $cid);
-		}
-	    } else {
-		state run {
-		    INSERT INTO meta ( mid,  pid,  bid,  aid,  cid)
-		    VALUES           ($mid, $pid, $bid, $aid, $cid);
-		}
+	    state run {
+		INSERT INTO meta ( mid,  pid,  bid,  aid,  cid)
+		VALUES           ($mid, $pid, $bid, $aid, $cid);
 	    }
 	}
 	return
     }
 

Modified tools/cvs2fossil/lib/id.tcl from [43c9bdd480] to [618dedd478].

@@ -34,10 +34,11 @@
 
 	return $mycounter
     }
 
     method keyof {id} { return $myinvert($id) }
+    method get   {}   { return [array get mydata] }
 
     # # ## ### ##### ######## #############
     ## Internal. State.
 
     variable mydata   -array {} ; # Map data -> id