Fossil SCM
Improved timeline title when both p= and d= query parameters are provided and refer to different checkins.
Commit
5253f0cf027605034c39c65569dafdbf572102c3375354c30c508b1f0c68f6f4
Parent
a1a4adfa2755e50…
2 files changed
+4
-4
+1
-1
+4
-4
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -2350,15 +2350,15 @@ | ||
| 2350 | 2350 | } |
| 2351 | 2351 | if( bSeparateDandP ){ |
| 2352 | 2352 | int n = db_int(0, "SELECT count(*) FROM ok"); |
| 2353 | 2353 | blob_reset(&desc); |
| 2354 | 2354 | blob_appendf(&desc, |
| 2355 | - "%d check-ins that are both ancestors of %z%h</a>" | |
| 2356 | - " and descendants of %z%h</a>", | |
| 2355 | + "%d check-ins that are derived from %z%h</a>" | |
| 2356 | + " and contribute to %z%h</a>", | |
| 2357 | 2357 | n, |
| 2358 | - href("%R/info?name=%h",zDPNameP),zDPNameP, | |
| 2359 | - href("%R/info?name=%h",zDPNameD),zDPNameD | |
| 2358 | + href("%R/info?name=%h",zDPNameD),zDPNameD, | |
| 2359 | + href("%R/info?name=%h",zDPNameP),zDPNameP | |
| 2360 | 2360 | ); |
| 2361 | 2361 | ridBackTo = 0; |
| 2362 | 2362 | ridFwdTo = 0; |
| 2363 | 2363 | }else{ |
| 2364 | 2364 | blob_appendf(&desc, " of %z%h</a>", |
| 2365 | 2365 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2350,15 +2350,15 @@ | |
| 2350 | } |
| 2351 | if( bSeparateDandP ){ |
| 2352 | int n = db_int(0, "SELECT count(*) FROM ok"); |
| 2353 | blob_reset(&desc); |
| 2354 | blob_appendf(&desc, |
| 2355 | "%d check-ins that are both ancestors of %z%h</a>" |
| 2356 | " and descendants of %z%h</a>", |
| 2357 | n, |
| 2358 | href("%R/info?name=%h",zDPNameP),zDPNameP, |
| 2359 | href("%R/info?name=%h",zDPNameD),zDPNameD |
| 2360 | ); |
| 2361 | ridBackTo = 0; |
| 2362 | ridFwdTo = 0; |
| 2363 | }else{ |
| 2364 | blob_appendf(&desc, " of %z%h</a>", |
| 2365 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2350,15 +2350,15 @@ | |
| 2350 | } |
| 2351 | if( bSeparateDandP ){ |
| 2352 | int n = db_int(0, "SELECT count(*) FROM ok"); |
| 2353 | blob_reset(&desc); |
| 2354 | blob_appendf(&desc, |
| 2355 | "%d check-ins that are derived from %z%h</a>" |
| 2356 | " and contribute to %z%h</a>", |
| 2357 | n, |
| 2358 | href("%R/info?name=%h",zDPNameD),zDPNameD, |
| 2359 | href("%R/info?name=%h",zDPNameP),zDPNameP |
| 2360 | ); |
| 2361 | ridBackTo = 0; |
| 2362 | ridFwdTo = 0; |
| 2363 | }else{ |
| 2364 | blob_appendf(&desc, " of %z%h</a>", |
| 2365 |
+1
-1
| --- www/index.wiki | ||
| +++ www/index.wiki | ||
| @@ -88,11 +88,11 @@ | ||
| 88 | 88 | <hr> |
| 89 | 89 | <h3>Latest Release: 2.26 ([/timeline?c=version-2.26|2025-04-30])</h3> |
| 90 | 90 | |
| 91 | 91 | * [/uv/download.html|Download] |
| 92 | 92 | * [./changes.wiki#v2_26|Change Summary] |
| 93 | - * [/timeline?p=version-2.26&bt=version-2.25&y=ci|Check-ins in version 2.26] | |
| 93 | + * [/timeline?p=version-2.26&d=version-2.25&y=ci|Check-ins in version 2.26] | |
| 94 | 94 | * [/timeline?df=version-2.26&y=ci|Check-ins derived from the 2.26 release] |
| 95 | 95 | * [/timeline?t=release|Timeline of all past releases] |
| 96 | 96 | |
| 97 | 97 | <hr> |
| 98 | 98 | <h3>Quick Start</h3> |
| 99 | 99 |
| --- www/index.wiki | |
| +++ www/index.wiki | |
| @@ -88,11 +88,11 @@ | |
| 88 | <hr> |
| 89 | <h3>Latest Release: 2.26 ([/timeline?c=version-2.26|2025-04-30])</h3> |
| 90 | |
| 91 | * [/uv/download.html|Download] |
| 92 | * [./changes.wiki#v2_26|Change Summary] |
| 93 | * [/timeline?p=version-2.26&bt=version-2.25&y=ci|Check-ins in version 2.26] |
| 94 | * [/timeline?df=version-2.26&y=ci|Check-ins derived from the 2.26 release] |
| 95 | * [/timeline?t=release|Timeline of all past releases] |
| 96 | |
| 97 | <hr> |
| 98 | <h3>Quick Start</h3> |
| 99 |
| --- www/index.wiki | |
| +++ www/index.wiki | |
| @@ -88,11 +88,11 @@ | |
| 88 | <hr> |
| 89 | <h3>Latest Release: 2.26 ([/timeline?c=version-2.26|2025-04-30])</h3> |
| 90 | |
| 91 | * [/uv/download.html|Download] |
| 92 | * [./changes.wiki#v2_26|Change Summary] |
| 93 | * [/timeline?p=version-2.26&d=version-2.25&y=ci|Check-ins in version 2.26] |
| 94 | * [/timeline?df=version-2.26&y=ci|Check-ins derived from the 2.26 release] |
| 95 | * [/timeline?t=release|Timeline of all past releases] |
| 96 | |
| 97 | <hr> |
| 98 | <h3>Quick Start</h3> |
| 99 |