Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix a C89 error specific to the symlinks branch and also pull in the C89 fix and the versionable settings fix from trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | symlinks |
| Files: | files | file ages | folders |
| SHA1: |
4778edd3f2c8e529f940b8bbcbc9431e |
| User & Date: | drh 2011-08-27 18:12:56.750 |
Context
|
2011-08-27
| ||
| 18:25 | Changes to fossil_stat() so that the build works for mingw. check-in: a7e747e58f user: drh tags: symlinks | |
| 18:12 | Fix a C89 error specific to the symlinks branch and also pull in the C89 fix and the versionable settings fix from trunk. check-in: 4778edd3f2 user: drh tags: symlinks | |
| 18:05 | Versionable settings are only checked if the local _FOSSIL_ database is already opened. Versionable settings no longer attempts to open that database itself. This fixes an issue with the Admin/Settings page. check-in: a2cc6bc6dc user: drh tags: trunk | |
| 09:44 | Fix reading delta from wrong column in stash. check-in: 0317a929cb user: dmitry tags: symlinks | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
1436 1437 1438 1439 1440 1441 1442 |
zVersionedSetting = fossil_strdup(cacheEntry->zValue);
break;
}
cacheEntry = cacheEntry->next;
}
/* Attempt to read value from file in checkout if there wasn't a cache hit
** and a checkout is open. */
| | | 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 |
zVersionedSetting = fossil_strdup(cacheEntry->zValue);
break;
}
cacheEntry = cacheEntry->next;
}
/* Attempt to read value from file in checkout if there wasn't a cache hit
** and a checkout is open. */
if( cacheEntry==0 ){
Blob versionedPathname;
char *zVersionedPathname;
blob_zero(&versionedPathname);
blob_appendf(&versionedPathname, "%s/.fossil-settings/%s",
g.zLocalRoot, zName);
zVersionedPathname = blob_str(&versionedPathname);
if( file_size(zVersionedPathname)>=0 ){
|
| ︙ | ︙ | |||
1510 1511 1512 1513 1514 1515 1516 |
z = db_text(0, "SELECT value FROM config WHERE name=%Q", zName);
}
if( z==0 && g.configOpen ){
db_swap_connections();
z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName);
db_swap_connections();
}
| | | 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 |
z = db_text(0, "SELECT value FROM config WHERE name=%Q", zName);
}
if( z==0 && g.configOpen ){
db_swap_connections();
z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName);
db_swap_connections();
}
if( ctrlSetting!=0 && ctrlSetting->versionable && g.localOpen ){
/* This is a versionable setting, try and get the info from a checked out file */
z = db_get_do_versionable(zName, z);
}
if( z==0 ){
z = zDefault;
}
return z;
|
| ︙ | ︙ |
Changes to src/diffcmd.c.
| ︙ | ︙ | |||
285 286 287 288 289 290 291 292 293 294 295 296 297 |
if( !asNewFile ){ showDiff = 0; }
}else if( isChnged==3 ){
diff_printf("ADDED_BY_MERGE %s\n", zPathname);
srcid = 0;
if( !asNewFile ){ showDiff = 0; }
}
if( showDiff ){
if( !isLink != !file_islink(zFullName) ){
diff_print_index(zPathname);
diff_printf("--- %s\n+++ %s\n", zPathname, zPathname);
diff_printf("cannot compute difference between symlink and regular file\n");
continue;
}
| > < | 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 |
if( !asNewFile ){ showDiff = 0; }
}else if( isChnged==3 ){
diff_printf("ADDED_BY_MERGE %s\n", zPathname);
srcid = 0;
if( !asNewFile ){ showDiff = 0; }
}
if( showDiff ){
Blob content;
if( !isLink != !file_islink(zFullName) ){
diff_print_index(zPathname);
diff_printf("--- %s\n+++ %s\n", zPathname, zPathname);
diff_printf("cannot compute difference between symlink and regular file\n");
continue;
}
if( srcid>0 ){
content_get(srcid, &content);
}else{
blob_zero(&content);
}
diff_print_index(zPathname);
diff_file(&content, zFullName, zPathname, zDiffCmd, ignoreEolWs);
|
| ︙ | ︙ |
Changes to src/setup.c.
| ︙ | ︙ | |||
1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 |
login_check_credentials();
if( !g.okSetup ){
login_needed();
}
style_header("Settings");
db_begin_transaction();
@ <p>This page provides a simple interface to the "fossil setting" command.
@ See the "fossil help setting" output below for further information on
@ the meaning of each setting.</p><hr />
@ <form action="%s(g.zTop)/setup_settings" method="post"><div>
@ <table border="0"><tr><td valign="top">
login_insert_csrf_secret();
| > | 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 |
login_check_credentials();
if( !g.okSetup ){
login_needed();
}
style_header("Settings");
db_open_local();
db_begin_transaction();
@ <p>This page provides a simple interface to the "fossil setting" command.
@ See the "fossil help setting" output below for further information on
@ the meaning of each setting.</p><hr />
@ <form action="%s(g.zTop)/setup_settings" method="post"><div>
@ <table border="0"><tr><td valign="top">
login_insert_csrf_secret();
|
| ︙ | ︙ |
Changes to src/timeline.c.
| ︙ | ︙ | |||
1257 1258 1259 1260 1261 1262 1263 |
** 4. Number of non-merge children
** 5. Number of parents
*/
void print_timeline(Stmt *q, int mxLine, int showfiles){
int nLine = 0;
char zPrevDate[20];
const char *zCurrentUuid=0;
| < > | 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 |
** 4. Number of non-merge children
** 5. Number of parents
*/
void print_timeline(Stmt *q, int mxLine, int showfiles){
int nLine = 0;
char zPrevDate[20];
const char *zCurrentUuid=0;
int fchngQueryInit = 0; /* True if fchngQuery is initialized */
Stmt fchngQuery; /* Query for file changes on check-ins */
zPrevDate[0] = 0;
if( g.localOpen ){
int rid = db_lget_int("checkout", 0);
zCurrentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
}
while( db_step(q)==SQLITE_ROW && nLine<=mxLine ){
|
| ︙ | ︙ |