Fossil SCM
Show default value of settings that have a default in 'fossil help SETTING' output. These values are otherwise only documented in the source code. ok stephan, danield
Commit
1e1a319e6313f3108bd063ac3d736b5b895b872cdaaaecffbcbaa06e7f1c5374
Parent
bb66461f8a30b3f…
1 file changed
+8
-2
+8
-2
| --- src/dispatch.c | ||
| +++ src/dispatch.c | ||
| @@ -1270,14 +1270,20 @@ | ||
| 1270 | 1270 | if( z==0 ){ |
| 1271 | 1271 | fossil_fatal("no help available for the %s %s", |
| 1272 | 1272 | pCmd->zName, zCmdOrPage); |
| 1273 | 1273 | } |
| 1274 | 1274 | if( pCmd->eCmdFlags & CMDFLAG_SETTING ){ |
| 1275 | - fossil_print("Setting: \"%s\"%s\n\n", | |
| 1276 | - pCmd->zName, | |
| 1275 | + const Setting *pSetting = db_find_setting(pCmd->zName, 0); | |
| 1276 | + char *zDflt = 0; | |
| 1277 | + if( pSetting!=0 && pSetting->def!=0 && *pSetting->def!=0 ){ | |
| 1278 | + zDflt = mprintf(" (default: %s)", pSetting->def); | |
| 1279 | + } | |
| 1280 | + fossil_print("Setting: \"%s\"%s%s\n\n", | |
| 1281 | + pCmd->zName, zDflt!=0 ? zDflt : "", | |
| 1277 | 1282 | (pCmd->eCmdFlags & CMDFLAG_VERSIONABLE)!=0 ? " (versionable)" : "" |
| 1278 | 1283 | ); |
| 1284 | + fossil_free(zDflt); | |
| 1279 | 1285 | } |
| 1280 | 1286 | blob_init(&txt, 0, 0); |
| 1281 | 1287 | if( useHtml ){ |
| 1282 | 1288 | help_to_html(z, &txt); |
| 1283 | 1289 | }else{ |
| 1284 | 1290 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -1270,14 +1270,20 @@ | |
| 1270 | if( z==0 ){ |
| 1271 | fossil_fatal("no help available for the %s %s", |
| 1272 | pCmd->zName, zCmdOrPage); |
| 1273 | } |
| 1274 | if( pCmd->eCmdFlags & CMDFLAG_SETTING ){ |
| 1275 | fossil_print("Setting: \"%s\"%s\n\n", |
| 1276 | pCmd->zName, |
| 1277 | (pCmd->eCmdFlags & CMDFLAG_VERSIONABLE)!=0 ? " (versionable)" : "" |
| 1278 | ); |
| 1279 | } |
| 1280 | blob_init(&txt, 0, 0); |
| 1281 | if( useHtml ){ |
| 1282 | help_to_html(z, &txt); |
| 1283 | }else{ |
| 1284 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -1270,14 +1270,20 @@ | |
| 1270 | if( z==0 ){ |
| 1271 | fossil_fatal("no help available for the %s %s", |
| 1272 | pCmd->zName, zCmdOrPage); |
| 1273 | } |
| 1274 | if( pCmd->eCmdFlags & CMDFLAG_SETTING ){ |
| 1275 | const Setting *pSetting = db_find_setting(pCmd->zName, 0); |
| 1276 | char *zDflt = 0; |
| 1277 | if( pSetting!=0 && pSetting->def!=0 && *pSetting->def!=0 ){ |
| 1278 | zDflt = mprintf(" (default: %s)", pSetting->def); |
| 1279 | } |
| 1280 | fossil_print("Setting: \"%s\"%s%s\n\n", |
| 1281 | pCmd->zName, zDflt!=0 ? zDflt : "", |
| 1282 | (pCmd->eCmdFlags & CMDFLAG_VERSIONABLE)!=0 ? " (versionable)" : "" |
| 1283 | ); |
| 1284 | fossil_free(zDflt); |
| 1285 | } |
| 1286 | blob_init(&txt, 0, 0); |
| 1287 | if( useHtml ){ |
| 1288 | help_to_html(z, &txt); |
| 1289 | }else{ |
| 1290 |