SHA1 Hash:	5bbc7d4c57e5622513fe937ae50bc028eae7b21b
Date:	2007-12-01 18:35:07
User:	aku
Comment:	Helper updated to changes in state definition.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

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

Modified tools/cvs2fossil/filerevtree from [9d86241d75] to [b6e1124634].

@@ -134,21 +134,22 @@
     if {[llength $cs]} {
 	foreach {cs ord cstype} $cs {
 	    append label "\\nCS/${cstype}($cs) @$ord"
 	}
     }
-    dg node insert $rid
-    dg node set    $rid label $label
-    dg node set    $rid shape [expr {$isdefault ? "diamond" : "box"}]
+    set key [list rev $rid]
+    dg node insert $key
+    dg node set    $key label $label
+    dg node set    $key shape [expr {$isdefault ? "diamond" : "box"}]
 }
 
 # Go through the revisions a second time and set up the arcs based on
 # the stored successor information.
 
-::vc::fossil::import::cvs::project::rev::PullSuccessorRevisions dep [array names rev]
+::vc::fossil::import::cvs::project::rev::rev successors dep [array names rev]
 
-proc Ord {cmd rid} {
+proc Ord {cmd rid} {return 0
     global rev
     set ords {}
     foreach {cs ord cstype} [lindex $rev($rid) 4] { lappend ords $ord }
     return [$cmd $ords]
 }
@@ -155,11 +156,13 @@
 
 foreach {rid children} [array get dep] {
     set max [Ord max $rid]
 
     foreach child $children {
-	set a [dg arc insert $rid $child]
+	if {[catch {
+	    set a [dg arc insert $rid $child]
+	}]} continue
 
 	if {$max > [Ord min $child]} {
 	    puts "Backward : $rid -> $child"
 	    dg arc set $a color red
 	}