Fossil SCM
Improve the warning message about versioned/non-versioned settings so that it includes the full path to the versioned settings file, for better use with things like 'fossil all'.
Commit
83fd73849043380da5b7cb757958674f4e4983d4
Parent
2375d6cbce93326…
1 file changed
+5
-5
M
src/db.c
+5
-5
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2275,15 +2275,15 @@ | ||
| 2275 | 2275 | ){ |
| 2276 | 2276 | /* There's a versioned setting, and a non-versioned setting. Tell |
| 2277 | 2277 | ** the user about the conflict */ |
| 2278 | 2278 | fossil_warning( |
| 2279 | 2279 | "setting %s has both versioned and non-versioned values: using " |
| 2280 | - "versioned value from file .fossil-settings/%s (to silence this " | |
| 2281 | - "warning, either create an empty file named " | |
| 2282 | - ".fossil-settings/%s.no-warn in the check-out root, " | |
| 2283 | - "or delete the non-versioned setting " | |
| 2284 | - "with \"fossil unset %s\")", zName, zName, zName, zName | |
| 2280 | + "versioned value from file \"%/.fossil-settings/%s\" (to silence " | |
| 2281 | + "this warning, either create an empty file named " | |
| 2282 | + "\"%/.fossil-settings/%s.no-warn\" in the check-out root, or delete " | |
| 2283 | + "the non-versioned setting with \"fossil unset %s\")", zName, | |
| 2284 | + g.zLocalRoot, zName, g.zLocalRoot, zName, zName | |
| 2285 | 2285 | ); |
| 2286 | 2286 | } |
| 2287 | 2287 | /* Prefer the versioned setting */ |
| 2288 | 2288 | return ( zVersionedSetting!=0 ) ? zVersionedSetting : zNonVersionedSetting; |
| 2289 | 2289 | } |
| 2290 | 2290 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2275,15 +2275,15 @@ | |
| 2275 | ){ |
| 2276 | /* There's a versioned setting, and a non-versioned setting. Tell |
| 2277 | ** the user about the conflict */ |
| 2278 | fossil_warning( |
| 2279 | "setting %s has both versioned and non-versioned values: using " |
| 2280 | "versioned value from file .fossil-settings/%s (to silence this " |
| 2281 | "warning, either create an empty file named " |
| 2282 | ".fossil-settings/%s.no-warn in the check-out root, " |
| 2283 | "or delete the non-versioned setting " |
| 2284 | "with \"fossil unset %s\")", zName, zName, zName, zName |
| 2285 | ); |
| 2286 | } |
| 2287 | /* Prefer the versioned setting */ |
| 2288 | return ( zVersionedSetting!=0 ) ? zVersionedSetting : zNonVersionedSetting; |
| 2289 | } |
| 2290 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2275,15 +2275,15 @@ | |
| 2275 | ){ |
| 2276 | /* There's a versioned setting, and a non-versioned setting. Tell |
| 2277 | ** the user about the conflict */ |
| 2278 | fossil_warning( |
| 2279 | "setting %s has both versioned and non-versioned values: using " |
| 2280 | "versioned value from file \"%/.fossil-settings/%s\" (to silence " |
| 2281 | "this warning, either create an empty file named " |
| 2282 | "\"%/.fossil-settings/%s.no-warn\" in the check-out root, or delete " |
| 2283 | "the non-versioned setting with \"fossil unset %s\")", zName, |
| 2284 | g.zLocalRoot, zName, g.zLocalRoot, zName, zName |
| 2285 | ); |
| 2286 | } |
| 2287 | /* Prefer the versioned setting */ |
| 2288 | return ( zVersionedSetting!=0 ) ? zVersionedSetting : zNonVersionedSetting; |
| 2289 | } |
| 2290 |