Fossil SCM
Use disjoint timelines when filtering by the chng timeline query parameter
Commit
e7bdbbe435556a769cf3cb6b1596d1655a29479a
Parent
f23ccc89cecaf2e…
1 file changed
+4
-1
+4
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1805,11 +1805,14 @@ | ||
| 1805 | 1805 | int n; |
| 1806 | 1806 | const char *zEType = "timeline item"; |
| 1807 | 1807 | char *zDate; |
| 1808 | 1808 | Blob cond; |
| 1809 | 1809 | blob_zero(&cond); |
| 1810 | - addFileGlobExclusion(zChng, &cond); | |
| 1810 | + if( zChng && *zChng ){ | |
| 1811 | + addFileGlobExclusion(zChng, &cond); | |
| 1812 | + tmFlags |= TIMELINE_DISJOINT; | |
| 1813 | + } | |
| 1811 | 1814 | if( zUses ){ |
| 1812 | 1815 | blob_append_sql(&cond, " AND event.objid IN usesfile "); |
| 1813 | 1816 | } |
| 1814 | 1817 | if( renameOnly ){ |
| 1815 | 1818 | blob_append_sql(&cond, " AND event.objid IN rnfile "); |
| 1816 | 1819 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1805,11 +1805,14 @@ | |
| 1805 | int n; |
| 1806 | const char *zEType = "timeline item"; |
| 1807 | char *zDate; |
| 1808 | Blob cond; |
| 1809 | blob_zero(&cond); |
| 1810 | addFileGlobExclusion(zChng, &cond); |
| 1811 | if( zUses ){ |
| 1812 | blob_append_sql(&cond, " AND event.objid IN usesfile "); |
| 1813 | } |
| 1814 | if( renameOnly ){ |
| 1815 | blob_append_sql(&cond, " AND event.objid IN rnfile "); |
| 1816 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1805,11 +1805,14 @@ | |
| 1805 | int n; |
| 1806 | const char *zEType = "timeline item"; |
| 1807 | char *zDate; |
| 1808 | Blob cond; |
| 1809 | blob_zero(&cond); |
| 1810 | if( zChng && *zChng ){ |
| 1811 | addFileGlobExclusion(zChng, &cond); |
| 1812 | tmFlags |= TIMELINE_DISJOINT; |
| 1813 | } |
| 1814 | if( zUses ){ |
| 1815 | blob_append_sql(&cond, " AND event.objid IN usesfile "); |
| 1816 | } |
| 1817 | if( renameOnly ){ |
| 1818 | blob_append_sql(&cond, " AND event.objid IN rnfile "); |
| 1819 |