Fossil SCM

Report "E-card in ???" syntax errors as "?-card in check-in". Refactoring needed for next commit. No change in functionality.

jan.nijtmans 2013-08-23 13:15 trunk
Commit 6324a3ce6b8ffb2333f7307e785d97a065fe60fa
Parent 882f7a5dad1cc58…
1 file changed +26 -23
~ src/manifest.c
M src/manifest.c
+26 -23
--- src/manifest.c
+++ src/manifest.c
@@ -875,44 +875,47 @@
875875
 ){
876876
 SYNTAX("cluster contains a card other than M- or Z-");
877877
 }
878878
 if( !seenZ ) SYNTAX("missing Z-card on cluster");
879879
 p->type = CFTYPE_CLUSTER;
880
- }else if( p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){
881
- if( p->rDate<=0.0 ) SYNTAX("missing date on check-in");
882
- if( p->nField>0 ) SYNTAX("J-card in check-in");
883
- if( p->zTicketUuid ) SYNTAX("K-card in check-in");
884
- if( p->zWiki ) SYNTAX("W-card in check-in");
885
- if( p->zWikiTitle ) SYNTAX("L-card in check-in");
886
- if( p->zEventId ) SYNTAX("E-card in check-in");
887
- if( p->zTicketUuid ) SYNTAX("K-card in check-in");
888
- if( p->zAttachName ) SYNTAX("A-card in check-in");
889
- p->type = CFTYPE_MANIFEST;
890
- }else if( p->nField>0 || p->zTicketUuid!=0 ){
891
- if( p->rDate<=0.0 ) SYNTAX("missing date on ticket");
892
- if( p->zWiki ) SYNTAX("W-card in ticket");
893
- if( p->zWikiTitle ) SYNTAX("L-card in ticket");
894
- if( p->zEventId ) SYNTAX("E-card in ticket");
895
- if( p->nField==0 ) SYNTAX("missing J-card on ticket");
896
- if( p->nTag>0 ) SYNTAX("T-card in ticket");
897
- if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket");
898
- if( p->zUser==0 ) SYNTAX("missing U-card on ticket");
899
- if( p->zAttachName ) SYNTAX("A-card in ticket");
900
- if( p->zMimetype) SYNTAX("N-card in ticket");
901
- if( !seenZ ) SYNTAX("missing Z-card on ticket");
902
- p->type = CFTYPE_TICKET;
903880
 }else if( p->zEventId ){
904881
 if( p->rDate<=0.0 ) SYNTAX("missing date on event");
882
+ if( p->nFile>0 ) SYNTAX("F-card in event");
883
+ if( p->zRepoCksum ) SYNTAX("R-card in event");
884
+ if( p->zBaseline ) SYNTAX("B-card in event");
885
+ if( p->nField>0 ) SYNTAX("J-card in event");
886
+ if( p->zTicketUuid ) SYNTAX("K-card in event");
905887
 if( p->zWikiTitle!=0 ) SYNTAX("L-card in event");
906888
 if( p->zWiki==0 ) SYNTAX("missing W-card on event");
907889
 if( p->zAttachName ) SYNTAX("A-card in event");
908890
 for(i=0; i<p->nTag; i++){
909891
 if( p->aTag[i].zName[0]!='+' ) SYNTAX("propagating tag in event");
910892
 if( p->aTag[i].zUuid!=0 ) SYNTAX("non-self-referential tag in event");
911893
 }
912894
 if( !seenZ ) SYNTAX("missing Z-card on event");
913895
 p->type = CFTYPE_EVENT;
896
+ }else if( p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){
897
+ if( p->rDate<=0.0 ) SYNTAX("missing date on check-in");
898
+ if( p->nField>0 ) SYNTAX("J-card in check-in");
899
+ if( p->zTicketUuid ) SYNTAX("K-card in check-in");
900
+ if( p->zWiki ) SYNTAX("W-card in check-in");
901
+ if( p->zWikiTitle ) SYNTAX("L-card in check-in");
902
+ if( p->zTicketUuid ) SYNTAX("K-card in check-in");
903
+ if( p->zAttachName ) SYNTAX("A-card in check-in");
904
+ p->type = CFTYPE_MANIFEST;
905
+ }else if( p->nField>0 || p->zTicketUuid!=0 ){
906
+ if( p->rDate<=0.0 ) SYNTAX("missing date on ticket");
907
+ if( p->zWiki ) SYNTAX("W-card in ticket");
908
+ if( p->zWikiTitle ) SYNTAX("L-card in ticket");
909
+ if( p->nField==0 ) SYNTAX("missing J-card on ticket");
910
+ if( p->nTag>0 ) SYNTAX("T-card in ticket");
911
+ if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket");
912
+ if( p->zUser==0 ) SYNTAX("missing U-card on ticket");
913
+ if( p->zAttachName ) SYNTAX("A-card in ticket");
914
+ if( p->zMimetype) SYNTAX("N-card in ticket");
915
+ if( !seenZ ) SYNTAX("missing Z-card on ticket");
916
+ p->type = CFTYPE_TICKET;
914917
 }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){
915918
 if( p->rDate<=0.0 ) SYNTAX("missing date on wiki");
916919
 if( p->nTag>0 ) SYNTAX("T-card in wiki");
917920
 if( p->zWiki==0 ) SYNTAX("missing W-card on wiki");
918921
 if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki");
919922
--- src/manifest.c
+++ src/manifest.c
@@ -875,44 +875,47 @@
875 ){
876 SYNTAX("cluster contains a card other than M- or Z-");
877 }
878 if( !seenZ ) SYNTAX("missing Z-card on cluster");
879 p->type = CFTYPE_CLUSTER;
880 }else if( p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){
881 if( p->rDate<=0.0 ) SYNTAX("missing date on check-in");
882 if( p->nField>0 ) SYNTAX("J-card in check-in");
883 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
884 if( p->zWiki ) SYNTAX("W-card in check-in");
885 if( p->zWikiTitle ) SYNTAX("L-card in check-in");
886 if( p->zEventId ) SYNTAX("E-card in check-in");
887 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
888 if( p->zAttachName ) SYNTAX("A-card in check-in");
889 p->type = CFTYPE_MANIFEST;
890 }else if( p->nField>0 || p->zTicketUuid!=0 ){
891 if( p->rDate<=0.0 ) SYNTAX("missing date on ticket");
892 if( p->zWiki ) SYNTAX("W-card in ticket");
893 if( p->zWikiTitle ) SYNTAX("L-card in ticket");
894 if( p->zEventId ) SYNTAX("E-card in ticket");
895 if( p->nField==0 ) SYNTAX("missing J-card on ticket");
896 if( p->nTag>0 ) SYNTAX("T-card in ticket");
897 if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket");
898 if( p->zUser==0 ) SYNTAX("missing U-card on ticket");
899 if( p->zAttachName ) SYNTAX("A-card in ticket");
900 if( p->zMimetype) SYNTAX("N-card in ticket");
901 if( !seenZ ) SYNTAX("missing Z-card on ticket");
902 p->type = CFTYPE_TICKET;
903 }else if( p->zEventId ){
904 if( p->rDate<=0.0 ) SYNTAX("missing date on event");
 
 
 
 
 
905 if( p->zWikiTitle!=0 ) SYNTAX("L-card in event");
906 if( p->zWiki==0 ) SYNTAX("missing W-card on event");
907 if( p->zAttachName ) SYNTAX("A-card in event");
908 for(i=0; i<p->nTag; i++){
909 if( p->aTag[i].zName[0]!='+' ) SYNTAX("propagating tag in event");
910 if( p->aTag[i].zUuid!=0 ) SYNTAX("non-self-referential tag in event");
911 }
912 if( !seenZ ) SYNTAX("missing Z-card on event");
913 p->type = CFTYPE_EVENT;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
914 }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){
915 if( p->rDate<=0.0 ) SYNTAX("missing date on wiki");
916 if( p->nTag>0 ) SYNTAX("T-card in wiki");
917 if( p->zWiki==0 ) SYNTAX("missing W-card on wiki");
918 if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki");
919
--- src/manifest.c
+++ src/manifest.c
@@ -875,44 +875,47 @@
875 ){
876 SYNTAX("cluster contains a card other than M- or Z-");
877 }
878 if( !seenZ ) SYNTAX("missing Z-card on cluster");
879 p->type = CFTYPE_CLUSTER;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
880 }else if( p->zEventId ){
881 if( p->rDate<=0.0 ) SYNTAX("missing date on event");
882 if( p->nFile>0 ) SYNTAX("F-card in event");
883 if( p->zRepoCksum ) SYNTAX("R-card in event");
884 if( p->zBaseline ) SYNTAX("B-card in event");
885 if( p->nField>0 ) SYNTAX("J-card in event");
886 if( p->zTicketUuid ) SYNTAX("K-card in event");
887 if( p->zWikiTitle!=0 ) SYNTAX("L-card in event");
888 if( p->zWiki==0 ) SYNTAX("missing W-card on event");
889 if( p->zAttachName ) SYNTAX("A-card in event");
890 for(i=0; i<p->nTag; i++){
891 if( p->aTag[i].zName[0]!='+' ) SYNTAX("propagating tag in event");
892 if( p->aTag[i].zUuid!=0 ) SYNTAX("non-self-referential tag in event");
893 }
894 if( !seenZ ) SYNTAX("missing Z-card on event");
895 p->type = CFTYPE_EVENT;
896 }else if( p->nFile>0 || p->zRepoCksum!=0 || p->zBaseline ){
897 if( p->rDate<=0.0 ) SYNTAX("missing date on check-in");
898 if( p->nField>0 ) SYNTAX("J-card in check-in");
899 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
900 if( p->zWiki ) SYNTAX("W-card in check-in");
901 if( p->zWikiTitle ) SYNTAX("L-card in check-in");
902 if( p->zTicketUuid ) SYNTAX("K-card in check-in");
903 if( p->zAttachName ) SYNTAX("A-card in check-in");
904 p->type = CFTYPE_MANIFEST;
905 }else if( p->nField>0 || p->zTicketUuid!=0 ){
906 if( p->rDate<=0.0 ) SYNTAX("missing date on ticket");
907 if( p->zWiki ) SYNTAX("W-card in ticket");
908 if( p->zWikiTitle ) SYNTAX("L-card in ticket");
909 if( p->nField==0 ) SYNTAX("missing J-card on ticket");
910 if( p->nTag>0 ) SYNTAX("T-card in ticket");
911 if( p->zTicketUuid==0 ) SYNTAX("missing K-card on ticket");
912 if( p->zUser==0 ) SYNTAX("missing U-card on ticket");
913 if( p->zAttachName ) SYNTAX("A-card in ticket");
914 if( p->zMimetype) SYNTAX("N-card in ticket");
915 if( !seenZ ) SYNTAX("missing Z-card on ticket");
916 p->type = CFTYPE_TICKET;
917 }else if( p->zWiki!=0 || p->zWikiTitle!=0 ){
918 if( p->rDate<=0.0 ) SYNTAX("missing date on wiki");
919 if( p->nTag>0 ) SYNTAX("T-card in wiki");
920 if( p->zWiki==0 ) SYNTAX("missing W-card on wiki");
921 if( p->zWikiTitle==0 ) SYNTAX("missing L-card on wiki");
922

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button