Fossil SCM
Fixed a typo in error text which never triggers. Manifest crosslinking's update of the event table now shows the tag value for a +closed/-closed tag if it is available (the default client does not currently add a value for those but the prototype one can).
Commit
902135f747ecc6db5cd0df7b152eb308ee1fa607
Parent
ce0594c22d1eb34…
1 file changed
+11
-3
+11
-3
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -783,11 +783,11 @@ | ||
| 783 | 783 | ** Identify the user who created this control file by their |
| 784 | 784 | ** login. Only one U line is allowed. Prohibited in clusters. |
| 785 | 785 | ** If the user name is omitted, take that to be "anonymous". |
| 786 | 786 | */ |
| 787 | 787 | case 'U': { |
| 788 | - if( p->zUser!=0 ) SYNTAX("more than on U-card"); | |
| 788 | + if( p->zUser!=0 ) SYNTAX("more than one U-card"); | |
| 789 | 789 | p->zUser = next_token(&x, 0); |
| 790 | 790 | if( p->zUser==0 ){ |
| 791 | 791 | p->zUser = "anonymous"; |
| 792 | 792 | }else{ |
| 793 | 793 | defossilize(p->zUser); |
| @@ -1965,13 +1965,21 @@ | ||
| 1965 | 1965 | }else if( memcmp(zName, "+sym-",5)==0 ){ |
| 1966 | 1966 | blob_appendf(&comment, " Add tag \"%h\".", &zName[5]); |
| 1967 | 1967 | }else if( memcmp(zName, "-sym-",5)==0 ){ |
| 1968 | 1968 | blob_appendf(&comment, " Cancel tag \"%h\".", &zName[5]); |
| 1969 | 1969 | }else if( strcmp(zName, "+closed")==0 ){ |
| 1970 | - blob_appendf(&comment, " Marked \"Closed\"."); | |
| 1970 | + blob_append(&comment, " Marked \"Closed\"", -1); | |
| 1971 | + if( zValue && *zValue ){ | |
| 1972 | + blob_appendf(&comment, " with note \"%h\"", zValue); | |
| 1973 | + } | |
| 1974 | + blob_append(&comment, ".", 1); | |
| 1971 | 1975 | }else if( strcmp(zName, "-closed")==0 ){ |
| 1972 | - blob_appendf(&comment, " Removed the \"Closed\" mark."); | |
| 1976 | + blob_append(&comment, " Removed the \"Closed\" mark", -1); | |
| 1977 | + if( zValue && *zValue ){ | |
| 1978 | + blob_appendf(&comment, " with note \"%h\"", zValue); | |
| 1979 | + } | |
| 1980 | + blob_append(&comment, ".", 1); | |
| 1973 | 1981 | }else { |
| 1974 | 1982 | if( zName[0]=='-' ){ |
| 1975 | 1983 | blob_appendf(&comment, " Cancel \"%h\"", &zName[1]); |
| 1976 | 1984 | }else if( zName[0]=='+' ){ |
| 1977 | 1985 | blob_appendf(&comment, " Add \"%h\"", &zName[1]); |
| 1978 | 1986 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -783,11 +783,11 @@ | |
| 783 | ** Identify the user who created this control file by their |
| 784 | ** login. Only one U line is allowed. Prohibited in clusters. |
| 785 | ** If the user name is omitted, take that to be "anonymous". |
| 786 | */ |
| 787 | case 'U': { |
| 788 | if( p->zUser!=0 ) SYNTAX("more than on U-card"); |
| 789 | p->zUser = next_token(&x, 0); |
| 790 | if( p->zUser==0 ){ |
| 791 | p->zUser = "anonymous"; |
| 792 | }else{ |
| 793 | defossilize(p->zUser); |
| @@ -1965,13 +1965,21 @@ | |
| 1965 | }else if( memcmp(zName, "+sym-",5)==0 ){ |
| 1966 | blob_appendf(&comment, " Add tag \"%h\".", &zName[5]); |
| 1967 | }else if( memcmp(zName, "-sym-",5)==0 ){ |
| 1968 | blob_appendf(&comment, " Cancel tag \"%h\".", &zName[5]); |
| 1969 | }else if( strcmp(zName, "+closed")==0 ){ |
| 1970 | blob_appendf(&comment, " Marked \"Closed\"."); |
| 1971 | }else if( strcmp(zName, "-closed")==0 ){ |
| 1972 | blob_appendf(&comment, " Removed the \"Closed\" mark."); |
| 1973 | }else { |
| 1974 | if( zName[0]=='-' ){ |
| 1975 | blob_appendf(&comment, " Cancel \"%h\"", &zName[1]); |
| 1976 | }else if( zName[0]=='+' ){ |
| 1977 | blob_appendf(&comment, " Add \"%h\"", &zName[1]); |
| 1978 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -783,11 +783,11 @@ | |
| 783 | ** Identify the user who created this control file by their |
| 784 | ** login. Only one U line is allowed. Prohibited in clusters. |
| 785 | ** If the user name is omitted, take that to be "anonymous". |
| 786 | */ |
| 787 | case 'U': { |
| 788 | if( p->zUser!=0 ) SYNTAX("more than one U-card"); |
| 789 | p->zUser = next_token(&x, 0); |
| 790 | if( p->zUser==0 ){ |
| 791 | p->zUser = "anonymous"; |
| 792 | }else{ |
| 793 | defossilize(p->zUser); |
| @@ -1965,13 +1965,21 @@ | |
| 1965 | }else if( memcmp(zName, "+sym-",5)==0 ){ |
| 1966 | blob_appendf(&comment, " Add tag \"%h\".", &zName[5]); |
| 1967 | }else if( memcmp(zName, "-sym-",5)==0 ){ |
| 1968 | blob_appendf(&comment, " Cancel tag \"%h\".", &zName[5]); |
| 1969 | }else if( strcmp(zName, "+closed")==0 ){ |
| 1970 | blob_append(&comment, " Marked \"Closed\"", -1); |
| 1971 | if( zValue && *zValue ){ |
| 1972 | blob_appendf(&comment, " with note \"%h\"", zValue); |
| 1973 | } |
| 1974 | blob_append(&comment, ".", 1); |
| 1975 | }else if( strcmp(zName, "-closed")==0 ){ |
| 1976 | blob_append(&comment, " Removed the \"Closed\" mark", -1); |
| 1977 | if( zValue && *zValue ){ |
| 1978 | blob_appendf(&comment, " with note \"%h\"", zValue); |
| 1979 | } |
| 1980 | blob_append(&comment, ".", 1); |
| 1981 | }else { |
| 1982 | if( zName[0]=='-' ){ |
| 1983 | blob_appendf(&comment, " Cancel \"%h\"", &zName[1]); |
| 1984 | }else if( zName[0]=='+' ){ |
| 1985 | blob_appendf(&comment, " Add \"%h\"", &zName[1]); |
| 1986 |