Fossil SCM
check-in->manifest and tag->control, that are the names of the artifact types used everywhere else.
Commit
a5479f189bf3459f99e7ab6029456ce4c4fae230
Parent
2e83d0dea36f7e2…
1 file changed
+11
-11
+11
-11
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -893,17 +893,17 @@ | ||
| 893 | 893 | if( p->aTag[i].zUuid!=0 ) SYNTAX("non-self-referential tag in event"); |
| 894 | 894 | } |
| 895 | 895 | if( !seenZ ) SYNTAX("missing Z-card on event"); |
| 896 | 896 | p->type = CFTYPE_EVENT; |
| 897 | 897 | }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){ |
| 898 | - if( p->rDate<=0.0 ) SYNTAX("missing date on check-in"); | |
| 899 | - if( p->nField>0 ) SYNTAX("J-card in check-in"); | |
| 900 | - if( p->zTicketUuid ) SYNTAX("K-card in check-in"); | |
| 901 | - if( p->zWiki ) SYNTAX("W-card in check-in"); | |
| 902 | - if( p->zWikiTitle ) SYNTAX("L-card in check-in"); | |
| 903 | - if( p->zTicketUuid ) SYNTAX("K-card in check-in"); | |
| 904 | - if( p->zAttachName ) SYNTAX("A-card in check-in"); | |
| 898 | + if( p->rDate<=0.0 ) SYNTAX("missing date on manifest"); | |
| 899 | + if( p->nField>0 ) SYNTAX("J-card in manifest"); | |
| 900 | + if( p->zTicketUuid ) SYNTAX("K-card in manifest"); | |
| 901 | + if( p->zWiki ) SYNTAX("W-card in manifest"); | |
| 902 | + if( p->zWikiTitle ) SYNTAX("L-card in manifest"); | |
| 903 | + if( p->zTicketUuid ) SYNTAX("K-card in manifest"); | |
| 904 | + if( p->zAttachName ) SYNTAX("A-card in manifest"); | |
| 905 | 905 | p->type = CFTYPE_MANIFEST; |
| 906 | 906 | }else if( p->nField>0 || p->zTicketUuid!=0 ){ |
| 907 | 907 | if( p->rDate<=0.0 ) SYNTAX("missing date on ticket"); |
| 908 | 908 | if( p->zWiki ) SYNTAX("W-card in ticket"); |
| 909 | 909 | if( p->zWikiTitle ) SYNTAX("L-card in ticket"); |
| @@ -927,14 +927,14 @@ | ||
| 927 | 927 | if( p->rDate<=0.0 ) SYNTAX("missing date on attachment"); |
| 928 | 928 | if( p->nTag>0 ) SYNTAX("T-card in attachment"); |
| 929 | 929 | if( !seenZ ) SYNTAX("missing Z-card on attachment"); |
| 930 | 930 | p->type = CFTYPE_ATTACHMENT; |
| 931 | 931 | }else{ |
| 932 | - if( p->rDate<=0.0 ) SYNTAX("missing date on tag"); | |
| 933 | - if( p->nParent>0 ) SYNTAX("P-card in tag"); | |
| 934 | - if( p->zMimetype ) SYNTAX("N-card in tag"); | |
| 935 | - if( !seenZ ) SYNTAX("missing Z-card on tag"); | |
| 932 | + if( p->rDate<=0.0 ) SYNTAX("missing date on control"); | |
| 933 | + if( p->nParent>0 ) SYNTAX("P-card in control"); | |
| 934 | + if( p->zMimetype ) SYNTAX("N-card in control"); | |
| 935 | + if( !seenZ ) SYNTAX("missing Z-card on control"); | |
| 936 | 936 | p->type = CFTYPE_CONTROL; |
| 937 | 937 | } |
| 938 | 938 | md5sum_init(); |
| 939 | 939 | if( !isRepeat ) g.parseCnt[p->type]++; |
| 940 | 940 | return p; |
| 941 | 941 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -893,17 +893,17 @@ | |
| 893 | if( p->aTag[i].zUuid!=0 ) SYNTAX("non-self-referential tag in event"); |
| 894 | } |
| 895 | if( !seenZ ) SYNTAX("missing Z-card on event"); |
| 896 | p->type = CFTYPE_EVENT; |
| 897 | }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){ |
| 898 | if( p->rDate<=0.0 ) SYNTAX("missing date on check-in"); |
| 899 | if( p->nField>0 ) SYNTAX("J-card in check-in"); |
| 900 | if( p->zTicketUuid ) SYNTAX("K-card in check-in"); |
| 901 | if( p->zWiki ) SYNTAX("W-card in check-in"); |
| 902 | if( p->zWikiTitle ) SYNTAX("L-card in check-in"); |
| 903 | if( p->zTicketUuid ) SYNTAX("K-card in check-in"); |
| 904 | if( p->zAttachName ) SYNTAX("A-card in check-in"); |
| 905 | p->type = CFTYPE_MANIFEST; |
| 906 | }else if( p->nField>0 || p->zTicketUuid!=0 ){ |
| 907 | if( p->rDate<=0.0 ) SYNTAX("missing date on ticket"); |
| 908 | if( p->zWiki ) SYNTAX("W-card in ticket"); |
| 909 | if( p->zWikiTitle ) SYNTAX("L-card in ticket"); |
| @@ -927,14 +927,14 @@ | |
| 927 | if( p->rDate<=0.0 ) SYNTAX("missing date on attachment"); |
| 928 | if( p->nTag>0 ) SYNTAX("T-card in attachment"); |
| 929 | if( !seenZ ) SYNTAX("missing Z-card on attachment"); |
| 930 | p->type = CFTYPE_ATTACHMENT; |
| 931 | }else{ |
| 932 | if( p->rDate<=0.0 ) SYNTAX("missing date on tag"); |
| 933 | if( p->nParent>0 ) SYNTAX("P-card in tag"); |
| 934 | if( p->zMimetype ) SYNTAX("N-card in tag"); |
| 935 | if( !seenZ ) SYNTAX("missing Z-card on tag"); |
| 936 | p->type = CFTYPE_CONTROL; |
| 937 | } |
| 938 | md5sum_init(); |
| 939 | if( !isRepeat ) g.parseCnt[p->type]++; |
| 940 | return p; |
| 941 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -893,17 +893,17 @@ | |
| 893 | if( p->aTag[i].zUuid!=0 ) SYNTAX("non-self-referential tag in event"); |
| 894 | } |
| 895 | if( !seenZ ) SYNTAX("missing Z-card on event"); |
| 896 | p->type = CFTYPE_EVENT; |
| 897 | }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){ |
| 898 | if( p->rDate<=0.0 ) SYNTAX("missing date on manifest"); |
| 899 | if( p->nField>0 ) SYNTAX("J-card in manifest"); |
| 900 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 901 | if( p->zWiki ) SYNTAX("W-card in manifest"); |
| 902 | if( p->zWikiTitle ) SYNTAX("L-card in manifest"); |
| 903 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 904 | if( p->zAttachName ) SYNTAX("A-card in manifest"); |
| 905 | p->type = CFTYPE_MANIFEST; |
| 906 | }else if( p->nField>0 || p->zTicketUuid!=0 ){ |
| 907 | if( p->rDate<=0.0 ) SYNTAX("missing date on ticket"); |
| 908 | if( p->zWiki ) SYNTAX("W-card in ticket"); |
| 909 | if( p->zWikiTitle ) SYNTAX("L-card in ticket"); |
| @@ -927,14 +927,14 @@ | |
| 927 | if( p->rDate<=0.0 ) SYNTAX("missing date on attachment"); |
| 928 | if( p->nTag>0 ) SYNTAX("T-card in attachment"); |
| 929 | if( !seenZ ) SYNTAX("missing Z-card on attachment"); |
| 930 | p->type = CFTYPE_ATTACHMENT; |
| 931 | }else{ |
| 932 | if( p->rDate<=0.0 ) SYNTAX("missing date on control"); |
| 933 | if( p->nParent>0 ) SYNTAX("P-card in control"); |
| 934 | if( p->zMimetype ) SYNTAX("N-card in control"); |
| 935 | if( !seenZ ) SYNTAX("missing Z-card on control"); |
| 936 | p->type = CFTYPE_CONTROL; |
| 937 | } |
| 938 | md5sum_init(); |
| 939 | if( !isRepeat ) g.parseCnt[p->type]++; |
| 940 | return p; |
| 941 |