Fossil SCM
Fix the labeling of timelines with the dp=UUID query parameter.
Commit
a47fde8eeda449899b2fb9f2246bacb4d7721b25
Parent
0bde74ea1e9229a…
1 file changed
+8
-9
+8
-9
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -843,23 +843,24 @@ | ||
| 843 | 843 | ** |
| 844 | 844 | ** a=TIMESTAMP after this date |
| 845 | 845 | ** b=TIMESTAMP before this date. |
| 846 | 846 | ** c=TIMESTAMP "circa" this date. |
| 847 | 847 | ** n=COUNT number of events in output |
| 848 | -** p=RID artifact RID and up to COUNT parents and ancestors | |
| 849 | -** d=RID artifact RID and up to COUNT descendants | |
| 848 | +** p=UUID artifact and up to COUNT parents and ancestors | |
| 849 | +** d=UUID artifact and up to COUNT descendants | |
| 850 | +** dp=UUUID The same as d=UUID&p=UUID | |
| 850 | 851 | ** t=TAGID show only check-ins with the given tagid |
| 851 | 852 | ** r=TAGID show check-ins related to tagid |
| 852 | 853 | ** u=USER only if belonging to this user |
| 853 | 854 | ** y=TYPE 'ci', 'w', 't', 'e' |
| 854 | 855 | ** s=TEXT string search (comment and brief) |
| 855 | 856 | ** ng Suppress the graph if present |
| 856 | 857 | ** nd Suppress "divider" lines |
| 857 | 858 | ** fc Show details of files changed |
| 858 | -** f=RID Show family (immediate parents and children) of RID | |
| 859 | -** from=RID Path from... | |
| 860 | -** to=RID ... to this | |
| 859 | +** f=UUID Show family (immediate parents and children) of UUID | |
| 860 | +** from=UUID Path from... | |
| 861 | +** to=UUID ... to this | |
| 861 | 862 | ** nomerge ... avoid merge links on the path |
| 862 | 863 | ** brbg Background color from branch name |
| 863 | 864 | ** ubg Background color from user |
| 864 | 865 | ** |
| 865 | 866 | ** p= and d= can appear individually or together. If either p= or d= |
| @@ -999,14 +1000,12 @@ | ||
| 999 | 1000 | blob_appendf(&sql, " AND event.objid IN ok"); |
| 1000 | 1001 | nd = 0; |
| 1001 | 1002 | if( d_rid ){ |
| 1002 | 1003 | compute_descendants(d_rid, nEntry+1); |
| 1003 | 1004 | nd = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 1004 | - if( nd>=0 ){ | |
| 1005 | - db_multi_exec("%s", blob_str(&sql)); | |
| 1006 | - blob_appendf(&desc, "%d descendant%s", nd,(1==nd)?"":"s"); | |
| 1007 | - } | |
| 1005 | + if( nd>=0 ) db_multi_exec("%s", blob_str(&sql)); | |
| 1006 | + if( nd>0 ) blob_appendf(&desc, "%d descendant%s", nd,(1==nd)?"":"s"); | |
| 1008 | 1007 | if( useDividers ) timeline_add_dividers(0, d_rid); |
| 1009 | 1008 | db_multi_exec("DELETE FROM ok"); |
| 1010 | 1009 | } |
| 1011 | 1010 | if( p_rid ){ |
| 1012 | 1011 | compute_ancestors(p_rid, nEntry+1); |
| 1013 | 1012 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -843,23 +843,24 @@ | |
| 843 | ** |
| 844 | ** a=TIMESTAMP after this date |
| 845 | ** b=TIMESTAMP before this date. |
| 846 | ** c=TIMESTAMP "circa" this date. |
| 847 | ** n=COUNT number of events in output |
| 848 | ** p=RID artifact RID and up to COUNT parents and ancestors |
| 849 | ** d=RID artifact RID and up to COUNT descendants |
| 850 | ** t=TAGID show only check-ins with the given tagid |
| 851 | ** r=TAGID show check-ins related to tagid |
| 852 | ** u=USER only if belonging to this user |
| 853 | ** y=TYPE 'ci', 'w', 't', 'e' |
| 854 | ** s=TEXT string search (comment and brief) |
| 855 | ** ng Suppress the graph if present |
| 856 | ** nd Suppress "divider" lines |
| 857 | ** fc Show details of files changed |
| 858 | ** f=RID Show family (immediate parents and children) of RID |
| 859 | ** from=RID Path from... |
| 860 | ** to=RID ... to this |
| 861 | ** nomerge ... avoid merge links on the path |
| 862 | ** brbg Background color from branch name |
| 863 | ** ubg Background color from user |
| 864 | ** |
| 865 | ** p= and d= can appear individually or together. If either p= or d= |
| @@ -999,14 +1000,12 @@ | |
| 999 | blob_appendf(&sql, " AND event.objid IN ok"); |
| 1000 | nd = 0; |
| 1001 | if( d_rid ){ |
| 1002 | compute_descendants(d_rid, nEntry+1); |
| 1003 | nd = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 1004 | if( nd>=0 ){ |
| 1005 | db_multi_exec("%s", blob_str(&sql)); |
| 1006 | blob_appendf(&desc, "%d descendant%s", nd,(1==nd)?"":"s"); |
| 1007 | } |
| 1008 | if( useDividers ) timeline_add_dividers(0, d_rid); |
| 1009 | db_multi_exec("DELETE FROM ok"); |
| 1010 | } |
| 1011 | if( p_rid ){ |
| 1012 | compute_ancestors(p_rid, nEntry+1); |
| 1013 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -843,23 +843,24 @@ | |
| 843 | ** |
| 844 | ** a=TIMESTAMP after this date |
| 845 | ** b=TIMESTAMP before this date. |
| 846 | ** c=TIMESTAMP "circa" this date. |
| 847 | ** n=COUNT number of events in output |
| 848 | ** p=UUID artifact and up to COUNT parents and ancestors |
| 849 | ** d=UUID artifact and up to COUNT descendants |
| 850 | ** dp=UUUID The same as d=UUID&p=UUID |
| 851 | ** t=TAGID show only check-ins with the given tagid |
| 852 | ** r=TAGID show check-ins related to tagid |
| 853 | ** u=USER only if belonging to this user |
| 854 | ** y=TYPE 'ci', 'w', 't', 'e' |
| 855 | ** s=TEXT string search (comment and brief) |
| 856 | ** ng Suppress the graph if present |
| 857 | ** nd Suppress "divider" lines |
| 858 | ** fc Show details of files changed |
| 859 | ** f=UUID Show family (immediate parents and children) of UUID |
| 860 | ** from=UUID Path from... |
| 861 | ** to=UUID ... to this |
| 862 | ** nomerge ... avoid merge links on the path |
| 863 | ** brbg Background color from branch name |
| 864 | ** ubg Background color from user |
| 865 | ** |
| 866 | ** p= and d= can appear individually or together. If either p= or d= |
| @@ -999,14 +1000,12 @@ | |
| 1000 | blob_appendf(&sql, " AND event.objid IN ok"); |
| 1001 | nd = 0; |
| 1002 | if( d_rid ){ |
| 1003 | compute_descendants(d_rid, nEntry+1); |
| 1004 | nd = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 1005 | if( nd>=0 ) db_multi_exec("%s", blob_str(&sql)); |
| 1006 | if( nd>0 ) blob_appendf(&desc, "%d descendant%s", nd,(1==nd)?"":"s"); |
| 1007 | if( useDividers ) timeline_add_dividers(0, d_rid); |
| 1008 | db_multi_exec("DELETE FROM ok"); |
| 1009 | } |
| 1010 | if( p_rid ){ |
| 1011 | compute_ancestors(p_rid, nEntry+1); |
| 1012 |