Fossil SCM
Add some options to the test-all-help command.
Commit
1b0a3cf3b321bfd0935baa861d35865e2ff874c8
Parent
f070ec99aed31e4…
1 file changed
+28
-4
+28
-4
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -1226,19 +1226,43 @@ | ||
| 1226 | 1226 | } |
| 1227 | 1227 | |
| 1228 | 1228 | |
| 1229 | 1229 | /* |
| 1230 | 1230 | ** COMMAND: test-all-help |
| 1231 | -** %fossil test-all-help | |
| 1231 | +** %fossil test-all-help ?OPTIONS? | |
| 1232 | +** | |
| 1233 | +** Show help text for commands and pages. Useful for proof-reading. | |
| 1234 | +** Defaults to just the CLI commands. Specify --www to see only the web | |
| 1235 | +** pages, or --everything to see both commands and pages. | |
| 1232 | 1236 | ** |
| 1233 | -** Show all help text. Useful for proof-reading. | |
| 1237 | +** Options: | |
| 1238 | +** -e|--everything Show all commands and pages. | |
| 1239 | +** -t|--test Include test- commands | |
| 1240 | +** -w|--www Show WWW pages. | |
| 1234 | 1241 | */ |
| 1235 | 1242 | void test_all_help_cmd(void){ |
| 1236 | 1243 | int i; |
| 1237 | - fossil_print("All commands and pages:\n\n"); | |
| 1244 | + int mask = CMDFLAG_1ST_TIER | CMDFLAG_2ND_TIER; | |
| 1245 | + | |
| 1246 | + if( find_option("www","w",0) ){ | |
| 1247 | + mask = CMDFLAG_WEBPAGE; | |
| 1248 | + } | |
| 1249 | + if( find_option("everything","e",0) ){ | |
| 1250 | + mask = CMDFLAG_1ST_TIER | CMDFLAG_2ND_TIER | CMDFLAG_WEBPAGE; | |
| 1251 | + } | |
| 1252 | + if( find_option("test","t",0) ){ | |
| 1253 | + mask |= CMDFLAG_TEST; | |
| 1254 | + } | |
| 1255 | + | |
| 1256 | + fossil_print("Help text for:\n"); | |
| 1257 | + if( mask & CMDFLAG_1ST_TIER ) fossil_print(" * Commands\n"); | |
| 1258 | + if( mask & CMDFLAG_2ND_TIER ) fossil_print(" * Auxiliary commands\n"); | |
| 1259 | + if( mask & CMDFLAG_TEST ) fossil_print(" * Test commands\n"); | |
| 1260 | + if( mask & CMDFLAG_WEBPAGE ) fossil_print(" * Web pages\n"); | |
| 1261 | + fossil_print("---\n"); | |
| 1238 | 1262 | for(i=0; i<count(aCommand); i++){ |
| 1239 | - //if( memcmp(aCommand[i].zName, "test", 4)==0 ) continue; | |
| 1263 | + if( (aCommand[i].cmdFlags & mask)==0 ) continue; | |
| 1240 | 1264 | fossil_print("# %s\n", aCommand[i].zName); |
| 1241 | 1265 | fossil_print("%s\n\n", aCmdHelp[i].zText); |
| 1242 | 1266 | } |
| 1243 | 1267 | fossil_print("---\n"); |
| 1244 | 1268 | version_cmd(); |
| 1245 | 1269 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1226,19 +1226,43 @@ | |
| 1226 | } |
| 1227 | |
| 1228 | |
| 1229 | /* |
| 1230 | ** COMMAND: test-all-help |
| 1231 | ** %fossil test-all-help |
| 1232 | ** |
| 1233 | ** Show all help text. Useful for proof-reading. |
| 1234 | */ |
| 1235 | void test_all_help_cmd(void){ |
| 1236 | int i; |
| 1237 | fossil_print("All commands and pages:\n\n"); |
| 1238 | for(i=0; i<count(aCommand); i++){ |
| 1239 | //if( memcmp(aCommand[i].zName, "test", 4)==0 ) continue; |
| 1240 | fossil_print("# %s\n", aCommand[i].zName); |
| 1241 | fossil_print("%s\n\n", aCmdHelp[i].zText); |
| 1242 | } |
| 1243 | fossil_print("---\n"); |
| 1244 | version_cmd(); |
| 1245 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1226,19 +1226,43 @@ | |
| 1226 | } |
| 1227 | |
| 1228 | |
| 1229 | /* |
| 1230 | ** COMMAND: test-all-help |
| 1231 | ** %fossil test-all-help ?OPTIONS? |
| 1232 | ** |
| 1233 | ** Show help text for commands and pages. Useful for proof-reading. |
| 1234 | ** Defaults to just the CLI commands. Specify --www to see only the web |
| 1235 | ** pages, or --everything to see both commands and pages. |
| 1236 | ** |
| 1237 | ** Options: |
| 1238 | ** -e|--everything Show all commands and pages. |
| 1239 | ** -t|--test Include test- commands |
| 1240 | ** -w|--www Show WWW pages. |
| 1241 | */ |
| 1242 | void test_all_help_cmd(void){ |
| 1243 | int i; |
| 1244 | int mask = CMDFLAG_1ST_TIER | CMDFLAG_2ND_TIER; |
| 1245 | |
| 1246 | if( find_option("www","w",0) ){ |
| 1247 | mask = CMDFLAG_WEBPAGE; |
| 1248 | } |
| 1249 | if( find_option("everything","e",0) ){ |
| 1250 | mask = CMDFLAG_1ST_TIER | CMDFLAG_2ND_TIER | CMDFLAG_WEBPAGE; |
| 1251 | } |
| 1252 | if( find_option("test","t",0) ){ |
| 1253 | mask |= CMDFLAG_TEST; |
| 1254 | } |
| 1255 | |
| 1256 | fossil_print("Help text for:\n"); |
| 1257 | if( mask & CMDFLAG_1ST_TIER ) fossil_print(" * Commands\n"); |
| 1258 | if( mask & CMDFLAG_2ND_TIER ) fossil_print(" * Auxiliary commands\n"); |
| 1259 | if( mask & CMDFLAG_TEST ) fossil_print(" * Test commands\n"); |
| 1260 | if( mask & CMDFLAG_WEBPAGE ) fossil_print(" * Web pages\n"); |
| 1261 | fossil_print("---\n"); |
| 1262 | for(i=0; i<count(aCommand); i++){ |
| 1263 | if( (aCommand[i].cmdFlags & mask)==0 ) continue; |
| 1264 | fossil_print("# %s\n", aCommand[i].zName); |
| 1265 | fossil_print("%s\n\n", aCmdHelp[i].zText); |
| 1266 | } |
| 1267 | fossil_print("---\n"); |
| 1268 | version_cmd(); |
| 1269 |