Fossil SCM
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).
Commit
89e9b357edc1bcbc6eac3a3cf17385782fae070e
Parent
7375ebb988e181e…
2 files changed
+6
-14
+1
| --- tools/cvs2fossil/lib/c2f_repository.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_repository.tcl | ||
| @@ -268,11 +268,11 @@ | ||
| 268 | 268 | return $res |
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | proc SaveAuthors {} { |
| 272 | 272 | ::variable myauthor |
| 273 | - foreach {name aid} [array get myauthor] { | |
| 273 | + foreach {name aid} [$myauthor get] { | |
| 274 | 274 | state run { |
| 275 | 275 | INSERT INTO author ( aid, name) |
| 276 | 276 | VALUES ($aid, $name); |
| 277 | 277 | } |
| 278 | 278 | } |
| @@ -279,11 +279,11 @@ | ||
| 279 | 279 | return |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | proc SaveCommitMessages {} { |
| 283 | 283 | ::variable mycmsg |
| 284 | - foreach {text cid} [array get mycmsg] { | |
| 284 | + foreach {text cid} [$mycmsg get] { | |
| 285 | 285 | state run { |
| 286 | 286 | INSERT INTO cmessage ( cid, text) |
| 287 | 287 | VALUES ($cid, $text); |
| 288 | 288 | } |
| 289 | 289 | } |
| @@ -290,23 +290,15 @@ | ||
| 290 | 290 | return |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | proc SaveMeta {} { |
| 294 | 294 | ::variable mymeta |
| 295 | - foreach {key mid} [array get mymeta] { | |
| 295 | + foreach {key mid} [$mymeta get] { | |
| 296 | 296 | struct::list assign $key pid bid aid cid |
| 297 | - if {$bid eq ""} { | |
| 298 | - # Trunk. Encoded as NULL. | |
| 299 | - state run { | |
| 300 | - INSERT INTO meta ( mid, pid, bid, aid, cid) | |
| 301 | - VALUES ($mid, $pid, NULL, $aid, $cid); | |
| 302 | - } | |
| 303 | - } else { | |
| 304 | - state run { | |
| 305 | - INSERT INTO meta ( mid, pid, bid, aid, cid) | |
| 306 | - VALUES ($mid, $pid, $bid, $aid, $cid); | |
| 307 | - } | |
| 297 | + state run { | |
| 298 | + INSERT INTO meta ( mid, pid, bid, aid, cid) | |
| 299 | + VALUES ($mid, $pid, $bid, $aid, $cid); | |
| 308 | 300 | } |
| 309 | 301 | } |
| 310 | 302 | return |
| 311 | 303 | } |
| 312 | 304 | |
| 313 | 305 |
| --- tools/cvs2fossil/lib/c2f_repository.tcl | |
| +++ tools/cvs2fossil/lib/c2f_repository.tcl | |
| @@ -268,11 +268,11 @@ | |
| 268 | return $res |
| 269 | } |
| 270 | |
| 271 | proc SaveAuthors {} { |
| 272 | ::variable myauthor |
| 273 | foreach {name aid} [array get myauthor] { |
| 274 | state run { |
| 275 | INSERT INTO author ( aid, name) |
| 276 | VALUES ($aid, $name); |
| 277 | } |
| 278 | } |
| @@ -279,11 +279,11 @@ | |
| 279 | return |
| 280 | } |
| 281 | |
| 282 | proc SaveCommitMessages {} { |
| 283 | ::variable mycmsg |
| 284 | foreach {text cid} [array get mycmsg] { |
| 285 | state run { |
| 286 | INSERT INTO cmessage ( cid, text) |
| 287 | VALUES ($cid, $text); |
| 288 | } |
| 289 | } |
| @@ -290,23 +290,15 @@ | |
| 290 | return |
| 291 | } |
| 292 | |
| 293 | proc SaveMeta {} { |
| 294 | ::variable mymeta |
| 295 | foreach {key mid} [array get mymeta] { |
| 296 | struct::list assign $key pid bid aid cid |
| 297 | if {$bid eq ""} { |
| 298 | # Trunk. Encoded as NULL. |
| 299 | state run { |
| 300 | INSERT INTO meta ( mid, pid, bid, aid, cid) |
| 301 | VALUES ($mid, $pid, NULL, $aid, $cid); |
| 302 | } |
| 303 | } else { |
| 304 | state run { |
| 305 | INSERT INTO meta ( mid, pid, bid, aid, cid) |
| 306 | VALUES ($mid, $pid, $bid, $aid, $cid); |
| 307 | } |
| 308 | } |
| 309 | } |
| 310 | return |
| 311 | } |
| 312 | |
| 313 |
| --- tools/cvs2fossil/lib/c2f_repository.tcl | |
| +++ tools/cvs2fossil/lib/c2f_repository.tcl | |
| @@ -268,11 +268,11 @@ | |
| 268 | return $res |
| 269 | } |
| 270 | |
| 271 | proc SaveAuthors {} { |
| 272 | ::variable myauthor |
| 273 | foreach {name aid} [$myauthor get] { |
| 274 | state run { |
| 275 | INSERT INTO author ( aid, name) |
| 276 | VALUES ($aid, $name); |
| 277 | } |
| 278 | } |
| @@ -279,11 +279,11 @@ | |
| 279 | return |
| 280 | } |
| 281 | |
| 282 | proc SaveCommitMessages {} { |
| 283 | ::variable mycmsg |
| 284 | foreach {text cid} [$mycmsg get] { |
| 285 | state run { |
| 286 | INSERT INTO cmessage ( cid, text) |
| 287 | VALUES ($cid, $text); |
| 288 | } |
| 289 | } |
| @@ -290,23 +290,15 @@ | |
| 290 | return |
| 291 | } |
| 292 | |
| 293 | proc SaveMeta {} { |
| 294 | ::variable mymeta |
| 295 | foreach {key mid} [$mymeta get] { |
| 296 | struct::list assign $key pid bid aid cid |
| 297 | state run { |
| 298 | INSERT INTO meta ( mid, pid, bid, aid, cid) |
| 299 | VALUES ($mid, $pid, $bid, $aid, $cid); |
| 300 | } |
| 301 | } |
| 302 | return |
| 303 | } |
| 304 | |
| 305 |
| --- tools/cvs2fossil/lib/id.tcl | ||
| +++ tools/cvs2fossil/lib/id.tcl | ||
| @@ -34,10 +34,11 @@ | ||
| 34 | 34 | |
| 35 | 35 | return $mycounter |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | method keyof {id} { return $myinvert($id) } |
| 39 | + method get {} { return [array get mydata] } | |
| 39 | 40 | |
| 40 | 41 | # # ## ### ##### ######## ############# |
| 41 | 42 | ## Internal. State. |
| 42 | 43 | |
| 43 | 44 | variable mydata -array {} ; # Map data -> id |
| 44 | 45 |
| --- tools/cvs2fossil/lib/id.tcl | |
| +++ tools/cvs2fossil/lib/id.tcl | |
| @@ -34,10 +34,11 @@ | |
| 34 | |
| 35 | return $mycounter |
| 36 | } |
| 37 | |
| 38 | method keyof {id} { return $myinvert($id) } |
| 39 | |
| 40 | # # ## ### ##### ######## ############# |
| 41 | ## Internal. State. |
| 42 | |
| 43 | variable mydata -array {} ; # Map data -> id |
| 44 |
| --- tools/cvs2fossil/lib/id.tcl | |
| +++ tools/cvs2fossil/lib/id.tcl | |
| @@ -34,10 +34,11 @@ | |
| 34 | |
| 35 | return $mycounter |
| 36 | } |
| 37 | |
| 38 | method keyof {id} { return $myinvert($id) } |
| 39 | method get {} { return [array get mydata] } |
| 40 | |
| 41 | # # ## ### ##### ######## ############# |
| 42 | ## Internal. State. |
| 43 | |
| 44 | variable mydata -array {} ; # Map data -> id |
| 45 |