Fossil SCM
Add support for the "mionly" query parameter in /timeline when using from= and to=.
Commit
9fae21515191cc6f4564089442f17551e9d4ea9ba5d898432d4288be2e0286c2
Parent
994d7d849d70487…
1 file changed
+12
-4
+12
-4
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1758,21 +1758,29 @@ | ||
| 1758 | 1758 | blob_reset(&ins); |
| 1759 | 1759 | if( related ){ |
| 1760 | 1760 | db_multi_exec( |
| 1761 | 1761 | "CREATE TABLE IF NOT EXISTS temp.related(x INTEGER PRIMARY KEY);" |
| 1762 | 1762 | "INSERT OR IGNORE INTO related(x)" |
| 1763 | - " SELECT cid FROM plink WHERE pid IN pathnode AND NOT isprim;" | |
| 1764 | - "INSERT OR IGNORE INTO related(x)" | |
| 1765 | 1763 | " SELECT pid FROM plink WHERE cid IN pathnode AND NOT isprim;" |
| 1766 | 1764 | ); |
| 1765 | + if( P("mionly")==0 ){ | |
| 1766 | + db_multi_exec( | |
| 1767 | + "INSERT OR IGNORE INTO related(x)" | |
| 1768 | + " SELECT cid FROM plink WHERE pid IN pathnode;" | |
| 1769 | + ); | |
| 1770 | + } | |
| 1767 | 1771 | if( showCherrypicks ){ |
| 1768 | 1772 | db_multi_exec( |
| 1769 | - "INSERT OR IGNORE INTO related(x)" | |
| 1770 | - " SELECT childid FROM cherrypick WHERE parentid IN pathnode;" | |
| 1771 | 1773 | "INSERT OR IGNORE INTO related(x)" |
| 1772 | 1774 | " SELECT parentid FROM cherrypick WHERE childid IN pathnode;" |
| 1773 | 1775 | ); |
| 1776 | + if( P("mionly")==0 ){ | |
| 1777 | + db_multi_exec( | |
| 1778 | + "INSERT OR IGNORE INTO related(x)" | |
| 1779 | + " SELECT childid FROM cherrypick WHERE parentid IN pathnode;" | |
| 1780 | + ); | |
| 1781 | + } | |
| 1774 | 1782 | } |
| 1775 | 1783 | db_multi_exec("INSERT OR IGNORE INTO pathnode SELECT x FROM related"); |
| 1776 | 1784 | } |
| 1777 | 1785 | blob_append_sql(&sql, " AND event.objid IN pathnode"); |
| 1778 | 1786 | addFileGlobExclusion(zChng, &sql); |
| 1779 | 1787 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1758,21 +1758,29 @@ | |
| 1758 | blob_reset(&ins); |
| 1759 | if( related ){ |
| 1760 | db_multi_exec( |
| 1761 | "CREATE TABLE IF NOT EXISTS temp.related(x INTEGER PRIMARY KEY);" |
| 1762 | "INSERT OR IGNORE INTO related(x)" |
| 1763 | " SELECT cid FROM plink WHERE pid IN pathnode AND NOT isprim;" |
| 1764 | "INSERT OR IGNORE INTO related(x)" |
| 1765 | " SELECT pid FROM plink WHERE cid IN pathnode AND NOT isprim;" |
| 1766 | ); |
| 1767 | if( showCherrypicks ){ |
| 1768 | db_multi_exec( |
| 1769 | "INSERT OR IGNORE INTO related(x)" |
| 1770 | " SELECT childid FROM cherrypick WHERE parentid IN pathnode;" |
| 1771 | "INSERT OR IGNORE INTO related(x)" |
| 1772 | " SELECT parentid FROM cherrypick WHERE childid IN pathnode;" |
| 1773 | ); |
| 1774 | } |
| 1775 | db_multi_exec("INSERT OR IGNORE INTO pathnode SELECT x FROM related"); |
| 1776 | } |
| 1777 | blob_append_sql(&sql, " AND event.objid IN pathnode"); |
| 1778 | addFileGlobExclusion(zChng, &sql); |
| 1779 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1758,21 +1758,29 @@ | |
| 1758 | blob_reset(&ins); |
| 1759 | if( related ){ |
| 1760 | db_multi_exec( |
| 1761 | "CREATE TABLE IF NOT EXISTS temp.related(x INTEGER PRIMARY KEY);" |
| 1762 | "INSERT OR IGNORE INTO related(x)" |
| 1763 | " SELECT pid FROM plink WHERE cid IN pathnode AND NOT isprim;" |
| 1764 | ); |
| 1765 | if( P("mionly")==0 ){ |
| 1766 | db_multi_exec( |
| 1767 | "INSERT OR IGNORE INTO related(x)" |
| 1768 | " SELECT cid FROM plink WHERE pid IN pathnode;" |
| 1769 | ); |
| 1770 | } |
| 1771 | if( showCherrypicks ){ |
| 1772 | db_multi_exec( |
| 1773 | "INSERT OR IGNORE INTO related(x)" |
| 1774 | " SELECT parentid FROM cherrypick WHERE childid IN pathnode;" |
| 1775 | ); |
| 1776 | if( P("mionly")==0 ){ |
| 1777 | db_multi_exec( |
| 1778 | "INSERT OR IGNORE INTO related(x)" |
| 1779 | " SELECT childid FROM cherrypick WHERE parentid IN pathnode;" |
| 1780 | ); |
| 1781 | } |
| 1782 | } |
| 1783 | db_multi_exec("INSERT OR IGNORE INTO pathnode SELECT x FROM related"); |
| 1784 | } |
| 1785 | blob_append_sql(&sql, " AND event.objid IN pathnode"); |
| 1786 | addFileGlobExclusion(zChng, &sql); |
| 1787 |