Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch mgagnon_fix Excluding Merge-Ins
This is equivalent to a diff from 480367cecf to 7a57ab6465
|
2012-06-12
| ||
| 11:20 | Change the "pqueue_" prefix on methods of the priority queue object to be "pqueuex_" to avoid conflicts with OpenSSL. check-in: 81162c716c user: drh tags: trunk | |
|
2012-06-11
| ||
| 17:33 | merge trunk again... (previous merge was not from latest trunk from fossil-scm.org) Closed-Leaf check-in: 7a57ab6465 user: mgagnon tags: mgagnon_fix | |
| 17:23 | Merge in Trunk... check-in: c109e66db5 user: mgagnon tags: mgagnon_fix | |
| 11:39 | Minor pedantic wording change to accommodate a recent code change in how _FOSSIL_ stores the path to the repo file. check-in: 480367cecf user: stephan tags: trunk | |
|
2012-06-10
| ||
| 22:31 | Merge the autosetup and winsrv branches into trunk. check-in: 1ac9cece64 user: drh tags: trunk | |
Changes to src/add.c.
| ︙ | ︙ | |||
605 606 607 608 609 610 611 |
const char *zFrom = db_column_text(&q, 0);
const char *zTo = db_column_text(&q, 1);
mv_one_file(vid, zFrom, zTo);
}
db_finalize(&q);
db_end_transaction(0);
}
| > > > > > | 605 606 607 608 609 610 611 612 613 614 615 616 |
const char *zFrom = db_column_text(&q, 0);
const char *zTo = db_column_text(&q, 1);
mv_one_file(vid, zFrom, zTo);
}
db_finalize(&q);
db_end_transaction(0);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/allrepo.c.
| ︙ | ︙ | |||
214 215 216 217 218 219 220 |
fossil_print("%s\n", blob_str(&sql));
}else{
db_multi_exec(blob_str(&sql));
}
blob_reset(&sql);
}
}
| > > > > > | 214 215 216 217 218 219 220 221 222 223 224 225 |
fossil_print("%s\n", blob_str(&sql));
}else{
db_multi_exec(blob_str(&sql));
}
blob_reset(&sql);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/attach.c.
| ︙ | ︙ | |||
372 373 374 375 376 377 378 | @ <input type="hidden" name="from" value="%h(zFrom)" /> @ <input type="submit" name="confirm" value="Delete" /> @ <input type="submit" name="cancel" value="Cancel" /> @ </div></form> style_footer(); } | > > > > > | 372 373 374 375 376 377 378 379 380 381 382 383 | @ <input type="hidden" name="from" value="%h(zFrom)" /> @ <input type="submit" name="confirm" value="Delete" /> @ <input type="submit" name="cancel" value="Cancel" /> @ </div></form> style_footer(); } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/bag.c.
| ︙ | ︙ | |||
225 226 227 228 229 230 231 |
/*
** Return the number of elements in the bag.
*/
int bag_count(Bag *p){
return p->cnt;
}
| > > > > > | 225 226 227 228 229 230 231 232 233 234 235 236 |
/*
** Return the number of elements in the bag.
*/
int bag_count(Bag *p){
return p->cnt;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/bisect.c.
| ︙ | ︙ | |||
242 243 244 245 246 247 248 |
db_reset(&s);
}
db_finalize(&s);
}else{
usage("bad|good|next|reset|vlist ...");
}
}
| > > > > > | 242 243 244 245 246 247 248 249 250 251 252 253 |
db_reset(&s);
}
db_finalize(&s);
}else{
usage("bad|good|next|reset|vlist ...");
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/blob.c.
| ︙ | ︙ | |||
1079 1080 1081 1082 1083 1084 1085 |
assert( (pIn->iCursor+nLen) <= pIn->nUsed );
if( nLen ){
memcpy( pDest, pIn->aData, nLen );
pIn->iCursor += nLen;
}
return nLen;
}
| > > > > > | 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 |
assert( (pIn->iCursor+nLen) <= pIn->nUsed );
if( nLen ){
memcpy( pDest, pIn->aData, nLen );
pIn->iCursor += nLen;
}
return nLen;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/branch.c.
| ︙ | ︙ | |||
425 426 427 428 429 430 431 |
@ function xin(id){
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
| > > > > > | 425 426 427 428 429 430 431 432 433 434 435 436 |
@ function xin(id){
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/browse.c.
| ︙ | ︙ | |||
291 292 293 294 295 296 297 |
}
}
db_finalize(&q);
manifest_destroy(pM);
@ </ul></td></tr></table>
style_footer();
}
| > > > > > | 291 292 293 294 295 296 297 298 299 300 301 302 |
}
}
db_finalize(&q);
manifest_destroy(pM);
@ </ul></td></tr></table>
style_footer();
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/captcha.c.
| ︙ | ︙ | |||
436 437 438 439 440 441 442 | blob_appendf(&b, "%s-%x", zSecret, seed); sha1sum_blob(&b, &b); z = blob_buffer(&b); memcpy(zRes, z, 8); zRes[8] = 0; return zRes; } | > > > > > | 436 437 438 439 440 441 442 443 444 445 446 447 | blob_appendf(&b, "%s-%x", zSecret, seed); sha1sum_blob(&b, &b); z = blob_buffer(&b); memcpy(zRes, z, 8); zRes[8] = 0; return zRes; } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/cgi.c.
| ︙ | ︙ | |||
1442 1443 1444 1445 1446 1447 1448 | if( zIf==0 ) return; if( objectTime > cgi_rfc822_parsedate(zIf) ) return; cgi_set_status(304,"Not Modified"); cgi_reset_content(); cgi_reply(); fossil_exit(0); } | > > > > > | 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 | if( zIf==0 ) return; if( objectTime > cgi_rfc822_parsedate(zIf) ) return; cgi_set_status(304,"Not Modified"); cgi_reset_content(); cgi_reply(); fossil_exit(0); } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/checkin.c.
| ︙ | ︙ | |||
1346 1347 1348 1349 1350 1351 1352 |
if( !g.markPrivate ){
autosync(AUTOSYNC_PUSH);
}
if( count_nonbranch_children(vid)>1 ){
fossil_print("**** warning: a fork has occurred *****\n");
}
}
| > > > > > | 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 |
if( !g.markPrivate ){
autosync(AUTOSYNC_PUSH);
}
if( count_nonbranch_children(vid)>1 ){
fossil_print("**** warning: a fork has occurred *****\n");
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/checkout.c.
| ︙ | ︙ | |||
296 297 298 299 300 301 302 |
if( db_is_writeable("repository") ){
db_multi_exec("DELETE FROM config WHERE name='ckout:%q'", g.zLocalRoot);
}
unlink_local_database(1);
db_close(1);
unlink_local_database(0);
}
| > > > > > | 296 297 298 299 300 301 302 303 304 305 306 307 |
if( db_is_writeable("repository") ){
db_multi_exec("DELETE FROM config WHERE name='ckout:%q'", g.zLocalRoot);
}
unlink_local_database(1);
db_close(1);
unlink_local_database(0);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/clearsign.c.
| ︙ | ︙ | |||
56 57 58 59 60 61 62 | } file_delete(zOut); file_delete(zIn); free(zOut); free(zIn); return rc; } | > > > > > | 56 57 58 59 60 61 62 63 64 65 66 67 | } file_delete(zOut); file_delete(zIn); free(zOut); free(zIn); return rc; } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/clone.c.
| ︙ | ︙ | |||
181 182 183 184 185 186 187 |
fossil_print("server-id: %s\n", db_get("server-code", 0));
zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
zPw = g.urlPasswd;
if( !g.dontKeepUrl && zPw) db_set("last-sync-pw", obscure(zPw), 0);
db_end_transaction(0);
}
| > > > > > | 181 182 183 184 185 186 187 188 189 190 191 192 |
fossil_print("server-id: %s\n", db_get("server-code", 0));
zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
zPw = g.urlPasswd;
if( !g.dontKeepUrl && zPw) db_set("last-sync-pw", obscure(zPw), 0);
db_end_transaction(0);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/comformat.c.
| ︙ | ︙ | |||
94 95 96 97 98 99 100 |
if( g.argc!=4 ){
usage("PREFIX TEXT");
}
indent = strlen(g.argv[2]) + 1;
fossil_print("%s ", g.argv[2]);
fossil_print("(%d lines output)\n", comment_print(g.argv[3], indent, 79));
}
| > > > > > | 94 95 96 97 98 99 100 101 102 103 104 105 |
if( g.argc!=4 ){
usage("PREFIX TEXT");
}
indent = strlen(g.argv[2]) + 1;
fossil_print("%s ", g.argv[2]);
fossil_print("(%d lines output)\n", comment_print(g.argv[3], indent, 79));
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/config.h.
| ︙ | ︙ | |||
142 143 144 145 146 147 148 | #if defined(__GNUC__) || defined(__clang__) # define NORETURN __attribute__((__noreturn__)) #else # define NORETURN #endif #endif /* _RC_COMPILE_ */ | > > > > > | 142 143 144 145 146 147 148 149 150 151 152 153 | #if defined(__GNUC__) || defined(__clang__) # define NORETURN __attribute__((__noreturn__)) #else # define NORETURN #endif #endif /* _RC_COMPILE_ */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/configure.c.
| ︙ | ︙ | |||
915 916 917 918 919 920 921 |
fossil_nameofexe(), g.argv[1], zBackup);
}else
{
fossil_fatal("METHOD should be one of:"
" export import merge pull push reset");
}
}
| > > > > > | 915 916 917 918 919 920 921 922 923 924 925 926 |
fossil_nameofexe(), g.argv[1], zBackup);
}else
{
fossil_fatal("METHOD should be one of:"
" export import merge pull push reset");
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/content.c.
| ︙ | ︙ | |||
889 890 891 892 893 894 895 |
blob_reset(&content);
n2++;
}
db_finalize(&q);
fossil_print("%d non-phantom blobs (out of %d total) checked: %d errors\n",
n2, n1, nErr);
}
| > > > > > | 889 890 891 892 893 894 895 896 897 898 899 900 |
blob_reset(&content);
n2++;
}
db_finalize(&q);
fossil_print("%d non-phantom blobs (out of %d total) checked: %d errors\n",
n2, n1, nErr);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/cson_amalgamation.c.
| ︙ | ︙ | |||
5691 5692 5693 5694 5695 5696 5697 | #if defined(__cplusplus) } /*extern "C"*/ #endif #undef MARKER #endif /* CSON_ENABLE_SQLITE3 */ /* end file ./cson_sqlite3.c */ #endif /* FOSSIL_ENABLE_JSON */ | > > > > > | 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 | #if defined(__cplusplus) } /*extern "C"*/ #endif #undef MARKER #endif /* CSON_ENABLE_SQLITE3 */ /* end file ./cson_sqlite3.c */ #endif /* FOSSIL_ENABLE_JSON */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/cson_amalgamation.h.
| ︙ | ︙ | |||
2519 2520 2521 2522 2523 2524 2525 |
} /*extern "C"*/
#endif
#endif /* CSON_ENABLE_SQLITE3 */
#endif /* WANDERINGHORSE_NET_CSON_SQLITE3_H_INCLUDED */
/* end file include/wh/cson/cson_sqlite3.h */
#endif /* FOSSIL_ENABLE_JSON */
| > > > > > | 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 |
} /*extern "C"*/
#endif
#endif /* CSON_ENABLE_SQLITE3 */
#endif /* WANDERINGHORSE_NET_CSON_SQLITE3_H_INCLUDED */
/* end file include/wh/cson/cson_sqlite3.h */
#endif /* FOSSIL_ENABLE_JSON */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/db.c.
1 2 | /* ** Copyright (c) 2006 D. Richard Hipp | | | 1 2 3 4 5 6 7 8 9 10 | /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also ** known as the "2-Clause License" or "FreeBSD License".) ** This program is distributed in the hope that it will be useful, ** but without any warranty; without even the implied warranty of ** merchantability or fitness for a particular purpose. |
| ︙ | ︙ | |||
866 867 868 869 870 871 872 |
** This routine always opens the user database regardless of whether or
** not the repository database is found. If the _FOSSIL_ or .fos file
** is found, it is attached to the open database connection too.
*/
int db_open_local(void){
int i, n;
char zPwd[2000];
| | < > | > > > > > > | > > > > | 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 |
** This routine always opens the user database regardless of whether or
** not the repository database is found. If the _FOSSIL_ or .fos file
** is found, it is attached to the open database connection too.
*/
int db_open_local(void){
int i, n;
char zPwd[2000];
static const char *aDbName[] = { "_FOSSIL_", "fslckout", ".fos" };
if( g.localOpen) return 1;
file_getcwd(zPwd, sizeof(zPwd)-20);
n = strlen(zPwd);
while( n>0 ){
if( file_access(zPwd, W_OK) ) break;
for(i=0; i<sizeof(aDbName)/sizeof(aDbName[0]); i++){
if( zPwd[n-1] == '/'){
sqlite3_snprintf(sizeof(zPwd)-n, &zPwd[n], "%s", aDbName[i]);
}else{
sqlite3_snprintf(sizeof(zPwd)-n, &zPwd[n], "/%s", aDbName[i]);
}
if( isValidLocalDb(zPwd) ){
/* Found a valid checkout database file */
zPwd[n] = 0;
while( n>1 && zPwd[n-1]=='/' ){
n--;
zPwd[n] = 0;
}
if( zPwd[n-1] == '/'){
g.zLocalRoot = mprintf("%s", zPwd);
}else{
g.zLocalRoot = mprintf("%s/", zPwd);
}
g.localOpen = 1;
db_open_config(0);
db_open_repository(0);
return 1;
}
}
n--;
while( n>0 && zPwd[n]!='/' ){ n--; }
while( n>0 && zPwd[n-1]=='/' ){ n--; }
if(n==0 && zPwd[0]=='/'){
n=1;
}
zPwd[n] = 0;
}
/* A checkout database file could not be found */
return 0;
}
|
| ︙ | ︙ | |||
2185 2186 2187 2188 2189 2190 2191 |
if( g.argc!=3 ) usage("TIMESTAMP");
sqlite3_open(":memory:", &g.db);
rDiff = db_double(0.0, "SELECT julianday('now') - julianday(%Q)", g.argv[2]);
fossil_print("Time differences: %s\n", db_timespan_name(rDiff));
sqlite3_close(g.db);
g.db = 0;
}
| > > > > > | 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 |
if( g.argc!=3 ) usage("TIMESTAMP");
sqlite3_open(":memory:", &g.db);
rDiff = db_double(0.0, "SELECT julianday('now') - julianday(%Q)", g.argv[2]);
fossil_print("Time differences: %s\n", db_timespan_name(rDiff));
sqlite3_close(g.db);
g.db = 0;
}
/*
* vim:ts=2:sts=2:et:sw=2
*/
|
Changes to src/delta.c.
| ︙ | ︙ | |||
595 596 597 598 599 600 601 |
return -1;
}
}
}
/* ERROR: unterminated delta */
return -1;
}
| > > > > > | 595 596 597 598 599 600 601 602 603 604 605 606 |
return -1;
}
}
}
/* ERROR: unterminated delta */
return -1;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/deltacmd.c.
| ︙ | ︙ | |||
146 147 148 149 150 151 152 |
blob_delta_apply(&f1, &d12, &a2);
blob_delta_apply(&f2, &d21, &a1);
if( blob_compare(&f1,&a1) || blob_compare(&f2, &a2) ){
fossil_panic("delta test failed");
}
fossil_print("ok\n");
}
| > > > > > | 146 147 148 149 150 151 152 153 154 155 156 157 |
blob_delta_apply(&f1, &d12, &a2);
blob_delta_apply(&f2, &d21, &a1);
if( blob_compare(&f1,&a1) || blob_compare(&f2, &a2) ){
fossil_panic("delta test failed");
}
fossil_print("ok\n");
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/descendants.c.
| ︙ | ︙ | |||
403 404 405 406 407 408 409 |
@ function xin(id){
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
| > > > > > | 403 404 405 406 407 408 409 410 411 412 413 414 |
@ function xin(id){
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/diff.c.
| ︙ | ︙ | |||
1915 1916 1917 1918 1919 1920 1921 |
printf("---------------------------------------------------\n");
}
for(i=0; i<ann.nOrig; i++){
fossil_print("%s: %.*s\n",
ann.aOrig[i].zSrc, ann.aOrig[i].n, ann.aOrig[i].z);
}
}
| > > > > > | 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 |
printf("---------------------------------------------------\n");
}
for(i=0; i<ann.nOrig; i++){
fossil_print("%s: %.*s\n",
ann.aOrig[i].zSrc, ann.aOrig[i].n, ann.aOrig[i].z);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/diffcmd.c.
| ︙ | ︙ | |||
551 552 553 554 555 556 557 |
login_check_credentials();
if( !g.perm.Read ){ login_needed(); return; }
if( zFrom==0 || zTo==0 ) fossil_redirect_home();
cgi_set_content_type("text/plain");
diff_all_two_versions(zFrom, zTo, 0, DIFF_NEWFILE);
}
| > > > > > | 551 552 553 554 555 556 557 558 559 560 561 562 |
login_check_credentials();
if( !g.perm.Read ){ login_needed(); return; }
if( zFrom==0 || zTo==0 ) fossil_redirect_home();
cgi_set_content_type("text/plain");
diff_all_two_versions(zFrom, zTo, 0, DIFF_NEWFILE);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/doc.c.
| ︙ | ︙ | |||
635 636 637 638 639 640 641 |
if( blob_size(&bgimg)==0 ){
blob_init(&bgimg, (char*)aBackground, sizeof(aBackground));
}
cgi_set_content_type(zMime);
cgi_set_content(&bgimg);
g.isConst = 1;
}
| > > > > > | 635 636 637 638 639 640 641 642 643 644 645 646 |
if( blob_size(&bgimg)==0 ){
blob_init(&bgimg, (char*)aBackground, sizeof(aBackground));
}
cgi_set_content_type(zMime);
cgi_set_content(&bgimg);
g.isConst = 1;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/encode.c.
| ︙ | ︙ | |||
585 586 587 588 589 590 591 |
free(z);
free(z2);
z = unobscure(g.argv[i]);
fossil_print("UNOBSCURE: %s -> %s\n", g.argv[i], z);
free(z);
}
}
| > > > > > | 585 586 587 588 589 590 591 592 593 594 595 596 |
free(z);
free(z2);
z = unobscure(g.argv[i]);
fossil_print("UNOBSCURE: %s -> %s\n", g.argv[i], z);
free(z);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/event.c.
| ︙ | ︙ | |||
424 425 426 427 428 429 430 | @ <input type="submit" name="preview" value="Preview Your Changes" /> @ <input type="submit" name="submit" value="Apply These Changes" /> @ <input type="submit" name="cancel" value="Cancel" /> @ </td></tr></table> @ </div></form> style_footer(); } | > > > > > | 424 425 426 427 428 429 430 431 432 433 434 435 | @ <input type="submit" name="preview" value="Preview Your Changes" /> @ <input type="submit" name="submit" value="Apply These Changes" /> @ <input type="submit" name="cancel" value="Cancel" /> @ </td></tr></table> @ </div></form> style_footer(); } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/export.c.
| ︙ | ︙ | |||
342 343 344 345 346 347 348 |
}
db_finalize(&q);
if( ferror(f)!=0 || fclose(f)!=0 ) {
fossil_panic("error while writing %s", markfile_out);
}
}
}
| > > > > > | 342 343 344 345 346 347 348 349 350 351 352 353 |
}
db_finalize(&q);
if( ferror(f)!=0 || fclose(f)!=0 ) {
fossil_panic("error while writing %s", markfile_out);
}
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/file.c.
| ︙ | ︙ | |||
1100 1101 1102 1103 1104 1105 1106 |
*/
FILE *fossil_fopen(const char *zName, const char *zMode){
char *zMbcs = fossil_utf8_to_mbcs(zName);
FILE *f = fopen(zMbcs, zMode);
fossil_mbcs_free(zMbcs);
return f;
}
| > > > > > | 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 |
*/
FILE *fossil_fopen(const char *zName, const char *zMode){
char *zMbcs = fossil_utf8_to_mbcs(zName);
FILE *f = fopen(zMbcs, zMode);
fossil_mbcs_free(zMbcs);
return f;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/finfo.c.
| ︙ | ︙ | |||
347 348 349 350 351 352 353 |
@ </td></tr>
}
}
@ </table>
timeline_output_graph_javascript(pGraph, 0);
style_footer();
}
| > > > > > | 347 348 349 350 351 352 353 354 355 356 357 358 |
@ </td></tr>
}
}
@ </table>
timeline_output_graph_javascript(pGraph, 0);
style_footer();
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/glob.c.
| ︙ | ︙ | |||
260 261 262 263 264 265 266 |
fossil_print("pattern[%d] = [%s]\n", i, pGlob->azPattern[i]);
}
for(i=3; i<g.argc; i++){
fossil_print("%d %s\n", glob_match(pGlob, g.argv[i]), g.argv[i]);
}
glob_free(pGlob);
}
| > > > > > | 260 261 262 263 264 265 266 267 268 269 270 271 |
fossil_print("pattern[%d] = [%s]\n", i, pGlob->azPattern[i]);
}
for(i=3; i<g.argc; i++){
fossil_print("%d %s\n", glob_match(pGlob, g.argv[i]), g.argv[i]);
}
glob_free(pGlob);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/graph.c.
| ︙ | ︙ | |||
555 556 557 558 559 560 561 | /* ** Find the maximum rail number. */ find_max_rail(p); p->nErr = 0; } | > > > > > | 555 556 557 558 559 560 561 562 563 564 565 566 | /* ** Find the maximum rail number. */ find_max_rail(p); p->nErr = 0; } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/gzip.c.
| ︙ | ︙ | |||
134 135 136 137 138 139 140 | gzip_step(blob_buffer(&b), blob_size(&b)); blob_reset(&b); gzip_finish(&b); blob_write_to_file(&b, zOut); blob_reset(&b); fossil_free(zOut); } | > > > > > | 134 135 136 137 138 139 140 141 142 143 144 145 | gzip_step(blob_buffer(&b), blob_size(&b)); blob_reset(&b); gzip_finish(&b); blob_write_to_file(&b, zOut); blob_reset(&b); fossil_free(zOut); } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/http.c.
| ︙ | ︙ | |||
305 306 307 308 309 310 311 | /* ** Jump to here if an error is seen. */ write_err: transport_close(); return 1; } | > > > > > | 305 306 307 308 309 310 311 312 313 314 315 316 | /* ** Jump to here if an error is seen. */ write_err: transport_close(); return 1; } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/http_socket.c.
| ︙ | ︙ | |||
209 210 211 212 213 214 215 |
if( got<=0 ) break;
total += (size_t)got;
N -= (size_t)got;
pContent = (void*)&((char*)pContent)[got];
}
return total;
}
| > > > > > | 209 210 211 212 213 214 215 216 217 218 219 220 |
if( got<=0 ) break;
total += (size_t)got;
N -= (size_t)got;
pContent = (void*)&((char*)pContent)[got];
}
return total;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/http_ssl.c.
| ︙ | ︙ | |||
404 405 406 407 408 409 410 |
N -= got;
pContent = (void*)&((char*)pContent)[got];
}
return total;
}
#endif /* FOSSIL_ENABLE_SSL */
| > > > > > | 404 405 406 407 408 409 410 411 412 413 414 415 |
N -= got;
pContent = (void*)&((char*)pContent)[got];
}
return total;
}
#endif /* FOSSIL_ENABLE_SSL */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/http_transport.c.
| ︙ | ︙ | |||
487 488 489 490 491 492 493 |
#ifdef FOSSIL_ENABLE_SSL
ssl_global_shutdown();
#endif
}else{
socket_global_shutdown();
}
}
| > > > > > | 487 488 489 490 491 492 493 494 495 496 497 498 |
#ifdef FOSSIL_ENABLE_SSL
ssl_global_shutdown();
#endif
}else{
socket_global_shutdown();
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/import.c.
| ︙ | ︙ | |||
795 796 797 798 799 800 801 |
if( !incrFlag ){
fossil_print("project-id: %s\n", db_get("project-code", 0));
fossil_print("server-id: %s\n", db_get("server-code", 0));
zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
}
}
| > > > > > | 795 796 797 798 799 800 801 802 803 804 805 806 |
if( !incrFlag ){
fossil_print("project-id: %s\n", db_get("project-code", 0));
fossil_print("server-id: %s\n", db_get("server-code", 0));
zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/info.c.
| ︙ | ︙ | |||
2036 2037 2038 2039 2040 2041 2042 | @ <input type="submit" name="apply" value="Apply Changes" /> @ <input type="submit" name="cancel" value="Cancel" /> @ </td></tr> @ </table> @ </div></form> style_footer(); } | > > > > > | 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 | @ <input type="submit" name="apply" value="Apply Changes" /> @ <input type="submit" name="cancel" value="Cancel" /> @ </td></tr> @ </table> @ </div></form> style_footer(); } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/json.c.
| ︙ | ︙ | |||
2428 2429 2430 2431 2432 2433 2434 |
cson_value_free(payload);
fossil_exit(1);
}
}
#endif /* FOSSIL_ENABLE_JSON for mkindex */
#endif /* FOSSIL_ENABLE_JSON */
| > > > > > | 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 |
cson_value_free(payload);
fossil_exit(1);
}
}
#endif /* FOSSIL_ENABLE_JSON for mkindex */
#endif /* FOSSIL_ENABLE_JSON */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/json_artifact.c.
| ︙ | ︙ | |||
436 437 438 439 440 441 442 | } veryend: blob_reset(&uuid); return cson_object_value(pay); } #endif /* FOSSIL_ENABLE_JSON */ | > > > > > | 436 437 438 439 440 441 442 443 444 445 446 447 | } veryend: blob_reset(&uuid); return cson_object_value(pay); } #endif /* FOSSIL_ENABLE_JSON */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/json_branch.c.
| ︙ | ︙ | |||
385 386 387 388 389 390 391 | cson_value_free(payV); payV = NULL; ok: return payV; } #endif /* FOSSIL_ENABLE_JSON */ | > > > > > | 385 386 387 388 389 390 391 392 393 394 395 396 | cson_value_free(payV); payV = NULL; ok: return payV; } #endif /* FOSSIL_ENABLE_JSON */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/json_config.c.
| ︙ | ︙ | |||
167 168 169 170 171 172 173 |
** TODOs:
*/
static cson_value * json_config_save(){
json_set_err(FSL_JSON_E_NYI, NULL);
return NULL;
}
#endif /* FOSSIL_ENABLE_JSON */
| > > > > > | 167 168 169 170 171 172 173 174 175 176 177 178 |
** TODOs:
*/
static cson_value * json_config_save(){
json_set_err(FSL_JSON_E_NYI, NULL);
return NULL;
}
#endif /* FOSSIL_ENABLE_JSON */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/json_detail.h.
| ︙ | ︙ | |||
265 266 267 268 269 270 271 | ** and thus this distinction. */ char fossil_has_json(); #endif/*FOSSIL_JSON_DETAIL_H_INCLUDED*/ #endif /* FOSSIL_ENABLE_JSON */ | > > > > > | 265 266 267 268 269 270 271 272 273 274 275 276 | ** and thus this distinction. */ char fossil_has_json(); #endif/*FOSSIL_JSON_DETAIL_H_INCLUDED*/ #endif /* FOSSIL_ENABLE_JSON */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/json_diff.c.
| ︙ | ︙ | |||
132 133 134 135 136 137 138 | cson_object_set(pay, "diff", v); v = 0; return pay ? cson_object_value(pay) : NULL; } #endif /* FOSSIL_ENABLE_JSON */ | > > > > > | 132 133 134 135 136 137 138 139 140 141 142 143 | cson_object_set(pay, "diff", v); v = 0; return pay ? cson_object_value(pay) : NULL; } #endif /* FOSSIL_ENABLE_JSON */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/json_dir.c.
| ︙ | ︙ | |||
300 301 302 303 304 305 306 | return json_page_dir_list(); #else return json_page_dispatch_helper(&JsonPageDefs_Dir[0]); #endif } #endif /* FOSSIL_ENABLE_JSON */ | > > > > > | 300 301 302 303 304 305 306 307 308 309 310 311 | return json_page_dir_list(); #else return json_page_dispatch_helper(&JsonPageDefs_Dir[0]); #endif } #endif /* FOSSIL_ENABLE_JSON */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/json_finfo.c.
| ︙ | ︙ | |||
142 143 144 145 146 147 148 | return pay ? cson_object_value(pay) : NULL; } #endif /* FOSSIL_ENABLE_JSON */ | > > > > > | 142 143 144 145 146 147 148 149 150 151 152 153 | return pay ? cson_object_value(pay) : NULL; } #endif /* FOSSIL_ENABLE_JSON */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/json_login.c.
| ︙ | ︙ | |||
265 266 267 268 269 270 271 |
}else{
g.json.resultCode = FSL_JSON_E_RESOURCE_NOT_FOUND;
}
db_finalize(&q);
return payload;
}
#endif /* FOSSIL_ENABLE_JSON */
| > > > > > | 265 266 267 268 269 270 271 272 273 274 275 276 |
}else{
g.json.resultCode = FSL_JSON_E_RESOURCE_NOT_FOUND;
}
db_finalize(&q);
return payload;
}
#endif /* FOSSIL_ENABLE_JSON */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/json_query.c.
| ︙ | ︙ | |||
83 84 85 86 87 88 89 |
assert(NULL==payV);
}
return payV;
}
#endif /* FOSSIL_ENABLE_JSON */
| > > > > > | 83 84 85 86 87 88 89 90 91 92 93 94 |
assert(NULL==payV);
}
return payV;
}
#endif /* FOSSIL_ENABLE_JSON */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/json_report.c.
| ︙ | ︙ | |||
256 257 258 259 260 261 262 |
}
static cson_value * json_report_save(){
return NULL;
}
#endif /* FOSSIL_ENABLE_JSON */
| > > > > > | 256 257 258 259 260 261 262 263 264 265 266 267 |
}
static cson_value * json_report_save(){
return NULL;
}
#endif /* FOSSIL_ENABLE_JSON */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/json_tag.c.
| ︙ | ︙ | |||
471 472 473 474 475 476 477 |
end:
if( payV && !tagsVal ){
cson_object_set( pay, "tags", cson_value_null() );
}
return payV;
}
#endif /* FOSSIL_ENABLE_JSON */
| > > > > > | 471 472 473 474 475 476 477 478 479 480 481 482 |
end:
if( payV && !tagsVal ){
cson_object_set( pay, "tags", cson_value_null() );
}
return payV;
}
#endif /* FOSSIL_ENABLE_JSON */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/json_timeline.c.
| ︙ | ︙ | |||
668 669 670 671 672 673 674 | ok: blob_reset(&sql); db_finalize(&q); return payV; } #endif /* FOSSIL_ENABLE_JSON */ | > > > > > | 668 669 670 671 672 673 674 675 676 677 678 679 | ok: blob_reset(&sql); db_finalize(&q); return payV; } #endif /* FOSSIL_ENABLE_JSON */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/json_user.c.
| ︙ | ︙ | |||
430 431 432 433 434 435 436 |
assert((uid>0) && "Something went wrong in json_user_update_from_json()");
payload = json_load_user_by_id(uid);
}
cson_free_object(u);
return payload;
}
#endif /* FOSSIL_ENABLE_JSON */
| > > > > > | 430 431 432 433 434 435 436 437 438 439 440 441 |
assert((uid>0) && "Something went wrong in json_user_update_from_json()");
payload = json_load_user_by_id(uid);
}
cson_free_object(u);
return payload;
}
#endif /* FOSSIL_ENABLE_JSON */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/json_wiki.c.
| ︙ | ︙ | |||
582 583 584 585 586 587 588 | end: cson_free_object(pay); return NULL; } #endif /* FOSSIL_ENABLE_JSON */ | > > > > > | 582 583 584 585 586 587 588 589 590 591 592 593 | end: cson_free_object(pay); return NULL; } #endif /* FOSSIL_ENABLE_JSON */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/leaf.c.
| ︙ | ︙ | |||
177 178 179 180 181 182 183 |
void leaf_do_pending_checks(void){
int rid;
for(rid=bag_first(&needToCheck); rid; rid=bag_next(&needToCheck,rid)){
leaf_check(rid);
}
bag_clear(&needToCheck);
}
| > > > > > | 177 178 179 180 181 182 183 184 185 186 187 188 |
void leaf_do_pending_checks(void){
int rid;
for(rid=bag_first(&needToCheck); rid; rid=bag_next(&needToCheck,rid)){
leaf_check(rid);
}
bag_clear(&needToCheck);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/login.c.
| ︙ | ︙ | |||
1528 1529 1530 1531 1532 1533 1534 |
fossil_free(zSql);
db_multi_exec(
"DELETE FROM config "
" WHERE name GLOB 'peer-*'"
" OR name GLOB 'login-group-*';"
);
}
| > > > > > | 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 |
fossil_free(zSql);
db_multi_exec(
"DELETE FROM config "
" WHERE name GLOB 'peer-*'"
" OR name GLOB 'login-group-*';"
);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/main.c.
| ︙ | ︙ | |||
1809 1810 1811 1812 1813 1814 1815 |
*/
void test_echo_cmd(void){
int i;
for(i=0; i<g.argc; i++){
fossil_print("argv[%d] = [%s]\n", i, g.argv[i]);
}
}
| > > > > > | 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 |
*/
void test_echo_cmd(void){
int i;
for(i=0; i<g.argc; i++){
fossil_print("argv[%d] = [%s]\n", i, g.argv[i]);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/makeheaders.c.
| ︙ | ︙ | |||
3376 3377 3378 3379 3380 3381 3382 |
if( pFile->zSrc==0 ) continue;
nErr += MakeHeader(pFile,report,0);
}
}
return nErr;
}
#endif
| > > > > > | 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 |
if( pFile->zSrc==0 ) continue;
nErr += MakeHeader(pFile,report,0);
}
}
return nErr;
}
#endif
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/manifest.c.
| ︙ | ︙ | |||
1947 1948 1949 1950 1951 1952 1953 |
manifest_cache_insert(p);
}else{
manifest_destroy(p);
}
assert( blob_is_reset(pContent) );
return 1;
}
| > > > > > | 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 |
manifest_cache_insert(p);
}else{
manifest_destroy(p);
}
assert( blob_is_reset(pContent) );
return 1;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/md5.c.
| ︙ | ︙ | |||
441 442 443 444 445 446 447 |
}else{
md5sum_file(g.argv[i], &cksum);
}
fossil_print("%s %s\n", blob_str(&cksum), g.argv[i]);
blob_reset(&cksum);
}
}
| > > > > > | 441 442 443 444 445 446 447 448 449 450 451 452 |
}else{
md5sum_file(g.argv[i], &cksum);
}
fossil_print("%s %s\n", blob_str(&cksum), g.argv[i]);
blob_reset(&cksum);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/merge.c.
| ︙ | ︙ | |||
567 568 569 570 571 572 573 |
" WHERE type='ci' AND objid=%d",
mid
);
}
undo_finish();
db_end_transaction(nochangeFlag);
}
| > > > > > | 567 568 569 570 571 572 573 574 575 576 577 578 |
" WHERE type='ci' AND objid=%d",
mid
);
}
undo_finish();
db_end_transaction(nochangeFlag);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/merge3.c.
| ︙ | ︙ | |||
443 444 445 446 447 448 449 |
fossil_free(zPivot);
fossil_free(zOrig);
fossil_free(zOther);
}
blob_reset(&v1);
return rc;
}
| > > > > > | 443 444 445 446 447 448 449 450 451 452 453 454 |
fossil_free(zPivot);
fossil_free(zOrig);
fossil_free(zOther);
}
blob_reset(&v1);
return rc;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/mkindex.c.
| ︙ | ︙ | |||
365 366 367 368 369 370 371 |
for(i=1; i<argc; i++){
zFile = argv[i];
process_file();
}
build_table();
return 0;
}
| > > > > > | 365 366 367 368 369 370 371 372 373 374 375 376 |
for(i=1; i<argc; i++){
zFile = argv[i];
process_file();
}
build_table();
return 0;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/mkversion.c.
| ︙ | ︙ | |||
51 52 53 54 55 56 57 |
}
z++;
}
for(z=vx; z[0]=='0'; z++){}
printf("#define RELEASE_VERSION_NUMBER %s\n", z);
return 0;
}
| > > > > > | 51 52 53 54 55 56 57 58 59 60 61 62 |
}
z++;
}
for(z=vx; z[0]=='0'; z++){}
printf("#define RELEASE_VERSION_NUMBER %s\n", z);
return 0;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/name.c.
| ︙ | ︙ | |||
489 490 491 492 493 494 495 |
db_column_text(&q, 2));
fossil_print(" ");
comment_print(db_column_text(&q,4), 10, 78);
}
db_finalize(&q);
}
}
| > > > > > | 489 490 491 492 493 494 495 496 497 498 499 500 |
db_column_text(&q, 2));
fossil_print(" ");
comment_print(db_column_text(&q,4), 10, 78);
}
db_finalize(&q);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/path.c.
| ︙ | ︙ | |||
506 507 508 509 510 511 512 |
fossil_free(zTo);
}
fossil_free(aChng);
g.argv += 2;
g.argc -= 2;
}
}
| > > > > > | 506 507 508 509 510 511 512 513 514 515 516 517 |
fossil_free(zTo);
}
fossil_free(aChng);
g.argv += 2;
g.argc -= 2;
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/pivot.c.
| ︙ | ︙ | |||
164 165 166 167 168 169 170 |
pivot_set_secondary(name_to_rid(g.argv[i]));
}
rid = pivot_find();
printf("pivot=%s\n",
db_text("?","SELECT uuid FROM blob WHERE rid=%d",rid)
);
}
| > > > > > | 164 165 166 167 168 169 170 171 172 173 174 175 |
pivot_set_secondary(name_to_rid(g.argv[i]));
}
rid = pivot_find();
printf("pivot=%s\n",
db_text("?","SELECT uuid FROM blob WHERE rid=%d",rid)
);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/popen.c.
| ︙ | ︙ | |||
211 212 213 214 215 216 217 | fclose(pOut); #else close(fdIn); fclose(pOut); kill(childPid, SIGINT); #endif } | > > > > > | 211 212 213 214 215 216 217 218 219 220 221 222 | fclose(pOut); #else close(fdIn); fclose(pOut); kill(childPid, SIGINT); #endif } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/pqueue.c.
| ︙ | ︙ | |||
106 107 108 109 110 111 112 |
if( pp ) *pp = p->a[0].p;
for(i=0; i<p->cnt-1; i++){
p->a[i] = p->a[i+1];
}
p->cnt--;
return e;
}
| > > > > > | 106 107 108 109 110 111 112 113 114 115 116 117 |
if( pp ) *pp = p->a[0].p;
for(i=0; i<p->cnt-1; i++){
p->a[i] = p->a[i+1];
}
p->cnt--;
return e;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/printf.c.
| ︙ | ︙ | |||
913 914 915 916 917 918 919 |
return +1;
}
nByte = strlen(zB);
rc = sqlite3_strnicmp(zA, zB, nByte);
if( rc==0 && zA[nByte] ) rc = 1;
return rc;
}
| > > > > > | 913 914 915 916 917 918 919 920 921 922 923 924 |
return +1;
}
nByte = strlen(zB);
rc = sqlite3_strnicmp(zA, zB, nByte);
if( rc==0 && zA[nByte] ) rc = 1;
return rc;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/rebuild.c.
| ︙ | ︙ | |||
1024 1025 1026 1027 1028 1029 1030 |
fossil_print("\n");
}
/* free filename format string */
free(zFNameFormat);
zFNameFormat = 0;
}
| > > > > > | 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 |
fossil_print("\n");
}
/* free filename format string */
free(zFNameFormat);
zFNameFormat = 0;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/report.c.
| ︙ | ︙ | |||
1135 1136 1137 1138 1139 1140 1141 |
report_restrict_sql(&zErr1);
sqlite3_exec_readonly(g.db, zSql, output_separated_file, &count, &zErr2);
report_unrestrict_sql();
if( zFilter ){
free(zSql);
}
}
| > > > > > | 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 |
report_restrict_sql(&zErr1);
sqlite3_exec_readonly(g.db, zSql, output_separated_file, &count, &zErr2);
report_unrestrict_sql();
if( zFilter ){
free(zSql);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/rss.c.
| ︙ | ︙ | |||
143 144 145 146 147 148 149 |
@ </channel>
@ </rss>
if( zFreeProjectName != 0 ){
free( zFreeProjectName );
}
}
| > > > > > | 143 144 145 146 147 148 149 150 151 152 153 154 |
@ </channel>
@ </rss>
if( zFreeProjectName != 0 ){
free( zFreeProjectName );
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/schema.c.
| ︙ | ︙ | |||
482 483 484 485 486 487 488 | @ CREATE TABLE vmerge( @ id INTEGER REFERENCES vfile, -- VFILE entry that has been merged @ merge INTEGER, -- Merged with this record @ UNIQUE(id, merge) @ ); @ ; | > > > > > | 482 483 484 485 486 487 488 489 490 491 492 493 | @ CREATE TABLE vmerge( @ id INTEGER REFERENCES vfile, -- VFILE entry that has been merged @ merge INTEGER, -- Merged with this record @ UNIQUE(id, merge) @ ); @ ; /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/search.c.
| ︙ | ︙ | |||
204 205 206 207 208 209 210 |
"SELECT rid, uuid, date, comment, 0, 0 FROM srch"
" WHERE x>%d ORDER BY x DESC, date DESC",
iBest/3
);
print_timeline(&q, 1000, 0);
db_finalize(&q);
}
| > > > > > | 204 205 206 207 208 209 210 211 212 213 214 215 |
"SELECT rid, uuid, date, comment, 0, 0 FROM srch"
" WHERE x>%d ORDER BY x DESC, date DESC",
iBest/3
);
print_timeline(&q, 1000, 0);
db_finalize(&q);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/setup.c.
| ︙ | ︙ | |||
1489 1490 1491 1492 1493 1494 1495 | @ @ <p><span class="note">Note:</span> Your browser has probably cached these @ images, so you may need to press the Reload button before changes will @ take effect. </p> style_footer(); db_end_transaction(0); } | > > > > > | 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 | @ @ <p><span class="note">Note:</span> Your browser has probably cached these @ images, so you may need to press the Reload button before changes will @ take effect. </p> style_footer(); db_end_transaction(0); } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/sha1.c.
| ︙ | ︙ | |||
458 459 460 461 462 463 464 |
}else{
sha1sum_file(g.argv[i], &cksum);
}
fossil_print("%s %s\n", blob_str(&cksum), g.argv[i]);
blob_reset(&cksum);
}
}
| > > > > > | 458 459 460 461 462 463 464 465 466 467 468 469 |
}else{
sha1sum_file(g.argv[i], &cksum);
}
fossil_print("%s %s\n", blob_str(&cksum), g.argv[i]);
blob_reset(&cksum);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/shell.c.
| ︙ | ︙ | |||
3137 3138 3139 3140 3141 3142 3143 |
}
set_table_name(&data, 0);
if( data.db ){
sqlite3_close(data.db);
}
return rc;
}
| > > > > > | 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 |
}
set_table_name(&data, 0);
if( data.db ){
sqlite3_close(data.db);
}
return rc;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/shun.c.
| ︙ | ︙ | |||
322 323 324 325 326 327 328 |
@ (rid: %d(rid), size: %d(size))<br />
}
@ </td></tr>
@ </table>
db_finalize(&q);
style_footer();
}
| > > > > > | 322 323 324 325 326 327 328 329 330 331 332 333 |
@ (rid: %d(rid), size: %d(size))<br />
}
@ </td></tr>
@ </table>
db_finalize(&q);
style_footer();
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/skins.c.
| ︙ | ︙ | |||
1151 1152 1153 1154 1155 1156 1157 |
}
}
db_finalize(&q);
@ </ol>
style_footer();
db_end_transaction(0);
}
| > > > > > | 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 |
}
}
db_finalize(&q);
@ </ol>
style_footer();
db_end_transaction(0);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/sqlcmd.c.
| ︙ | ︙ | |||
149 150 151 152 153 154 155 |
** This routine is called by the patched sqlite3 command-line shell in order
** to load the name and database connection for the open Fossil database.
*/
void fossil_open(const char **pzRepoName){
sqlite3_auto_extension((void(*)(void))sqlcmd_autoinit);
*pzRepoName = g.zRepositoryName;
}
| > > > > > | 149 150 151 152 153 154 155 156 157 158 159 160 |
** This routine is called by the patched sqlite3 command-line shell in order
** to load the name and database connection for the open Fossil database.
*/
void fossil_open(const char **pzRepoName){
sqlite3_auto_extension((void(*)(void))sqlcmd_autoinit);
*pzRepoName = g.zRepositoryName;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/sqlite3.c.
| ︙ | ︙ | |||
138119 138120 138121 138122 138123 138124 138125 | *ppModule = &icuTokenizerModule; } #endif /* defined(SQLITE_ENABLE_ICU) */ #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */ /************** End of fts3_icu.c ********************************************/ | > > > > > | 138119 138120 138121 138122 138123 138124 138125 138126 138127 138128 138129 138130 | *ppModule = &icuTokenizerModule; } #endif /* defined(SQLITE_ENABLE_ICU) */ #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */ /************** End of fts3_icu.c ********************************************/ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/sqlite3.h.
| ︙ | ︙ | |||
7048 7049 7050 7051 7052 7053 7054 | #ifdef __cplusplus } /* end of the 'extern "C"' block */ #endif #endif /* ifndef _SQLITE3RTREE_H_ */ | > > > > > | 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 | #ifdef __cplusplus } /* end of the 'extern "C"' block */ #endif #endif /* ifndef _SQLITE3RTREE_H_ */ /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/stash.c.
| ︙ | ︙ | |||
571 572 573 574 575 576 577 |
help_cmd();
}else
{
usage("SUBCOMMAND ARGS...");
}
db_end_transaction(0);
}
| > > > > > | 571 572 573 574 575 576 577 578 579 580 581 582 |
help_cmd();
}else
{
usage("SUBCOMMAND ARGS...");
}
db_end_transaction(0);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/stat.c.
| ︙ | ︙ | |||
132 133 134 135 136 137 138 | @ %s(db_text(0, "PRAGMA %s.encoding", zDb)), @ %s(db_text(0, "PRAGMA %s.journal_mode", zDb)) mode @ </td></tr> @ </table> style_footer(); } | > > > > > | 132 133 134 135 136 137 138 139 140 141 142 143 | @ %s(db_text(0, "PRAGMA %s.encoding", zDb)), @ %s(db_text(0, "PRAGMA %s.journal_mode", zDb)) mode @ </td></tr> @ </table> style_footer(); } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/style.c.
| ︙ | ︙ | |||
973 974 975 976 977 978 979 |
cgi_print_all(atoi(PD("showall","0")));
if( g.perm.Setup ){
const char *zRedir = P("redirect");
if( zRedir ) cgi_redirect(zRedir);
}
style_footer();
}
| > > > > > | 973 974 975 976 977 978 979 980 981 982 983 984 |
cgi_print_all(atoi(PD("showall","0")));
if( g.perm.Setup ){
const char *zRedir = P("redirect");
if( zRedir ) cgi_redirect(zRedir);
}
style_footer();
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/sync.c.
| ︙ | ︙ | |||
279 280 281 282 283 284 285 |
fossil_print("off\n");
return;
}else{
url_parse(zUrl);
fossil_print("%s\n", g.urlCanonical);
}
}
| > > > > > | 279 280 281 282 283 284 285 286 287 288 289 290 |
fossil_print("off\n");
return;
}else{
url_parse(zUrl);
fossil_print("%s\n", g.urlCanonical);
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/tag.c.
| ︙ | ︙ | |||
590 591 592 593 594 595 596 |
@ function xin(id){
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
| > > > > > | 590 591 592 593 594 595 596 597 598 599 600 601 |
@ function xin(id){
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/tar.c.
| ︙ | ︙ | |||
607 608 609 610 611 612 613 |
if( nRid==0 && nName>10 ) zName[10] = 0;
tarball_of_checkin(rid, &tarball, zName);
free( zName );
free( zRid );
cgi_set_content(&tarball);
cgi_set_content_type("application/x-compressed");
}
| > > > > > | 607 608 609 610 611 612 613 614 615 616 617 618 |
if( nRid==0 && nName>10 ) zName[10] = 0;
tarball_of_checkin(rid, &tarball, zName);
free( zName );
free( zRid );
cgi_set_content(&tarball);
cgi_set_content_type("application/x-compressed");
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/th.c.
| ︙ | ︙ | |||
2603 2604 2605 2606 2607 2608 2609 |
*z++ = zExp[i];
}
}
*z = '\0';
return Th_SetResult(interp, zBuf, -1);
}
| > > > > > | 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 |
*z++ = zExp[i];
}
}
*z = '\0';
return Th_SetResult(interp, zBuf, -1);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/th.h.
| ︙ | ︙ | |||
177 178 179 180 181 182 183 |
/*
** Useful functions from th_lang.c.
*/
int Th_WrongNumArgs(Th_Interp *interp, const char *zMsg);
typedef struct Th_SubCommand {char *zName; Th_CommandProc xProc;} Th_SubCommand;
int Th_CallSubCommand(Th_Interp*,void*,int,const char**,int*,Th_SubCommand*);
| > > > > > | 177 178 179 180 181 182 183 184 185 186 187 188 |
/*
** Useful functions from th_lang.c.
*/
int Th_WrongNumArgs(Th_Interp *interp, const char *zMsg);
typedef struct Th_SubCommand {char *zName; Th_CommandProc xProc;} Th_SubCommand;
int Th_CallSubCommand(Th_Interp*,void*,int,const char**,int*,Th_SubCommand*);
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/th_lang.c.
| ︙ | ︙ | |||
1066 1067 1068 1069 1070 1071 1072 |
if ( !aCommand[i].zName || !aCommand[i].xProc ) continue;
ctx = aCommand[i].pContext;
Th_CreateCommand(interp, aCommand[i].zName, aCommand[i].xProc, ctx, 0);
}
return TH_OK;
}
| > > > > > | 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 |
if ( !aCommand[i].zName || !aCommand[i].xProc ) continue;
ctx = aCommand[i].pContext;
Th_CreateCommand(interp, aCommand[i].zName, aCommand[i].xProc, ctx, 0);
}
return TH_OK;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/th_main.c.
| ︙ | ︙ | |||
572 573 574 575 576 577 578 |
usage("FILE");
}
db_open_config(0); /* Needed for global "tcl" setting. */
blob_zero(&in);
blob_read_from_file(&in, g.argv[2]);
Th_Render(blob_str(&in));
}
| > > > > > | 572 573 574 575 576 577 578 579 580 581 582 583 |
usage("FILE");
}
db_open_config(0); /* Needed for global "tcl" setting. */
blob_zero(&in);
blob_read_from_file(&in, g.argv[2]);
Th_Render(blob_str(&in));
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/th_tcl.c.
| ︙ | ︙ | |||
432 433 434 435 436 437 438 |
if( !ctx ) ctx = pContext;
Th_CreateCommand(interp, aCommand[i].zName, aCommand[i].xProc, ctx, 0);
}
return TH_OK;
}
#endif /* FOSSIL_ENABLE_TCL */
| > > > > > | 432 433 434 435 436 437 438 439 440 441 442 443 |
if( !ctx ) ctx = pContext;
Th_CreateCommand(interp, aCommand[i].zName, aCommand[i].xProc, ctx, 0);
}
return TH_OK;
}
#endif /* FOSSIL_ENABLE_TCL */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/timeline.c.
| ︙ | ︙ | |||
1619 1620 1621 1622 1623 1624 1625 |
const char *zUuid = db_column_text(&q, 0);
@ <li>
@ <a href="%s(g.zTop)/timeline?p=%S(zUuid)&d=%S(zUuid)">%S(zUuid)</a>
}
db_finalize(&q);
style_footer();
}
| > > > > > | 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 |
const char *zUuid = db_column_text(&q, 0);
@ <li>
@ <a href="%s(g.zTop)/timeline?p=%S(zUuid)&d=%S(zUuid)">%S(zUuid)</a>
}
db_finalize(&q);
style_footer();
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/tkt.c.
| ︙ | ︙ | |||
1180 1181 1182 1183 1184 1185 1186 |
assert( blob_is_reset(&tktchng) );
printf("ticket %s succeeded for UID %s\n",
(eCmd==set?"set":"add"),zTktUuid);
}
}
}
}
| > > > > > | 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 |
assert( blob_is_reset(&tktchng) );
printf("ticket %s succeeded for UID %s\n",
(eCmd==set?"set":"add"),zTktUuid);
}
}
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/tktsetup.c.
| ︙ | ︙ | |||
758 759 760 761 762 763 764 | @ <input type="submit" name="setup" value="Cancel" /> @ </p> @ </div></form> db_end_transaction(0); style_footer(); } | > > > > > | 758 759 760 761 762 763 764 765 766 767 768 769 | @ <input type="submit" name="setup" value="Cancel" /> @ </p> @ </div></form> db_end_transaction(0); style_footer(); } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/translate.c.
| ︙ | ︙ | |||
185 186 187 188 189 190 191 |
trans(in, stdout);
fclose(in);
}else{
trans(stdin, stdout);
}
return 0;
}
| > > > > > | 185 186 187 188 189 190 191 192 193 194 195 196 |
trans(in, stdout);
fclose(in);
}else{
trans(stdin, stdout);
}
return 0;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/undo.c.
| ︙ | ︙ | |||
443 444 445 446 447 448 449 |
if( vid1!=vid2 ){
fossil_print("--------------------\n");
show_common_info(vid2, "updated-to:", 1, 0);
}
}
db_end_transaction(0);
}
| > > > > > | 443 444 445 446 447 448 449 450 451 452 453 454 |
if( vid1!=vid2 ){
fossil_print("--------------------\n");
show_common_info(vid2, "updated-to:", 1, 0);
}
}
db_end_transaction(0);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/update.c.
| ︙ | ︙ | |||
739 740 741 742 743 744 745 |
blob_reset(&record);
free(zFull);
}
db_finalize(&q);
undo_finish();
db_end_transaction(0);
}
| > > > > > | 739 740 741 742 743 744 745 746 747 748 749 750 |
blob_reset(&record);
free(zFull);
}
db_finalize(&q);
undo_finish();
db_end_transaction(0);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/url.c.
| ︙ | ︙ | |||
392 393 394 395 396 397 398 |
if( (g.urlUser && g.urlUser[0])
&& (g.urlPasswd==0 || g.urlPasswd[0]==0)
&& isatty(fileno(stdin))
){
url_prompt_for_password();
}
}
| > > > > > | 392 393 394 395 396 397 398 399 400 401 402 403 |
if( (g.urlUser && g.urlUser[0])
&& (g.urlPasswd==0 || g.urlPasswd[0]==0)
&& isatty(fileno(stdin))
){
url_prompt_for_password();
}
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/user.c.
| ︙ | ︙ | |||
484 485 486 487 488 489 490 | @ <form method="post" action="%s(g.zTop)/access_log"> @ <input type="checkbox" name="delall"> @ Delete all entries</input> @ <input type="submit" name="delallbtn" value="Delete"></input> @ </form> style_footer(); } | > > > > > | 484 485 486 487 488 489 490 491 492 493 494 495 | @ <form method="post" action="%s(g.zTop)/access_log"> @ <input type="checkbox" name="delall"> @ Delete all entries</input> @ <input type="submit" name="delallbtn" value="Delete"></input> @ </form> style_footer(); } /* * vim:ts=2:sts=2:et:sw=2:ft=c */ |
Changes to src/verify.c.
| ︙ | ︙ | |||
126 127 128 129 130 131 132 |
cnt++;
assert( bag_count(&toVerify)==cnt );
}
db_finalize(&q);
verify_at_commit();
assert( bag_count(&toVerify)==0 );
}
| > > > > > | 126 127 128 129 130 131 132 133 134 135 136 137 |
cnt++;
assert( bag_count(&toVerify)==cnt );
}
db_finalize(&q);
verify_at_commit();
assert( bag_count(&toVerify)==0 );
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/vfile.c.
| ︙ | ︙ | |||
694 695 696 697 698 699 700 |
vfile_aggregate_checksum_repository(vid, &hash);
printf("archive: %s\n", blob_str(&hash));
blob_reset(&hash);
vfile_aggregate_checksum_manifest(vid, &hash, &hash2);
printf("manifest: %s\n", blob_str(&hash));
printf("recorded: %s\n", blob_str(&hash2));
}
| > > > > > | 694 695 696 697 698 699 700 701 702 703 704 705 |
vfile_aggregate_checksum_repository(vid, &hash);
printf("archive: %s\n", blob_str(&hash));
blob_reset(&hash);
vfile_aggregate_checksum_manifest(vid, &hash, &hash2);
printf("manifest: %s\n", blob_str(&hash));
printf("recorded: %s\n", blob_str(&hash2));
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/wiki.c.
| ︙ | ︙ | |||
981 982 983 984 985 986 987 |
goto wiki_cmd_usage;
}
return;
wiki_cmd_usage:
usage("export|create|commit|list ...");
}
| > > > > > | 981 982 983 984 985 986 987 988 989 990 991 992 |
goto wiki_cmd_usage;
}
return;
wiki_cmd_usage:
usage("export|create|commit|list ...");
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/wikiformat.c.
| ︙ | ︙ | |||
1726 1727 1728 1729 1730 1731 1732 |
break;
}
}
z += n;
}
free(renderer.aStack);
}
| > > > > > | 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 |
break;
}
}
z += n;
}
free(renderer.aStack);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/winhttp.c.
| ︙ | ︙ | |||
872 873 874 875 876 877 878 |
fossil_fatal("METHOD should be one of:"
" create delete show start stop");
}
return;
}
#endif /* _WIN32 -- This code is for win32 only */
| > > > > > | 872 873 874 875 876 877 878 879 880 881 882 883 |
fossil_fatal("METHOD should be one of:"
" create delete show start stop");
}
return;
}
#endif /* _WIN32 -- This code is for win32 only */
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/xfer.c.
| ︙ | ︙ | |||
1777 1778 1779 1780 1781 1782 1783 |
transport_global_shutdown();
db_multi_exec("DROP TABLE onremote");
manifest_crosslink_end();
content_enable_dephantomize(1);
db_end_transaction(0);
return nErr;
}
| > > > > > | 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 |
transport_global_shutdown();
db_multi_exec("DROP TABLE onremote");
manifest_crosslink_end();
content_enable_dephantomize(1);
db_end_transaction(0);
return nErr;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/xfersetup.c.
| ︙ | ︙ | |||
142 143 144 145 146 147 148 |
zDefaultXferPush,
zDesc,
0,
0,
30
);
}
| > > > > > | 142 143 144 145 146 147 148 149 150 151 152 153 |
zDefaultXferPush,
zDesc,
0,
0,
30
);
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|
Changes to src/zip.c.
| ︙ | ︙ | |||
447 448 449 450 451 452 453 |
if( nRid==0 && nName>10 ) zName[10] = 0;
zip_of_baseline(rid, &zip, zName);
free( zName );
free( zRid );
cgi_set_content(&zip);
cgi_set_content_type("application/zip");
}
| > > > > > | 447 448 449 450 451 452 453 454 455 456 457 458 |
if( nRid==0 && nName>10 ) zName[10] = 0;
zip_of_baseline(rid, &zip, zName);
free( zName );
free( zRid );
cgi_set_content(&zip);
cgi_set_content_type("application/zip");
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|