Fossil

Check-in [dc81ac70]
Login

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

Overview
Comment:This checkin does a cherrypick merge off of another checkin that already has a prior full merge. The purpose of this checkin is to provide a test case for the cherrypick graph drawing logic. The code in this checkin is not intended to actually be used for anything.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | graph-test-branch
Files: files | file ages | folders
SHA3-256: dc81ac706b186ab6bf8e68c739aff40c77effec467bc1e1f7ba87a3001406966
User & Date: drh 2018-12-28 12:59:17
Wiki:graph-test-branch
Context
2018-12-28
12:59
This checkin does a cherrypick merge off of another checkin that already has a prior full merge. The purpose of this checkin is to provide a test case for the cherrypick graph drawing logic. The code in this checkin is not intended to actually be used for anything. Leaf check-in: dc81ac70 user: drh tags: graph-test-branch
2018-12-27
19:55
Attempt to draw the entire length of a cherrypick merge line using a dashed line. check-in: 236586d6 user: drh tags: trunk
12:36
Remove two unused variables (introduced by [2efcd19f14] through copy-and-paste) Closed-Leaf check-in: cf0f6fc8 user: florian tags: cmd-options-amend
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/tag.c.

479
480
481
482
483
484
485



486
487
488
489
490
491
492
...
526
527
528
529
530
531
532

533
534
535
536
537
538
539
    db_begin_transaction();
    tag_add_artifact(zPrefix, g.argv[3], g.argv[4], 0, dryRun, 0, 0);
    db_end_transaction(0);
  }else

  if( strncmp(g.argv[2],"find",n)==0 ){
    Stmt q;



    const char *zType = find_option("type","t",1);
    Blob sql = empty_blob;
    if( zType==0 || zType[0]==0 ) zType = "*";
    if( g.argc!=4 ){
      usage("find ?--raw? ?-t|--type TYPE? ?-n|--limit #? TAGNAME");
    }
    if( fRaw ){
................................................................................
        db_finalize(&q);
      }
    }
  }else

  if(( strncmp(g.argv[2],"list",n)==0 )||( strncmp(g.argv[2],"ls",n)==0 )){
    Stmt q;

    if( g.argc==3 ){
      db_prepare(&q,
        "SELECT tagname FROM tag"
        " WHERE EXISTS(SELECT 1 FROM tagxref"
        "               WHERE tagid=tag.tagid"
        "                 AND tagtype>0)"
        " ORDER BY tagname"







>
>
>







 







>







479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
...
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
    db_begin_transaction();
    tag_add_artifact(zPrefix, g.argv[3], g.argv[4], 0, dryRun, 0, 0);
    db_end_transaction(0);
  }else

  if( strncmp(g.argv[2],"find",n)==0 ){
    Stmt q;
    int fRaw = find_option("raw","",0)!=0;
    const char *zFindLimit = find_option("limit","n",1);
    const int nFindLimit = zFindLimit ? atoi(zFindLimit) : -2000;
    const char *zType = find_option("type","t",1);
    Blob sql = empty_blob;
    if( zType==0 || zType[0]==0 ) zType = "*";
    if( g.argc!=4 ){
      usage("find ?--raw? ?-t|--type TYPE? ?-n|--limit #? TAGNAME");
    }
    if( fRaw ){
................................................................................
        db_finalize(&q);
      }
    }
  }else

  if(( strncmp(g.argv[2],"list",n)==0 )||( strncmp(g.argv[2],"ls",n)==0 )){
    Stmt q;
    int fRaw = find_option("raw","",0)!=0;
    if( g.argc==3 ){
      db_prepare(&q,
        "SELECT tagname FROM tag"
        " WHERE EXISTS(SELECT 1 FROM tagxref"
        "               WHERE tagid=tag.tagid"
        "                 AND tagtype>0)"
        " ORDER BY tagname"