Fossil SCM
Do not show merge links to phantoms in the graph.
Commit
8a1e384b333ffc399c8a7e3620bd02632c333756
Parent
4614dadbcb9c3b0…
2 files changed
+3
-1
+3
+3
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -250,11 +250,13 @@ | ||
| 250 | 250 | const char *zBr; |
| 251 | 251 | int gidx; |
| 252 | 252 | static Stmt qparent; |
| 253 | 253 | static Stmt qbranch; |
| 254 | 254 | db_static_prepare(&qparent, |
| 255 | - "SELECT pid FROM plink WHERE cid=:rid ORDER BY isprim DESC /*sort*/" | |
| 255 | + "SELECT pid FROM plink" | |
| 256 | + " WHERE cid=:rid AND pid NOT IN phantom" | |
| 257 | + " ORDER BY isprim DESC /*sort*/" | |
| 256 | 258 | ); |
| 257 | 259 | db_static_prepare(&qbranch, |
| 258 | 260 | "SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0 AND rid=:rid", |
| 259 | 261 | TAG_BRANCH |
| 260 | 262 | ); |
| 261 | 263 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -250,11 +250,13 @@ | |
| 250 | const char *zBr; |
| 251 | int gidx; |
| 252 | static Stmt qparent; |
| 253 | static Stmt qbranch; |
| 254 | db_static_prepare(&qparent, |
| 255 | "SELECT pid FROM plink WHERE cid=:rid ORDER BY isprim DESC /*sort*/" |
| 256 | ); |
| 257 | db_static_prepare(&qbranch, |
| 258 | "SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0 AND rid=:rid", |
| 259 | TAG_BRANCH |
| 260 | ); |
| 261 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -250,11 +250,13 @@ | |
| 250 | const char *zBr; |
| 251 | int gidx; |
| 252 | static Stmt qparent; |
| 253 | static Stmt qbranch; |
| 254 | db_static_prepare(&qparent, |
| 255 | "SELECT pid FROM plink" |
| 256 | " WHERE cid=:rid AND pid NOT IN phantom" |
| 257 | " ORDER BY isprim DESC /*sort*/" |
| 258 | ); |
| 259 | db_static_prepare(&qbranch, |
| 260 | "SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0 AND rid=:rid", |
| 261 | TAG_BRANCH |
| 262 | ); |
| 263 |
| --- test/graph-test-1.wiki | ||
| +++ test/graph-test-1.wiki | ||
| @@ -19,5 +19,8 @@ | ||
| 19 | 19 | * [/timeline?t=creole] |
| 20 | 20 | * [/timeline?t=release] |
| 21 | 21 | * [/timeline?r=release] |
| 22 | 22 | * [/finfo?name=Makefile] |
| 23 | 23 | * [/timeline?a=1970-01-01] |
| 24 | + * [/timeline?y=ci&n=1000000] - All checkins - a huge graph | |
| 25 | + * [/timeline?f=8dfed953f7530442] - This malformed commit has a | |
| 26 | + merge parent which is not a valid checkin. | |
| 24 | 27 |
| --- test/graph-test-1.wiki | |
| +++ test/graph-test-1.wiki | |
| @@ -19,5 +19,8 @@ | |
| 19 | * [/timeline?t=creole] |
| 20 | * [/timeline?t=release] |
| 21 | * [/timeline?r=release] |
| 22 | * [/finfo?name=Makefile] |
| 23 | * [/timeline?a=1970-01-01] |
| 24 |
| --- test/graph-test-1.wiki | |
| +++ test/graph-test-1.wiki | |
| @@ -19,5 +19,8 @@ | |
| 19 | * [/timeline?t=creole] |
| 20 | * [/timeline?t=release] |
| 21 | * [/timeline?r=release] |
| 22 | * [/finfo?name=Makefile] |
| 23 | * [/timeline?a=1970-01-01] |
| 24 | * [/timeline?y=ci&n=1000000] - All checkins - a huge graph |
| 25 | * [/timeline?f=8dfed953f7530442] - This malformed commit has a |
| 26 | merge parent which is not a valid checkin. |
| 27 |