Fossil SCM
Extended changeset class with in-memory database mapping from changeset ids to the proper object, and extended the objects with position information and associated accessors. Extended pass 8 to load the commit order computed in pass 6, this is stored in the new position slot of changesets, and an inverted index mapping from position to changeset at that position.
Commit
de4cff4142168685027cd1e212782c72fe097349
Parent
65be27aa6995626…
2 files changed
+26
+11
-2
| --- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | ||
| @@ -44,10 +44,12 @@ | ||
| 44 | 44 | ## Public API |
| 45 | 45 | |
| 46 | 46 | typemethod setup {} { |
| 47 | 47 | # Define the names and structure of the persistent state of |
| 48 | 48 | # this pass. |
| 49 | + | |
| 50 | + state reading csorder | |
| 49 | 51 | return |
| 50 | 52 | } |
| 51 | 53 | |
| 52 | 54 | typemethod load {} { |
| 53 | 55 | # Pass manager interface. Executed to load data computed by |
| @@ -63,10 +65,11 @@ | ||
| 63 | 65 | cyclebreaker precmd [myproc BreakRetrogradeBranches] |
| 64 | 66 | cyclebreaker savecmd [myproc SaveOrder] |
| 65 | 67 | cyclebreaker breakcmd [myproc BreakCycle] |
| 66 | 68 | |
| 67 | 69 | state transaction { |
| 70 | + LoadCommitOrder | |
| 68 | 71 | cyclebreaker run break-all [myproc Changesets] |
| 69 | 72 | } |
| 70 | 73 | |
| 71 | 74 | repository printcsetstatistics |
| 72 | 75 | return |
| @@ -81,10 +84,27 @@ | ||
| 81 | 84 | |
| 82 | 85 | # # ## ### ##### ######## ############# |
| 83 | 86 | ## Internal methods |
| 84 | 87 | |
| 85 | 88 | proc Changesets {} { project::rev all } |
| 89 | + | |
| 90 | + proc LoadCommitOrder {} { | |
| 91 | + ::variable mycset | |
| 92 | + | |
| 93 | + state transaction { | |
| 94 | + foreach {cid pos} [state run { SELECT cid, pos FROM csorder }] { | |
| 95 | + set cset [project::rev of $cid] | |
| 96 | + $cset setpos $pos | |
| 97 | + set mycset($pos) $cset | |
| 98 | + } | |
| 99 | + # Remove the order information now that we have it in | |
| 100 | + # memory, so that we can save it once more, for all | |
| 101 | + # changesets, while breaking the remaining cycles. | |
| 102 | + state run { DELETE FROM csorder } | |
| 103 | + } | |
| 104 | + return | |
| 105 | + } | |
| 86 | 106 | |
| 87 | 107 | # # ## ### ##### ######## ############# |
| 88 | 108 | |
| 89 | 109 | proc BreakRetrogradeBranches {graph} { |
| 90 | 110 | } |
| @@ -97,10 +117,16 @@ | ||
| 97 | 117 | # # ## ### ##### ######## ############# |
| 98 | 118 | |
| 99 | 119 | proc BreakCycle {graph} { |
| 100 | 120 | cyclebreaker break $graph |
| 101 | 121 | } |
| 122 | + | |
| 123 | + # # ## ### ##### ######## ############# | |
| 124 | + | |
| 125 | + typevariable mycset -array {} ; # Map from commit positions to the | |
| 126 | + # changeset (object ref) at that | |
| 127 | + # position. | |
| 102 | 128 | |
| 103 | 129 | # # ## ### ##### ######## ############# |
| 104 | 130 | ## Configuration |
| 105 | 131 | |
| 106 | 132 | pragma -hasinstances no ; # singleton |
| 107 | 133 |
| --- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| @@ -44,10 +44,12 @@ | |
| 44 | ## Public API |
| 45 | |
| 46 | typemethod setup {} { |
| 47 | # Define the names and structure of the persistent state of |
| 48 | # this pass. |
| 49 | return |
| 50 | } |
| 51 | |
| 52 | typemethod load {} { |
| 53 | # Pass manager interface. Executed to load data computed by |
| @@ -63,10 +65,11 @@ | |
| 63 | cyclebreaker precmd [myproc BreakRetrogradeBranches] |
| 64 | cyclebreaker savecmd [myproc SaveOrder] |
| 65 | cyclebreaker breakcmd [myproc BreakCycle] |
| 66 | |
| 67 | state transaction { |
| 68 | cyclebreaker run break-all [myproc Changesets] |
| 69 | } |
| 70 | |
| 71 | repository printcsetstatistics |
| 72 | return |
| @@ -81,10 +84,27 @@ | |
| 81 | |
| 82 | # # ## ### ##### ######## ############# |
| 83 | ## Internal methods |
| 84 | |
| 85 | proc Changesets {} { project::rev all } |
| 86 | |
| 87 | # # ## ### ##### ######## ############# |
| 88 | |
| 89 | proc BreakRetrogradeBranches {graph} { |
| 90 | } |
| @@ -97,10 +117,16 @@ | |
| 97 | # # ## ### ##### ######## ############# |
| 98 | |
| 99 | proc BreakCycle {graph} { |
| 100 | cyclebreaker break $graph |
| 101 | } |
| 102 | |
| 103 | # # ## ### ##### ######## ############# |
| 104 | ## Configuration |
| 105 | |
| 106 | pragma -hasinstances no ; # singleton |
| 107 |
| --- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| @@ -44,10 +44,12 @@ | |
| 44 | ## Public API |
| 45 | |
| 46 | typemethod setup {} { |
| 47 | # Define the names and structure of the persistent state of |
| 48 | # this pass. |
| 49 | |
| 50 | state reading csorder |
| 51 | return |
| 52 | } |
| 53 | |
| 54 | typemethod load {} { |
| 55 | # Pass manager interface. Executed to load data computed by |
| @@ -63,10 +65,11 @@ | |
| 65 | cyclebreaker precmd [myproc BreakRetrogradeBranches] |
| 66 | cyclebreaker savecmd [myproc SaveOrder] |
| 67 | cyclebreaker breakcmd [myproc BreakCycle] |
| 68 | |
| 69 | state transaction { |
| 70 | LoadCommitOrder |
| 71 | cyclebreaker run break-all [myproc Changesets] |
| 72 | } |
| 73 | |
| 74 | repository printcsetstatistics |
| 75 | return |
| @@ -81,10 +84,27 @@ | |
| 84 | |
| 85 | # # ## ### ##### ######## ############# |
| 86 | ## Internal methods |
| 87 | |
| 88 | proc Changesets {} { project::rev all } |
| 89 | |
| 90 | proc LoadCommitOrder {} { |
| 91 | ::variable mycset |
| 92 | |
| 93 | state transaction { |
| 94 | foreach {cid pos} [state run { SELECT cid, pos FROM csorder }] { |
| 95 | set cset [project::rev of $cid] |
| 96 | $cset setpos $pos |
| 97 | set mycset($pos) $cset |
| 98 | } |
| 99 | # Remove the order information now that we have it in |
| 100 | # memory, so that we can save it once more, for all |
| 101 | # changesets, while breaking the remaining cycles. |
| 102 | state run { DELETE FROM csorder } |
| 103 | } |
| 104 | return |
| 105 | } |
| 106 | |
| 107 | # # ## ### ##### ######## ############# |
| 108 | |
| 109 | proc BreakRetrogradeBranches {graph} { |
| 110 | } |
| @@ -97,10 +117,16 @@ | |
| 117 | # # ## ### ##### ######## ############# |
| 118 | |
| 119 | proc BreakCycle {graph} { |
| 120 | cyclebreaker break $graph |
| 121 | } |
| 122 | |
| 123 | # # ## ### ##### ######## ############# |
| 124 | |
| 125 | typevariable mycset -array {} ; # Map from commit positions to the |
| 126 | # changeset (object ref) at that |
| 127 | # position. |
| 128 | |
| 129 | # # ## ### ##### ######## ############# |
| 130 | ## Configuration |
| 131 | |
| 132 | pragma -hasinstances no ; # singleton |
| 133 |
+11
-2
| --- tools/cvs2fossil/lib/c2f_prev.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | ||
| @@ -39,14 +39,16 @@ | ||
| 39 | 39 | |
| 40 | 40 | set myproject $project |
| 41 | 41 | set mytype $cstype |
| 42 | 42 | set mysrcid $srcid |
| 43 | 43 | set myrevisions $revisions |
| 44 | + set mypos {} ; # Commit location is not known yet. | |
| 44 | 45 | |
| 45 | 46 | # Keep track of the generated changesets and of the inverse |
| 46 | 47 | # mapping from revisions to them. |
| 47 | - lappend mychangesets $self | |
| 48 | + lappend mychangesets $self | |
| 49 | + set myidmap($myid) $self | |
| 48 | 50 | foreach r $revisions { set myrevmap($r) $self } |
| 49 | 51 | return |
| 50 | 52 | } |
| 51 | 53 | |
| 52 | 54 | method id {} { return $myid } |
| @@ -53,10 +55,13 @@ | ||
| 53 | 55 | method revisions {} { return $myrevisions } |
| 54 | 56 | method data {} { return [list $myproject $mytype $mysrcid] } |
| 55 | 57 | |
| 56 | 58 | method bysymbol {} { return [expr {$mytype eq "sym"}] } |
| 57 | 59 | method byrevision {} { return [expr {$mytype eq "rev"}] } |
| 60 | + | |
| 61 | + method setpos {p} { set mypos $p ; return } | |
| 62 | + method pos {} { return $mypos } | |
| 58 | 63 | |
| 59 | 64 | method successors {} { |
| 60 | 65 | # NOTE / FUTURE: Possible bottleneck. |
| 61 | 66 | set csets {} |
| 62 | 67 | foreach {_ children} [$self nextmap] { |
| @@ -294,10 +299,12 @@ | ||
| 294 | 299 | # the cset. |
| 295 | 300 | variable mynextmap {} ; # Dictionary mapping from the revisions |
| 296 | 301 | # to their successors. Cache to avoid |
| 297 | 302 | # loading this from the state more than |
| 298 | 303 | # once. |
| 304 | + variable mypos {} ; # Commit position of the changeset, if | |
| 305 | + # known. | |
| 299 | 306 | |
| 300 | 307 | # # ## ### ##### ######## ############# |
| 301 | 308 | ## Internal methods |
| 302 | 309 | |
| 303 | 310 | typevariable mycounter 0 ; # Id counter for csets. Last id used. |
| @@ -590,12 +597,14 @@ | ||
| 590 | 597 | |
| 591 | 598 | # # ## ### ##### ######## ############# |
| 592 | 599 | |
| 593 | 600 | typevariable mychangesets {} ; # List of all known changesets. |
| 594 | 601 | typevariable myrevmap -array {} ; # Map from revisions to their changeset. |
| 602 | + typevariable myidmap -array {} ; # Map from changeset id to changeset. | |
| 595 | 603 | |
| 596 | - typemethod all {} { return $mychangesets } | |
| 604 | + typemethod all {} { return $mychangesets } | |
| 605 | + typemethod of {id} { return $myidmap($id) } | |
| 597 | 606 | |
| 598 | 607 | # # ## ### ##### ######## ############# |
| 599 | 608 | ## Configuration |
| 600 | 609 | |
| 601 | 610 | pragma -hastypeinfo no ; # no type introspection |
| 602 | 611 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -39,14 +39,16 @@ | |
| 39 | |
| 40 | set myproject $project |
| 41 | set mytype $cstype |
| 42 | set mysrcid $srcid |
| 43 | set myrevisions $revisions |
| 44 | |
| 45 | # Keep track of the generated changesets and of the inverse |
| 46 | # mapping from revisions to them. |
| 47 | lappend mychangesets $self |
| 48 | foreach r $revisions { set myrevmap($r) $self } |
| 49 | return |
| 50 | } |
| 51 | |
| 52 | method id {} { return $myid } |
| @@ -53,10 +55,13 @@ | |
| 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 | set csets {} |
| 62 | foreach {_ children} [$self nextmap] { |
| @@ -294,10 +299,12 @@ | |
| 294 | # the cset. |
| 295 | variable mynextmap {} ; # Dictionary mapping from the revisions |
| 296 | # to their successors. Cache to avoid |
| 297 | # loading this from the state more than |
| 298 | # once. |
| 299 | |
| 300 | # # ## ### ##### ######## ############# |
| 301 | ## Internal methods |
| 302 | |
| 303 | typevariable mycounter 0 ; # Id counter for csets. Last id used. |
| @@ -590,12 +597,14 @@ | |
| 590 | |
| 591 | # # ## ### ##### ######## ############# |
| 592 | |
| 593 | typevariable mychangesets {} ; # List of all known changesets. |
| 594 | typevariable myrevmap -array {} ; # Map from revisions to their changeset. |
| 595 | |
| 596 | typemethod all {} { return $mychangesets } |
| 597 | |
| 598 | # # ## ### ##### ######## ############# |
| 599 | ## Configuration |
| 600 | |
| 601 | pragma -hastypeinfo no ; # no type introspection |
| 602 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -39,14 +39,16 @@ | |
| 39 | |
| 40 | set myproject $project |
| 41 | set mytype $cstype |
| 42 | set mysrcid $srcid |
| 43 | set myrevisions $revisions |
| 44 | set mypos {} ; # Commit location is not known yet. |
| 45 | |
| 46 | # Keep track of the generated changesets and of the inverse |
| 47 | # mapping from revisions to them. |
| 48 | lappend mychangesets $self |
| 49 | set myidmap($myid) $self |
| 50 | foreach r $revisions { set myrevmap($r) $self } |
| 51 | return |
| 52 | } |
| 53 | |
| 54 | method id {} { return $myid } |
| @@ -53,10 +55,13 @@ | |
| 55 | method revisions {} { return $myrevisions } |
| 56 | method data {} { return [list $myproject $mytype $mysrcid] } |
| 57 | |
| 58 | method bysymbol {} { return [expr {$mytype eq "sym"}] } |
| 59 | method byrevision {} { return [expr {$mytype eq "rev"}] } |
| 60 | |
| 61 | method setpos {p} { set mypos $p ; return } |
| 62 | method pos {} { return $mypos } |
| 63 | |
| 64 | method successors {} { |
| 65 | # NOTE / FUTURE: Possible bottleneck. |
| 66 | set csets {} |
| 67 | foreach {_ children} [$self nextmap] { |
| @@ -294,10 +299,12 @@ | |
| 299 | # the cset. |
| 300 | variable mynextmap {} ; # Dictionary mapping from the revisions |
| 301 | # to their successors. Cache to avoid |
| 302 | # loading this from the state more than |
| 303 | # once. |
| 304 | variable mypos {} ; # Commit position of the changeset, if |
| 305 | # known. |
| 306 | |
| 307 | # # ## ### ##### ######## ############# |
| 308 | ## Internal methods |
| 309 | |
| 310 | typevariable mycounter 0 ; # Id counter for csets. Last id used. |
| @@ -590,12 +597,14 @@ | |
| 597 | |
| 598 | # # ## ### ##### ######## ############# |
| 599 | |
| 600 | typevariable mychangesets {} ; # List of all known changesets. |
| 601 | typevariable myrevmap -array {} ; # Map from revisions to their changeset. |
| 602 | typevariable myidmap -array {} ; # Map from changeset id to changeset. |
| 603 | |
| 604 | typemethod all {} { return $mychangesets } |
| 605 | typemethod of {id} { return $myidmap($id) } |
| 606 | |
| 607 | # # ## ### ##### ######## ############# |
| 608 | ## Configuration |
| 609 | |
| 610 | pragma -hastypeinfo no ; # no type introspection |
| 611 |