Fossil

Check-in [1af1a662]
Login

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

Overview
Comment:(cherry-pick) Another place where checking for pRow->isLeaf is too simple (which could result in more phantom up-arrows)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | branch-1.35
Files: files | file ages | folders
SHA1:1af1a6628dc5886f2def051dad47fcd332a3c52a
User & Date: jan.nijtmans 2016-07-05 14:47:55
Context
2016-08-15
11:58
Update the built-in SQLite to version 3.14.1 check-in: 80789309 user: jan.nijtmans tags: branch-1.35
2016-07-05
14:47
(cherry-pick) Another place where checking for pRow->isLeaf is too simple (which could result in more phantom up-arrows) check-in: 1af1a662 user: jan.nijtmans tags: branch-1.35
14:30
(cherry-pick) Fix a timeline bug, showing an unintended arrow when closing a fork. check-in: 4cae5c94 user: jan.nijtmans tags: branch-1.35
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/graph.c.

472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
...
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
  /* Assign rails to all rows that are still unassigned.
  */
  for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
    int parentRid;

    if( pRow->iRail>=0 ){
      if( pRow->pChild==0 && !pRow->timeWarp ){
        if( omitDescenders || count_nonbranch_children(pRow->rid)==0 ){
          /* no-op */
        }else{
          riser_to_top(pRow);
        }
      }
      continue;
    }
    if( pRow->isDup ){
      continue;
................................................................................
        }
      }
    }
    mask = BIT(pRow->iRail);
    pRow->railInUse |= mask;
    if( pRow->pChild ){
      assignChildrenToRail(pRow);
    }else if( !pRow->isLeaf && !omitDescenders ){
      riser_to_top(pRow);
    }
    if( pParent ){
      for(pLoop=pParent->pPrev; pLoop && pLoop!=pRow; pLoop=pLoop->pPrev){
        pLoop->railInUse |= mask;
      }
    }







|
<
<







 







|







472
473
474
475
476
477
478
479


480
481
482
483
484
485
486
...
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
  /* Assign rails to all rows that are still unassigned.
  */
  for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
    int parentRid;

    if( pRow->iRail>=0 ){
      if( pRow->pChild==0 && !pRow->timeWarp ){
        if( !omitDescenders && count_nonbranch_children(pRow->rid)!=0 ){


          riser_to_top(pRow);
        }
      }
      continue;
    }
    if( pRow->isDup ){
      continue;
................................................................................
        }
      }
    }
    mask = BIT(pRow->iRail);
    pRow->railInUse |= mask;
    if( pRow->pChild ){
      assignChildrenToRail(pRow);
    }else if( !omitDescenders && count_nonbranch_children(pRow->rid)!=0 ){
      riser_to_top(pRow);
    }
    if( pParent ){
      for(pLoop=pParent->pPrev; pLoop && pLoop!=pRow; pLoop=pLoop->pPrev){
        pLoop->railInUse |= mask;
      }
    }