Fossil

Check-in [8a1e384b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Do not show merge links to phantoms in the graph.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:8a1e384b333ffc399c8a7e3620bd02632c333756
User & Date: drh 2010-12-31 03:23:46
Context
2010-12-31
21:12
Documentation updates. check-in: 5fb963ab user: drh tags: trunk
03:23
Do not show merge links to phantoms in the graph. check-in: 8a1e384b user: drh tags: trunk
2010-12-30
21:26
Improvements to the merge-out arrows on the graph. It is now more likely to draw the merge arrow up out of a leaf node. check-in: 4614dadb user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/timeline.c.

248
249
250
251
252
253
254


255
256
257
258
259
260
261
262
      int nParent = 0;
      int aParent[32];
      const char *zBr;
      int gidx;
      static Stmt qparent;
      static Stmt qbranch;
      db_static_prepare(&qparent,


        "SELECT pid FROM plink WHERE cid=:rid ORDER BY isprim DESC /*sort*/"
      );
      db_static_prepare(&qbranch,
        "SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0 AND rid=:rid",
        TAG_BRANCH
      );
      db_bind_int(&qparent, ":rid", rid);
      while( db_step(&qparent)==SQLITE_ROW && nParent<32 ){







>
>
|







248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
      int nParent = 0;
      int aParent[32];
      const char *zBr;
      int gidx;
      static Stmt qparent;
      static Stmt qbranch;
      db_static_prepare(&qparent,
        "SELECT pid FROM plink"
        " WHERE cid=:rid AND pid NOT IN phantom"
        " ORDER BY isprim DESC /*sort*/"
      );
      db_static_prepare(&qbranch,
        "SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0 AND rid=:rid",
        TAG_BRANCH
      );
      db_bind_int(&qparent, ":rid", rid);
      while( db_step(&qparent)==SQLITE_ROW && nParent<32 ){

Changes to test/graph-test-1.wiki.

17
18
19
20
21
22
23



  *  [/timeline?r=experimental&n=1000]
  *  [/timeline?r=creole]
  *  [/timeline?t=creole]
  *  [/timeline?t=release]
  *  [/timeline?r=release]
  *  [/finfo?name=Makefile]
  *  [/timeline?a=1970-01-01]










>
>
>
17
18
19
20
21
22
23
24
25
26
  *  [/timeline?r=experimental&n=1000]
  *  [/timeline?r=creole]
  *  [/timeline?t=creole]
  *  [/timeline?t=release]
  *  [/timeline?r=release]
  *  [/finfo?name=Makefile]
  *  [/timeline?a=1970-01-01]
  *  [/timeline?y=ci&n=1000000] - All checkins - a huge graph
  *  [/timeline?f=8dfed953f7530442] - This malformed commit has a 
     merge parent which is not a valid checkin.