Fossil SCM
Fix the "200 Entries" submenu hyperlink for branch-view timelines. Ticket [e436a483c5b08a1aec]
Commit
6b9a5932945ed456a1201b634bad6a588d29757c
Parent
1a6a154a4eb53bb…
1 file changed
+2
-2
+2
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -797,18 +797,18 @@ | ||
| 797 | 797 | if( tagid>0 ){ |
| 798 | 798 | blob_appendf(&sql, |
| 799 | 799 | "AND (EXISTS(SELECT 1 FROM tagxref" |
| 800 | 800 | " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)", tagid); |
| 801 | 801 | |
| 802 | - if( zBrName && zType[0]=='c' ){ | |
| 802 | + if( zBrName ){ | |
| 803 | + url_add_parameter(&url, "r", zBrName); | |
| 803 | 804 | /* The next two blob_appendf() calls add SQL that causes checkins that |
| 804 | 805 | ** are not part of the branch which are parents or childen of the branch |
| 805 | 806 | ** to be included in the report. This related check-ins are useful |
| 806 | 807 | ** in helping to visualize what has happened on a quiescent branch |
| 807 | 808 | ** that is infrequently merged with a much more activate branch. |
| 808 | 809 | */ |
| 809 | - url_add_parameter(&url, "r", zBrName); | |
| 810 | 810 | blob_appendf(&sql, |
| 811 | 811 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid" |
| 812 | 812 | " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)", tagid); |
| 813 | 813 | blob_appendf(&sql, |
| 814 | 814 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid" |
| 815 | 815 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -797,18 +797,18 @@ | |
| 797 | if( tagid>0 ){ |
| 798 | blob_appendf(&sql, |
| 799 | "AND (EXISTS(SELECT 1 FROM tagxref" |
| 800 | " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)", tagid); |
| 801 | |
| 802 | if( zBrName && zType[0]=='c' ){ |
| 803 | /* The next two blob_appendf() calls add SQL that causes checkins that |
| 804 | ** are not part of the branch which are parents or childen of the branch |
| 805 | ** to be included in the report. This related check-ins are useful |
| 806 | ** in helping to visualize what has happened on a quiescent branch |
| 807 | ** that is infrequently merged with a much more activate branch. |
| 808 | */ |
| 809 | url_add_parameter(&url, "r", zBrName); |
| 810 | blob_appendf(&sql, |
| 811 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid" |
| 812 | " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)", tagid); |
| 813 | blob_appendf(&sql, |
| 814 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid" |
| 815 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -797,18 +797,18 @@ | |
| 797 | if( tagid>0 ){ |
| 798 | blob_appendf(&sql, |
| 799 | "AND (EXISTS(SELECT 1 FROM tagxref" |
| 800 | " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)", tagid); |
| 801 | |
| 802 | if( zBrName ){ |
| 803 | url_add_parameter(&url, "r", zBrName); |
| 804 | /* The next two blob_appendf() calls add SQL that causes checkins that |
| 805 | ** are not part of the branch which are parents or childen of the branch |
| 806 | ** to be included in the report. This related check-ins are useful |
| 807 | ** in helping to visualize what has happened on a quiescent branch |
| 808 | ** that is infrequently merged with a much more activate branch. |
| 809 | */ |
| 810 | blob_appendf(&sql, |
| 811 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid" |
| 812 | " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)", tagid); |
| 813 | blob_appendf(&sql, |
| 814 | " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid" |
| 815 |