Fossil SCM
Tweaked log output a bit. Bugfixes: Forgot to propagate the border information into SplitRevisions, and a varname typo.
Commit
6d63634309ff7e98019353cf539e471641a65730
Parent
eabaea870afdc22…
1 file changed
+4
-4
| --- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | ||
| @@ -155,27 +155,27 @@ | ||
| 155 | 155 | |
| 156 | 156 | # limits : dict (revision -> list (max predecessor commit, min sucessor commit)) |
| 157 | 157 | |
| 158 | 158 | ComputeLimits $cset limits border |
| 159 | 159 | |
| 160 | - log write 6 breakacycle "At commit position border $border" | |
| 160 | + log write 6 breakacycle "Using commit position $border as border" | |
| 161 | 161 | |
| 162 | 162 | # Then we sort the file level items based on there they |
| 163 | 163 | # sit relative to the border into before and after the |
| 164 | 164 | # border. |
| 165 | 165 | |
| 166 | - SplitRevisions $limits normalrevisions backwardrevisions | |
| 166 | + SplitRevisions $limits $border normalrevisions backwardrevisions | |
| 167 | 167 | |
| 168 | 168 | set replacements [project::rev split $cset $normalrevisions $backwardrevisions] |
| 169 | 169 | cyclebreaker replace $graph $cset $replacements |
| 170 | 170 | |
| 171 | 171 | # At last check that the normal frament is indeed not |
| 172 | 172 | # backward, and iterate over the possibly still backward |
| 173 | 173 | # second fragment. |
| 174 | 174 | |
| 175 | 175 | struct::list assign $replacements normal backward |
| 176 | - if {[IsABackwardBranch $dg $normal]} { trouble internal "The normal fragment is unexpectedly a backward branch" } | |
| 176 | + if {[IsABackwardBranch $graph $normal]} { trouble internal "The normal fragment is unexpectedly a backward branch" } | |
| 177 | 177 | |
| 178 | 178 | set cset $backward |
| 179 | 179 | } |
| 180 | 180 | return |
| 181 | 181 | } |
| @@ -279,11 +279,11 @@ | ||
| 279 | 279 | return $res |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | proc MinSuccessorPosition {item} { lindex $item 1 } |
| 283 | 283 | |
| 284 | - proc SplitRevisions {limits nv bv} { | |
| 284 | + proc SplitRevisions {limits border nv bv} { | |
| 285 | 285 | upvar 1 $nv normalrevisions $bv backwardrevisions |
| 286 | 286 | |
| 287 | 287 | set normalrevisions {} |
| 288 | 288 | set backwardrevisions {} |
| 289 | 289 | |
| 290 | 290 |
| --- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| @@ -155,27 +155,27 @@ | |
| 155 | |
| 156 | # limits : dict (revision -> list (max predecessor commit, min sucessor commit)) |
| 157 | |
| 158 | ComputeLimits $cset limits border |
| 159 | |
| 160 | log write 6 breakacycle "At commit position border $border" |
| 161 | |
| 162 | # Then we sort the file level items based on there they |
| 163 | # sit relative to the border into before and after the |
| 164 | # border. |
| 165 | |
| 166 | SplitRevisions $limits normalrevisions backwardrevisions |
| 167 | |
| 168 | set replacements [project::rev split $cset $normalrevisions $backwardrevisions] |
| 169 | cyclebreaker replace $graph $cset $replacements |
| 170 | |
| 171 | # At last check that the normal frament is indeed not |
| 172 | # backward, and iterate over the possibly still backward |
| 173 | # second fragment. |
| 174 | |
| 175 | struct::list assign $replacements normal backward |
| 176 | if {[IsABackwardBranch $dg $normal]} { trouble internal "The normal fragment is unexpectedly a backward branch" } |
| 177 | |
| 178 | set cset $backward |
| 179 | } |
| 180 | return |
| 181 | } |
| @@ -279,11 +279,11 @@ | |
| 279 | return $res |
| 280 | } |
| 281 | |
| 282 | proc MinSuccessorPosition {item} { lindex $item 1 } |
| 283 | |
| 284 | proc SplitRevisions {limits nv bv} { |
| 285 | upvar 1 $nv normalrevisions $bv backwardrevisions |
| 286 | |
| 287 | set normalrevisions {} |
| 288 | set backwardrevisions {} |
| 289 | |
| 290 |
| --- tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pbreakacycle.tcl | |
| @@ -155,27 +155,27 @@ | |
| 155 | |
| 156 | # limits : dict (revision -> list (max predecessor commit, min sucessor commit)) |
| 157 | |
| 158 | ComputeLimits $cset limits border |
| 159 | |
| 160 | log write 6 breakacycle "Using commit position $border as border" |
| 161 | |
| 162 | # Then we sort the file level items based on there they |
| 163 | # sit relative to the border into before and after the |
| 164 | # border. |
| 165 | |
| 166 | SplitRevisions $limits $border normalrevisions backwardrevisions |
| 167 | |
| 168 | set replacements [project::rev split $cset $normalrevisions $backwardrevisions] |
| 169 | cyclebreaker replace $graph $cset $replacements |
| 170 | |
| 171 | # At last check that the normal frament is indeed not |
| 172 | # backward, and iterate over the possibly still backward |
| 173 | # second fragment. |
| 174 | |
| 175 | struct::list assign $replacements normal backward |
| 176 | if {[IsABackwardBranch $graph $normal]} { trouble internal "The normal fragment is unexpectedly a backward branch" } |
| 177 | |
| 178 | set cset $backward |
| 179 | } |
| 180 | return |
| 181 | } |
| @@ -279,11 +279,11 @@ | |
| 279 | return $res |
| 280 | } |
| 281 | |
| 282 | proc MinSuccessorPosition {item} { lindex $item 1 } |
| 283 | |
| 284 | proc SplitRevisions {limits border nv bv} { |
| 285 | upvar 1 $nv normalrevisions $bv backwardrevisions |
| 286 | |
| 287 | set normalrevisions {} |
| 288 | set backwardrevisions {} |
| 289 | |
| 290 |