Fossil SCM
Do not show cherrypick merge links in the context for the /ci_tags page.
Commit
758029a81226d4682f8f26539899f66225ca5041a716ecd2e8da09cfc8da0783
Parent
3d922b5210a0161…
1 file changed
-9
-9
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -612,19 +612,10 @@ | ||
| 612 | 612 | " (SELECT uuid FROM blob WHERE rid=tagxref.origid AND rid!=%d)" |
| 613 | 613 | " FROM tagxref JOIN tag ON tagxref.tagid=tag.tagid" |
| 614 | 614 | " WHERE tagxref.rid=%d" |
| 615 | 615 | " ORDER BY tagname /*sort*/", rid, rid, rid |
| 616 | 616 | ); |
| 617 | - if( db_table_exists("repository","cherrypick") ){ | |
| 618 | - db_multi_exec( | |
| 619 | - "INSERT OR IGNORE INTO ok " | |
| 620 | - " SELECT parentid FROM cherrypick WHERE childid=%d;" | |
| 621 | - "INSERT OR IGNORE INTO ok " | |
| 622 | - " SELECT childid FROM cherrypick WHERE parentid=%d;", | |
| 623 | - rid, rid | |
| 624 | - ); | |
| 625 | - } | |
| 626 | 617 | blob_zero(&sql); |
| 627 | 618 | blob_append(&sql, timeline_query_for_www(), -1); |
| 628 | 619 | blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC"); |
| 629 | 620 | db_prepare(&q, "%s", blob_sql_text(&sql)); |
| 630 | 621 | www_print_timeline(&q, TIMELINE_DISJOINT|TIMELINE_GRAPH|TIMELINE_NOSCROLL, |
| 631 | 622 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -612,19 +612,10 @@ | |
| 612 | " (SELECT uuid FROM blob WHERE rid=tagxref.origid AND rid!=%d)" |
| 613 | " FROM tagxref JOIN tag ON tagxref.tagid=tag.tagid" |
| 614 | " WHERE tagxref.rid=%d" |
| 615 | " ORDER BY tagname /*sort*/", rid, rid, rid |
| 616 | ); |
| 617 | if( db_table_exists("repository","cherrypick") ){ |
| 618 | db_multi_exec( |
| 619 | "INSERT OR IGNORE INTO ok " |
| 620 | " SELECT parentid FROM cherrypick WHERE childid=%d;" |
| 621 | "INSERT OR IGNORE INTO ok " |
| 622 | " SELECT childid FROM cherrypick WHERE parentid=%d;", |
| 623 | rid, rid |
| 624 | ); |
| 625 | } |
| 626 | blob_zero(&sql); |
| 627 | blob_append(&sql, timeline_query_for_www(), -1); |
| 628 | blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC"); |
| 629 | db_prepare(&q, "%s", blob_sql_text(&sql)); |
| 630 | www_print_timeline(&q, TIMELINE_DISJOINT|TIMELINE_GRAPH|TIMELINE_NOSCROLL, |
| 631 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -612,19 +612,10 @@ | |
| 612 | " (SELECT uuid FROM blob WHERE rid=tagxref.origid AND rid!=%d)" |
| 613 | " FROM tagxref JOIN tag ON tagxref.tagid=tag.tagid" |
| 614 | " WHERE tagxref.rid=%d" |
| 615 | " ORDER BY tagname /*sort*/", rid, rid, rid |
| 616 | ); |
| 617 | blob_zero(&sql); |
| 618 | blob_append(&sql, timeline_query_for_www(), -1); |
| 619 | blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC"); |
| 620 | db_prepare(&q, "%s", blob_sql_text(&sql)); |
| 621 | www_print_timeline(&q, TIMELINE_DISJOINT|TIMELINE_GRAPH|TIMELINE_NOSCROLL, |
| 622 |