Overview
| SHA1 Hash: | 5f7acef887eeb80a876ec5f25527d17793da0119 |
|---|---|
| Date: | 2007-11-10 07:46:20 |
| User: | aku |
| Comment: | Completed pass 5, computing the initial set of changesets. Defined persistent structure and filled out the long-existing placeholder class (project::rev). |
| Timelines: | ancestors | descendants | both | trunk |
| Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[hide diffs]Modified tools/cvs2fossil/lib/c2f_pinitcsets.tcl from [60ccdc280e] to [aae0715d5d].
@@ -8,22 +8,25 @@
# This software consists of voluntary contributions made by many
# individuals. For exact contribution history, see the revision
# history and logs, available at http://fossil-scm.hwaci.com/fossil
# # ## ### ##### ######## ############# #####################
-## Pass V. This pass defines the first approximate set of project
-## level revisions, aka changesets.
+## Pass V. This pass creates the initial set of project level
+## revisions, aka changesets. Later passes will refine them, puts them
+## into proper order, set their dependencies, etc.
# # ## ### ##### ######## ############# #####################
## Requirements
package require Tcl 8.4 ; # Required runtime.
package require snit ; # OO system.
package require vc::tools::misc ; # Text formatting.
package require vc::tools::log ; # User feedback.
+package require vc::fossil::import::cvs::repository ; # Repository management.
package require vc::fossil::import::cvs::state ; # State storage.
package require vc::fossil::import::cvs::project::sym ; # Project level symbols
+package require vc::fossil::import::cvs::project::rev ; # Project level changesets
# # ## ### ##### ######## ############# #####################
## Register the pass with the management
vc::fossil::import::cvs::pass define \
@@ -39,36 +42,247 @@
## Public API
typemethod setup {} {
# Define the names and structure of the persistent state of
# this pass.
+
+ state reading meta
+ state reading revision
+ state reading branch
+ state reading tag
+ state reading symbol
+
+ # Data per changeset, namely the project it belongs to, how it
+ # was induced (revision or symbol), plus reference to the
+ # primary entry causing it (meta entry or symbol). An adjunct
+ # table translates the type id's into human readable labels.
+
+ state writing changeset {
+ cid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ pid INTEGER NOT NULL REFERENCES project,
+ type INTEGER NOT NULL REFERENCES cstype,
+ src INTEGER NOT NULL -- REFERENCES meta|symbol (type dependent)
+ }
+ state writing cstype {
+ tid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ name TEXT NOT NULL,
+ UNIQUE (name)
+ }
+ state run {
+ INSERT INTO cstype VALUES (0,'rev');
+ INSERT INTO cstype VALUES (1,'sym');
+ }
+
+ # Map from changesets to the (file level) revisions they
+ # contain. The pos'ition provides an order of the revisions
+ # within a changeset. They are unique within the changeset.
+ # The revisions are in principle unique, if we were looking
+ # only at revision changesets. However a revision can appear
+ # in both revision and symbol changesets, and in multiple
+ # symbol changesets as well. So we can only say that it is
+ # unique within the changeset.
+ #
+ # TODO: Check if integrity checks are possible.
+
+ state writing csrevision {
+ cid INTEGER NOT NULL REFERENCES changeset,
+ pos INTEGER NOT NULL,
+ rid INTEGER NOT NULL REFERENCES revision,
+ UNIQUE (cid, pos),
+ UNIQUE (cid, rid)
+ }
+
+ project::rev getcstypes
return
}
typemethod load {} {
# Pass manager interface. Executed to load data computed by
# this pass into memory when this pass is skipped instead of
# executed.
- # /TODO/
+ # /TODO/load changesets
+
+ project::rev getcstypes
return
}
typemethod run {} {
# Pass manager interface. Executed to perform the
# functionality of the pass.
+
+ set csets {}
+ state transaction {
+ CreateRevisionChangesets csets ; # Group file revisions into csets.
+ CreateSymbolChangesets csets ; # Create csets for tags and branches.
+ PersistTheChangesets $csets
+ }
return
}
typemethod discard {} {
# Pass manager interface. Executed for all passes after the
# run passes, to remove all data of this pass from the state,
# as being out of date.
+
+ state discard changeset
+ state discard cstype
+ state discard csrevision
return
}
# # ## ### ##### ######## #############
## Internal methods
+
+ proc CreateRevisionChangesets {cv} {
+ upvar 1 $cv csets
+
+ log write 3 initcsets {Create changesets based on revisions}
+
+ # To get the initial of changesets we first group all file
+ # level revisions using the same meta data entry together. As
+ # the meta data encodes not only author and log message, but
+ # also line of development and project we can be sure that
+ # revisions in different project and lines of development are
+ # not grouped together. In contrast to cvs2svn we do __not__
+ # use distance in time between revisions to break them
+ # apart. We have seen CVS repositories (from SF) where a
+ # single commit contained revisions several hours apart,
+ # likely due to trouble on the server hosting the repository.
+
+ # We order the revisions here by time, this will help the
+ # later passes (avoids joins later to get at the ordering
+ # info).
+
+ set n 0
+
+ set lastmeta {}
+ set lastproject {}
+ set revisions {}
+
+ # Note: We could have written this loop to create the csets
+ # early, extending them with all their revisions. This
+ # however would mean lots of (slow) method invokations
+ # on the csets. Doing it like this, late creation, means
+ # less such calls. None, but the creation itself.
+
+ foreach {mid rid pid} [state run {
+ SELECT M.mid, R.rid, M.pid
+ FROM revision R, meta M -- R ==> M, using PK index of M.
+ WHERE R.mid = M.mid
+ ORDER BY M.mid, R.date
+ }] {
+ if {$lastmeta != $mid} {
+ if {[llength $revisions]} {
+ incr n
+ set p [repository projectof $lastproject]
+ lappend csets [project::rev %AUTO% $p rev $lastmeta $revisions]
+ set revisions {}
+ }
+ set lastmeta $mid
+ set lastproject $pid
+ }
+ lappend revisions $rid
+ }
+
+ if {[llength $revisions]} {
+ incr n
+ set p [repository projectof $lastproject]
+ lappend csets [project::rev %AUTO% $p rev $lastmeta $revisions]
+ }
+
+ log write 4 initcsets "Created [nsp $n {revision changeset}]"
+ return
+ }
+
+ proc CreateSymbolChangesets {cv} {
+ upvar 1 $cv csets
+
+ log write 3 initcsets {Create changesets based on symbols}
+
+ # Tags and branches induce changesets as well, containing the
+ # revisions they are attached to (tags), or spawned from
+ # (branches).
+
+ set n 0
+
+ # First process the tags, then the branches. We know that
+ # their ids do not overlap with each other.
+
+ set lastsymbol {}
+ set lastproject {}
+ set revisions {}
+
+ foreach {sid rid pid} [state run {
+ SELECT S.sid, R.rid, S.pid
+ FROM tag T, revision R, symbol S -- T ==> R/S, using PK indices of R, S.
+ WHERE T.rev = R.rid
+ AND T.sid = S.sid
+ ORDER BY S.sid, R.date
+ }] {
+ if {$lastsymbol != $sid} {
+ if {[llength $revisions]} {
+ incr n
+ set p [repository projectof $lastproject]
+ lappend csets [project::rev %AUTO% $p sym $lastsymbol $revisions]
+ set revisions {}
+ }
+ set lastsymbol $sid
+ set lastproject $pid
+ }
+ lappend revisions $rid
+ }
+
+ if {[llength $revisions]} {
+ incr n
+ set p [repository projectof $lastproject]
+ lappend csets [project::rev %AUTO% $p sym $lastsymbol $revisions]
+ }
+
+ set lastsymbol {}
+ set lasproject {}
+ set revisions {}
+
+ foreach {sid rid pid} [state run {
+ SELECT S.sid, R.rid, S.pid
+ FROM branch B, revision R, symbol S -- B ==> R/S, using PK indices of R, S.
+ WHERE B.root = R.rid
+ AND B.sid = S.sid
+ ORDER BY S.sid, R.date
+ }] {
+ if {$lastsymbol != $sid} {
+ if {[llength $revisions]} {
+ incr n
+ set p [repository projectof $lastproject]
+ lappend csets [project::rev %AUTO% $p sym $lastsymbol $revisions]
+ set revisions {}
+ }
+ set lastsymbol $sid
+ set lastproject $pid
+ }
+ lappend revisions $rid
+ }
+
+ if {[llength $revisions]} {
+ incr n
+ set p [repository projectof $lastproject]
+ lappend csets [project::rev %AUTO% $p sym $lastsymbol $revisions]
+ }
+
+ log write 4 initcsets "Created [nsp $n {symbol changeset}]"
+ return
+ }
+
+ proc PersistTheChangesets {csets} {
+ log write 3 initcsets {Saving the created changesets to the persistent state}
+
+ foreach cset $csets {
+ $cset persist
+ }
+
+ log write 4 initcsets {Ok.}
+ return
+ }
# # ## ### ##### ######## #############
## Configuration
pragma -hasinstances no ; # singleton
@@ -79,11 +293,16 @@
}
namespace eval ::vc::fossil::import::cvs::pass {
namespace export initcsets
namespace eval initcsets {
+ namespace import ::vc::fossil::import::cvs::repository
namespace import ::vc::fossil::import::cvs::state
+ namespace eval project {
+ namespace import ::vc::fossil::import::cvs::project::rev
+ }
+ namespace import ::vc::tools::misc::*
namespace import ::vc::tools::log
log register initcsets
}
}
Modified tools/cvs2fossil/lib/c2f_prev.tcl from [72f0105a20] to [855ccb9239].
@@ -8,50 +8,97 @@
# This software consists of voluntary contributions made by many
# individuals. For exact contribution history, see the revision
# history and logs, available at http://fossil-scm.hwaci.com/fossil
# # ## ### ##### ######## ############# #####################
-## Revisions per project, aka Changesets.
+## Revisions per project, aka Changesets. These objects are first used
+## in pass 5, which creates the initial set covering the repository.
# # ## ### ##### ######## ############# #####################
## Requirements
-package require Tcl 8.4 ; # Required runtime.
-package require snit ; # OO system.
+package require Tcl 8.4 ; # Required runtime.
+package require snit ; # OO system.
+package require vc::fossil::import::cvs::state ; # State storage.
# # ## ### ##### ######## ############# #####################
##
snit::type ::vc::fossil::import::cvs::project::rev {
# # ## ### ##### ######## #############
## Public API
- constructor {} {
+ constructor {project cstype srcid revisions} {
+ set myid [incr mycounter]
+ set myproject $project
+ set mytype $cstype
+ set mysrcid $srcid
+ set myrevisions $revisions
+ return
+ }
+
+ method persist {} {
+ set tid $mycstype($mytype)
+ set pid [$myproject id]
+ set pos 0
+
+ state transaction {
+ state run {
+ INSERT INTO changeset (cid, pid, type, src)
+ VALUES ($myid, $pid, $tid, $mysrcid);
+ }
+
+ foreach rid $myrevisions {
+ state run {
+ INSERT INTO csrevision (cid, pos, rid)
+ VALUES ($myid, $pos, $rid);
+ }
+ incr pos
+ }
+ }
return
}
# # ## ### ##### ######## #############
## State
+ variable myid ; # Id of the cset for the persistent state.
+ variable myproject ; # Reference of the project object the changeset belongs to.
+ variable mytype ; # rev or sym, where the cset originated from.
+ variable mysrcid ; # id of the metadata or symbol the cset is based on.
+ variable myrevisions ; # List of the file level revisions in the cset.
+
# # ## ### ##### ######## #############
## Internal methods
+
+ typevariable mycounter 0 ; # Id counter for csets.
+ typevariable mycstype -array {} ; # Map cstypes to persistent ids.
+
+ typemethod getcstypes {} {
+ foreach {tid name} [state run {
+ SELECT tid, name FROM cstype;
+ }] { set mycstype($name) $tid }
+ return
+ }
# # ## ### ##### ######## #############
## Configuration
pragma -hastypeinfo no ; # no type introspection
pragma -hasinfo no ; # no object introspection
- pragma -hastypemethods no ; # type is not relevant.
pragma -simpledispatch yes ; # simple fast dispatch
# # ## ### ##### ######## #############
}
namespace eval ::vc::fossil::import::cvs::project {
namespace export rev
+ namespace eval rev {
+ namespace import ::vc::fossil::import::cvs::state
+ }
}
# # ## ### ##### ######## ############# #####################
## Ready
package provide vc::fossil::import::cvs::project::rev 1.0
return
Modified tools/cvs2fossil/lib/c2f_repository.tcl from [7a9e86cef9] to [af48ae3168].
@@ -216,10 +216,14 @@
typemethod determinesymboltypes {} {
foreach project [TheProjects] {
$project determinesymboltypes
}
return
+ }
+
+ typemethod projectof {pid} {
+ return $myprojmap($pid)
}
# # ## ### ##### ######## #############
## State