Fossil SCM
Modified the API for the construction of changesets a bit, now allowing their construction with the correct id, instead of correcting it later. Updated pass 5 to use this, and fixed bug where the id counter for changesets was left uninitialized, allowing the improper generation of duplicate ids.
Commit
65be27aa69956266ba1f92fa2fef3e59a1b92060
Parent
ad7d5c2d10666dd…
2 files changed
+2
-2
+7
-4
| --- tools/cvs2fossil/lib/c2f_pinitcsets.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl | ||
| @@ -114,15 +114,15 @@ | ||
| 114 | 114 | set r [project::rev %AUTO% [repository projectof $pid] $cstype $srcid [state run { |
| 115 | 115 | SELECT C.rid |
| 116 | 116 | FROM csrevision C |
| 117 | 117 | WHERE C.cid = $id |
| 118 | 118 | ORDER BY C.pos |
| 119 | - }]] | |
| 120 | - $r setid $id | |
| 119 | + }] $id] | |
| 121 | 120 | } |
| 122 | 121 | |
| 123 | 122 | project::rev getcstypes |
| 123 | + project::rev loadcounter | |
| 124 | 124 | return |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | typemethod run {} { |
| 128 | 128 | # Pass manager interface. Executed to perform the |
| 129 | 129 |
| --- tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| @@ -114,15 +114,15 @@ | |
| 114 | set r [project::rev %AUTO% [repository projectof $pid] $cstype $srcid [state run { |
| 115 | SELECT C.rid |
| 116 | FROM csrevision C |
| 117 | WHERE C.cid = $id |
| 118 | ORDER BY C.pos |
| 119 | }]] |
| 120 | $r setid $id |
| 121 | } |
| 122 | |
| 123 | project::rev getcstypes |
| 124 | return |
| 125 | } |
| 126 | |
| 127 | typemethod run {} { |
| 128 | # Pass manager interface. Executed to perform the |
| 129 |
| --- tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pinitcsets.tcl | |
| @@ -114,15 +114,15 @@ | |
| 114 | set r [project::rev %AUTO% [repository projectof $pid] $cstype $srcid [state run { |
| 115 | SELECT C.rid |
| 116 | FROM csrevision C |
| 117 | WHERE C.cid = $id |
| 118 | ORDER BY C.pos |
| 119 | }] $id] |
| 120 | } |
| 121 | |
| 122 | project::rev getcstypes |
| 123 | project::rev loadcounter |
| 124 | return |
| 125 | } |
| 126 | |
| 127 | typemethod run {} { |
| 128 | # Pass manager interface. Executed to perform the |
| 129 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | ||
| @@ -28,12 +28,17 @@ | ||
| 28 | 28 | |
| 29 | 29 | snit::type ::vc::fossil::import::cvs::project::rev { |
| 30 | 30 | # # ## ### ##### ######## ############# |
| 31 | 31 | ## Public API |
| 32 | 32 | |
| 33 | - constructor {project cstype srcid revisions} { | |
| 34 | - set myid [incr mycounter] | |
| 33 | + constructor {project cstype srcid revisions {theid {}}} { | |
| 34 | + if {$theid ne ""} { | |
| 35 | + set myid $theid | |
| 36 | + } else { | |
| 37 | + set myid [incr mycounter] | |
| 38 | + } | |
| 39 | + | |
| 35 | 40 | set myproject $project |
| 36 | 41 | set mytype $cstype |
| 37 | 42 | set mysrcid $srcid |
| 38 | 43 | set myrevisions $revisions |
| 39 | 44 | |
| @@ -46,12 +51,10 @@ | ||
| 46 | 51 | |
| 47 | 52 | method id {} { return $myid } |
| 48 | 53 | method revisions {} { return $myrevisions } |
| 49 | 54 | method data {} { return [list $myproject $mytype $mysrcid] } |
| 50 | 55 | |
| 51 | - method setid {id} { set myid $id ; return } | |
| 52 | - | |
| 53 | 56 | method bysymbol {} { return [expr {$mytype eq "sym"}] } |
| 54 | 57 | method byrevision {} { return [expr {$mytype eq "rev"}] } |
| 55 | 58 | |
| 56 | 59 | method successors {} { |
| 57 | 60 | # NOTE / FUTURE: Possible bottleneck. |
| 58 | 61 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -28,12 +28,17 @@ | |
| 28 | |
| 29 | snit::type ::vc::fossil::import::cvs::project::rev { |
| 30 | # # ## ### ##### ######## ############# |
| 31 | ## Public API |
| 32 | |
| 33 | constructor {project cstype srcid revisions} { |
| 34 | set myid [incr mycounter] |
| 35 | set myproject $project |
| 36 | set mytype $cstype |
| 37 | set mysrcid $srcid |
| 38 | set myrevisions $revisions |
| 39 | |
| @@ -46,12 +51,10 @@ | |
| 46 | |
| 47 | method id {} { return $myid } |
| 48 | method revisions {} { return $myrevisions } |
| 49 | method data {} { return [list $myproject $mytype $mysrcid] } |
| 50 | |
| 51 | method setid {id} { set myid $id ; return } |
| 52 | |
| 53 | method bysymbol {} { return [expr {$mytype eq "sym"}] } |
| 54 | method byrevision {} { return [expr {$mytype eq "rev"}] } |
| 55 | |
| 56 | method successors {} { |
| 57 | # NOTE / FUTURE: Possible bottleneck. |
| 58 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -28,12 +28,17 @@ | |
| 28 | |
| 29 | snit::type ::vc::fossil::import::cvs::project::rev { |
| 30 | # # ## ### ##### ######## ############# |
| 31 | ## Public API |
| 32 | |
| 33 | constructor {project cstype srcid revisions {theid {}}} { |
| 34 | if {$theid ne ""} { |
| 35 | set myid $theid |
| 36 | } else { |
| 37 | set myid [incr mycounter] |
| 38 | } |
| 39 | |
| 40 | set myproject $project |
| 41 | set mytype $cstype |
| 42 | set mysrcid $srcid |
| 43 | set myrevisions $revisions |
| 44 | |
| @@ -46,12 +51,10 @@ | |
| 51 | |
| 52 | method id {} { return $myid } |
| 53 | method revisions {} { return $myrevisions } |
| 54 | method data {} { return [list $myproject $mytype $mysrcid] } |
| 55 | |
| 56 | method bysymbol {} { return [expr {$mytype eq "sym"}] } |
| 57 | method byrevision {} { return [expr {$mytype eq "rev"}] } |
| 58 | |
| 59 | method successors {} { |
| 60 | # NOTE / FUTURE: Possible bottleneck. |
| 61 |