Fossil SCM
Renamed changeset method to describe modified results, and updated the one invoker. Modified the sorting of time ranges. Now by max, min as tiebreaker, and object name as last tiebreaker.
Commit
04d76a9e797fbefe8dc872b58c91093443594aa7
Parent
2c9c26815f5db13…
2 files changed
+4
-2
+3
-3
| --- tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | ||
| @@ -214,11 +214,11 @@ | ||
| 214 | 214 | log write 2 cyclebreaker "LOOP changeset [$cset str] __________________" |
| 215 | 215 | array set nmap [$cset nextmap] |
| 216 | 216 | foreach r [lsort -dict [array names nmap]] { |
| 217 | 217 | foreach succrev $nmap($r) { |
| 218 | 218 | log write 2 cyclebreaker \ |
| 219 | - "LOOP * rev <$r> --> rev <$succrev> --> cs [project::rev strlist [project::rev ofrev $succrev]]" | |
| 219 | + "LOOP * rev <$r> --> rev <$succrev> --> cs [project::rev str [project::rev ofitem $succrev]]" | |
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | } |
| 224 | 224 | } |
| @@ -288,11 +288,13 @@ | ||
| 288 | 288 | return 1 |
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | proc ScheduleCandidates {} { |
| 292 | 292 | ::variable mybottom |
| 293 | - set mybottom [lsort -index 1 -integer [lsort -index 2 -integer [lsort -index 0 -dict $mybottom]]] | |
| 293 | + # Sort by cset object name, lower border of timerange, at last | |
| 294 | + # by the upper border. | |
| 295 | + set mybottom [lsort -index 2 -integer [lsort -index 1 -integer [lsort -index 0 -dict $mybottom]]] | |
| 294 | 296 | return |
| 295 | 297 | } |
| 296 | 298 | |
| 297 | 299 | proc ShowPendingNodes {} { |
| 298 | 300 | if {[log verbosity?] < 10} return |
| 299 | 301 |
| --- tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| +++ tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| @@ -214,11 +214,11 @@ | |
| 214 | log write 2 cyclebreaker "LOOP changeset [$cset str] __________________" |
| 215 | array set nmap [$cset nextmap] |
| 216 | foreach r [lsort -dict [array names nmap]] { |
| 217 | foreach succrev $nmap($r) { |
| 218 | log write 2 cyclebreaker \ |
| 219 | "LOOP * rev <$r> --> rev <$succrev> --> cs [project::rev strlist [project::rev ofrev $succrev]]" |
| 220 | } |
| 221 | } |
| 222 | } |
| 223 | } |
| 224 | } |
| @@ -288,11 +288,13 @@ | |
| 288 | return 1 |
| 289 | } |
| 290 | |
| 291 | proc ScheduleCandidates {} { |
| 292 | ::variable mybottom |
| 293 | set mybottom [lsort -index 1 -integer [lsort -index 2 -integer [lsort -index 0 -dict $mybottom]]] |
| 294 | return |
| 295 | } |
| 296 | |
| 297 | proc ShowPendingNodes {} { |
| 298 | if {[log verbosity?] < 10} return |
| 299 |
| --- tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| +++ tools/cvs2fossil/lib/c2f_cyclebreaker.tcl | |
| @@ -214,11 +214,11 @@ | |
| 214 | log write 2 cyclebreaker "LOOP changeset [$cset str] __________________" |
| 215 | array set nmap [$cset nextmap] |
| 216 | foreach r [lsort -dict [array names nmap]] { |
| 217 | foreach succrev $nmap($r) { |
| 218 | log write 2 cyclebreaker \ |
| 219 | "LOOP * rev <$r> --> rev <$succrev> --> cs [project::rev str [project::rev ofitem $succrev]]" |
| 220 | } |
| 221 | } |
| 222 | } |
| 223 | } |
| 224 | } |
| @@ -288,11 +288,13 @@ | |
| 288 | return 1 |
| 289 | } |
| 290 | |
| 291 | proc ScheduleCandidates {} { |
| 292 | ::variable mybottom |
| 293 | # Sort by cset object name, lower border of timerange, at last |
| 294 | # by the upper border. |
| 295 | set mybottom [lsort -index 2 -integer [lsort -index 1 -integer [lsort -index 0 -dict $mybottom]]] |
| 296 | return |
| 297 | } |
| 298 | |
| 299 | proc ShowPendingNodes {} { |
| 300 | if {[log verbosity?] < 10} return |
| 301 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | ||
| @@ -652,13 +652,13 @@ | ||
| 652 | 652 | # be used by only one |
| 653 | 653 | # changeset. |
| 654 | 654 | typevariable myidmap -array {} ; # Map from changeset id to |
| 655 | 655 | # changeset. |
| 656 | 656 | |
| 657 | - typemethod all {} { return $mychangesets } | |
| 658 | - typemethod of {cid} { return $myidmap($cid) } | |
| 659 | - typemethod ofrev {iid} { return $myitemmap($iid) } | |
| 657 | + typemethod all {} { return $mychangesets } | |
| 658 | + typemethod of {cid} { return $myidmap($cid) } | |
| 659 | + typemethod ofitem {iid} { return $myitemmap($iid) } | |
| 660 | 660 | |
| 661 | 661 | # # ## ### ##### ######## ############# |
| 662 | 662 | ## Configuration |
| 663 | 663 | |
| 664 | 664 | pragma -hastypeinfo no ; # no type introspection |
| 665 | 665 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -652,13 +652,13 @@ | |
| 652 | # be used by only one |
| 653 | # changeset. |
| 654 | typevariable myidmap -array {} ; # Map from changeset id to |
| 655 | # changeset. |
| 656 | |
| 657 | typemethod all {} { return $mychangesets } |
| 658 | typemethod of {cid} { return $myidmap($cid) } |
| 659 | typemethod ofrev {iid} { return $myitemmap($iid) } |
| 660 | |
| 661 | # # ## ### ##### ######## ############# |
| 662 | ## Configuration |
| 663 | |
| 664 | pragma -hastypeinfo no ; # no type introspection |
| 665 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -652,13 +652,13 @@ | |
| 652 | # be used by only one |
| 653 | # changeset. |
| 654 | typevariable myidmap -array {} ; # Map from changeset id to |
| 655 | # changeset. |
| 656 | |
| 657 | typemethod all {} { return $mychangesets } |
| 658 | typemethod of {cid} { return $myidmap($cid) } |
| 659 | typemethod ofitem {iid} { return $myitemmap($iid) } |
| 660 | |
| 661 | # # ## ### ##### ######## ############# |
| 662 | ## Configuration |
| 663 | |
| 664 | pragma -hastypeinfo no ; # no type introspection |
| 665 |