SHA1 Hash:	7c43583de113828f5a83a01dd25e5223311a7cb8
Date:	2008-01-31 06:25:34
User:	aku
Comment:	Tinkered with the revision information transfered from a changeset to push, to the fossil accessor code, modified the logging as well.
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_fossil.tcl from [fe0ae1211b] to [7fa49e081f].

@@ -96,30 +96,33 @@
     }
 
     method importrevision {label user message date parent revisions} {
 	# TODO = Write the actual import, and up the log level.
 
-	log write 2 fossil {== $user @ [clock format $date]}
-	log write 2 fossil {-> $parent}
-	log write 2 fossil {%% [join [split $message \n] "\n%% "]}
-
-	set uuids {}
-	foreach {uuid fname revnr} $revisions {
-	    lappend uuids $uuid
-	    log write 2 fossil {** $fname/$revnr = <$uuid>}
-	}
-
 	# Massage the commit message to remember the old user name
 	# which did the commit in CVS.
 
 	set message "By $user:\n$message"
 
+	log write 2 fossil {== $user @ [clock format $date]}
+	log write 2 fossil {-> $parent}
+	log write 2 fossil {%% [join [split $message \n] "\n%% "]}
+
+	lappend cmd Do test-import-manifest $date $message
+	if {$parent ne ""} { lappend cmd --parents $parent }
+	lappend cmd --files
+	foreach {frid fpath flabel} $revisions {
+	    lappend cmd $frid $fpath
+	    log write 2 fossil {** <[format %5d $frid]> = $flabel}
+	}
+
 	# run fossil test-command performing the import.
-	#
-
-	log write 2 fossil {== $label}
-	return $label ; # FAKE a uuid for the moment
+	# set uuid [eval $cmd]
+	set uuid $label ; # FAKE an uuid for the moment
+
+	log write 2 fossil {== $uuid}
+	return $uuid
     }
 
     method finalize {destination} {
 	::file rename -force $myrepository $destination
 	::file delete -force $myworkspace

Modified tools/cvs2fossil/lib/c2f_prev.tcl from [696f01d05d] to [3d8ecf2b79].

@@ -429,18 +429,18 @@
     }
 
     proc Getrevisioninfo {revisions} {
 	set theset ('[join $revisions {','}]')
 	set revisions {}
-	foreach {uuid fname revnr} [state run [subst -nocommands -nobackslashes {
-	    SELECT U.uuid, F.name, R.rev
+	foreach {frid path fname revnr} [state run [subst -nocommands -nobackslashes {
+	    SELECT U.uuid, F.visible, F.name, R.rev
 	    FROM   revision R, revuuid U, file F
 	    WHERE  R.rid IN $theset  -- All specified revisions
 	    AND    U.rid = R.rid     -- get fossil uuid of revision
 	    AND    F.fid = R.fid     -- get file of revision
 	}]] {
-	    lappend revisions $uuid $fname $revnr
+	    lappend revisions $frid $path $fname/$revnr
 	}
 	return $revisions
     }
 
     proc Getparent {sv lodname project} {