Differences From:

File tools/cvs2fossil/lib/c2f_pbreakacycle.tcl part of check-in [7ed2f29d7a] - Updated passes 6 and 8 for to the changtes in the cycle breaker API (changed signature of save callback). by aku on 2007-11-24 03:56:46. [view]

To:

File tools/cvs2fossil/lib/c2f_pbreakacycle.tcl part of check-in [6d63634309] - Tweaked log output a bit. Bugfixes: Forgot to propagate the border information into SplitRevisions, and a varname typo. by aku on 2007-11-24 04:19:15. [view]

@@ -156,15 +156,15 @@
 	    # limits : dict (revision -> list (max predecessor commit, min sucessor commit))
 
 	    ComputeLimits $cset limits border
 
-	    log write 6 breakacycle "At commit position border $border"
+	    log write 6 breakacycle "Using commit position $border as border"
 
 	    # Then we sort the file level items based on there they
 	    # sit relative to the border into before and after the
 	    # border.
 
-	    SplitRevisions $limits normalrevisions backwardrevisions
+	    SplitRevisions $limits $border normalrevisions backwardrevisions
 
 	    set replacements [project::rev split $cset $normalrevisions $backwardrevisions]
 	    cyclebreaker replace $graph $cset $replacements
 
@@ -172,9 +172,9 @@
 	    # backward, and iterate over the possibly still backward
 	    # second fragment.
 
 	    struct::list assign $replacements normal backward
-	    if {[IsABackwardBranch $dg $normal]} { trouble internal "The normal fragment is unexpectedly a backward branch" }
+	    if {[IsABackwardBranch $graph $normal]} { trouble internal "The normal fragment is unexpectedly a backward branch" }
 
 	    set cset $backward
 	}
 	return
@@ -280,9 +280,9 @@
     }
 
     proc MinSuccessorPosition {item} { lindex $item 1 }
 
-    proc SplitRevisions {limits nv bv} {
+    proc SplitRevisions {limits border nv bv} {
 	upvar 1 $nv normalrevisions $bv backwardrevisions
 
 	set normalrevisions   {}
 	set backwardrevisions {}