Fossil SCM
Add the mionly parameter to timeline that works with r=TAG to show only merges into the TAG.
Commit
bc427ad7278946b4f030b81e37024dedb04ea414
Parent
5d699b625e7c3d5…
1 file changed
+12
-4
+12
-4
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -978,14 +978,22 @@ | ||
| 978 | 978 | ** in helping to visualize what has happened on a quiescent branch |
| 979 | 979 | ** that is infrequently merged with a much more activate branch. |
| 980 | 980 | */ |
| 981 | 981 | blob_appendf(&sql, |
| 982 | 982 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid" |
| 983 | - " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)", tagid); | |
| 984 | - blob_appendf(&sql, | |
| 985 | - " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid" | |
| 986 | - " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)", tagid); | |
| 983 | + " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)", | |
| 984 | + tagid | |
| 985 | + ); | |
| 986 | + if( P("mionly")==0 ){ | |
| 987 | + blob_appendf(&sql, | |
| 988 | + " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid" | |
| 989 | + " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)", | |
| 990 | + tagid | |
| 991 | + ); | |
| 992 | + }else{ | |
| 993 | + url_add_parameter(&url, "mionly", "1"); | |
| 994 | + } | |
| 987 | 995 | }else{ |
| 988 | 996 | url_add_parameter(&url, "t", zTagName); |
| 989 | 997 | } |
| 990 | 998 | blob_appendf(&sql, ")"); |
| 991 | 999 | } |
| 992 | 1000 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -978,14 +978,22 @@ | |
| 978 | ** in helping to visualize what has happened on a quiescent branch |
| 979 | ** that is infrequently merged with a much more activate branch. |
| 980 | */ |
| 981 | blob_appendf(&sql, |
| 982 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid" |
| 983 | " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)", tagid); |
| 984 | blob_appendf(&sql, |
| 985 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid" |
| 986 | " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)", tagid); |
| 987 | }else{ |
| 988 | url_add_parameter(&url, "t", zTagName); |
| 989 | } |
| 990 | blob_appendf(&sql, ")"); |
| 991 | } |
| 992 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -978,14 +978,22 @@ | |
| 978 | ** in helping to visualize what has happened on a quiescent branch |
| 979 | ** that is infrequently merged with a much more activate branch. |
| 980 | */ |
| 981 | blob_appendf(&sql, |
| 982 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid" |
| 983 | " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)", |
| 984 | tagid |
| 985 | ); |
| 986 | if( P("mionly")==0 ){ |
| 987 | blob_appendf(&sql, |
| 988 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid" |
| 989 | " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)", |
| 990 | tagid |
| 991 | ); |
| 992 | }else{ |
| 993 | url_add_parameter(&url, "mionly", "1"); |
| 994 | } |
| 995 | }else{ |
| 996 | url_add_parameter(&url, "t", zTagName); |
| 997 | } |
| 998 | blob_appendf(&sql, ")"); |
| 999 | } |
| 1000 |