SHA1 Hash:	04d76a9e797fbefe8dc872b58c91093443594aa7
Date:	2007-11-29 07:55:01
User:	aku
Comment:	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.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified tools/cvs2fossil/lib/c2f_cyclebreaker.tcl from [be1a345cb2] to [60fbae5ce7].

@@ -214,11 +214,11 @@
 		    log write 2 cyclebreaker "LOOP changeset [$cset str] __________________"
 		    array set nmap [$cset nextmap]
 		    foreach r [lsort -dict [array names nmap]] {
 			foreach succrev $nmap($r) {
 			    log write 2 cyclebreaker \
-				"LOOP * rev <$r> --> rev <$succrev> --> cs [project::rev strlist [project::rev ofrev $succrev]]"
+				"LOOP * rev <$r> --> rev <$succrev> --> cs [project::rev str [project::rev ofitem $succrev]]"
 			}
 		    }
 		}
 	    }
 	}
@@ -288,11 +288,13 @@
 	return 1
     }
 
     proc ScheduleCandidates {} {
 	::variable mybottom
-	set mybottom [lsort -index 1 -integer [lsort -index 2 -integer [lsort -index 0 -dict $mybottom]]]
+	# Sort by cset object name, lower border of timerange, at last
+	# by the upper border.
+	set mybottom [lsort -index 2 -integer [lsort -index 1 -integer [lsort -index 0 -dict $mybottom]]]
 	return
     }
 
     proc ShowPendingNodes {} {
 	if {[log verbosity?] < 10} return

Modified tools/cvs2fossil/lib/c2f_prev.tcl from [ee1979daea] to [aa2d0f3589].

@@ -652,13 +652,13 @@
 				       # be used by only one
 				       # changeset.
     typevariable myidmap   -array {} ; # Map from changeset id to
 				       # changeset.
 
-    typemethod all   {}    { return $mychangesets }
-    typemethod of    {cid} { return $myidmap($cid) }
-    typemethod ofrev {iid} { return $myitemmap($iid) }
+    typemethod all    {}    { return $mychangesets }
+    typemethod of     {cid} { return $myidmap($cid) }
+    typemethod ofitem {iid} { return $myitemmap($iid) }
 
     # # ## ### ##### ######## #############
     ## Configuration
 
     pragma -hastypeinfo    no  ; # no type introspection