Fossil SCM
Moved more parts taken over by the top. sort passes out the breaker passes, and renumbered them.
Commit
d743f04bd2e2cf7903b18f73689a162d7f9af14f
Parent
b6b7ff79ccf41d6…
1 file changed
+5
-20
| --- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | ||
| @@ -8,15 +8,15 @@ | ||
| 8 | 8 | # This software consists of voluntary contributions made by many |
| 9 | 9 | # individuals. For exact contribution history, see the revision |
| 10 | 10 | # history and logs, available at http://fossil-scm.hwaci.com/fossil |
| 11 | 11 | # # ## ### ##### ######## ############# ##################### |
| 12 | 12 | |
| 13 | -## Pass VIII. This is the final pass for breaking changeset dependency | |
| 14 | -## cycles. The two previous passes broke cycles covering revision and | |
| 15 | -## symbol changesets, respectively. This pass now breaks any remaining | |
| 16 | -## cycles each of which has to contain at least one revision and at | |
| 17 | -## least one symbol changeset. | |
| 13 | +## Pass IX. This is the final pass for breaking changeset dependency | |
| 14 | +## cycles. The previous breaker passes (6 and 8) broke cycles covering | |
| 15 | +## revision and symbol changesets, respectively. This pass now breaks | |
| 16 | +## any remaining cycles, each of which has to contain at least one | |
| 17 | +## revision and at least one symbol changeset. | |
| 18 | 18 | |
| 19 | 19 | # # ## ### ##### ######## ############# ##################### |
| 20 | 20 | ## Requirements |
| 21 | 21 | |
| 22 | 22 | package require Tcl 8.4 ; # Required runtime. |
| @@ -63,11 +63,10 @@ | ||
| 63 | 63 | typemethod run {} { |
| 64 | 64 | # Pass manager interface. Executed to perform the |
| 65 | 65 | # functionality of the pass. |
| 66 | 66 | |
| 67 | 67 | cyclebreaker precmd [myproc BreakBackwardBranches] |
| 68 | - cyclebreaker savecmd [myproc SaveOrder] | |
| 69 | 68 | cyclebreaker breakcmd [myproc BreakCycle] |
| 70 | 69 | |
| 71 | 70 | state transaction { |
| 72 | 71 | LoadCommitOrder |
| 73 | 72 | cyclebreaker run break-all [myproc Changesets] |
| @@ -300,24 +299,10 @@ | ||
| 300 | 299 | if {![llength $backwardrevisions]} { trouble internal "Set of backward revisions is empty" } |
| 301 | 300 | return |
| 302 | 301 | } |
| 303 | 302 | |
| 304 | 303 | |
| 305 | - # # ## ### ##### ######## ############# | |
| 306 | - | |
| 307 | - proc SaveOrder {graph at cset} { | |
| 308 | - set cid [$cset id] | |
| 309 | - | |
| 310 | - log write 4 breakacycle "Comitting @ $at: [$cset str]" | |
| 311 | - state run { | |
| 312 | - INSERT INTO csorder (cid, pos) | |
| 313 | - VALUES ($cid, $at) | |
| 314 | - } | |
| 315 | - # MAYBE TODO: Write the project level changeset dependencies as well. | |
| 316 | - return | |
| 317 | - } | |
| 318 | - | |
| 319 | 304 | # # ## ### ##### ######## ############# |
| 320 | 305 | |
| 321 | 306 | proc BreakCycle {graph} { |
| 322 | 307 | cyclebreaker break $graph |
| 323 | 308 | } |
| 324 | 309 |
| --- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| @@ -8,15 +8,15 @@ | |
| 8 | # This software consists of voluntary contributions made by many |
| 9 | # individuals. For exact contribution history, see the revision |
| 10 | # history and logs, available at http://fossil-scm.hwaci.com/fossil |
| 11 | # # ## ### ##### ######## ############# ##################### |
| 12 | |
| 13 | ## Pass VIII. This is the final pass for breaking changeset dependency |
| 14 | ## cycles. The two previous passes broke cycles covering revision and |
| 15 | ## symbol changesets, respectively. This pass now breaks any remaining |
| 16 | ## cycles each of which has to contain at least one revision and at |
| 17 | ## least one symbol changeset. |
| 18 | |
| 19 | # # ## ### ##### ######## ############# ##################### |
| 20 | ## Requirements |
| 21 | |
| 22 | package require Tcl 8.4 ; # Required runtime. |
| @@ -63,11 +63,10 @@ | |
| 63 | typemethod run {} { |
| 64 | # Pass manager interface. Executed to perform the |
| 65 | # functionality of the pass. |
| 66 | |
| 67 | cyclebreaker precmd [myproc BreakBackwardBranches] |
| 68 | cyclebreaker savecmd [myproc SaveOrder] |
| 69 | cyclebreaker breakcmd [myproc BreakCycle] |
| 70 | |
| 71 | state transaction { |
| 72 | LoadCommitOrder |
| 73 | cyclebreaker run break-all [myproc Changesets] |
| @@ -300,24 +299,10 @@ | |
| 300 | if {![llength $backwardrevisions]} { trouble internal "Set of backward revisions is empty" } |
| 301 | return |
| 302 | } |
| 303 | |
| 304 | |
| 305 | # # ## ### ##### ######## ############# |
| 306 | |
| 307 | proc SaveOrder {graph at cset} { |
| 308 | set cid [$cset id] |
| 309 | |
| 310 | log write 4 breakacycle "Comitting @ $at: [$cset str]" |
| 311 | state run { |
| 312 | INSERT INTO csorder (cid, pos) |
| 313 | VALUES ($cid, $at) |
| 314 | } |
| 315 | # MAYBE TODO: Write the project level changeset dependencies as well. |
| 316 | return |
| 317 | } |
| 318 | |
| 319 | # # ## ### ##### ######## ############# |
| 320 | |
| 321 | proc BreakCycle {graph} { |
| 322 | cyclebreaker break $graph |
| 323 | } |
| 324 |
| --- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| @@ -8,15 +8,15 @@ | |
| 8 | # This software consists of voluntary contributions made by many |
| 9 | # individuals. For exact contribution history, see the revision |
| 10 | # history and logs, available at http://fossil-scm.hwaci.com/fossil |
| 11 | # # ## ### ##### ######## ############# ##################### |
| 12 | |
| 13 | ## Pass IX. This is the final pass for breaking changeset dependency |
| 14 | ## cycles. The previous breaker passes (6 and 8) broke cycles covering |
| 15 | ## revision and symbol changesets, respectively. This pass now breaks |
| 16 | ## any remaining cycles, each of which has to contain at least one |
| 17 | ## revision and at least one symbol changeset. |
| 18 | |
| 19 | # # ## ### ##### ######## ############# ##################### |
| 20 | ## Requirements |
| 21 | |
| 22 | package require Tcl 8.4 ; # Required runtime. |
| @@ -63,11 +63,10 @@ | |
| 63 | typemethod run {} { |
| 64 | # Pass manager interface. Executed to perform the |
| 65 | # functionality of the pass. |
| 66 | |
| 67 | cyclebreaker precmd [myproc BreakBackwardBranches] |
| 68 | cyclebreaker breakcmd [myproc BreakCycle] |
| 69 | |
| 70 | state transaction { |
| 71 | LoadCommitOrder |
| 72 | cyclebreaker run break-all [myproc Changesets] |
| @@ -300,24 +299,10 @@ | |
| 299 | if {![llength $backwardrevisions]} { trouble internal "Set of backward revisions is empty" } |
| 300 | return |
| 301 | } |
| 302 | |
| 303 | |
| 304 | # # ## ### ##### ######## ############# |
| 305 | |
| 306 | proc BreakCycle {graph} { |
| 307 | cyclebreaker break $graph |
| 308 | } |
| 309 |