Fossil SCM
Completed loading of pass I from persistent state when skipped.
Commit
54ac684df7feaa0ab5e0945386faa453b707968a
Parent
ae19c0fcb4c72ed…
3 files changed
+2
-1
+18
-4
| --- tools/cvs2fossil/lib/c2f_pcollar.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_pcollar.tcl | ||
| @@ -85,10 +85,12 @@ | ||
| 85 | 85 | # run passes, to load all data of their pass from the state, |
| 86 | 86 | # as if it had been computed by the pass itself. |
| 87 | 87 | |
| 88 | 88 | state reading project |
| 89 | 89 | state reading file |
| 90 | + | |
| 91 | + repository load | |
| 90 | 92 | return |
| 91 | 93 | } |
| 92 | 94 | |
| 93 | 95 | typemethod run {} { |
| 94 | 96 | # Pass manager interface. Executed to perform the |
| 95 | 97 |
| --- tools/cvs2fossil/lib/c2f_pcollar.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pcollar.tcl | |
| @@ -85,10 +85,12 @@ | |
| 85 | # run passes, to load all data of their pass from the state, |
| 86 | # as if it had been computed by the pass itself. |
| 87 | |
| 88 | state reading project |
| 89 | state reading file |
| 90 | return |
| 91 | } |
| 92 | |
| 93 | typemethod run {} { |
| 94 | # Pass manager interface. Executed to perform the |
| 95 |
| --- tools/cvs2fossil/lib/c2f_pcollar.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pcollar.tcl | |
| @@ -85,10 +85,12 @@ | |
| 85 | # run passes, to load all data of their pass from the state, |
| 86 | # as if it had been computed by the pass itself. |
| 87 | |
| 88 | state reading project |
| 89 | state reading file |
| 90 | |
| 91 | repository load |
| 92 | return |
| 93 | } |
| 94 | |
| 95 | typemethod run {} { |
| 96 | # Pass manager interface. Executed to perform the |
| 97 |
| --- tools/cvs2fossil/lib/c2f_project.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_project.tcl | ||
| @@ -50,11 +50,10 @@ | ||
| 50 | 50 | method filenames {} { |
| 51 | 51 | return [lsort -dict [array names myfiles]] |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | method files {} { |
| 55 | - # TODO: Loading from state | |
| 56 | 55 | return [TheFiles] |
| 57 | 56 | } |
| 58 | 57 | |
| 59 | 58 | delegate method author to myrepository |
| 60 | 59 | delegate method cmessage to myrepository |
| 61 | 60 |
| --- tools/cvs2fossil/lib/c2f_project.tcl | |
| +++ tools/cvs2fossil/lib/c2f_project.tcl | |
| @@ -50,11 +50,10 @@ | |
| 50 | method filenames {} { |
| 51 | return [lsort -dict [array names myfiles]] |
| 52 | } |
| 53 | |
| 54 | method files {} { |
| 55 | # TODO: Loading from state |
| 56 | return [TheFiles] |
| 57 | } |
| 58 | |
| 59 | delegate method author to myrepository |
| 60 | delegate method cmessage to myrepository |
| 61 |
| --- tools/cvs2fossil/lib/c2f_project.tcl | |
| +++ tools/cvs2fossil/lib/c2f_project.tcl | |
| @@ -50,11 +50,10 @@ | |
| 50 | method filenames {} { |
| 51 | return [lsort -dict [array names myfiles]] |
| 52 | } |
| 53 | |
| 54 | method files {} { |
| 55 | return [TheFiles] |
| 56 | } |
| 57 | |
| 58 | delegate method author to myrepository |
| 59 | delegate method cmessage to myrepository |
| 60 |
| --- tools/cvs2fossil/lib/c2f_repository.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_repository.tcl | ||
| @@ -50,13 +50,10 @@ | ||
| 50 | 50 | lappend myprojpaths $path |
| 51 | 51 | return |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | typemethod projects {} { |
| 55 | - # TODO: Loading from the state database if CollAr is skipped | |
| 56 | - # in a run. | |
| 57 | - | |
| 58 | 55 | return [TheProjects] |
| 59 | 56 | } |
| 60 | 57 | |
| 61 | 58 | typemethod base? {} { return $mybase } |
| 62 | 59 | |
| @@ -135,10 +132,28 @@ | ||
| 135 | 132 | state transaction { |
| 136 | 133 | foreach p [TheProjects] { $p persist } |
| 137 | 134 | } |
| 138 | 135 | return |
| 139 | 136 | } |
| 137 | + | |
| 138 | + typemethod load {} { | |
| 139 | + array set pr {} | |
| 140 | + state transaction { | |
| 141 | + foreach {pid name} [state run { | |
| 142 | + SELECT pid, name FROM project ; | |
| 143 | + }] { | |
| 144 | + lappend myprojpaths $name | |
| 145 | + lappend myprojects [set pr($pid) [project %AUTO% $name $type]] | |
| 146 | + } | |
| 147 | + foreach {fid pid name visible exec} [state run { | |
| 148 | + SELECT fid, pid, name, visible, exec FROM file ; | |
| 149 | + }] { | |
| 150 | + $pr($pid) addfile $name $visible $exec | |
| 151 | + } | |
| 152 | + } | |
| 153 | + return | |
| 154 | + } | |
| 140 | 155 | |
| 141 | 156 | # pass II results |
| 142 | 157 | typemethod printrevstatistics {} { |
| 143 | 158 | log write 2 repository "Scanned ..." |
| 144 | 159 | # number of revisions, symbols, repository wide, per project ... |
| @@ -198,11 +213,10 @@ | ||
| 198 | 213 | |
| 199 | 214 | proc TheProjects {} { |
| 200 | 215 | upvar 1 type type |
| 201 | 216 | ::variable myprojects |
| 202 | 217 | ::variable myprojpaths |
| 203 | - ::variable mybase | |
| 204 | 218 | |
| 205 | 219 | if {![llength $myprojects]} { |
| 206 | 220 | set myprojects [EmptyProjects $myprojpaths] |
| 207 | 221 | } |
| 208 | 222 | return $myprojects |
| 209 | 223 |
| --- tools/cvs2fossil/lib/c2f_repository.tcl | |
| +++ tools/cvs2fossil/lib/c2f_repository.tcl | |
| @@ -50,13 +50,10 @@ | |
| 50 | lappend myprojpaths $path |
| 51 | return |
| 52 | } |
| 53 | |
| 54 | typemethod projects {} { |
| 55 | # TODO: Loading from the state database if CollAr is skipped |
| 56 | # in a run. |
| 57 | |
| 58 | return [TheProjects] |
| 59 | } |
| 60 | |
| 61 | typemethod base? {} { return $mybase } |
| 62 | |
| @@ -135,10 +132,28 @@ | |
| 135 | state transaction { |
| 136 | foreach p [TheProjects] { $p persist } |
| 137 | } |
| 138 | return |
| 139 | } |
| 140 | |
| 141 | # pass II results |
| 142 | typemethod printrevstatistics {} { |
| 143 | log write 2 repository "Scanned ..." |
| 144 | # number of revisions, symbols, repository wide, per project ... |
| @@ -198,11 +213,10 @@ | |
| 198 | |
| 199 | proc TheProjects {} { |
| 200 | upvar 1 type type |
| 201 | ::variable myprojects |
| 202 | ::variable myprojpaths |
| 203 | ::variable mybase |
| 204 | |
| 205 | if {![llength $myprojects]} { |
| 206 | set myprojects [EmptyProjects $myprojpaths] |
| 207 | } |
| 208 | return $myprojects |
| 209 |
| --- tools/cvs2fossil/lib/c2f_repository.tcl | |
| +++ tools/cvs2fossil/lib/c2f_repository.tcl | |
| @@ -50,13 +50,10 @@ | |
| 50 | lappend myprojpaths $path |
| 51 | return |
| 52 | } |
| 53 | |
| 54 | typemethod projects {} { |
| 55 | return [TheProjects] |
| 56 | } |
| 57 | |
| 58 | typemethod base? {} { return $mybase } |
| 59 | |
| @@ -135,10 +132,28 @@ | |
| 132 | state transaction { |
| 133 | foreach p [TheProjects] { $p persist } |
| 134 | } |
| 135 | return |
| 136 | } |
| 137 | |
| 138 | typemethod load {} { |
| 139 | array set pr {} |
| 140 | state transaction { |
| 141 | foreach {pid name} [state run { |
| 142 | SELECT pid, name FROM project ; |
| 143 | }] { |
| 144 | lappend myprojpaths $name |
| 145 | lappend myprojects [set pr($pid) [project %AUTO% $name $type]] |
| 146 | } |
| 147 | foreach {fid pid name visible exec} [state run { |
| 148 | SELECT fid, pid, name, visible, exec FROM file ; |
| 149 | }] { |
| 150 | $pr($pid) addfile $name $visible $exec |
| 151 | } |
| 152 | } |
| 153 | return |
| 154 | } |
| 155 | |
| 156 | # pass II results |
| 157 | typemethod printrevstatistics {} { |
| 158 | log write 2 repository "Scanned ..." |
| 159 | # number of revisions, symbols, repository wide, per project ... |
| @@ -198,11 +213,10 @@ | |
| 213 | |
| 214 | proc TheProjects {} { |
| 215 | upvar 1 type type |
| 216 | ::variable myprojects |
| 217 | ::variable myprojpaths |
| 218 | |
| 219 | if {![llength $myprojects]} { |
| 220 | set myprojects [EmptyProjects $myprojpaths] |
| 221 | } |
| 222 | return $myprojects |
| 223 |