Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Backout changes from timeline_showfiles_fix branch which was attempting to fix
discrepancy between CLI and web when listing modified files in checkins.
Make "fossil timeline -v" command behave like the web interface so the CLI timeline command get fixed instead of breaking the web interface. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
3c34db8d0ecb671bcc837c46a300613a |
User & Date: | mgagnon 2015-10-21 12:04:32 |
References
2015-10-24
| ||
14:10 | Fix "json timeline" to don't show duplicate files in some chek-ins with merge. Same way CLI timeline was fix on [3c34db8d]. ... (check-in: 26d903de user: mgagnon tags: trunk) | |
Context
2015-10-21
| ||
20:39 | Add the 'encode64' command to TH1. ... (check-in: 3f21421a user: mistachkin tags: trunk) | |
12:04 |
Backout changes from timeline_showfiles_fix branch which was attempting to fix
discrepancy between CLI and web when listing modified files in checkins.
Make "fossil timeline -v" command behave like the web interface so the CLI timeline command get fixed instead of breaking the web interface. ... (check-in: 3c34db8d user: mgagnon tags: trunk) | |
2015-10-20
| ||
17:40 | Cherrypick of [2a1d7e0efc]. Docker build 'release' by default. Meant for upcoming Fossil release. ... (check-in: b88e6c77 user: mistachkin tags: trunk) | |
08:14 | Docker build "release" by default. Meant for upcoming Fossil release. ... (Closed-Leaf check-in: 2a1d7e0e user: jan.nijtmans tags: pending-review) | |
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 NOT mlink.isaux" " 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.
︙ | ︙ | |||
489 490 491 492 493 494 495 | } /* Generate the file-change list if requested */ if( (tmFlags & (TIMELINE_FCHANGES|TIMELINE_FRENAMES))!=0 && zType[0]=='c' && g.perm.Hyperlink ){ int inUl = 0; | < > | < < | 489 490 491 492 493 494 495 496 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 531 532 | } /* 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, "SELECT pid," " fid," " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," " (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))" " AND NOT mlink.isaux" " 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); int isNew = db_column_int(&fchngQuery, 0)<=0; int isMergeNew = db_column_int(&fchngQuery, 0)<0; int fid = db_column_int(&fchngQuery, 1); int isDel = fid==0; const char *zOldName = db_column_text(&fchngQuery, 5); const char *zOld = db_column_text(&fchngQuery, 4); const char *zNew = db_column_text(&fchngQuery, 3); const char *zUnpub = ""; char *zA; char zId[20]; if( !inUl ){ @ <ul class="filelist"> inUl = 1; } if( tmFlags & TIMELINE_SHOWRID ){ sqlite3_snprintf(sizeof(zId), zId, " (%d) ", fid); }else{ |
︙ | ︙ | |||
1862 1863 1864 1865 1866 1867 1868 | db_prepare(&fchngQuery, "SELECT (pid<=0) AS isnew," " (fid==0) AS isdel," " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," " (SELECT uuid FROM blob WHERE rid=fid)," " (SELECT uuid FROM blob WHERE rid=pid)" " FROM mlink" | | | 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 | db_prepare(&fchngQuery, "SELECT (pid<=0) AS isnew," " (fid==0) AS isdel," " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," " (SELECT uuid FROM blob WHERE rid=fid)," " (SELECT uuid FROM blob WHERE rid=pid)" " FROM mlink" " WHERE mid=:mid AND pid!=fid AND NOT mlink.isaux" " 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); |
︙ | ︙ |