Fossil SCM
Started to adapt the integrity module. Renamed Check to CheckRev, and added analoguous commands for Tags and Branches. Added placeholders for the new integrity commands, updated main changeset integrity command.
Commit
7c28fe1312286211e78d5b18c4cfae9edef9a200
Parent
8e3012423b2db72…
1 file changed
+66
-22
+66
-22
| --- tools/cvs2fossil/lib/c2f_integrity.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_integrity.tcl | ||
| @@ -55,13 +55,13 @@ | ||
| 55 | 55 | |
| 56 | 56 | typemethod changesets {} { |
| 57 | 57 | log write 4 integrity {Check database consistency} |
| 58 | 58 | |
| 59 | 59 | set n 0 |
| 60 | - AllChangesets | |
| 61 | 60 | RevisionChangesets |
| 62 | - SymbolChangesets | |
| 61 | + TagChangesets | |
| 62 | + BranchChangesets | |
| 63 | 63 | return |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | # # ## ### ##### ######## ############# |
| 67 | 67 | ## Internal methods |
| @@ -73,11 +73,11 @@ | ||
| 73 | 73 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 74 | 74 | # the main label). |
| 75 | 75 | |
| 76 | 76 | # Find all revisions which disagree with their line of |
| 77 | 77 | # development about the project they are owned by. |
| 78 | - Check \ | |
| 78 | + CheckRev \ | |
| 79 | 79 | {Revisions and their LODs have to be in the same project} \ |
| 80 | 80 | {disagrees with its LOD about owning project} { |
| 81 | 81 | SELECT F.name, R.rev |
| 82 | 82 | FROM revision R, file F, symbol S |
| 83 | 83 | WHERE R.fid = F.fid |
| @@ -85,11 +85,11 @@ | ||
| 85 | 85 | AND F.pid != S.pid |
| 86 | 86 | ; |
| 87 | 87 | } |
| 88 | 88 | # Find all revisions which disgree with their meta data about |
| 89 | 89 | # the project they are owned by. |
| 90 | - Check \ | |
| 90 | + CheckRev \ | |
| 91 | 91 | {Revisions and their meta data have to be in the same project} \ |
| 92 | 92 | {disagrees with its meta data about owning project} { |
| 93 | 93 | SELECT F.name, R.rev |
| 94 | 94 | FROM revision R, file F, meta M |
| 95 | 95 | WHERE R.fid = F.fid |
| @@ -97,11 +97,11 @@ | ||
| 97 | 97 | AND F.pid != M.pid |
| 98 | 98 | ; |
| 99 | 99 | } |
| 100 | 100 | # Find all revisions with a primary child which disagrees |
| 101 | 101 | # about the file they belong to. |
| 102 | - Check \ | |
| 102 | + CheckRev \ | |
| 103 | 103 | {Revisions and their primary children have to be in the same file} \ |
| 104 | 104 | {disagrees with its primary child about the owning file} { |
| 105 | 105 | SELECT F.name, R.rev |
| 106 | 106 | FROM revision R, revision C, file F |
| 107 | 107 | WHERE R.fid = F.fid |
| @@ -111,11 +111,11 @@ | ||
| 111 | 111 | ; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | # Find all revisions with a branch parent symbol whose parent |
| 115 | 115 | # disagrees about the file they belong to. |
| 116 | - Check \ | |
| 116 | + CheckRev \ | |
| 117 | 117 | {Revisions and their branch children have to be in the same file} \ |
| 118 | 118 | {at the beginning of its branch and its parent disagree about the owning file} { |
| 119 | 119 | SELECT F.name, R.rev |
| 120 | 120 | FROM revision R, revision P, file F |
| 121 | 121 | WHERE R.fid = F.fid |
| @@ -124,11 +124,11 @@ | ||
| 124 | 124 | AND R.fid != P.fid |
| 125 | 125 | ; |
| 126 | 126 | } |
| 127 | 127 | # Find all revisions with a non-NTDB child which disagrees |
| 128 | 128 | # about the file they belong to. |
| 129 | - Check \ | |
| 129 | + CheckRev \ | |
| 130 | 130 | {Revisions and their non-NTDB children have to be in the same file} \ |
| 131 | 131 | {disagrees with its non-NTDB child about the owning file} { |
| 132 | 132 | SELECT F.name, R.rev |
| 133 | 133 | FROM revision R, revision C, file F |
| 134 | 134 | WHERE R.fid = F.fid |
| @@ -137,11 +137,11 @@ | ||
| 137 | 137 | AND C.fid != R.fid |
| 138 | 138 | ; |
| 139 | 139 | } |
| 140 | 140 | # Find all revisions which have a primary child, but the child |
| 141 | 141 | # does not have them as parent. |
| 142 | - Check \ | |
| 142 | + CheckRev \ | |
| 143 | 143 | {Revisions have to be parents of their primary children} \ |
| 144 | 144 | {is not the parent of its primary child} { |
| 145 | 145 | SELECT F.name, R.rev |
| 146 | 146 | FROM revision R, revision C, file F |
| 147 | 147 | WHERE R.fid = F.fid |
| @@ -150,11 +150,11 @@ | ||
| 150 | 150 | AND C.parent != R.rid |
| 151 | 151 | ; |
| 152 | 152 | } |
| 153 | 153 | # Find all revisions which have a primrary child, but the |
| 154 | 154 | # child has a branch parent symbol making them brach starters. |
| 155 | - Check \ | |
| 155 | + CheckRev \ | |
| 156 | 156 | {Primary children of revisions must not start branches} \ |
| 157 | 157 | {is parent of a primary child which is the beginning of a branch} { |
| 158 | 158 | SELECT F.name, R.rev |
| 159 | 159 | FROM revision R, revision C, file F |
| 160 | 160 | WHERE R.fid = F.fid |
| @@ -163,11 +163,11 @@ | ||
| 163 | 163 | AND C.bparent IS NOT NULL |
| 164 | 164 | ; |
| 165 | 165 | } |
| 166 | 166 | # Find all revisions without branch parent symbol which have a |
| 167 | 167 | # parent, but the parent does not have them as primary child. |
| 168 | - Check \ | |
| 168 | + CheckRev \ | |
| 169 | 169 | {Revisions have to be primary children of their parents, if any} \ |
| 170 | 170 | {is not the child of its parent} { |
| 171 | 171 | SELECT F.name, R.rev |
| 172 | 172 | FROM revision R, revision P, file F |
| 173 | 173 | WHERE R.fid = F.fid |
| @@ -177,11 +177,11 @@ | ||
| 177 | 177 | AND P.child != R.rid |
| 178 | 178 | ; |
| 179 | 179 | } |
| 180 | 180 | # Find all revisions with a branch parent symbol which do not |
| 181 | 181 | # have a parent. |
| 182 | - Check \ | |
| 182 | + CheckRev \ | |
| 183 | 183 | {Branch starting revisions have to have a parent} \ |
| 184 | 184 | {at the beginning of its branch has no parent} { |
| 185 | 185 | SELECT F.name, R.rev |
| 186 | 186 | FROM revision R, file F |
| 187 | 187 | WHERE R.fid = F.fid |
| @@ -189,11 +189,11 @@ | ||
| 189 | 189 | AND R.parent IS NULL |
| 190 | 190 | ; |
| 191 | 191 | } |
| 192 | 192 | # Find all revisions with a branch parent symbol whose parent |
| 193 | 193 | # has them as primary child. |
| 194 | - Check \ | |
| 194 | + CheckRev \ | |
| 195 | 195 | {Branch starting revisions must not be primary children of their parents} \ |
| 196 | 196 | {at the beginning of its branch is the primary child of its parent} { |
| 197 | 197 | SELECT F.name, R.rev |
| 198 | 198 | FROM revision R, revision P, file F |
| 199 | 199 | WHERE R.fid = F.fid |
| @@ -203,11 +203,11 @@ | ||
| 203 | 203 | AND P.child = R.rid |
| 204 | 204 | ; |
| 205 | 205 | } |
| 206 | 206 | # Find all revisions with a non-NTDB child which are not on |
| 207 | 207 | # the NTDB. |
| 208 | - Check \ | |
| 208 | + CheckRev \ | |
| 209 | 209 | {NTDB to trunk transition has to begin on NTDB} \ |
| 210 | 210 | {has a non-NTDB child, yet is not on the NTDB} { |
| 211 | 211 | SELECT F.name, R.rev |
| 212 | 212 | FROM revision R, file F |
| 213 | 213 | WHERE R.fid = F.fid |
| @@ -214,11 +214,11 @@ | ||
| 214 | 214 | AND R.dbchild IS NOT NULL |
| 215 | 215 | AND NOT R.isdefault |
| 216 | 216 | ; |
| 217 | 217 | } |
| 218 | 218 | # Find all revisions with a NTDB parent which are on the NTDB. |
| 219 | - Check \ | |
| 219 | + CheckRev \ | |
| 220 | 220 | {NTDB to trunk transition has to end on non-NTDB} \ |
| 221 | 221 | {has a NTDB parent, yet is on the NTDB} { |
| 222 | 222 | SELECT F.name, R.rev |
| 223 | 223 | FROM revision R, file F |
| 224 | 224 | WHERE R.fid = F.fid |
| @@ -226,11 +226,11 @@ | ||
| 226 | 226 | AND R.isdefault |
| 227 | 227 | ; |
| 228 | 228 | } |
| 229 | 229 | # Find all revisions with a child which disagrees about the |
| 230 | 230 | # line of development they belong to. |
| 231 | - Check \ | |
| 231 | + CheckRev \ | |
| 232 | 232 | {Revisions and their primary children have to be in the same LOD} \ |
| 233 | 233 | {and its primary child disagree about their LOD} { |
| 234 | 234 | SELECT F.name, R.rev |
| 235 | 235 | FROM revision R, revision C, file F |
| 236 | 236 | WHERE R.fid = F.fid |
| @@ -239,11 +239,11 @@ | ||
| 239 | 239 | AND C.lod != R.lod |
| 240 | 240 | ; |
| 241 | 241 | } |
| 242 | 242 | # Find all revisions with a non-NTDB child which agrees about |
| 243 | 243 | # the line of development they belong to. |
| 244 | - Check \ | |
| 244 | + CheckRev \ | |
| 245 | 245 | {NTDB and trunk revisions have to be in different LODs} \ |
| 246 | 246 | {on NTDB and its non-NTDB child wrongly agree about their LOD} { |
| 247 | 247 | SELECT F.name, R.rev |
| 248 | 248 | FROM revision R, revision C, file F |
| 249 | 249 | WHERE R.fid = F.fid |
| @@ -252,11 +252,11 @@ | ||
| 252 | 252 | AND C.lod = R.lod |
| 253 | 253 | ; |
| 254 | 254 | } |
| 255 | 255 | # Find all revisions with a branch parent symbol which is not |
| 256 | 256 | # their LOD. |
| 257 | - Check \ | |
| 257 | + CheckRev \ | |
| 258 | 258 | {Branch starting revisions have to have their LOD as branch parent symbol} \ |
| 259 | 259 | {at the beginning of its branch does not have the branch symbol as its LOD} { |
| 260 | 260 | SELECT F.name, R.rev |
| 261 | 261 | FROM revision R, file F |
| 262 | 262 | WHERE R.fid = F.fid |
| @@ -264,11 +264,11 @@ | ||
| 264 | 264 | AND R.lod != R.bparent |
| 265 | 265 | ; |
| 266 | 266 | } |
| 267 | 267 | # Find all revisions with a branch parent symbol whose parent |
| 268 | 268 | # is in the same line of development. |
| 269 | - Check \ | |
| 269 | + CheckRev \ | |
| 270 | 270 | {Revisions and their branch children have to be in different LODs} \ |
| 271 | 271 | {at the beginning of its branch and its parent wrongly agree about their LOD} { |
| 272 | 272 | SELECT F.name, R.rev |
| 273 | 273 | FROM revision R, revision P, file F |
| 274 | 274 | WHERE R.fid = F.fid |
| @@ -287,11 +287,11 @@ | ||
| 287 | 287 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 288 | 288 | # the main label). |
| 289 | 289 | |
| 290 | 290 | # Find all revisions which disgree with their meta data about |
| 291 | 291 | # the branch/line of development they belong to. |
| 292 | - Check \ | |
| 292 | + CheckRev \ | |
| 293 | 293 | {Revisions and their meta data have to be in the same LOD} \ |
| 294 | 294 | {disagrees with its meta data about owning LOD} { |
| 295 | 295 | SELECT F.name, R.rev |
| 296 | 296 | FROM revision R, meta M, file F |
| 297 | 297 | WHERE R.mid = M.mid |
| @@ -310,11 +310,11 @@ | ||
| 310 | 310 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 311 | 311 | # the main label). |
| 312 | 312 | |
| 313 | 313 | # Find all revisions which are not used by at least one |
| 314 | 314 | # revision changeset. |
| 315 | - Check \ | |
| 315 | + CheckRev \ | |
| 316 | 316 | {All revisions have to be used by least one revision changeset} \ |
| 317 | 317 | {is not used by a revision changeset} { |
| 318 | 318 | -- Unused revisions = All revisions |
| 319 | 319 | -- - revisions used by revision changesets. |
| 320 | 320 | -- |
| @@ -331,11 +331,11 @@ | ||
| 331 | 331 | AND C.type = 0) -- changeset |
| 332 | 332 | AND R.fid = F.fid -- get file of unused revision |
| 333 | 333 | } |
| 334 | 334 | # Find all revisions which are used by more than one revision |
| 335 | 335 | # changeset. |
| 336 | - Check \ | |
| 336 | + CheckRev \ | |
| 337 | 337 | {All revisions have to be used by at most one revision changeset} \ |
| 338 | 338 | {is used by multiple revision changesets} { |
| 339 | 339 | -- Principle of operation: Get all revision/changeset |
| 340 | 340 | -- pairs for all revision changesets, group by |
| 341 | 341 | -- revision to aggregate the changeset, counting |
| @@ -450,10 +450,32 @@ | ||
| 450 | 450 | AND R.fid = F.fid -- get file of the revision |
| 451 | 451 | AND CT.tid = C.type -- get changeset type, for labeling |
| 452 | 452 | } |
| 453 | 453 | return |
| 454 | 454 | } |
| 455 | + | |
| 456 | + proc TagChangesets {} { | |
| 457 | + # This code performs a number of paranoid checks of the | |
| 458 | + # database, searching for inconsistent changeset/revision | |
| 459 | + # information. | |
| 460 | + | |
| 461 | + return ; # Disabled for now, bottlenecks ... | |
| 462 | + | |
| 463 | + upvar 1 n n ; # Counter for the checks (we print an id before | |
| 464 | + # the main label). | |
| 465 | + } | |
| 466 | + | |
| 467 | + proc BranchChangesets {} { | |
| 468 | + # This code performs a number of paranoid checks of the | |
| 469 | + # database, searching for inconsistent changeset/revision | |
| 470 | + # information. | |
| 471 | + | |
| 472 | + return ; # Disabled for now, bottlenecks ... | |
| 473 | + | |
| 474 | + upvar 1 n n ; # Counter for the checks (we print an id before | |
| 475 | + # the main label). | |
| 476 | + } | |
| 455 | 477 | |
| 456 | 478 | proc SymbolChangesets {} { |
| 457 | 479 | # This code performs a number of paranoid checks of the |
| 458 | 480 | # database, searching for inconsistent changeset/revision |
| 459 | 481 | # information. |
| @@ -515,16 +537,38 @@ | ||
| 515 | 537 | # for all known branches. |
| 516 | 538 | return |
| 517 | 539 | } |
| 518 | 540 | |
| 519 | 541 | |
| 520 | - proc Check {header label sql} { | |
| 542 | + proc CheckRev {header label sql} { | |
| 521 | 543 | upvar 1 n n |
| 522 | 544 | set ok 1 |
| 523 | 545 | foreach {fname revnr} [state run $sql] { |
| 524 | 546 | set ok 0 |
| 525 | 547 | trouble fatal "$fname <$revnr> $label" |
| 548 | + } | |
| 549 | + log write 5 integrity {\[[format %02d [incr n]]\] [expr {$ok ? "Ok " : "Failed"}] ... $header} | |
| 550 | + return | |
| 551 | + } | |
| 552 | + | |
| 553 | + proc CheckTag {header label sql} { | |
| 554 | + upvar 1 n n | |
| 555 | + set ok 1 | |
| 556 | + foreach {pname sname} [state run $sql] { | |
| 557 | + set ok 0 | |
| 558 | + trouble fatal "<$pname tag '$sname'> $label" | |
| 559 | + } | |
| 560 | + log write 5 integrity {\[[format %02d [incr n]]\] [expr {$ok ? "Ok " : "Failed"}] ... $header} | |
| 561 | + return | |
| 562 | + } | |
| 563 | + | |
| 564 | + proc CheckBranch {header label sql} { | |
| 565 | + upvar 1 n n | |
| 566 | + set ok 1 | |
| 567 | + foreach {pname sname} [state run $sql] { | |
| 568 | + set ok 0 | |
| 569 | + trouble fatal "<$pname branch '$sname'> $label" | |
| 526 | 570 | } |
| 527 | 571 | log write 5 integrity {\[[format %02d [incr n]]\] [expr {$ok ? "Ok " : "Failed"}] ... $header} |
| 528 | 572 | return |
| 529 | 573 | } |
| 530 | 574 | |
| 531 | 575 |
| --- tools/cvs2fossil/lib/c2f_integrity.tcl | |
| +++ tools/cvs2fossil/lib/c2f_integrity.tcl | |
| @@ -55,13 +55,13 @@ | |
| 55 | |
| 56 | typemethod changesets {} { |
| 57 | log write 4 integrity {Check database consistency} |
| 58 | |
| 59 | set n 0 |
| 60 | AllChangesets |
| 61 | RevisionChangesets |
| 62 | SymbolChangesets |
| 63 | return |
| 64 | } |
| 65 | |
| 66 | # # ## ### ##### ######## ############# |
| 67 | ## Internal methods |
| @@ -73,11 +73,11 @@ | |
| 73 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 74 | # the main label). |
| 75 | |
| 76 | # Find all revisions which disagree with their line of |
| 77 | # development about the project they are owned by. |
| 78 | Check \ |
| 79 | {Revisions and their LODs have to be in the same project} \ |
| 80 | {disagrees with its LOD about owning project} { |
| 81 | SELECT F.name, R.rev |
| 82 | FROM revision R, file F, symbol S |
| 83 | WHERE R.fid = F.fid |
| @@ -85,11 +85,11 @@ | |
| 85 | AND F.pid != S.pid |
| 86 | ; |
| 87 | } |
| 88 | # Find all revisions which disgree with their meta data about |
| 89 | # the project they are owned by. |
| 90 | Check \ |
| 91 | {Revisions and their meta data have to be in the same project} \ |
| 92 | {disagrees with its meta data about owning project} { |
| 93 | SELECT F.name, R.rev |
| 94 | FROM revision R, file F, meta M |
| 95 | WHERE R.fid = F.fid |
| @@ -97,11 +97,11 @@ | |
| 97 | AND F.pid != M.pid |
| 98 | ; |
| 99 | } |
| 100 | # Find all revisions with a primary child which disagrees |
| 101 | # about the file they belong to. |
| 102 | Check \ |
| 103 | {Revisions and their primary children have to be in the same file} \ |
| 104 | {disagrees with its primary child about the owning file} { |
| 105 | SELECT F.name, R.rev |
| 106 | FROM revision R, revision C, file F |
| 107 | WHERE R.fid = F.fid |
| @@ -111,11 +111,11 @@ | |
| 111 | ; |
| 112 | } |
| 113 | |
| 114 | # Find all revisions with a branch parent symbol whose parent |
| 115 | # disagrees about the file they belong to. |
| 116 | Check \ |
| 117 | {Revisions and their branch children have to be in the same file} \ |
| 118 | {at the beginning of its branch and its parent disagree about the owning file} { |
| 119 | SELECT F.name, R.rev |
| 120 | FROM revision R, revision P, file F |
| 121 | WHERE R.fid = F.fid |
| @@ -124,11 +124,11 @@ | |
| 124 | AND R.fid != P.fid |
| 125 | ; |
| 126 | } |
| 127 | # Find all revisions with a non-NTDB child which disagrees |
| 128 | # about the file they belong to. |
| 129 | Check \ |
| 130 | {Revisions and their non-NTDB children have to be in the same file} \ |
| 131 | {disagrees with its non-NTDB child about the owning file} { |
| 132 | SELECT F.name, R.rev |
| 133 | FROM revision R, revision C, file F |
| 134 | WHERE R.fid = F.fid |
| @@ -137,11 +137,11 @@ | |
| 137 | AND C.fid != R.fid |
| 138 | ; |
| 139 | } |
| 140 | # Find all revisions which have a primary child, but the child |
| 141 | # does not have them as parent. |
| 142 | Check \ |
| 143 | {Revisions have to be parents of their primary children} \ |
| 144 | {is not the parent of its primary child} { |
| 145 | SELECT F.name, R.rev |
| 146 | FROM revision R, revision C, file F |
| 147 | WHERE R.fid = F.fid |
| @@ -150,11 +150,11 @@ | |
| 150 | AND C.parent != R.rid |
| 151 | ; |
| 152 | } |
| 153 | # Find all revisions which have a primrary child, but the |
| 154 | # child has a branch parent symbol making them brach starters. |
| 155 | Check \ |
| 156 | {Primary children of revisions must not start branches} \ |
| 157 | {is parent of a primary child which is the beginning of a branch} { |
| 158 | SELECT F.name, R.rev |
| 159 | FROM revision R, revision C, file F |
| 160 | WHERE R.fid = F.fid |
| @@ -163,11 +163,11 @@ | |
| 163 | AND C.bparent IS NOT NULL |
| 164 | ; |
| 165 | } |
| 166 | # Find all revisions without branch parent symbol which have a |
| 167 | # parent, but the parent does not have them as primary child. |
| 168 | Check \ |
| 169 | {Revisions have to be primary children of their parents, if any} \ |
| 170 | {is not the child of its parent} { |
| 171 | SELECT F.name, R.rev |
| 172 | FROM revision R, revision P, file F |
| 173 | WHERE R.fid = F.fid |
| @@ -177,11 +177,11 @@ | |
| 177 | AND P.child != R.rid |
| 178 | ; |
| 179 | } |
| 180 | # Find all revisions with a branch parent symbol which do not |
| 181 | # have a parent. |
| 182 | Check \ |
| 183 | {Branch starting revisions have to have a parent} \ |
| 184 | {at the beginning of its branch has no parent} { |
| 185 | SELECT F.name, R.rev |
| 186 | FROM revision R, file F |
| 187 | WHERE R.fid = F.fid |
| @@ -189,11 +189,11 @@ | |
| 189 | AND R.parent IS NULL |
| 190 | ; |
| 191 | } |
| 192 | # Find all revisions with a branch parent symbol whose parent |
| 193 | # has them as primary child. |
| 194 | Check \ |
| 195 | {Branch starting revisions must not be primary children of their parents} \ |
| 196 | {at the beginning of its branch is the primary child of its parent} { |
| 197 | SELECT F.name, R.rev |
| 198 | FROM revision R, revision P, file F |
| 199 | WHERE R.fid = F.fid |
| @@ -203,11 +203,11 @@ | |
| 203 | AND P.child = R.rid |
| 204 | ; |
| 205 | } |
| 206 | # Find all revisions with a non-NTDB child which are not on |
| 207 | # the NTDB. |
| 208 | Check \ |
| 209 | {NTDB to trunk transition has to begin on NTDB} \ |
| 210 | {has a non-NTDB child, yet is not on the NTDB} { |
| 211 | SELECT F.name, R.rev |
| 212 | FROM revision R, file F |
| 213 | WHERE R.fid = F.fid |
| @@ -214,11 +214,11 @@ | |
| 214 | AND R.dbchild IS NOT NULL |
| 215 | AND NOT R.isdefault |
| 216 | ; |
| 217 | } |
| 218 | # Find all revisions with a NTDB parent which are on the NTDB. |
| 219 | Check \ |
| 220 | {NTDB to trunk transition has to end on non-NTDB} \ |
| 221 | {has a NTDB parent, yet is on the NTDB} { |
| 222 | SELECT F.name, R.rev |
| 223 | FROM revision R, file F |
| 224 | WHERE R.fid = F.fid |
| @@ -226,11 +226,11 @@ | |
| 226 | AND R.isdefault |
| 227 | ; |
| 228 | } |
| 229 | # Find all revisions with a child which disagrees about the |
| 230 | # line of development they belong to. |
| 231 | Check \ |
| 232 | {Revisions and their primary children have to be in the same LOD} \ |
| 233 | {and its primary child disagree about their LOD} { |
| 234 | SELECT F.name, R.rev |
| 235 | FROM revision R, revision C, file F |
| 236 | WHERE R.fid = F.fid |
| @@ -239,11 +239,11 @@ | |
| 239 | AND C.lod != R.lod |
| 240 | ; |
| 241 | } |
| 242 | # Find all revisions with a non-NTDB child which agrees about |
| 243 | # the line of development they belong to. |
| 244 | Check \ |
| 245 | {NTDB and trunk revisions have to be in different LODs} \ |
| 246 | {on NTDB and its non-NTDB child wrongly agree about their LOD} { |
| 247 | SELECT F.name, R.rev |
| 248 | FROM revision R, revision C, file F |
| 249 | WHERE R.fid = F.fid |
| @@ -252,11 +252,11 @@ | |
| 252 | AND C.lod = R.lod |
| 253 | ; |
| 254 | } |
| 255 | # Find all revisions with a branch parent symbol which is not |
| 256 | # their LOD. |
| 257 | Check \ |
| 258 | {Branch starting revisions have to have their LOD as branch parent symbol} \ |
| 259 | {at the beginning of its branch does not have the branch symbol as its LOD} { |
| 260 | SELECT F.name, R.rev |
| 261 | FROM revision R, file F |
| 262 | WHERE R.fid = F.fid |
| @@ -264,11 +264,11 @@ | |
| 264 | AND R.lod != R.bparent |
| 265 | ; |
| 266 | } |
| 267 | # Find all revisions with a branch parent symbol whose parent |
| 268 | # is in the same line of development. |
| 269 | Check \ |
| 270 | {Revisions and their branch children have to be in different LODs} \ |
| 271 | {at the beginning of its branch and its parent wrongly agree about their LOD} { |
| 272 | SELECT F.name, R.rev |
| 273 | FROM revision R, revision P, file F |
| 274 | WHERE R.fid = F.fid |
| @@ -287,11 +287,11 @@ | |
| 287 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 288 | # the main label). |
| 289 | |
| 290 | # Find all revisions which disgree with their meta data about |
| 291 | # the branch/line of development they belong to. |
| 292 | Check \ |
| 293 | {Revisions and their meta data have to be in the same LOD} \ |
| 294 | {disagrees with its meta data about owning LOD} { |
| 295 | SELECT F.name, R.rev |
| 296 | FROM revision R, meta M, file F |
| 297 | WHERE R.mid = M.mid |
| @@ -310,11 +310,11 @@ | |
| 310 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 311 | # the main label). |
| 312 | |
| 313 | # Find all revisions which are not used by at least one |
| 314 | # revision changeset. |
| 315 | Check \ |
| 316 | {All revisions have to be used by least one revision changeset} \ |
| 317 | {is not used by a revision changeset} { |
| 318 | -- Unused revisions = All revisions |
| 319 | -- - revisions used by revision changesets. |
| 320 | -- |
| @@ -331,11 +331,11 @@ | |
| 331 | AND C.type = 0) -- changeset |
| 332 | AND R.fid = F.fid -- get file of unused revision |
| 333 | } |
| 334 | # Find all revisions which are used by more than one revision |
| 335 | # changeset. |
| 336 | Check \ |
| 337 | {All revisions have to be used by at most one revision changeset} \ |
| 338 | {is used by multiple revision changesets} { |
| 339 | -- Principle of operation: Get all revision/changeset |
| 340 | -- pairs for all revision changesets, group by |
| 341 | -- revision to aggregate the changeset, counting |
| @@ -450,10 +450,32 @@ | |
| 450 | AND R.fid = F.fid -- get file of the revision |
| 451 | AND CT.tid = C.type -- get changeset type, for labeling |
| 452 | } |
| 453 | return |
| 454 | } |
| 455 | |
| 456 | proc SymbolChangesets {} { |
| 457 | # This code performs a number of paranoid checks of the |
| 458 | # database, searching for inconsistent changeset/revision |
| 459 | # information. |
| @@ -515,16 +537,38 @@ | |
| 515 | # for all known branches. |
| 516 | return |
| 517 | } |
| 518 | |
| 519 | |
| 520 | proc Check {header label sql} { |
| 521 | upvar 1 n n |
| 522 | set ok 1 |
| 523 | foreach {fname revnr} [state run $sql] { |
| 524 | set ok 0 |
| 525 | trouble fatal "$fname <$revnr> $label" |
| 526 | } |
| 527 | log write 5 integrity {\[[format %02d [incr n]]\] [expr {$ok ? "Ok " : "Failed"}] ... $header} |
| 528 | return |
| 529 | } |
| 530 | |
| 531 |
| --- tools/cvs2fossil/lib/c2f_integrity.tcl | |
| +++ tools/cvs2fossil/lib/c2f_integrity.tcl | |
| @@ -55,13 +55,13 @@ | |
| 55 | |
| 56 | typemethod changesets {} { |
| 57 | log write 4 integrity {Check database consistency} |
| 58 | |
| 59 | set n 0 |
| 60 | RevisionChangesets |
| 61 | TagChangesets |
| 62 | BranchChangesets |
| 63 | return |
| 64 | } |
| 65 | |
| 66 | # # ## ### ##### ######## ############# |
| 67 | ## Internal methods |
| @@ -73,11 +73,11 @@ | |
| 73 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 74 | # the main label). |
| 75 | |
| 76 | # Find all revisions which disagree with their line of |
| 77 | # development about the project they are owned by. |
| 78 | CheckRev \ |
| 79 | {Revisions and their LODs have to be in the same project} \ |
| 80 | {disagrees with its LOD about owning project} { |
| 81 | SELECT F.name, R.rev |
| 82 | FROM revision R, file F, symbol S |
| 83 | WHERE R.fid = F.fid |
| @@ -85,11 +85,11 @@ | |
| 85 | AND F.pid != S.pid |
| 86 | ; |
| 87 | } |
| 88 | # Find all revisions which disgree with their meta data about |
| 89 | # the project they are owned by. |
| 90 | CheckRev \ |
| 91 | {Revisions and their meta data have to be in the same project} \ |
| 92 | {disagrees with its meta data about owning project} { |
| 93 | SELECT F.name, R.rev |
| 94 | FROM revision R, file F, meta M |
| 95 | WHERE R.fid = F.fid |
| @@ -97,11 +97,11 @@ | |
| 97 | AND F.pid != M.pid |
| 98 | ; |
| 99 | } |
| 100 | # Find all revisions with a primary child which disagrees |
| 101 | # about the file they belong to. |
| 102 | CheckRev \ |
| 103 | {Revisions and their primary children have to be in the same file} \ |
| 104 | {disagrees with its primary child about the owning file} { |
| 105 | SELECT F.name, R.rev |
| 106 | FROM revision R, revision C, file F |
| 107 | WHERE R.fid = F.fid |
| @@ -111,11 +111,11 @@ | |
| 111 | ; |
| 112 | } |
| 113 | |
| 114 | # Find all revisions with a branch parent symbol whose parent |
| 115 | # disagrees about the file they belong to. |
| 116 | CheckRev \ |
| 117 | {Revisions and their branch children have to be in the same file} \ |
| 118 | {at the beginning of its branch and its parent disagree about the owning file} { |
| 119 | SELECT F.name, R.rev |
| 120 | FROM revision R, revision P, file F |
| 121 | WHERE R.fid = F.fid |
| @@ -124,11 +124,11 @@ | |
| 124 | AND R.fid != P.fid |
| 125 | ; |
| 126 | } |
| 127 | # Find all revisions with a non-NTDB child which disagrees |
| 128 | # about the file they belong to. |
| 129 | CheckRev \ |
| 130 | {Revisions and their non-NTDB children have to be in the same file} \ |
| 131 | {disagrees with its non-NTDB child about the owning file} { |
| 132 | SELECT F.name, R.rev |
| 133 | FROM revision R, revision C, file F |
| 134 | WHERE R.fid = F.fid |
| @@ -137,11 +137,11 @@ | |
| 137 | AND C.fid != R.fid |
| 138 | ; |
| 139 | } |
| 140 | # Find all revisions which have a primary child, but the child |
| 141 | # does not have them as parent. |
| 142 | CheckRev \ |
| 143 | {Revisions have to be parents of their primary children} \ |
| 144 | {is not the parent of its primary child} { |
| 145 | SELECT F.name, R.rev |
| 146 | FROM revision R, revision C, file F |
| 147 | WHERE R.fid = F.fid |
| @@ -150,11 +150,11 @@ | |
| 150 | AND C.parent != R.rid |
| 151 | ; |
| 152 | } |
| 153 | # Find all revisions which have a primrary child, but the |
| 154 | # child has a branch parent symbol making them brach starters. |
| 155 | CheckRev \ |
| 156 | {Primary children of revisions must not start branches} \ |
| 157 | {is parent of a primary child which is the beginning of a branch} { |
| 158 | SELECT F.name, R.rev |
| 159 | FROM revision R, revision C, file F |
| 160 | WHERE R.fid = F.fid |
| @@ -163,11 +163,11 @@ | |
| 163 | AND C.bparent IS NOT NULL |
| 164 | ; |
| 165 | } |
| 166 | # Find all revisions without branch parent symbol which have a |
| 167 | # parent, but the parent does not have them as primary child. |
| 168 | CheckRev \ |
| 169 | {Revisions have to be primary children of their parents, if any} \ |
| 170 | {is not the child of its parent} { |
| 171 | SELECT F.name, R.rev |
| 172 | FROM revision R, revision P, file F |
| 173 | WHERE R.fid = F.fid |
| @@ -177,11 +177,11 @@ | |
| 177 | AND P.child != R.rid |
| 178 | ; |
| 179 | } |
| 180 | # Find all revisions with a branch parent symbol which do not |
| 181 | # have a parent. |
| 182 | CheckRev \ |
| 183 | {Branch starting revisions have to have a parent} \ |
| 184 | {at the beginning of its branch has no parent} { |
| 185 | SELECT F.name, R.rev |
| 186 | FROM revision R, file F |
| 187 | WHERE R.fid = F.fid |
| @@ -189,11 +189,11 @@ | |
| 189 | AND R.parent IS NULL |
| 190 | ; |
| 191 | } |
| 192 | # Find all revisions with a branch parent symbol whose parent |
| 193 | # has them as primary child. |
| 194 | CheckRev \ |
| 195 | {Branch starting revisions must not be primary children of their parents} \ |
| 196 | {at the beginning of its branch is the primary child of its parent} { |
| 197 | SELECT F.name, R.rev |
| 198 | FROM revision R, revision P, file F |
| 199 | WHERE R.fid = F.fid |
| @@ -203,11 +203,11 @@ | |
| 203 | AND P.child = R.rid |
| 204 | ; |
| 205 | } |
| 206 | # Find all revisions with a non-NTDB child which are not on |
| 207 | # the NTDB. |
| 208 | CheckRev \ |
| 209 | {NTDB to trunk transition has to begin on NTDB} \ |
| 210 | {has a non-NTDB child, yet is not on the NTDB} { |
| 211 | SELECT F.name, R.rev |
| 212 | FROM revision R, file F |
| 213 | WHERE R.fid = F.fid |
| @@ -214,11 +214,11 @@ | |
| 214 | AND R.dbchild IS NOT NULL |
| 215 | AND NOT R.isdefault |
| 216 | ; |
| 217 | } |
| 218 | # Find all revisions with a NTDB parent which are on the NTDB. |
| 219 | CheckRev \ |
| 220 | {NTDB to trunk transition has to end on non-NTDB} \ |
| 221 | {has a NTDB parent, yet is on the NTDB} { |
| 222 | SELECT F.name, R.rev |
| 223 | FROM revision R, file F |
| 224 | WHERE R.fid = F.fid |
| @@ -226,11 +226,11 @@ | |
| 226 | AND R.isdefault |
| 227 | ; |
| 228 | } |
| 229 | # Find all revisions with a child which disagrees about the |
| 230 | # line of development they belong to. |
| 231 | CheckRev \ |
| 232 | {Revisions and their primary children have to be in the same LOD} \ |
| 233 | {and its primary child disagree about their LOD} { |
| 234 | SELECT F.name, R.rev |
| 235 | FROM revision R, revision C, file F |
| 236 | WHERE R.fid = F.fid |
| @@ -239,11 +239,11 @@ | |
| 239 | AND C.lod != R.lod |
| 240 | ; |
| 241 | } |
| 242 | # Find all revisions with a non-NTDB child which agrees about |
| 243 | # the line of development they belong to. |
| 244 | CheckRev \ |
| 245 | {NTDB and trunk revisions have to be in different LODs} \ |
| 246 | {on NTDB and its non-NTDB child wrongly agree about their LOD} { |
| 247 | SELECT F.name, R.rev |
| 248 | FROM revision R, revision C, file F |
| 249 | WHERE R.fid = F.fid |
| @@ -252,11 +252,11 @@ | |
| 252 | AND C.lod = R.lod |
| 253 | ; |
| 254 | } |
| 255 | # Find all revisions with a branch parent symbol which is not |
| 256 | # their LOD. |
| 257 | CheckRev \ |
| 258 | {Branch starting revisions have to have their LOD as branch parent symbol} \ |
| 259 | {at the beginning of its branch does not have the branch symbol as its LOD} { |
| 260 | SELECT F.name, R.rev |
| 261 | FROM revision R, file F |
| 262 | WHERE R.fid = F.fid |
| @@ -264,11 +264,11 @@ | |
| 264 | AND R.lod != R.bparent |
| 265 | ; |
| 266 | } |
| 267 | # Find all revisions with a branch parent symbol whose parent |
| 268 | # is in the same line of development. |
| 269 | CheckRev \ |
| 270 | {Revisions and their branch children have to be in different LODs} \ |
| 271 | {at the beginning of its branch and its parent wrongly agree about their LOD} { |
| 272 | SELECT F.name, R.rev |
| 273 | FROM revision R, revision P, file F |
| 274 | WHERE R.fid = F.fid |
| @@ -287,11 +287,11 @@ | |
| 287 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 288 | # the main label). |
| 289 | |
| 290 | # Find all revisions which disgree with their meta data about |
| 291 | # the branch/line of development they belong to. |
| 292 | CheckRev \ |
| 293 | {Revisions and their meta data have to be in the same LOD} \ |
| 294 | {disagrees with its meta data about owning LOD} { |
| 295 | SELECT F.name, R.rev |
| 296 | FROM revision R, meta M, file F |
| 297 | WHERE R.mid = M.mid |
| @@ -310,11 +310,11 @@ | |
| 310 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 311 | # the main label). |
| 312 | |
| 313 | # Find all revisions which are not used by at least one |
| 314 | # revision changeset. |
| 315 | CheckRev \ |
| 316 | {All revisions have to be used by least one revision changeset} \ |
| 317 | {is not used by a revision changeset} { |
| 318 | -- Unused revisions = All revisions |
| 319 | -- - revisions used by revision changesets. |
| 320 | -- |
| @@ -331,11 +331,11 @@ | |
| 331 | AND C.type = 0) -- changeset |
| 332 | AND R.fid = F.fid -- get file of unused revision |
| 333 | } |
| 334 | # Find all revisions which are used by more than one revision |
| 335 | # changeset. |
| 336 | CheckRev \ |
| 337 | {All revisions have to be used by at most one revision changeset} \ |
| 338 | {is used by multiple revision changesets} { |
| 339 | -- Principle of operation: Get all revision/changeset |
| 340 | -- pairs for all revision changesets, group by |
| 341 | -- revision to aggregate the changeset, counting |
| @@ -450,10 +450,32 @@ | |
| 450 | AND R.fid = F.fid -- get file of the revision |
| 451 | AND CT.tid = C.type -- get changeset type, for labeling |
| 452 | } |
| 453 | return |
| 454 | } |
| 455 | |
| 456 | proc TagChangesets {} { |
| 457 | # This code performs a number of paranoid checks of the |
| 458 | # database, searching for inconsistent changeset/revision |
| 459 | # information. |
| 460 | |
| 461 | return ; # Disabled for now, bottlenecks ... |
| 462 | |
| 463 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 464 | # the main label). |
| 465 | } |
| 466 | |
| 467 | proc BranchChangesets {} { |
| 468 | # This code performs a number of paranoid checks of the |
| 469 | # database, searching for inconsistent changeset/revision |
| 470 | # information. |
| 471 | |
| 472 | return ; # Disabled for now, bottlenecks ... |
| 473 | |
| 474 | upvar 1 n n ; # Counter for the checks (we print an id before |
| 475 | # the main label). |
| 476 | } |
| 477 | |
| 478 | proc SymbolChangesets {} { |
| 479 | # This code performs a number of paranoid checks of the |
| 480 | # database, searching for inconsistent changeset/revision |
| 481 | # information. |
| @@ -515,16 +537,38 @@ | |
| 537 | # for all known branches. |
| 538 | return |
| 539 | } |
| 540 | |
| 541 | |
| 542 | proc CheckRev {header label sql} { |
| 543 | upvar 1 n n |
| 544 | set ok 1 |
| 545 | foreach {fname revnr} [state run $sql] { |
| 546 | set ok 0 |
| 547 | trouble fatal "$fname <$revnr> $label" |
| 548 | } |
| 549 | log write 5 integrity {\[[format %02d [incr n]]\] [expr {$ok ? "Ok " : "Failed"}] ... $header} |
| 550 | return |
| 551 | } |
| 552 | |
| 553 | proc CheckTag {header label sql} { |
| 554 | upvar 1 n n |
| 555 | set ok 1 |
| 556 | foreach {pname sname} [state run $sql] { |
| 557 | set ok 0 |
| 558 | trouble fatal "<$pname tag '$sname'> $label" |
| 559 | } |
| 560 | log write 5 integrity {\[[format %02d [incr n]]\] [expr {$ok ? "Ok " : "Failed"}] ... $header} |
| 561 | return |
| 562 | } |
| 563 | |
| 564 | proc CheckBranch {header label sql} { |
| 565 | upvar 1 n n |
| 566 | set ok 1 |
| 567 | foreach {pname sname} [state run $sql] { |
| 568 | set ok 0 |
| 569 | trouble fatal "<$pname branch '$sname'> $label" |
| 570 | } |
| 571 | log write 5 integrity {\[[format %02d [incr n]]\] [expr {$ok ? "Ok " : "Failed"}] ... $header} |
| 572 | return |
| 573 | } |
| 574 | |
| 575 |