Fossil SCM
Fix check-in [34f5ea44038583fe] so that it only disables the limit on the number of entries in a timeline if both d= and bt= are both present.
Commit
c353212cde5082653d49359b543c3759f77ac49208e403fbb79da257b08428e9
Parent
00e031bb578e5cb…
1 file changed
+1
-1
+1
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -2137,11 +2137,11 @@ | ||
| 2137 | 2137 | db_multi_exec("DELETE FROM ok"); |
| 2138 | 2138 | } |
| 2139 | 2139 | if( p_rid ){ |
| 2140 | 2140 | zBackTo = P("bt"); |
| 2141 | 2141 | ridBackTo = zBackTo ? name_to_typed_rid(zBackTo,"ci") : 0; |
| 2142 | - if( !haveParameterN ) nEntry = 0; | |
| 2142 | + if( ridBackTo && !haveParameterN ) nEntry = 0; | |
| 2143 | 2143 | compute_ancestors(p_rid, nEntry==0 ? 0 : nEntry+1, 0, ridBackTo); |
| 2144 | 2144 | np = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 2145 | 2145 | if( np>0 || nd==0 ){ |
| 2146 | 2146 | if( nd>0 ) blob_appendf(&desc, " and "); |
| 2147 | 2147 | blob_appendf(&desc, "%d ancestor%s", np, (1==np)?"":"s"); |
| 2148 | 2148 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2137,11 +2137,11 @@ | |
| 2137 | db_multi_exec("DELETE FROM ok"); |
| 2138 | } |
| 2139 | if( p_rid ){ |
| 2140 | zBackTo = P("bt"); |
| 2141 | ridBackTo = zBackTo ? name_to_typed_rid(zBackTo,"ci") : 0; |
| 2142 | if( !haveParameterN ) nEntry = 0; |
| 2143 | compute_ancestors(p_rid, nEntry==0 ? 0 : nEntry+1, 0, ridBackTo); |
| 2144 | np = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 2145 | if( np>0 || nd==0 ){ |
| 2146 | if( nd>0 ) blob_appendf(&desc, " and "); |
| 2147 | blob_appendf(&desc, "%d ancestor%s", np, (1==np)?"":"s"); |
| 2148 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2137,11 +2137,11 @@ | |
| 2137 | db_multi_exec("DELETE FROM ok"); |
| 2138 | } |
| 2139 | if( p_rid ){ |
| 2140 | zBackTo = P("bt"); |
| 2141 | ridBackTo = zBackTo ? name_to_typed_rid(zBackTo,"ci") : 0; |
| 2142 | if( ridBackTo && !haveParameterN ) nEntry = 0; |
| 2143 | compute_ancestors(p_rid, nEntry==0 ? 0 : nEntry+1, 0, ridBackTo); |
| 2144 | np = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 2145 | if( np>0 || nd==0 ){ |
| 2146 | if( nd>0 ) blob_appendf(&desc, " and "); |
| 2147 | blob_appendf(&desc, "%d ancestor%s", np, (1==np)?"":"s"); |
| 2148 |