Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Omit MLINK entries when a file is added by merge. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | mlink-improvements |
| Files: | files | file ages | folders |
| SHA1: |
bd08b03a72410c4888b1a994ef17ec09 |
| User & Date: | drh 2015-01-26 11:52:01.357 |
Context
|
2015-01-26
| ||
| 11:58 | Merge recent trunk enhancements. check-in: 3c3c166c89 user: drh tags: mlink-improvements | |
| 11:52 | Omit MLINK entries when a file is added by merge. check-in: bd08b03a72 user: drh tags: mlink-improvements | |
|
2015-01-25
| ||
| 02:29 | Some minor fixes to the /finfo tree construction. Still having problems with incorrect mlink entries being created for files added by merge. check-in: f603a91432 user: drh tags: mlink-improvements | |
Changes
Changes to src/finfo.c.
| ︙ | ︙ | |||
331 332 333 334 335 336 337 |
" mlink.pid," /* Parent file rid */
" mlink.fid," /* File rid */
" (SELECT uuid FROM blob WHERE rid=mlink.pid)," /* Parent file uuid */
" (SELECT uuid FROM blob WHERE rid=mlink.fid)," /* Current file uuid */
" (SELECT uuid FROM blob WHERE rid=mlink.mid)," /* Check-in uuid */
" event.bgcolor," /* Background color */
" (SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0"
| | | 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 |
" mlink.pid," /* Parent file rid */
" mlink.fid," /* File rid */
" (SELECT uuid FROM blob WHERE rid=mlink.pid)," /* Parent file uuid */
" (SELECT uuid FROM blob WHERE rid=mlink.fid)," /* Current file uuid */
" (SELECT uuid FROM blob WHERE rid=mlink.mid)," /* Check-in uuid */
" event.bgcolor," /* Background color */
" (SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0"
" AND tagxref.rid=mlink.mid)," /* Branchname */
" mlink.mid," /* check-in ID */
" mlink.pfnid", /* Previous filename */
timeline_utc(), TAG_BRANCH
);
if( firstChngOnly ){
#if 0
blob_append_sql(&sql, ", min(event.mtime)");
|
| ︙ | ︙ | |||
499 500 501 502 503 504 505 |
}
hyperlink_to_uuid(zCkin);
if( fShowId ){
@ (%d(fmid))
}
@ %W(zCom) (user:
hyperlink_to_user(zUser, zDate, "");
| | | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 |
}
hyperlink_to_uuid(zCkin);
if( fShowId ){
@ (%d(fmid))
}
@ %W(zCom) (user:
hyperlink_to_user(zUser, zDate, "");
@ branch: %z(href("%R/timeline?t=%T&n=200",zBr))%h(zBr)</a>
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))[checkins using]</a>
|
| ︙ | ︙ |
Changes to src/manifest.c.
| ︙ | ︙ | |||
1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 |
int pid = uuid_to_rid(p->azParent[i], 1);
db_multi_exec(
"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);
if( i==0 ) parentid = pid;
}
db_prepare(&q, "SELECT cid, isprim FROM plink WHERE pid=%d", rid);
while( db_step(&q)==SQLITE_ROW ){
int cid = db_column_int(&q, 0);
int isprim = db_column_int(&q, 1);
add_mlink(rid, p, cid, 0, isprim);
}
| > > > > > > > > > > > > > | 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 |
int pid = uuid_to_rid(p->azParent[i], 1);
db_multi_exec(
"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);
if( i==0 ) parentid = pid;
}
if( p->nParent>1 ){
/* Remove incorrect MLINK create-file entries that arise when a
** file is added by merge. */
db_multi_exec(
"DELETE FROM mlink"
" WHERE mid=%d"
" AND pid=0"
" AND fnid IN "
" (SELECT fnid FROM mlink WHERE mid=%d GROUP BY fnid"
" HAVING count(*)<%d)",
rid, rid, p->nParent
);
}
db_prepare(&q, "SELECT cid, isprim FROM plink WHERE pid=%d", rid);
while( db_step(&q)==SQLITE_ROW ){
int cid = db_column_int(&q, 0);
int isprim = db_column_int(&q, 1);
add_mlink(rid, p, cid, 0, isprim);
}
|
| ︙ | ︙ |