Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix variable declaration order to block-top; keeps the C89 conformance. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
0cb6e03443f96985fa834d9345468669 |
| User & Date: | ashepilko 2020-07-17 22:05:59.123 |
Context
|
2020-07-17
| ||
| 23:53 | For strtoll() with Visual Studio prior to MSVS 2013, fallback to _strtoi64(). ... (check-in: d626ddb554 user: ashepilko tags: trunk) | |
| 22:05 | Fix variable declaration order to block-top; keeps the C89 conformance. ... (check-in: 0cb6e03443 user: ashepilko tags: trunk) | |
| 22:02 | Support out-of-source build on Windows when BUILDDIR envvar is not set. ... (check-in: 0f0b904337 user: ashepilko tags: trunk) | |
Changes
Changes to src/graph.c.
| ︙ | ︙ | |||
735 736 737 738 739 740 741 742 743 744 745 |
** See the graph on check-in 8ac66ef33b464d28 for example
** iReuseIdx = -1;
** iReuseRail = -1; */
isCherrypick = 1;
}
pDesc = hashFind(p, parentRid);
if( pDesc==0 ){
/* Merge from a node that is off-screen */
if( iReuseIdx>=p->nRow+1 ){
continue; /* Suppress multiple off-screen merges */
}
| > < | 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 |
** See the graph on check-in 8ac66ef33b464d28 for example
** iReuseIdx = -1;
** iReuseRail = -1; */
isCherrypick = 1;
}
pDesc = hashFind(p, parentRid);
if( pDesc==0 ){
int iMrail = -1;
/* Merge from a node that is off-screen */
if( iReuseIdx>=p->nRow+1 ){
continue; /* Suppress multiple off-screen merges */
}
for(j=0; j<GR_MAX_RAIL; j++){
if( mergeRiserFrom[j]==parentRid ){
iMrail = j;
break;
}
}
if( iMrail==-1 ){
|
| ︙ | ︙ |
Changes to src/hook.c.
| ︙ | ︙ | |||
270 271 272 273 274 275 276 277 278 279 |
}
if( zType ) validate_type(zType);
nSeq = zSeq ? atoi(zSeq) : 10;
if( g.argc<4 ) usage("delete ID ...");
db_begin_write();
for(i=3; i<g.argc; i++){
Blob sql;
if( sqlite3_strglob("*[^0-9]*", g.argv[i])==0 ){
fossil_fatal("not a valid ID: \"%s\"", g.argv[i]);
}
| > | | 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 |
}
if( zType ) validate_type(zType);
nSeq = zSeq ? atoi(zSeq) : 10;
if( g.argc<4 ) usage("delete ID ...");
db_begin_write();
for(i=3; i<g.argc; i++){
Blob sql;
int id;
if( sqlite3_strglob("*[^0-9]*", g.argv[i])==0 ){
fossil_fatal("not a valid ID: \"%s\"", g.argv[i]);
}
id = atoi(g.argv[i]);
blob_init(&sql, 0, 0);
blob_append_sql(&sql, "UPDATE config SET mtime=now(), value="
"json_replace(CASE WHEN json_valid(value) THEN value ELSE '[]' END");
if( zCmd ){
blob_append_sql(&sql, ",'$[%d].cmd',%Q", id, zCmd);
}
if( zType ){
|
| ︙ | ︙ | |||
322 323 324 325 326 327 328 |
atoi(zId)
);
}
db_commit_transaction();
}else
if( strncmp(zCmd, "list", nCmd)==0 ){
Stmt q;
| < > | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 |
atoi(zId)
);
}
db_commit_transaction();
}else
if( strncmp(zCmd, "list", nCmd)==0 ){
Stmt q;
int n = 0;
verify_all_options();
db_prepare(&q,
"SELECT jx.key,"
" json_extract(jx.value,'$.seq'),"
" json_extract(jx.value,'$.cmd'),"
" json_extract(jx.value,'$.type')"
" FROM config, json_each(config.value) AS jx"
" WHERE config.name='hooks' AND json_valid(config.value)"
|
| ︙ | ︙ | |||
354 355 356 357 358 359 360 361 362 363 364 365 366 |
while( db_step(&q)==SQLITE_ROW ){
fossil_print("%s: %s\n", db_column_text(&q,0), db_column_text(&q,1));
}
db_finalize(&q);
}else
if( strncmp(zCmd, "test", nCmd)==0 ){
Stmt q;
int bDryRun = find_option("dry-run", "n", 0)!=0;
const char *zOrigRcvid = find_option("base-rcvid",0,1);
const char *zNewRcvid = find_option("new-rcvid",0,1);
const char *zAuxFilename = find_option("aux-file",0,1);
verify_all_options();
if( g.argc<4 ) usage("test ID");
| > | | 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 |
while( db_step(&q)==SQLITE_ROW ){
fossil_print("%s: %s\n", db_column_text(&q,0), db_column_text(&q,1));
}
db_finalize(&q);
}else
if( strncmp(zCmd, "test", nCmd)==0 ){
Stmt q;
int id;
int bDryRun = find_option("dry-run", "n", 0)!=0;
const char *zOrigRcvid = find_option("base-rcvid",0,1);
const char *zNewRcvid = find_option("new-rcvid",0,1);
const char *zAuxFilename = find_option("aux-file",0,1);
verify_all_options();
if( g.argc<4 ) usage("test ID");
id = atoi(g.argv[3]);
if( zOrigRcvid==0 ){
zOrigRcvid = db_text(0, "SELECT max(rcvid)-1 FROM rcvfrom");
}
db_prepare(&q,
"SELECT json_extract(value,'$[%d].cmd'), "
" json_extract(value,'$[%d].type')=='after-receive'"
" FROM config"
|
| ︙ | ︙ |