Fossil SCM
Updated some manifest parsing comments to reflect recent reality adjustments. Comment changes only.
Commit
b5f2ebd3235d88643ba297576bd25bcc378fa960
Parent
d239479528bdb04…
1 file changed
+6
-3
+6
-3
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -469,12 +469,13 @@ | ||
| 469 | 469 | |
| 470 | 470 | /* |
| 471 | 471 | ** C <comment> |
| 472 | 472 | ** |
| 473 | 473 | ** Comment text is fossil-encoded. There may be no more than |
| 474 | - ** one C line. C lines are required for manifests and are | |
| 475 | - ** disallowed on all other control files. | |
| 474 | + ** one C line. C lines are required for manifests, are optional | |
| 475 | + ** for Events and Attachments, and are disallowed on all other | |
| 476 | + ** control files. | |
| 476 | 477 | */ |
| 477 | 478 | case 'C': { |
| 478 | 479 | if( p->zComment!=0 ) SYNTAX("more than one C-card"); |
| 479 | 480 | p->zComment = next_token(&x, 0); |
| 480 | 481 | if( p->zComment==0 ) SYNTAX("missing comment text on C-card"); |
| @@ -663,11 +664,13 @@ | ||
| 663 | 664 | /* |
| 664 | 665 | ** P <uuid> ... |
| 665 | 666 | ** |
| 666 | 667 | ** Specify one or more other artifacts which are the parents of |
| 667 | 668 | ** this artifact. The first parent is the primary parent. All |
| 668 | - ** others are parents by merge. | |
| 669 | + ** others are parents by merge. Note that the initial empty | |
| 670 | + ** checkin historically has an empty P-card, so empty P-cards | |
| 671 | + ** must be accepted. | |
| 669 | 672 | */ |
| 670 | 673 | case 'P': { |
| 671 | 674 | while( (zUuid = next_token(&x, &sz))!=0 ){ |
| 672 | 675 | if( sz!=UUID_SIZE ) SYNTAX("wrong size UUID on P-card"); |
| 673 | 676 | if( !validate16(zUuid, UUID_SIZE) )SYNTAX("invalid UUID on P-card"); |
| 674 | 677 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -469,12 +469,13 @@ | |
| 469 | |
| 470 | /* |
| 471 | ** C <comment> |
| 472 | ** |
| 473 | ** Comment text is fossil-encoded. There may be no more than |
| 474 | ** one C line. C lines are required for manifests and are |
| 475 | ** disallowed on all other control files. |
| 476 | */ |
| 477 | case 'C': { |
| 478 | if( p->zComment!=0 ) SYNTAX("more than one C-card"); |
| 479 | p->zComment = next_token(&x, 0); |
| 480 | if( p->zComment==0 ) SYNTAX("missing comment text on C-card"); |
| @@ -663,11 +664,13 @@ | |
| 663 | /* |
| 664 | ** P <uuid> ... |
| 665 | ** |
| 666 | ** Specify one or more other artifacts which are the parents of |
| 667 | ** this artifact. The first parent is the primary parent. All |
| 668 | ** others are parents by merge. |
| 669 | */ |
| 670 | case 'P': { |
| 671 | while( (zUuid = next_token(&x, &sz))!=0 ){ |
| 672 | if( sz!=UUID_SIZE ) SYNTAX("wrong size UUID on P-card"); |
| 673 | if( !validate16(zUuid, UUID_SIZE) )SYNTAX("invalid UUID on P-card"); |
| 674 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -469,12 +469,13 @@ | |
| 469 | |
| 470 | /* |
| 471 | ** C <comment> |
| 472 | ** |
| 473 | ** Comment text is fossil-encoded. There may be no more than |
| 474 | ** one C line. C lines are required for manifests, are optional |
| 475 | ** for Events and Attachments, and are disallowed on all other |
| 476 | ** control files. |
| 477 | */ |
| 478 | case 'C': { |
| 479 | if( p->zComment!=0 ) SYNTAX("more than one C-card"); |
| 480 | p->zComment = next_token(&x, 0); |
| 481 | if( p->zComment==0 ) SYNTAX("missing comment text on C-card"); |
| @@ -663,11 +664,13 @@ | |
| 664 | /* |
| 665 | ** P <uuid> ... |
| 666 | ** |
| 667 | ** Specify one or more other artifacts which are the parents of |
| 668 | ** this artifact. The first parent is the primary parent. All |
| 669 | ** others are parents by merge. Note that the initial empty |
| 670 | ** checkin historically has an empty P-card, so empty P-cards |
| 671 | ** must be accepted. |
| 672 | */ |
| 673 | case 'P': { |
| 674 | while( (zUuid = next_token(&x, &sz))!=0 ){ |
| 675 | if( sz!=UUID_SIZE ) SYNTAX("wrong size UUID on P-card"); |
| 676 | if( !validate16(zUuid, UUID_SIZE) )SYNTAX("invalid UUID on P-card"); |
| 677 |