Fossil SCM
Fix "'syntax error in manifest' when checkin would result in empty worktree" problem, reported by Michai Ramakers on the ML
Commit
de1a5e234edbb0d14073c3f5a84bbf56df0101f6
Parent
e7340ac3d916287…
2 files changed
+22
-22
+22
-22
+22
-22
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -890,58 +890,58 @@ | ||
| 890 | 890 | SYNTAX("cluster contains a card other than M- or Z-"); |
| 891 | 891 | } |
| 892 | 892 | if( !seenZ ) SYNTAX("missing Z-card on cluster"); |
| 893 | 893 | p->type = CFTYPE_CLUSTER; |
| 894 | 894 | }else if( p->zEventId ){ |
| 895 | + if( p->zAttachName ) SYNTAX("A-card in event"); | |
| 896 | + if( p->zBaseline ) SYNTAX("B-card in event"); | |
| 895 | 897 | if( p->rDate<=0.0 ) SYNTAX("missing date on event"); |
| 896 | 898 | if( p->nFile>0 ) SYNTAX("F-card in event"); |
| 897 | - if( p->zRepoCksum ) SYNTAX("R-card in event"); | |
| 898 | - if( p->zBaseline ) SYNTAX("B-card in event"); | |
| 899 | 899 | if( p->nField>0 ) SYNTAX("J-card in event"); |
| 900 | 900 | if( p->zTicketUuid ) SYNTAX("K-card in event"); |
| 901 | 901 | if( p->zWikiTitle!=0 ) SYNTAX("L-card in event"); |
| 902 | + if( p->zRepoCksum ) SYNTAX("R-card in event"); | |
| 902 | 903 | if( p->zWiki==0 ) SYNTAX("missing W-card on event"); |
| 903 | - if( p->zAttachName ) SYNTAX("A-card in event"); | |
| 904 | 904 | if( !seenZ ) SYNTAX("missing Z-card on event"); |
| 905 | 905 | p->type = CFTYPE_EVENT; |
| 906 | - }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){ | |
| 906 | + }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){ | |
| 907 | + if( p->zAttachName ) SYNTAX("A-card in wiki"); | |
| 908 | + if( p->zBaseline ) SYNTAX("B-card in wiki"); | |
| 909 | + if( p->rDate<=0.0 ) SYNTAX("missing date on wiki"); | |
| 910 | + if( p->nFile>0 ) SYNTAX("F-card in wiki"); | |
| 911 | + if( p->nField>0 ) SYNTAX("J-card in wiki"); | |
| 912 | + if( p->zTicketUuid ) SYNTAX("K-card in wiki"); | |
| 913 | + if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki"); | |
| 914 | + if( p->zRepoCksum ) SYNTAX("R-card in wiki"); | |
| 915 | + if( p->nTag>0 ) SYNTAX("T-card in wiki"); | |
| 916 | + if( p->zWiki==0 ) SYNTAX("missing W-card on wiki"); | |
| 917 | + if( !seenZ ) SYNTAX("missing Z-card on wiki"); | |
| 918 | + p->type = CFTYPE_WIKI; | |
| 919 | + }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline | |
| 920 | + || p->nParent>0 ){ | |
| 921 | + if( p->zAttachName ) SYNTAX("A-card in manifest"); | |
| 907 | 922 | if( p->rDate<=0.0 ) SYNTAX("missing date on manifest"); |
| 908 | 923 | if( p->nField>0 ) SYNTAX("J-card in manifest"); |
| 909 | 924 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 910 | - if( p->zWiki ) SYNTAX("W-card in manifest"); | |
| 911 | - if( p->zWikiTitle ) SYNTAX("L-card in manifest"); | |
| 912 | - if( p->zTicketUuid ) SYNTAX("K-card in manifest"); | |
| 913 | - if( p->zAttachName ) SYNTAX("A-card in manifest"); | |
| 914 | 925 | p->type = CFTYPE_MANIFEST; |
| 915 | 926 | }else if( p->nField>0 || p->zTicketUuid!=0 ){ |
| 927 | + if( p->zAttachName ) SYNTAX("A-card in ticket"); | |
| 916 | 928 | if( p->rDate<=0.0 ) SYNTAX("missing date on ticket"); |
| 917 | - if( p->zWiki ) SYNTAX("W-card in ticket"); | |
| 918 | - if( p->zWikiTitle ) SYNTAX("L-card in ticket"); | |
| 919 | 929 | if( p->nField==0 ) SYNTAX("missing J-card on ticket"); |
| 930 | + if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket"); | |
| 931 | + if( p->zMimetype) SYNTAX("N-card in ticket"); | |
| 920 | 932 | if( p->nTag>0 ) SYNTAX("T-card in ticket"); |
| 921 | - if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket"); | |
| 922 | 933 | if( p->zUser==0 ) SYNTAX("missing U-card on ticket"); |
| 923 | - if( p->zAttachName ) SYNTAX("A-card in ticket"); | |
| 924 | - if( p->zMimetype) SYNTAX("N-card in ticket"); | |
| 925 | 934 | if( !seenZ ) SYNTAX("missing Z-card on ticket"); |
| 926 | 935 | p->type = CFTYPE_TICKET; |
| 927 | - }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){ | |
| 928 | - if( p->rDate<=0.0 ) SYNTAX("missing date on wiki"); | |
| 929 | - if( p->nTag>0 ) SYNTAX("T-card in wiki"); | |
| 930 | - if( p->zWiki==0 ) SYNTAX("missing W-card on wiki"); | |
| 931 | - if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki"); | |
| 932 | - if( p->zAttachName ) SYNTAX("A-card in wiki"); | |
| 933 | - if( !seenZ ) SYNTAX("missing Z-card on wiki"); | |
| 934 | - p->type = CFTYPE_WIKI; | |
| 935 | 936 | }else if( p->zAttachName ){ |
| 936 | 937 | if( p->rDate<=0.0 ) SYNTAX("missing date on attachment"); |
| 937 | 938 | if( p->nTag>0 ) SYNTAX("T-card in attachment"); |
| 938 | 939 | if( !seenZ ) SYNTAX("missing Z-card on attachment"); |
| 939 | 940 | p->type = CFTYPE_ATTACHMENT; |
| 940 | 941 | }else{ |
| 941 | 942 | if( p->rDate<=0.0 ) SYNTAX("missing date on control"); |
| 942 | - if( p->nParent>0 ) SYNTAX("P-card in control"); | |
| 943 | 943 | if( p->zMimetype ) SYNTAX("N-card in control"); |
| 944 | 944 | if( !seenZ ) SYNTAX("missing Z-card on control"); |
| 945 | 945 | p->type = CFTYPE_CONTROL; |
| 946 | 946 | } |
| 947 | 947 | md5sum_init(); |
| 948 | 948 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -890,58 +890,58 @@ | |
| 890 | SYNTAX("cluster contains a card other than M- or Z-"); |
| 891 | } |
| 892 | if( !seenZ ) SYNTAX("missing Z-card on cluster"); |
| 893 | p->type = CFTYPE_CLUSTER; |
| 894 | }else if( p->zEventId ){ |
| 895 | if( p->rDate<=0.0 ) SYNTAX("missing date on event"); |
| 896 | if( p->nFile>0 ) SYNTAX("F-card in event"); |
| 897 | if( p->zRepoCksum ) SYNTAX("R-card in event"); |
| 898 | if( p->zBaseline ) SYNTAX("B-card in event"); |
| 899 | if( p->nField>0 ) SYNTAX("J-card in event"); |
| 900 | if( p->zTicketUuid ) SYNTAX("K-card in event"); |
| 901 | if( p->zWikiTitle!=0 ) SYNTAX("L-card in event"); |
| 902 | if( p->zWiki==0 ) SYNTAX("missing W-card on event"); |
| 903 | if( p->zAttachName ) SYNTAX("A-card in event"); |
| 904 | if( !seenZ ) SYNTAX("missing Z-card on event"); |
| 905 | p->type = CFTYPE_EVENT; |
| 906 | }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){ |
| 907 | if( p->rDate<=0.0 ) SYNTAX("missing date on manifest"); |
| 908 | if( p->nField>0 ) SYNTAX("J-card in manifest"); |
| 909 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 910 | if( p->zWiki ) SYNTAX("W-card in manifest"); |
| 911 | if( p->zWikiTitle ) SYNTAX("L-card in manifest"); |
| 912 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 913 | if( p->zAttachName ) SYNTAX("A-card in manifest"); |
| 914 | p->type = CFTYPE_MANIFEST; |
| 915 | }else if( p->nField>0 || p->zTicketUuid!=0 ){ |
| 916 | if( p->rDate<=0.0 ) SYNTAX("missing date on ticket"); |
| 917 | if( p->zWiki ) SYNTAX("W-card in ticket"); |
| 918 | if( p->zWikiTitle ) SYNTAX("L-card in ticket"); |
| 919 | if( p->nField==0 ) SYNTAX("missing J-card on ticket"); |
| 920 | if( p->nTag>0 ) SYNTAX("T-card in ticket"); |
| 921 | if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket"); |
| 922 | if( p->zUser==0 ) SYNTAX("missing U-card on ticket"); |
| 923 | if( p->zAttachName ) SYNTAX("A-card in ticket"); |
| 924 | if( p->zMimetype) SYNTAX("N-card in ticket"); |
| 925 | if( !seenZ ) SYNTAX("missing Z-card on ticket"); |
| 926 | p->type = CFTYPE_TICKET; |
| 927 | }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){ |
| 928 | if( p->rDate<=0.0 ) SYNTAX("missing date on wiki"); |
| 929 | if( p->nTag>0 ) SYNTAX("T-card in wiki"); |
| 930 | if( p->zWiki==0 ) SYNTAX("missing W-card on wiki"); |
| 931 | if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki"); |
| 932 | if( p->zAttachName ) SYNTAX("A-card in wiki"); |
| 933 | if( !seenZ ) SYNTAX("missing Z-card on wiki"); |
| 934 | p->type = CFTYPE_WIKI; |
| 935 | }else if( p->zAttachName ){ |
| 936 | if( p->rDate<=0.0 ) SYNTAX("missing date on attachment"); |
| 937 | if( p->nTag>0 ) SYNTAX("T-card in attachment"); |
| 938 | if( !seenZ ) SYNTAX("missing Z-card on attachment"); |
| 939 | p->type = CFTYPE_ATTACHMENT; |
| 940 | }else{ |
| 941 | if( p->rDate<=0.0 ) SYNTAX("missing date on control"); |
| 942 | if( p->nParent>0 ) SYNTAX("P-card in control"); |
| 943 | if( p->zMimetype ) SYNTAX("N-card in control"); |
| 944 | if( !seenZ ) SYNTAX("missing Z-card on control"); |
| 945 | p->type = CFTYPE_CONTROL; |
| 946 | } |
| 947 | md5sum_init(); |
| 948 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -890,58 +890,58 @@ | |
| 890 | SYNTAX("cluster contains a card other than M- or Z-"); |
| 891 | } |
| 892 | if( !seenZ ) SYNTAX("missing Z-card on cluster"); |
| 893 | p->type = CFTYPE_CLUSTER; |
| 894 | }else if( p->zEventId ){ |
| 895 | if( p->zAttachName ) SYNTAX("A-card in event"); |
| 896 | if( p->zBaseline ) SYNTAX("B-card in event"); |
| 897 | if( p->rDate<=0.0 ) SYNTAX("missing date on event"); |
| 898 | if( p->nFile>0 ) SYNTAX("F-card in event"); |
| 899 | if( p->nField>0 ) SYNTAX("J-card in event"); |
| 900 | if( p->zTicketUuid ) SYNTAX("K-card in event"); |
| 901 | if( p->zWikiTitle!=0 ) SYNTAX("L-card in event"); |
| 902 | if( p->zRepoCksum ) SYNTAX("R-card in event"); |
| 903 | if( p->zWiki==0 ) SYNTAX("missing W-card on event"); |
| 904 | if( !seenZ ) SYNTAX("missing Z-card on event"); |
| 905 | p->type = CFTYPE_EVENT; |
| 906 | }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){ |
| 907 | if( p->zAttachName ) SYNTAX("A-card in wiki"); |
| 908 | if( p->zBaseline ) SYNTAX("B-card in wiki"); |
| 909 | if( p->rDate<=0.0 ) SYNTAX("missing date on wiki"); |
| 910 | if( p->nFile>0 ) SYNTAX("F-card in wiki"); |
| 911 | if( p->nField>0 ) SYNTAX("J-card in wiki"); |
| 912 | if( p->zTicketUuid ) SYNTAX("K-card in wiki"); |
| 913 | if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki"); |
| 914 | if( p->zRepoCksum ) SYNTAX("R-card in wiki"); |
| 915 | if( p->nTag>0 ) SYNTAX("T-card in wiki"); |
| 916 | if( p->zWiki==0 ) SYNTAX("missing W-card on wiki"); |
| 917 | if( !seenZ ) SYNTAX("missing Z-card on wiki"); |
| 918 | p->type = CFTYPE_WIKI; |
| 919 | }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline |
| 920 | || p->nParent>0 ){ |
| 921 | if( p->zAttachName ) SYNTAX("A-card in manifest"); |
| 922 | if( p->rDate<=0.0 ) SYNTAX("missing date on manifest"); |
| 923 | if( p->nField>0 ) SYNTAX("J-card in manifest"); |
| 924 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 925 | p->type = CFTYPE_MANIFEST; |
| 926 | }else if( p->nField>0 || p->zTicketUuid!=0 ){ |
| 927 | if( p->zAttachName ) SYNTAX("A-card in ticket"); |
| 928 | if( p->rDate<=0.0 ) SYNTAX("missing date on ticket"); |
| 929 | if( p->nField==0 ) SYNTAX("missing J-card on ticket"); |
| 930 | if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket"); |
| 931 | if( p->zMimetype) SYNTAX("N-card in ticket"); |
| 932 | if( p->nTag>0 ) SYNTAX("T-card in ticket"); |
| 933 | if( p->zUser==0 ) SYNTAX("missing U-card on ticket"); |
| 934 | if( !seenZ ) SYNTAX("missing Z-card on ticket"); |
| 935 | p->type = CFTYPE_TICKET; |
| 936 | }else if( p->zAttachName ){ |
| 937 | if( p->rDate<=0.0 ) SYNTAX("missing date on attachment"); |
| 938 | if( p->nTag>0 ) SYNTAX("T-card in attachment"); |
| 939 | if( !seenZ ) SYNTAX("missing Z-card on attachment"); |
| 940 | p->type = CFTYPE_ATTACHMENT; |
| 941 | }else{ |
| 942 | if( p->rDate<=0.0 ) SYNTAX("missing date on control"); |
| 943 | if( p->zMimetype ) SYNTAX("N-card in control"); |
| 944 | if( !seenZ ) SYNTAX("missing Z-card on control"); |
| 945 | p->type = CFTYPE_CONTROL; |
| 946 | } |
| 947 | md5sum_init(); |
| 948 |
+22
-22
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -890,58 +890,58 @@ | ||
| 890 | 890 | SYNTAX("cluster contains a card other than M- or Z-"); |
| 891 | 891 | } |
| 892 | 892 | if( !seenZ ) SYNTAX("missing Z-card on cluster"); |
| 893 | 893 | p->type = CFTYPE_CLUSTER; |
| 894 | 894 | }else if( p->zEventId ){ |
| 895 | + if( p->zAttachName ) SYNTAX("A-card in event"); | |
| 896 | + if( p->zBaseline ) SYNTAX("B-card in event"); | |
| 895 | 897 | if( p->rDate<=0.0 ) SYNTAX("missing date on event"); |
| 896 | 898 | if( p->nFile>0 ) SYNTAX("F-card in event"); |
| 897 | - if( p->zRepoCksum ) SYNTAX("R-card in event"); | |
| 898 | - if( p->zBaseline ) SYNTAX("B-card in event"); | |
| 899 | 899 | if( p->nField>0 ) SYNTAX("J-card in event"); |
| 900 | 900 | if( p->zTicketUuid ) SYNTAX("K-card in event"); |
| 901 | 901 | if( p->zWikiTitle!=0 ) SYNTAX("L-card in event"); |
| 902 | + if( p->zRepoCksum ) SYNTAX("R-card in event"); | |
| 902 | 903 | if( p->zWiki==0 ) SYNTAX("missing W-card on event"); |
| 903 | - if( p->zAttachName ) SYNTAX("A-card in event"); | |
| 904 | 904 | if( !seenZ ) SYNTAX("missing Z-card on event"); |
| 905 | 905 | p->type = CFTYPE_EVENT; |
| 906 | - }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){ | |
| 906 | + }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){ | |
| 907 | + if( p->zAttachName ) SYNTAX("A-card in wiki"); | |
| 908 | + if( p->zBaseline ) SYNTAX("B-card in wiki"); | |
| 909 | + if( p->rDate<=0.0 ) SYNTAX("missing date on wiki"); | |
| 910 | + if( p->nFile>0 ) SYNTAX("F-card in wiki"); | |
| 911 | + if( p->nField>0 ) SYNTAX("J-card in wiki"); | |
| 912 | + if( p->zTicketUuid ) SYNTAX("K-card in wiki"); | |
| 913 | + if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki"); | |
| 914 | + if( p->zRepoCksum ) SYNTAX("R-card in wiki"); | |
| 915 | + if( p->nTag>0 ) SYNTAX("T-card in wiki"); | |
| 916 | + if( p->zWiki==0 ) SYNTAX("missing W-card on wiki"); | |
| 917 | + if( !seenZ ) SYNTAX("missing Z-card on wiki"); | |
| 918 | + p->type = CFTYPE_WIKI; | |
| 919 | + }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline | |
| 920 | + || p->nParent>0 ){ | |
| 921 | + if( p->zAttachName ) SYNTAX("A-card in manifest"); | |
| 907 | 922 | if( p->rDate<=0.0 ) SYNTAX("missing date on manifest"); |
| 908 | 923 | if( p->nField>0 ) SYNTAX("J-card in manifest"); |
| 909 | 924 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 910 | - if( p->zWiki ) SYNTAX("W-card in manifest"); | |
| 911 | - if( p->zWikiTitle ) SYNTAX("L-card in manifest"); | |
| 912 | - if( p->zTicketUuid ) SYNTAX("K-card in manifest"); | |
| 913 | - if( p->zAttachName ) SYNTAX("A-card in manifest"); | |
| 914 | 925 | p->type = CFTYPE_MANIFEST; |
| 915 | 926 | }else if( p->nField>0 || p->zTicketUuid!=0 ){ |
| 927 | + if( p->zAttachName ) SYNTAX("A-card in ticket"); | |
| 916 | 928 | if( p->rDate<=0.0 ) SYNTAX("missing date on ticket"); |
| 917 | - if( p->zWiki ) SYNTAX("W-card in ticket"); | |
| 918 | - if( p->zWikiTitle ) SYNTAX("L-card in ticket"); | |
| 919 | 929 | if( p->nField==0 ) SYNTAX("missing J-card on ticket"); |
| 930 | + if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket"); | |
| 931 | + if( p->zMimetype) SYNTAX("N-card in ticket"); | |
| 920 | 932 | if( p->nTag>0 ) SYNTAX("T-card in ticket"); |
| 921 | - if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket"); | |
| 922 | 933 | if( p->zUser==0 ) SYNTAX("missing U-card on ticket"); |
| 923 | - if( p->zAttachName ) SYNTAX("A-card in ticket"); | |
| 924 | - if( p->zMimetype) SYNTAX("N-card in ticket"); | |
| 925 | 934 | if( !seenZ ) SYNTAX("missing Z-card on ticket"); |
| 926 | 935 | p->type = CFTYPE_TICKET; |
| 927 | - }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){ | |
| 928 | - if( p->rDate<=0.0 ) SYNTAX("missing date on wiki"); | |
| 929 | - if( p->nTag>0 ) SYNTAX("T-card in wiki"); | |
| 930 | - if( p->zWiki==0 ) SYNTAX("missing W-card on wiki"); | |
| 931 | - if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki"); | |
| 932 | - if( p->zAttachName ) SYNTAX("A-card in wiki"); | |
| 933 | - if( !seenZ ) SYNTAX("missing Z-card on wiki"); | |
| 934 | - p->type = CFTYPE_WIKI; | |
| 935 | 936 | }else if( p->zAttachName ){ |
| 936 | 937 | if( p->rDate<=0.0 ) SYNTAX("missing date on attachment"); |
| 937 | 938 | if( p->nTag>0 ) SYNTAX("T-card in attachment"); |
| 938 | 939 | if( !seenZ ) SYNTAX("missing Z-card on attachment"); |
| 939 | 940 | p->type = CFTYPE_ATTACHMENT; |
| 940 | 941 | }else{ |
| 941 | 942 | if( p->rDate<=0.0 ) SYNTAX("missing date on control"); |
| 942 | - if( p->nParent>0 ) SYNTAX("P-card in control"); | |
| 943 | 943 | if( p->zMimetype ) SYNTAX("N-card in control"); |
| 944 | 944 | if( !seenZ ) SYNTAX("missing Z-card on control"); |
| 945 | 945 | p->type = CFTYPE_CONTROL; |
| 946 | 946 | } |
| 947 | 947 | md5sum_init(); |
| 948 | 948 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -890,58 +890,58 @@ | |
| 890 | SYNTAX("cluster contains a card other than M- or Z-"); |
| 891 | } |
| 892 | if( !seenZ ) SYNTAX("missing Z-card on cluster"); |
| 893 | p->type = CFTYPE_CLUSTER; |
| 894 | }else if( p->zEventId ){ |
| 895 | if( p->rDate<=0.0 ) SYNTAX("missing date on event"); |
| 896 | if( p->nFile>0 ) SYNTAX("F-card in event"); |
| 897 | if( p->zRepoCksum ) SYNTAX("R-card in event"); |
| 898 | if( p->zBaseline ) SYNTAX("B-card in event"); |
| 899 | if( p->nField>0 ) SYNTAX("J-card in event"); |
| 900 | if( p->zTicketUuid ) SYNTAX("K-card in event"); |
| 901 | if( p->zWikiTitle!=0 ) SYNTAX("L-card in event"); |
| 902 | if( p->zWiki==0 ) SYNTAX("missing W-card on event"); |
| 903 | if( p->zAttachName ) SYNTAX("A-card in event"); |
| 904 | if( !seenZ ) SYNTAX("missing Z-card on event"); |
| 905 | p->type = CFTYPE_EVENT; |
| 906 | }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){ |
| 907 | if( p->rDate<=0.0 ) SYNTAX("missing date on manifest"); |
| 908 | if( p->nField>0 ) SYNTAX("J-card in manifest"); |
| 909 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 910 | if( p->zWiki ) SYNTAX("W-card in manifest"); |
| 911 | if( p->zWikiTitle ) SYNTAX("L-card in manifest"); |
| 912 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 913 | if( p->zAttachName ) SYNTAX("A-card in manifest"); |
| 914 | p->type = CFTYPE_MANIFEST; |
| 915 | }else if( p->nField>0 || p->zTicketUuid!=0 ){ |
| 916 | if( p->rDate<=0.0 ) SYNTAX("missing date on ticket"); |
| 917 | if( p->zWiki ) SYNTAX("W-card in ticket"); |
| 918 | if( p->zWikiTitle ) SYNTAX("L-card in ticket"); |
| 919 | if( p->nField==0 ) SYNTAX("missing J-card on ticket"); |
| 920 | if( p->nTag>0 ) SYNTAX("T-card in ticket"); |
| 921 | if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket"); |
| 922 | if( p->zUser==0 ) SYNTAX("missing U-card on ticket"); |
| 923 | if( p->zAttachName ) SYNTAX("A-card in ticket"); |
| 924 | if( p->zMimetype) SYNTAX("N-card in ticket"); |
| 925 | if( !seenZ ) SYNTAX("missing Z-card on ticket"); |
| 926 | p->type = CFTYPE_TICKET; |
| 927 | }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){ |
| 928 | if( p->rDate<=0.0 ) SYNTAX("missing date on wiki"); |
| 929 | if( p->nTag>0 ) SYNTAX("T-card in wiki"); |
| 930 | if( p->zWiki==0 ) SYNTAX("missing W-card on wiki"); |
| 931 | if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki"); |
| 932 | if( p->zAttachName ) SYNTAX("A-card in wiki"); |
| 933 | if( !seenZ ) SYNTAX("missing Z-card on wiki"); |
| 934 | p->type = CFTYPE_WIKI; |
| 935 | }else if( p->zAttachName ){ |
| 936 | if( p->rDate<=0.0 ) SYNTAX("missing date on attachment"); |
| 937 | if( p->nTag>0 ) SYNTAX("T-card in attachment"); |
| 938 | if( !seenZ ) SYNTAX("missing Z-card on attachment"); |
| 939 | p->type = CFTYPE_ATTACHMENT; |
| 940 | }else{ |
| 941 | if( p->rDate<=0.0 ) SYNTAX("missing date on control"); |
| 942 | if( p->nParent>0 ) SYNTAX("P-card in control"); |
| 943 | if( p->zMimetype ) SYNTAX("N-card in control"); |
| 944 | if( !seenZ ) SYNTAX("missing Z-card on control"); |
| 945 | p->type = CFTYPE_CONTROL; |
| 946 | } |
| 947 | md5sum_init(); |
| 948 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -890,58 +890,58 @@ | |
| 890 | SYNTAX("cluster contains a card other than M- or Z-"); |
| 891 | } |
| 892 | if( !seenZ ) SYNTAX("missing Z-card on cluster"); |
| 893 | p->type = CFTYPE_CLUSTER; |
| 894 | }else if( p->zEventId ){ |
| 895 | if( p->zAttachName ) SYNTAX("A-card in event"); |
| 896 | if( p->zBaseline ) SYNTAX("B-card in event"); |
| 897 | if( p->rDate<=0.0 ) SYNTAX("missing date on event"); |
| 898 | if( p->nFile>0 ) SYNTAX("F-card in event"); |
| 899 | if( p->nField>0 ) SYNTAX("J-card in event"); |
| 900 | if( p->zTicketUuid ) SYNTAX("K-card in event"); |
| 901 | if( p->zWikiTitle!=0 ) SYNTAX("L-card in event"); |
| 902 | if( p->zRepoCksum ) SYNTAX("R-card in event"); |
| 903 | if( p->zWiki==0 ) SYNTAX("missing W-card on event"); |
| 904 | if( !seenZ ) SYNTAX("missing Z-card on event"); |
| 905 | p->type = CFTYPE_EVENT; |
| 906 | }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){ |
| 907 | if( p->zAttachName ) SYNTAX("A-card in wiki"); |
| 908 | if( p->zBaseline ) SYNTAX("B-card in wiki"); |
| 909 | if( p->rDate<=0.0 ) SYNTAX("missing date on wiki"); |
| 910 | if( p->nFile>0 ) SYNTAX("F-card in wiki"); |
| 911 | if( p->nField>0 ) SYNTAX("J-card in wiki"); |
| 912 | if( p->zTicketUuid ) SYNTAX("K-card in wiki"); |
| 913 | if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki"); |
| 914 | if( p->zRepoCksum ) SYNTAX("R-card in wiki"); |
| 915 | if( p->nTag>0 ) SYNTAX("T-card in wiki"); |
| 916 | if( p->zWiki==0 ) SYNTAX("missing W-card on wiki"); |
| 917 | if( !seenZ ) SYNTAX("missing Z-card on wiki"); |
| 918 | p->type = CFTYPE_WIKI; |
| 919 | }else if( hasSelfRefTag || p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline |
| 920 | || p->nParent>0 ){ |
| 921 | if( p->zAttachName ) SYNTAX("A-card in manifest"); |
| 922 | if( p->rDate<=0.0 ) SYNTAX("missing date on manifest"); |
| 923 | if( p->nField>0 ) SYNTAX("J-card in manifest"); |
| 924 | if( p->zTicketUuid ) SYNTAX("K-card in manifest"); |
| 925 | p->type = CFTYPE_MANIFEST; |
| 926 | }else if( p->nField>0 || p->zTicketUuid!=0 ){ |
| 927 | if( p->zAttachName ) SYNTAX("A-card in ticket"); |
| 928 | if( p->rDate<=0.0 ) SYNTAX("missing date on ticket"); |
| 929 | if( p->nField==0 ) SYNTAX("missing J-card on ticket"); |
| 930 | if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket"); |
| 931 | if( p->zMimetype) SYNTAX("N-card in ticket"); |
| 932 | if( p->nTag>0 ) SYNTAX("T-card in ticket"); |
| 933 | if( p->zUser==0 ) SYNTAX("missing U-card on ticket"); |
| 934 | if( !seenZ ) SYNTAX("missing Z-card on ticket"); |
| 935 | p->type = CFTYPE_TICKET; |
| 936 | }else if( p->zAttachName ){ |
| 937 | if( p->rDate<=0.0 ) SYNTAX("missing date on attachment"); |
| 938 | if( p->nTag>0 ) SYNTAX("T-card in attachment"); |
| 939 | if( !seenZ ) SYNTAX("missing Z-card on attachment"); |
| 940 | p->type = CFTYPE_ATTACHMENT; |
| 941 | }else{ |
| 942 | if( p->rDate<=0.0 ) SYNTAX("missing date on control"); |
| 943 | if( p->zMimetype ) SYNTAX("N-card in control"); |
| 944 | if( !seenZ ) SYNTAX("missing Z-card on control"); |
| 945 | p->type = CFTYPE_CONTROL; |
| 946 | } |
| 947 | md5sum_init(); |
| 948 |