Fossil SCM
Merge fixes from trunk.
Commit
9773d5966f6a58486be64ce6a22ff58b454769c9
Parent
326688e58b23999…
4 files changed
+2
-2
+2
-2
+1
+1
-1
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1426,11 +1426,11 @@ | ||
| 1426 | 1426 | } |
| 1427 | 1427 | cacheEntry = cacheEntry->next; |
| 1428 | 1428 | } |
| 1429 | 1429 | /* Attempt to read value from file in checkout if there wasn't a cache hit |
| 1430 | 1430 | ** and a checkout is open. */ |
| 1431 | - if( cacheEntry==0 && db_open_local() ){ | |
| 1431 | + if( cacheEntry==0 ){ | |
| 1432 | 1432 | Blob versionedPathname; |
| 1433 | 1433 | char *zVersionedPathname; |
| 1434 | 1434 | blob_zero(&versionedPathname); |
| 1435 | 1435 | blob_appendf(&versionedPathname, "%s/.fossil-settings/%s", |
| 1436 | 1436 | g.zLocalRoot, zName); |
| @@ -1500,11 +1500,11 @@ | ||
| 1500 | 1500 | if( z==0 && g.configOpen ){ |
| 1501 | 1501 | db_swap_connections(); |
| 1502 | 1502 | z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName); |
| 1503 | 1503 | db_swap_connections(); |
| 1504 | 1504 | } |
| 1505 | - if( ctrlSetting!=0 && ctrlSetting->versionable ){ | |
| 1505 | + if( ctrlSetting!=0 && ctrlSetting->versionable && g.localOpen ){ | |
| 1506 | 1506 | /* This is a versionable setting, try and get the info from a checked out file */ |
| 1507 | 1507 | z = db_get_do_versionable(zName, z); |
| 1508 | 1508 | } |
| 1509 | 1509 | if( z==0 ){ |
| 1510 | 1510 | z = zDefault; |
| 1511 | 1511 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1426,11 +1426,11 @@ | |
| 1426 | } |
| 1427 | cacheEntry = cacheEntry->next; |
| 1428 | } |
| 1429 | /* Attempt to read value from file in checkout if there wasn't a cache hit |
| 1430 | ** and a checkout is open. */ |
| 1431 | if( cacheEntry==0 && db_open_local() ){ |
| 1432 | Blob versionedPathname; |
| 1433 | char *zVersionedPathname; |
| 1434 | blob_zero(&versionedPathname); |
| 1435 | blob_appendf(&versionedPathname, "%s/.fossil-settings/%s", |
| 1436 | g.zLocalRoot, zName); |
| @@ -1500,11 +1500,11 @@ | |
| 1500 | if( z==0 && g.configOpen ){ |
| 1501 | db_swap_connections(); |
| 1502 | z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName); |
| 1503 | db_swap_connections(); |
| 1504 | } |
| 1505 | if( ctrlSetting!=0 && ctrlSetting->versionable ){ |
| 1506 | /* This is a versionable setting, try and get the info from a checked out file */ |
| 1507 | z = db_get_do_versionable(zName, z); |
| 1508 | } |
| 1509 | if( z==0 ){ |
| 1510 | z = zDefault; |
| 1511 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1426,11 +1426,11 @@ | |
| 1426 | } |
| 1427 | cacheEntry = cacheEntry->next; |
| 1428 | } |
| 1429 | /* Attempt to read value from file in checkout if there wasn't a cache hit |
| 1430 | ** and a checkout is open. */ |
| 1431 | if( cacheEntry==0 ){ |
| 1432 | Blob versionedPathname; |
| 1433 | char *zVersionedPathname; |
| 1434 | blob_zero(&versionedPathname); |
| 1435 | blob_appendf(&versionedPathname, "%s/.fossil-settings/%s", |
| 1436 | g.zLocalRoot, zName); |
| @@ -1500,11 +1500,11 @@ | |
| 1500 | if( z==0 && g.configOpen ){ |
| 1501 | db_swap_connections(); |
| 1502 | z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName); |
| 1503 | db_swap_connections(); |
| 1504 | } |
| 1505 | if( ctrlSetting!=0 && ctrlSetting->versionable && g.localOpen ){ |
| 1506 | /* This is a versionable setting, try and get the info from a checked out file */ |
| 1507 | z = db_get_do_versionable(zName, z); |
| 1508 | } |
| 1509 | if( z==0 ){ |
| 1510 | z = zDefault; |
| 1511 |
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1426,11 +1426,11 @@ | ||
| 1426 | 1426 | } |
| 1427 | 1427 | cacheEntry = cacheEntry->next; |
| 1428 | 1428 | } |
| 1429 | 1429 | /* Attempt to read value from file in checkout if there wasn't a cache hit |
| 1430 | 1430 | ** and a checkout is open. */ |
| 1431 | - if( cacheEntry==0 && db_open_local() ){ | |
| 1431 | + if( cacheEntry==0 ){ | |
| 1432 | 1432 | Blob versionedPathname; |
| 1433 | 1433 | char *zVersionedPathname; |
| 1434 | 1434 | blob_zero(&versionedPathname); |
| 1435 | 1435 | blob_appendf(&versionedPathname, "%s/.fossil-settings/%s", |
| 1436 | 1436 | g.zLocalRoot, zName); |
| @@ -1500,11 +1500,11 @@ | ||
| 1500 | 1500 | if( z==0 && g.configOpen ){ |
| 1501 | 1501 | db_swap_connections(); |
| 1502 | 1502 | z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName); |
| 1503 | 1503 | db_swap_connections(); |
| 1504 | 1504 | } |
| 1505 | - if( ctrlSetting!=0 && ctrlSetting->versionable ){ | |
| 1505 | + if( ctrlSetting!=0 && ctrlSetting->versionable && g.localOpen ){ | |
| 1506 | 1506 | /* This is a versionable setting, try and get the info from a checked out file */ |
| 1507 | 1507 | z = db_get_do_versionable(zName, z); |
| 1508 | 1508 | } |
| 1509 | 1509 | if( z==0 ){ |
| 1510 | 1510 | z = zDefault; |
| 1511 | 1511 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1426,11 +1426,11 @@ | |
| 1426 | } |
| 1427 | cacheEntry = cacheEntry->next; |
| 1428 | } |
| 1429 | /* Attempt to read value from file in checkout if there wasn't a cache hit |
| 1430 | ** and a checkout is open. */ |
| 1431 | if( cacheEntry==0 && db_open_local() ){ |
| 1432 | Blob versionedPathname; |
| 1433 | char *zVersionedPathname; |
| 1434 | blob_zero(&versionedPathname); |
| 1435 | blob_appendf(&versionedPathname, "%s/.fossil-settings/%s", |
| 1436 | g.zLocalRoot, zName); |
| @@ -1500,11 +1500,11 @@ | |
| 1500 | if( z==0 && g.configOpen ){ |
| 1501 | db_swap_connections(); |
| 1502 | z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName); |
| 1503 | db_swap_connections(); |
| 1504 | } |
| 1505 | if( ctrlSetting!=0 && ctrlSetting->versionable ){ |
| 1506 | /* This is a versionable setting, try and get the info from a checked out file */ |
| 1507 | z = db_get_do_versionable(zName, z); |
| 1508 | } |
| 1509 | if( z==0 ){ |
| 1510 | z = zDefault; |
| 1511 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1426,11 +1426,11 @@ | |
| 1426 | } |
| 1427 | cacheEntry = cacheEntry->next; |
| 1428 | } |
| 1429 | /* Attempt to read value from file in checkout if there wasn't a cache hit |
| 1430 | ** and a checkout is open. */ |
| 1431 | if( cacheEntry==0 ){ |
| 1432 | Blob versionedPathname; |
| 1433 | char *zVersionedPathname; |
| 1434 | blob_zero(&versionedPathname); |
| 1435 | blob_appendf(&versionedPathname, "%s/.fossil-settings/%s", |
| 1436 | g.zLocalRoot, zName); |
| @@ -1500,11 +1500,11 @@ | |
| 1500 | if( z==0 && g.configOpen ){ |
| 1501 | db_swap_connections(); |
| 1502 | z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName); |
| 1503 | db_swap_connections(); |
| 1504 | } |
| 1505 | if( ctrlSetting!=0 && ctrlSetting->versionable && g.localOpen ){ |
| 1506 | /* This is a versionable setting, try and get the info from a checked out file */ |
| 1507 | z = db_get_do_versionable(zName, z); |
| 1508 | } |
| 1509 | if( z==0 ){ |
| 1510 | z = zDefault; |
| 1511 |
+1
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -1050,10 +1050,11 @@ | ||
| 1050 | 1050 | if( !g.okSetup ){ |
| 1051 | 1051 | login_needed(); |
| 1052 | 1052 | } |
| 1053 | 1053 | |
| 1054 | 1054 | style_header("Settings"); |
| 1055 | + db_open_local(); | |
| 1055 | 1056 | db_begin_transaction(); |
| 1056 | 1057 | @ <p>This page provides a simple interface to the "fossil setting" command. |
| 1057 | 1058 | @ See the "fossil help setting" output below for further information on |
| 1058 | 1059 | @ the meaning of each setting.</p><hr /> |
| 1059 | 1060 | @ <form action="%s(g.zTop)/setup_settings" method="post"><div> |
| 1060 | 1061 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -1050,10 +1050,11 @@ | |
| 1050 | if( !g.okSetup ){ |
| 1051 | login_needed(); |
| 1052 | } |
| 1053 | |
| 1054 | style_header("Settings"); |
| 1055 | db_begin_transaction(); |
| 1056 | @ <p>This page provides a simple interface to the "fossil setting" command. |
| 1057 | @ See the "fossil help setting" output below for further information on |
| 1058 | @ the meaning of each setting.</p><hr /> |
| 1059 | @ <form action="%s(g.zTop)/setup_settings" method="post"><div> |
| 1060 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -1050,10 +1050,11 @@ | |
| 1050 | if( !g.okSetup ){ |
| 1051 | login_needed(); |
| 1052 | } |
| 1053 | |
| 1054 | style_header("Settings"); |
| 1055 | db_open_local(); |
| 1056 | db_begin_transaction(); |
| 1057 | @ <p>This page provides a simple interface to the "fossil setting" command. |
| 1058 | @ See the "fossil help setting" output below for further information on |
| 1059 | @ the meaning of each setting.</p><hr /> |
| 1060 | @ <form action="%s(g.zTop)/setup_settings" method="post"><div> |
| 1061 |
+1
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1259,13 +1259,13 @@ | ||
| 1259 | 1259 | */ |
| 1260 | 1260 | void print_timeline(Stmt *q, int mxLine, int showfiles){ |
| 1261 | 1261 | int nLine = 0; |
| 1262 | 1262 | char zPrevDate[20]; |
| 1263 | 1263 | const char *zCurrentUuid=0; |
| 1264 | - zPrevDate[0] = 0; | |
| 1265 | 1264 | int fchngQueryInit = 0; /* True if fchngQuery is initialized */ |
| 1266 | 1265 | Stmt fchngQuery; /* Query for file changes on check-ins */ |
| 1266 | + zPrevDate[0] = 0; | |
| 1267 | 1267 | |
| 1268 | 1268 | if( g.localOpen ){ |
| 1269 | 1269 | int rid = db_lget_int("checkout", 0); |
| 1270 | 1270 | zCurrentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 1271 | 1271 | } |
| 1272 | 1272 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1259,13 +1259,13 @@ | |
| 1259 | */ |
| 1260 | void print_timeline(Stmt *q, int mxLine, int showfiles){ |
| 1261 | int nLine = 0; |
| 1262 | char zPrevDate[20]; |
| 1263 | const char *zCurrentUuid=0; |
| 1264 | zPrevDate[0] = 0; |
| 1265 | int fchngQueryInit = 0; /* True if fchngQuery is initialized */ |
| 1266 | Stmt fchngQuery; /* Query for file changes on check-ins */ |
| 1267 | |
| 1268 | if( g.localOpen ){ |
| 1269 | int rid = db_lget_int("checkout", 0); |
| 1270 | zCurrentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 1271 | } |
| 1272 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1259,13 +1259,13 @@ | |
| 1259 | */ |
| 1260 | void print_timeline(Stmt *q, int mxLine, int showfiles){ |
| 1261 | int nLine = 0; |
| 1262 | char zPrevDate[20]; |
| 1263 | const char *zCurrentUuid=0; |
| 1264 | int fchngQueryInit = 0; /* True if fchngQuery is initialized */ |
| 1265 | Stmt fchngQuery; /* Query for file changes on check-ins */ |
| 1266 | zPrevDate[0] = 0; |
| 1267 | |
| 1268 | if( g.localOpen ){ |
| 1269 | int rid = db_lget_int("checkout", 0); |
| 1270 | zCurrentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 1271 | } |
| 1272 |