Fossil

Check-in [911d56a8]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Changesets, extended human readable representation, and tweaking of log output.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 911d56a8c8b9bac7f22ba3baacf3125d00e53f4c
User & Date: aku 2007-11-27 09:03:07
Context
2007-11-27
09:04
Updated to extended changeset string, and added tabular formatting. Further tweaked output, putting timestamp adjust messages on the same line as the changeset itself. check-in: 1c39e576 user: aku tags: trunk
09:03
Changesets, extended human readable representation, and tweaking of log output. check-in: 911d56a8 user: aku tags: trunk
08:59
Bugfix in the generation of the initial symbol changesets. Keep entries apart per line-of-development. check-in: 2e07cd71 user: aku tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to tools/cvs2fossil/lib/c2f_prev.tcl.

    48     48   	# mapping from revisions to them.
    49     49   	lappend mychangesets   $self
    50     50   	set     myidmap($myid) $self
    51     51   	foreach r $revisions { lappend myrevmap($r) $self }
    52     52   	return
    53     53       }
    54     54   
    55         -    method str {} { return "<$mytype ${myid}>" }
           55  +    method str {} {
           56  +	set str    "<"
           57  +	set detail ""
           58  +	if {$mytype eq "sym"} {
           59  +	    struct::list assign [state run {
           60  +		SELECT T.name, S.name
           61  +		FROM   symtype T, symbol S
           62  +		WHERE  S.sid = $mysrcid
           63  +		AND    T.tid = S.type
           64  +	    }] stype detail
           65  +	    append str $stype " "
           66  +	    set detail " '$detail'"
           67  +	}
           68  +	append str "$mytype ${myid}${detail}>"
           69  +	return $str
           70  +    }
    56     71   
    57     72       method id        {} { return $myid }
    58     73       method revisions {} { return $myrevisions }
    59     74       method data      {} { return [list $myproject $mytype $mysrcid] }
    60     75   
    61     76       method bysymbol   {} { return [expr {$mytype eq "sym"}] }
    62     77       method byrevision {} { return [expr {$mytype eq "rev"}] }
    63     78   
    64     79       method setpos {p} { set mypos $p ; return }
    65     80       method pos    {}  { return $mypos }
    66     81   
    67     82       method isbranch {} {
           83  +	error NOT-USED
    68     84   	return [expr {($mytype eq "sym") &&
    69     85   		      ($mybranchcode == [state one {
    70     86   			  SELECT type FROM symbol WHERE sid = $mysrcid
    71     87   		      }])}]
    72     88       }
    73     89   
    74     90       # result = dict (revision -> list (changeset))
................................................................................
   155    171   	# Array of dependencies (parent -> child). This is pulled from
   156    172   	# the state, and limited to successors within the changeset.
   157    173   
   158    174   	array set dependencies {}
   159    175   	PullInternalSuccessorRevisions dependencies $myrevisions
   160    176   	if {![array size dependencies]} {return 0} ; # Nothing to break.
   161    177   
   162         -	log write 6 csets ...[$self str].......................................................
          178  +	log write 5 csets ...[$self str].......................................................
   163    179   
   164    180   	# We have internal dependencies to break. We now iterate over
   165    181   	# all positions in the list (which is chronological, at least
   166    182   	# as far as the timestamps are correct and unique) and
   167    183   	# determine the best position for the break, by trying to
   168    184   	# break as many dependencies as possible in one go. When a
   169    185   	# break was found this is redone for the fragments coming and
................................................................................
   771    787   
   772    788   	    foreach loc $depc($dep) { incr cross($loc) -1 }
   773    789   	    unset depc($dep)
   774    790   
   775    791   	    if {!$six} continue
   776    792   
   777    793   	    struct::list assign $dep parent child
   778         -	    log write 6 csets "Broke dependency [PD $parent] --> [PD $child]"
          794  +	    log write 5 csets "Broke dependency [PD $parent] --> [PD $child]"
   779    795   	}
   780    796   
   781    797   	return
   782    798       }
   783    799   
   784    800       # Print identifying data for a revision (project, file, dotted rev
   785    801       # number), for high verbosity log output.