Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch show-add-by-merge Excluding Merge-Ins
This is equivalent to a diff from acd670f251 to 7d2ac84598
2015-05-06
| ||
12:35 | Record files added by merge using mlink.pid=-1. Improve the web interface to better indicate files added by merge. check-in: 8e44cf6f4d user: drh tags: trunk | |
2015-05-05
| ||
18:59 | Update the built-in SQLite to the second beta of 3.8.10. Closed-Leaf check-in: 7d2ac84598 user: drh tags: show-add-by-merge | |
16:07 | More changes for distinguishing between new files and files added by merge. check-in: 243c77e6e9 user: drh tags: show-add-by-merge | |
12:31 | Attempt to distinguish between files added from nothing and files added by merge. check-in: 0d73f3f670 user: drh tags: show-add-by-merge | |
06:49 | Now really update the built-in SQLite to the first 3.8.10 beta, not only the command line shell. check-in: acd670f251 user: jan.nijtmans tags: trunk | |
2015-05-04
| ||
20:10 | Since fossil now uses sqlite_malloc64, which is introduced in SQLite 3.8.7, don't accept linkage using earlier SQLite versions any more. check-in: a481a8176b user: jan.nijtmans tags: trunk | |
Changes to src/finfo.c.
︙ | |||
507 508 509 510 511 512 513 | 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 | - + | if( g.perm.Hyperlink && zUuid ){ const char *z = zFilename; @ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin)) @ [annotate]</a> @ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin)) @ [blame]</a> @ %z(href("%R/timeline?n=200&uf=%!S",zUuid))[check-ins using]</a> |
︙ |
Changes to src/manifest.c.
︙ | |||
1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 | 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 | + | ** will be NULL and it will be computed based on cid/pid. ** ** A single mlink entry is added for every file that changed content, ** name, and/or permissions going from pid to cid. ** ** Deleted files have mlink.fid=0. ** Added files have mlink.pid=0. ** File added by merge have mlink.pid=-1 ** Edited files have both mlink.pid!=0 and mlink.fid!=0 */ static void add_mlink( int pmid, Manifest *pParent, /* Parent check-in */ int mid, Manifest *pChild, /* The child check-in */ int isPrim /* TRUE if pmid is the primary parent of mid */ ){ |
︙ | |||
1799 1800 1801 1802 1803 1804 1805 | 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 | - - + - + | "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime, baseid)" "VALUES(%d, %d, %d, %.17g, %s)", pid, rid, i==0, p->rDate, zBaseId/*safe-for-%s*/); add_mlink(pid, 0, rid, p, i==0); if( i==0 ) parentid = pid; } if( p->nParent>1 ){ |
︙ |
Changes to src/schema.c.
︙ | |||
247 248 249 250 251 252 253 | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | - - + + + + - - - - - - - - + + + + + + + + | @ -- fid = File ID. @ -- pmid = Parent Manifest ID. @ -- pid = Parent file ID. @ -- fnid = File Name ID. @ -- pfnid = Parent File Name ID. @ -- isaux = pmid IS AUXiliary parent, not primary parent @ -- |
︙ |
Changes to src/sqlite3.c.
︙ | |||
316 317 318 319 320 321 322 | 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 | - + | ** ** See also: [sqlite3_libversion()], ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ #define SQLITE_VERSION "3.8.10" #define SQLITE_VERSION_NUMBER 3008010 |
︙ | |||
21588 21589 21590 21591 21592 21593 21594 | 21588 21589 21590 21591 21592 21593 21594 21595 21596 21597 21598 21599 21600 21601 | - | case '#': flag_alternateform = 1; break; case '!': flag_altform2 = 1; break; case '0': flag_zeropad = 1; break; default: done = 1; break; } }while( !done && (c=(*++fmt))!=0 ); /* Get the field width */ |
︙ | |||
21612 21613 21614 21615 21616 21617 21618 | 21611 21612 21613 21614 21615 21616 21617 21618 21619 21620 21621 21622 21623 21624 | - | } testcase( wx>0x7fffffff ); width = wx & 0x7fffffff; } /* Get the precision */ if( c=='.' ){ |
︙ | |||
55475 55476 55477 55478 55479 55480 55481 | 55473 55474 55475 55476 55477 55478 55479 55480 55481 55482 55483 55484 55485 55486 55487 | - + | if( nReserve<0 ){ nReserve = pBt->pageSize - pBt->usableSize; } assert( nReserve>=0 && nReserve<=255 ); if( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE && ((pageSize-1)&pageSize)==0 ){ assert( (pageSize & 7)==0 ); |
︙ | |||
71812 71813 71814 71815 71816 71817 71818 | 71810 71811 71812 71813 71814 71815 71816 71817 71818 71819 71820 71821 71822 71823 | - | if( rc==SQLITE_BUSY ){ p->rc = rc = SQLITE_BUSY; }else{ assert( rc==SQLITE_OK || (p->rc&0xff)==SQLITE_CONSTRAINT ); assert( rc==SQLITE_OK || db->nDeferredCons>0 || db->nDeferredImmCons>0 ); rc = p->rc ? SQLITE_ERROR : SQLITE_DONE; } |
︙ | |||
76740 76741 76742 76743 76744 76745 76746 | 76737 76738 76739 76740 76741 76742 76743 76744 76745 76746 76747 76748 76749 76750 | - | #endif /* ifndef SQLITE_OMIT_WAL */ if( rc ){ eNew = eOld; } eNew = sqlite3PagerSetJournalMode(pPager, eNew); |
︙ | |||
84052 84053 84054 84055 84056 84057 84058 | 84048 84049 84050 84051 84052 84053 84054 84055 84056 84057 84058 84059 84060 84061 84062 | - + | */ SQLITE_PRIVATE u32 sqlite3ExprListFlags(const ExprList *pList){ int i; u32 m = 0; if( pList ){ for(i=0; i<pList->nExpr; i++){ Expr *pExpr = pList->a[i].pExpr; |
︙ | |||
130863 130864 130865 130866 130867 130868 130869 130870 130871 130872 130873 130874 130875 130876 | 130859 130860 130861 130862 130863 130864 130865 130866 130867 130868 130869 130870 130871 130872 130873 130874 130875 130876 130877 130878 130879 | + + + + + + + | #endif #ifdef SQLITE_ENABLE_RTREE if( !db->mallocFailed && rc==SQLITE_OK){ rc = sqlite3RtreeInit(db); } #endif #ifdef SQLITE_ENABLE_DBSTAT_VTAB if( !db->mallocFailed && rc==SQLITE_OK){ int sqlite3_dbstat_register(sqlite3*); rc = sqlite3_dbstat_register(db); } #endif /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking ** mode. -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking ** mode. Doing nothing at all also makes NORMAL the default. */ #ifdef SQLITE_DEFAULT_LOCKING_MODE db->dfltLockMode = SQLITE_DEFAULT_LOCKING_MODE; |
︙ | |||
155225 155226 155227 155228 155229 155230 155231 | 155228 155229 155230 155231 155232 155233 155234 155235 155236 155237 155238 155239 155240 155241 155242 | - + | ** The dbstat virtual table is used to extract low-level formatting ** information from an SQLite database in order to implement the ** "sqlite3_analyzer" utility. See the ../tool/spaceanal.tcl script ** for an example implementation. */ #if (defined(SQLITE_ENABLE_DBSTAT_VTAB) || defined(SQLITE_TEST)) \ |
︙ |
Changes to src/sqlite3.h.
︙ | |||
109 110 111 112 113 114 115 | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | - + | ** ** See also: [sqlite3_libversion()], ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ #define SQLITE_VERSION "3.8.10" #define SQLITE_VERSION_NUMBER 3008010 |
︙ |
Changes to src/timeline.c.
︙ | |||
497 498 499 500 501 502 503 | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | - + - + + | /* Generate the file-change list if requested */ if( (tmFlags & (TIMELINE_FCHANGES|TIMELINE_FRENAMES))!=0 && zType[0]=='c' && g.perm.Hyperlink ){ int inUl = 0; if( !fchngQueryInit ){ db_prepare(&fchngQuery, |
︙ | |||
544 545 546 547 548 549 550 | 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 | - - + + + + + + + | continue; } zA = href("%R/artifact/%!S",fid?zNew:zOld); if( content_is_private(fid) ){ zUnpub = UNPUB_TAG; } if( isNew ){ |
︙ | |||
1871 1872 1873 1874 1875 1876 1877 | 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 | - + | /* record another X lines */ nLine += comment_print(zFree, zCom, 9, width, g.comFmtFlags); fossil_free(zFree); if(verboseFlag){ if( !fchngQueryInit ){ db_prepare(&fchngQuery, |
︙ |