Fossil SCM
Modified loop check in cycle breaker to abort immediately on first looped changeset.
Commit
487bb1c619f020acaa77ad1a58f31b8e564fc3fe
Parent
f7cca3f082ea5a4…
1 file changed
+2
-2
| --- tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | ||
| @@ -207,11 +207,11 @@ | ||
| 207 | 207 | # chosen set. These are ignored |
| 208 | 208 | if {![$dg node exists $succ]} continue |
| 209 | 209 | $dg arc insert $cset $succ |
| 210 | 210 | if {$succ eq $cset} { |
| 211 | 211 | $cset loopcheck |
| 212 | - trouble fatal "[$cset str] depends on itself" | |
| 212 | + trouble internal "[$cset str] depends on itself" | |
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | incr n |
| 216 | 216 | } |
| 217 | 217 | |
| @@ -431,11 +431,11 @@ | ||
| 431 | 431 | # the chosen set. These are ignored |
| 432 | 432 | if {![$dg node exists $succ]} continue |
| 433 | 433 | $dg arc insert $cset $succ |
| 434 | 434 | if {$succ eq $cset} { |
| 435 | 435 | $cset loopcheck |
| 436 | - trouble fatal "[$cset str] depends on itself" | |
| 436 | + trouble internal "[$cset str] depends on itself" | |
| 437 | 437 | } |
| 438 | 438 | } |
| 439 | 439 | } |
| 440 | 440 | foreach cset $pre { |
| 441 | 441 | foreach succ [$cset successors] { |
| 442 | 442 |
| --- tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| +++ tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| @@ -207,11 +207,11 @@ | |
| 207 | # chosen set. These are ignored |
| 208 | if {![$dg node exists $succ]} continue |
| 209 | $dg arc insert $cset $succ |
| 210 | if {$succ eq $cset} { |
| 211 | $cset loopcheck |
| 212 | trouble fatal "[$cset str] depends on itself" |
| 213 | } |
| 214 | } |
| 215 | incr n |
| 216 | } |
| 217 | |
| @@ -431,11 +431,11 @@ | |
| 431 | # the chosen set. These are ignored |
| 432 | if {![$dg node exists $succ]} continue |
| 433 | $dg arc insert $cset $succ |
| 434 | if {$succ eq $cset} { |
| 435 | $cset loopcheck |
| 436 | trouble fatal "[$cset str] depends on itself" |
| 437 | } |
| 438 | } |
| 439 | } |
| 440 | foreach cset $pre { |
| 441 | foreach succ [$cset successors] { |
| 442 |
| --- tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| +++ tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| @@ -207,11 +207,11 @@ | |
| 207 | # chosen set. These are ignored |
| 208 | if {![$dg node exists $succ]} continue |
| 209 | $dg arc insert $cset $succ |
| 210 | if {$succ eq $cset} { |
| 211 | $cset loopcheck |
| 212 | trouble internal "[$cset str] depends on itself" |
| 213 | } |
| 214 | } |
| 215 | incr n |
| 216 | } |
| 217 | |
| @@ -431,11 +431,11 @@ | |
| 431 | # the chosen set. These are ignored |
| 432 | if {![$dg node exists $succ]} continue |
| 433 | $dg arc insert $cset $succ |
| 434 | if {$succ eq $cset} { |
| 435 | $cset loopcheck |
| 436 | trouble internal "[$cset str] depends on itself" |
| 437 | } |
| 438 | } |
| 439 | } |
| 440 | foreach cset $pre { |
| 441 | foreach succ [$cset successors] { |
| 442 |