Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the show-files option for timelines so that it shows all files affected, even if they are coming in from a merge. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
9431fec1ea098feab24002d4c3bfa013 |
| User & Date: | drh 2015-10-10 13:36:20.178 |
References
|
2015-10-20
| ||
| 07:41 | Backout [9431fec1ea098feab24002d4c3bfa0132017ef39]: It causes too many files being displayed in various screens. Reported in fossil-dev and Tcl Core mailing list. ... (check-in: 5903a70bd5 user: jan.nijtmans tags: pending-review) | |
Context
|
2015-10-20
| ||
| 07:41 | Backout [9431fec1ea098feab24002d4c3bfa0132017ef39]: It causes too many files being displayed in various screens. Reported in fossil-dev and Tcl Core mailing list. ... (check-in: 5903a70bd5 user: jan.nijtmans tags: pending-review) | |
|
2015-10-10
| ||
| 14:03 | SQLite 3.9.0 beta 2. The first 3.9.0 beta gave compiler errors on some older platforms, which are fixed here. Behold the reason why I check-in SQLite betas into the Fossil trunk. ... (check-in: 0b81254c79 user: drh tags: trunk) | |
| 13:36 | Fix the show-files option for timelines so that it shows all files affected, even if they are coming in from a merge. ... (check-in: 9431fec1ea user: drh tags: trunk) | |
| 13:32 | Update the built-in SQLite to the first 3.9.0 beta. Enable JSON1 and FTS5 support (though not currently used). ... (check-in: 7428117cbf user: drh tags: trunk) | |
|
2015-10-08
| ||
| 01:37 | revert accidental line addition in comment header. ... (Closed-Leaf check-in: f8dbed8e7c user: mgagnon tags: timeline_showfiles_fix) | |
Changes
Changes to src/info.c.
| ︙ | ︙ | |||
736 737 738 739 740 741 742 |
db_prepare(&q3,
"SELECT name,"
" mperm,"
" (SELECT uuid FROM blob WHERE rid=mlink.pid),"
" (SELECT uuid FROM blob WHERE rid=mlink.fid),"
" (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
" FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
| | | 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 |
db_prepare(&q3,
"SELECT name,"
" mperm,"
" (SELECT uuid FROM blob WHERE rid=mlink.pid),"
" (SELECT uuid FROM blob WHERE rid=mlink.fid),"
" (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
" FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
" WHERE mlink.mid=%d"
" AND (mlink.fid>0"
" OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))"
" ORDER BY name /*sort*/",
rid, rid
);
while( db_step(&q3)==SQLITE_ROW ){
const char *zName = db_column_text(&q3,0);
|
| ︙ | ︙ |
Changes to src/timeline.c.
| ︙ | ︙ | |||
501 502 503 504 505 506 507 |
" (SELECT uuid FROM blob WHERE rid=fid),"
" (SELECT uuid FROM blob WHERE rid=pid),"
" (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm"
" FROM mlink"
" WHERE mid=:mid AND (pid!=fid OR pfnid>0)"
" AND (fid>0 OR"
" fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))"
| < | 501 502 503 504 505 506 507 508 509 510 511 512 513 514 |
" (SELECT uuid FROM blob WHERE rid=fid),"
" (SELECT uuid FROM blob WHERE rid=pid),"
" (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm"
" FROM mlink"
" WHERE mid=:mid AND (pid!=fid OR pfnid>0)"
" AND (fid>0 OR"
" fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))"
" ORDER BY 3 /*sort*/"
);
fchngQueryInit = 1;
}
db_bind_int(&fchngQuery, ":mid", rid);
while( db_step(&fchngQuery)==SQLITE_ROW ){
const char *zFilename = db_column_text(&fchngQuery, 2);
|
| ︙ | ︙ |