Fossil SCM
The 'manifest' setting still needs to be marked as 'versionable'.
Commit
3604802d553e502968e0381be44f149b9d9d7409
Parent
22c62dba300b262…
1 file changed
+8
-9
M
src/db.c
+8
-9
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2287,23 +2287,22 @@ | ||
| 2287 | 2287 | ** which letters can be used to represent flags (any permutation of flags must |
| 2288 | 2288 | ** not be able to fully form one of the boolean values). |
| 2289 | 2289 | */ |
| 2290 | 2290 | int db_get_manifest_setting(void){ |
| 2291 | 2291 | int flg; |
| 2292 | - char *zNVVal = db_get("manifest", "off"); | |
| 2293 | - char *zVal = db_get_versioned("manifest", zNVVal); | |
| 2294 | - if( is_false(zVal) ){ | |
| 2292 | + char *zVal = db_get("manifest", 0); | |
| 2293 | + if( zVal==0 || is_false(zVal) ){ | |
| 2295 | 2294 | return 0; |
| 2296 | - }else if( is_truth(zVal) ) { | |
| 2295 | + }else if( is_truth(zVal) ){ | |
| 2297 | 2296 | return MFESTFLG_RAW|MFESTFLG_UUID; |
| 2298 | 2297 | } |
| 2299 | 2298 | flg = 0; |
| 2300 | 2299 | while( *zVal ){ |
| 2301 | - switch( *zVal ){ | |
| 2302 | - case 'r': flg |= MFESTFLG_RAW; break; | |
| 2303 | - case 'u': flg |= MFESTFLG_UUID; break; | |
| 2304 | - case 't': flg |= MFESTFLG_TAGS; break; | |
| 2300 | + switch( *zVal ){ | |
| 2301 | + case 'r': flg |= MFESTFLG_RAW; break; | |
| 2302 | + case 'u': flg |= MFESTFLG_UUID; break; | |
| 2303 | + case 't': flg |= MFESTFLG_TAGS; break; | |
| 2305 | 2304 | } |
| 2306 | 2305 | zVal++; |
| 2307 | 2306 | } |
| 2308 | 2307 | return flg; |
| 2309 | 2308 | } |
| @@ -2606,11 +2605,11 @@ | ||
| 2606 | 2605 | { "https-login", 0, 0, 0, 0, "off" }, |
| 2607 | 2606 | { "ignore-glob", 0, 40, 1, 0, "" }, |
| 2608 | 2607 | { "keep-glob", 0, 40, 1, 0, "" }, |
| 2609 | 2608 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2610 | 2609 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2611 | - { "manifest", 0, 5, 0, 0, "off" }, | |
| 2610 | + { "manifest", 0, 5, 1, 0, "off" }, | |
| 2612 | 2611 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2613 | 2612 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2614 | 2613 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2615 | 2614 | #if FOSSIL_ENABLE_LEGACY_MV_RM |
| 2616 | 2615 | { "mv-rm-files", 0, 0, 0, 0, "off" }, |
| 2617 | 2616 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2287,23 +2287,22 @@ | |
| 2287 | ** which letters can be used to represent flags (any permutation of flags must |
| 2288 | ** not be able to fully form one of the boolean values). |
| 2289 | */ |
| 2290 | int db_get_manifest_setting(void){ |
| 2291 | int flg; |
| 2292 | char *zNVVal = db_get("manifest", "off"); |
| 2293 | char *zVal = db_get_versioned("manifest", zNVVal); |
| 2294 | if( is_false(zVal) ){ |
| 2295 | return 0; |
| 2296 | }else if( is_truth(zVal) ) { |
| 2297 | return MFESTFLG_RAW|MFESTFLG_UUID; |
| 2298 | } |
| 2299 | flg = 0; |
| 2300 | while( *zVal ){ |
| 2301 | switch( *zVal ){ |
| 2302 | case 'r': flg |= MFESTFLG_RAW; break; |
| 2303 | case 'u': flg |= MFESTFLG_UUID; break; |
| 2304 | case 't': flg |= MFESTFLG_TAGS; break; |
| 2305 | } |
| 2306 | zVal++; |
| 2307 | } |
| 2308 | return flg; |
| 2309 | } |
| @@ -2606,11 +2605,11 @@ | |
| 2606 | { "https-login", 0, 0, 0, 0, "off" }, |
| 2607 | { "ignore-glob", 0, 40, 1, 0, "" }, |
| 2608 | { "keep-glob", 0, 40, 1, 0, "" }, |
| 2609 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2610 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2611 | { "manifest", 0, 5, 0, 0, "off" }, |
| 2612 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2613 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2614 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2615 | #if FOSSIL_ENABLE_LEGACY_MV_RM |
| 2616 | { "mv-rm-files", 0, 0, 0, 0, "off" }, |
| 2617 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2287,23 +2287,22 @@ | |
| 2287 | ** which letters can be used to represent flags (any permutation of flags must |
| 2288 | ** not be able to fully form one of the boolean values). |
| 2289 | */ |
| 2290 | int db_get_manifest_setting(void){ |
| 2291 | int flg; |
| 2292 | char *zVal = db_get("manifest", 0); |
| 2293 | if( zVal==0 || is_false(zVal) ){ |
| 2294 | return 0; |
| 2295 | }else if( is_truth(zVal) ){ |
| 2296 | return MFESTFLG_RAW|MFESTFLG_UUID; |
| 2297 | } |
| 2298 | flg = 0; |
| 2299 | while( *zVal ){ |
| 2300 | switch( *zVal ){ |
| 2301 | case 'r': flg |= MFESTFLG_RAW; break; |
| 2302 | case 'u': flg |= MFESTFLG_UUID; break; |
| 2303 | case 't': flg |= MFESTFLG_TAGS; break; |
| 2304 | } |
| 2305 | zVal++; |
| 2306 | } |
| 2307 | return flg; |
| 2308 | } |
| @@ -2606,11 +2605,11 @@ | |
| 2605 | { "https-login", 0, 0, 0, 0, "off" }, |
| 2606 | { "ignore-glob", 0, 40, 1, 0, "" }, |
| 2607 | { "keep-glob", 0, 40, 1, 0, "" }, |
| 2608 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2609 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2610 | { "manifest", 0, 5, 1, 0, "off" }, |
| 2611 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2612 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2613 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2614 | #if FOSSIL_ENABLE_LEGACY_MV_RM |
| 2615 | { "mv-rm-files", 0, 0, 0, 0, "off" }, |
| 2616 |