Fossil SCM
In the timeline, continue to show the of a branch as a "Leaf" even after the branch has been merged into some other line.
Commit
ba6687f2423d5388b9de8638408347309b30810e
Parent
2521a0a9a704b41…
1 file changed
+2
-2
+2
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -83,11 +83,11 @@ | ||
| 83 | 83 | int count_nonbranch_children(int pid){ |
| 84 | 84 | int nNonBranch; |
| 85 | 85 | |
| 86 | 86 | nNonBranch = db_int(0, |
| 87 | 87 | "SELECT count(*) FROM plink" |
| 88 | - " WHERE pid=%d" | |
| 88 | + " WHERE pid=%d AND isprim" | |
| 89 | 89 | " AND NOT EXISTS(SELECT 1 FROM tagxref" |
| 90 | 90 | " WHERE tagid=%d" |
| 91 | 91 | " AND rid=cid" |
| 92 | 92 | " AND tagtype>0" |
| 93 | 93 | " )", |
| @@ -244,11 +244,11 @@ | ||
| 244 | 244 | @ coalesce(ecomment, comment), |
| 245 | 245 | @ coalesce(euser, user), |
| 246 | 246 | @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim=1), |
| 247 | 247 | @ (SELECT count(*) FROM plink WHERE cid=blob.rid), |
| 248 | 248 | @ 0==(SELECT count(*) FROM plink |
| 249 | - @ WHERE pid=blob.rid AND NOT EXISTS( | |
| 249 | + @ WHERE pid=blob.rid AND isprim AND NOT EXISTS( | |
| 250 | 250 | @ SELECT 1 FROM tagxref |
| 251 | 251 | @ WHERE tagid=(SELECT tagid FROM tag WHERE tagname='newbranch') |
| 252 | 252 | @ AND rid=plink.cid AND tagtype>0)), |
| 253 | 253 | @ bgcolor, |
| 254 | 254 | @ event.type, |
| 255 | 255 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -83,11 +83,11 @@ | |
| 83 | int count_nonbranch_children(int pid){ |
| 84 | int nNonBranch; |
| 85 | |
| 86 | nNonBranch = db_int(0, |
| 87 | "SELECT count(*) FROM plink" |
| 88 | " WHERE pid=%d" |
| 89 | " AND NOT EXISTS(SELECT 1 FROM tagxref" |
| 90 | " WHERE tagid=%d" |
| 91 | " AND rid=cid" |
| 92 | " AND tagtype>0" |
| 93 | " )", |
| @@ -244,11 +244,11 @@ | |
| 244 | @ coalesce(ecomment, comment), |
| 245 | @ coalesce(euser, user), |
| 246 | @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim=1), |
| 247 | @ (SELECT count(*) FROM plink WHERE cid=blob.rid), |
| 248 | @ 0==(SELECT count(*) FROM plink |
| 249 | @ WHERE pid=blob.rid AND NOT EXISTS( |
| 250 | @ SELECT 1 FROM tagxref |
| 251 | @ WHERE tagid=(SELECT tagid FROM tag WHERE tagname='newbranch') |
| 252 | @ AND rid=plink.cid AND tagtype>0)), |
| 253 | @ bgcolor, |
| 254 | @ event.type, |
| 255 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -83,11 +83,11 @@ | |
| 83 | int count_nonbranch_children(int pid){ |
| 84 | int nNonBranch; |
| 85 | |
| 86 | nNonBranch = db_int(0, |
| 87 | "SELECT count(*) FROM plink" |
| 88 | " WHERE pid=%d AND isprim" |
| 89 | " AND NOT EXISTS(SELECT 1 FROM tagxref" |
| 90 | " WHERE tagid=%d" |
| 91 | " AND rid=cid" |
| 92 | " AND tagtype>0" |
| 93 | " )", |
| @@ -244,11 +244,11 @@ | |
| 244 | @ coalesce(ecomment, comment), |
| 245 | @ coalesce(euser, user), |
| 246 | @ (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim=1), |
| 247 | @ (SELECT count(*) FROM plink WHERE cid=blob.rid), |
| 248 | @ 0==(SELECT count(*) FROM plink |
| 249 | @ WHERE pid=blob.rid AND isprim AND NOT EXISTS( |
| 250 | @ SELECT 1 FROM tagxref |
| 251 | @ WHERE tagid=(SELECT tagid FROM tag WHERE tagname='newbranch') |
| 252 | @ AND rid=plink.cid AND tagtype>0)), |
| 253 | @ bgcolor, |
| 254 | @ event.type, |
| 255 |