Fossil SCM
Enhance the Wiki change event display on the timeline so that it detects obsolete EVENT table comments and handles them appropriately.
Commit
18891326a4cc59ed82e2293868dd00645d61bd3dfbb2c94eac0c204c1cb8a373
Parent
1a9b1c4de7abfcb…
1 file changed
+11
-5
+11
-5
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -604,18 +604,24 @@ | ||
| 604 | 604 | ** comment on-the-fly |
| 605 | 605 | */ |
| 606 | 606 | wiki_hyperlink_override(zUuid); |
| 607 | 607 | if( zCom[0]=='-' ){ |
| 608 | 608 | @ Deleted wiki page "%z(href("%R/whistory?name=%t",zCom+1))\ |
| 609 | - }else if( (tmFlags & TIMELINE_REFS)!=0 ){ | |
| 610 | - @ Wiki page "%z(href("%R/wiki?name=%t",zCom+1))\ | |
| 609 | + @ %h(zCom+1)</a> | |
| 610 | + }else if( (tmFlags & TIMELINE_REFS)!=0 | |
| 611 | + && (zCom[0]=='+' || zCom[0]==':') ){ | |
| 612 | + @ Wiki page "%z(href("%R/wiki?name=%t",zCom+1))%h(zCom+1)</a> | |
| 611 | 613 | }else if( zCom[0]=='+' ){ |
| 612 | - @ Added wiki page "%z(href("%R/wiki?name=%t",zCom+1))\ | |
| 613 | - }else{ | |
| 614 | + @ Added wiki page "%z(href("%R/wiki?name=%t",zCom+1))%h(zCom+1)</a> | |
| 615 | + }else if( zCom[0]==':' ){ | |
| 614 | 616 | @ Changes to wiki page "%z(href("%R/wiki?name=%t",zCom+1))\ |
| 617 | + @ %h(zCom+1)</a> | |
| 618 | + }else{ | |
| 619 | + /* Legacy EVENT table entry that needs to be rebuilt */ | |
| 620 | + @ Changes to a wiki page → Obsolete EVENT table information. | |
| 621 | + @ Run "fossil rebuild" on the repository. | |
| 615 | 622 | } |
| 616 | - @ %h(zCom+1)</a>" | |
| 617 | 623 | wiki_hyperlink_override(0); |
| 618 | 624 | }else{ |
| 619 | 625 | wiki_convert(&comment, 0, WIKI_INLINE); |
| 620 | 626 | } |
| 621 | 627 | }else{ |
| 622 | 628 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -604,18 +604,24 @@ | |
| 604 | ** comment on-the-fly |
| 605 | */ |
| 606 | wiki_hyperlink_override(zUuid); |
| 607 | if( zCom[0]=='-' ){ |
| 608 | @ Deleted wiki page "%z(href("%R/whistory?name=%t",zCom+1))\ |
| 609 | }else if( (tmFlags & TIMELINE_REFS)!=0 ){ |
| 610 | @ Wiki page "%z(href("%R/wiki?name=%t",zCom+1))\ |
| 611 | }else if( zCom[0]=='+' ){ |
| 612 | @ Added wiki page "%z(href("%R/wiki?name=%t",zCom+1))\ |
| 613 | }else{ |
| 614 | @ Changes to wiki page "%z(href("%R/wiki?name=%t",zCom+1))\ |
| 615 | } |
| 616 | @ %h(zCom+1)</a>" |
| 617 | wiki_hyperlink_override(0); |
| 618 | }else{ |
| 619 | wiki_convert(&comment, 0, WIKI_INLINE); |
| 620 | } |
| 621 | }else{ |
| 622 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -604,18 +604,24 @@ | |
| 604 | ** comment on-the-fly |
| 605 | */ |
| 606 | wiki_hyperlink_override(zUuid); |
| 607 | if( zCom[0]=='-' ){ |
| 608 | @ Deleted wiki page "%z(href("%R/whistory?name=%t",zCom+1))\ |
| 609 | @ %h(zCom+1)</a> |
| 610 | }else if( (tmFlags & TIMELINE_REFS)!=0 |
| 611 | && (zCom[0]=='+' || zCom[0]==':') ){ |
| 612 | @ Wiki page "%z(href("%R/wiki?name=%t",zCom+1))%h(zCom+1)</a> |
| 613 | }else if( zCom[0]=='+' ){ |
| 614 | @ Added wiki page "%z(href("%R/wiki?name=%t",zCom+1))%h(zCom+1)</a> |
| 615 | }else if( zCom[0]==':' ){ |
| 616 | @ Changes to wiki page "%z(href("%R/wiki?name=%t",zCom+1))\ |
| 617 | @ %h(zCom+1)</a> |
| 618 | }else{ |
| 619 | /* Legacy EVENT table entry that needs to be rebuilt */ |
| 620 | @ Changes to a wiki page → Obsolete EVENT table information. |
| 621 | @ Run "fossil rebuild" on the repository. |
| 622 | } |
| 623 | wiki_hyperlink_override(0); |
| 624 | }else{ |
| 625 | wiki_convert(&comment, 0, WIKI_INLINE); |
| 626 | } |
| 627 | }else{ |
| 628 |