Differences From:

File tools/cvs2fossil/lib/c2f_prev.tcl part of check-in [678765068d] - Bugfixes when generating revision changesets. (1) The dependencies for a revision are a list, not single. (2) Use pseudo-dependencies to separate revisions of the same file from each other if they have no direct dependencies in the state. by aku on 2007-11-27 05:08:54. [view]

To:

File tools/cvs2fossil/lib/c2f_prev.tcl part of check-in [911d56a8c8] - Changesets, extended human readable representation, and tweaking of log output. by aku on 2007-11-27 09:03:07. [view]

@@ -51,9 +51,24 @@
 	foreach r $revisions { lappend myrevmap($r) $self }
 	return
     }
 
-    method str {} { return "<$mytype ${myid}>" }
+    method str {} {
+	set str    "<"
+	set detail ""
+	if {$mytype eq "sym"} {
+	    struct::list assign [state run {
+		SELECT T.name, S.name
+		FROM   symtype T, symbol S
+		WHERE  S.sid = $mysrcid
+		AND    T.tid = S.type
+	    }] stype detail
+	    append str $stype " "
+	    set detail " '$detail'"
+	}
+	append str "$mytype ${myid}${detail}>"
+	return $str
+    }
 
     method id        {} { return $myid }
     method revisions {} { return $myrevisions }
     method data      {} { return [list $myproject $mytype $mysrcid] }
@@ -64,8 +79,9 @@
     method setpos {p} { set mypos $p ; return }
     method pos    {}  { return $mypos }
 
     method isbranch {} {
+	error NOT-USED
 	return [expr {($mytype eq "sym") &&
 		      ($mybranchcode == [state one {
 			  SELECT type FROM symbol WHERE sid = $mysrcid
 		      }])}]
@@ -158,9 +174,9 @@
 	array set dependencies {}
 	PullInternalSuccessorRevisions dependencies $myrevisions
 	if {![array size dependencies]} {return 0} ; # Nothing to break.
 
-	log write 6 csets ...[$self str].......................................................
+	log write 5 csets ...[$self str].......................................................
 
 	# We have internal dependencies to break. We now iterate over
 	# all positions in the list (which is chronological, at least
 	# as far as the timestamps are correct and unique) and
@@ -774,9 +790,9 @@
 
 	    if {!$six} continue
 
 	    struct::list assign $dep parent child
-	    log write 6 csets "Broke dependency [PD $parent] --> [PD $child]"
+	    log write 5 csets "Broke dependency [PD $parent] --> [PD $child]"
 	}
 
 	return
     }