Fossil SCM

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.

drh 2018-12-28 12:59 trunk
Commit dc81ac706b186ab6bf8e68c739aff40c77effec467bc1e1f7ba87a3001406966
Parent 236586d6f20e7c4…
2 files changed +4 +4
~ src/tag.c ~ src/tag.c
M src/tag.c
+4
--- src/tag.c
+++ src/tag.c
@@ -481,10 +481,13 @@
481481
 db_end_transaction(0);
482482
 }else
483483
484484
 if( strncmp(g.argv[2],"find",n)==0 ){
485485
 Stmt q;
486
+ int fRaw = find_option("raw","",0)!=0;
487
+ const char *zFindLimit = find_option("limit","n",1);
488
+ const int nFindLimit = zFindLimit ? atoi(zFindLimit) : -2000;
486489
 const char *zType = find_option("type","t",1);
487490
 Blob sql = empty_blob;
488491
 if( zType==0 || zType[0]==0 ) zType = "*";
489492
 if( g.argc!=4 ){
490493
 usage("find ?--raw? ?-t|--type TYPE? ?-n|--limit #? TAGNAME");
@@ -528,10 +531,11 @@
528531
 }
529532
 }else
530533
531534
 if(( strncmp(g.argv[2],"list",n)==0 )||( strncmp(g.argv[2],"ls",n)==0 )){
532535
 Stmt q;
536
+ int fRaw = find_option("raw","",0)!=0;
533537
 if( g.argc==3 ){
534538
 db_prepare(&q,
535539
 "SELECT tagname FROM tag"
536540
 " WHERE EXISTS(SELECT 1 FROM tagxref"
537541
 " WHERE tagid=tag.tagid"
538542
--- src/tag.c
+++ src/tag.c
@@ -481,10 +481,13 @@
481 db_end_transaction(0);
482 }else
483
484 if( strncmp(g.argv[2],"find",n)==0 ){
485 Stmt q;
 
 
 
486 const char *zType = find_option("type","t",1);
487 Blob sql = empty_blob;
488 if( zType==0 || zType[0]==0 ) zType = "*";
489 if( g.argc!=4 ){
490 usage("find ?--raw? ?-t|--type TYPE? ?-n|--limit #? TAGNAME");
@@ -528,10 +531,11 @@
528 }
529 }else
530
531 if(( strncmp(g.argv[2],"list",n)==0 )||( strncmp(g.argv[2],"ls",n)==0 )){
532 Stmt q;
 
533 if( g.argc==3 ){
534 db_prepare(&q,
535 "SELECT tagname FROM tag"
536 " WHERE EXISTS(SELECT 1 FROM tagxref"
537 " WHERE tagid=tag.tagid"
538
--- src/tag.c
+++ src/tag.c
@@ -481,10 +481,13 @@
481 db_end_transaction(0);
482 }else
483
484 if( strncmp(g.argv[2],"find",n)==0 ){
485 Stmt q;
486 int fRaw = find_option("raw","",0)!=0;
487 const char *zFindLimit = find_option("limit","n",1);
488 const int nFindLimit = zFindLimit ? atoi(zFindLimit) : -2000;
489 const char *zType = find_option("type","t",1);
490 Blob sql = empty_blob;
491 if( zType==0 || zType[0]==0 ) zType = "*";
492 if( g.argc!=4 ){
493 usage("find ?--raw? ?-t|--type TYPE? ?-n|--limit #? TAGNAME");
@@ -528,10 +531,11 @@
531 }
532 }else
533
534 if(( strncmp(g.argv[2],"list",n)==0 )||( strncmp(g.argv[2],"ls",n)==0 )){
535 Stmt q;
536 int fRaw = find_option("raw","",0)!=0;
537 if( g.argc==3 ){
538 db_prepare(&q,
539 "SELECT tagname FROM tag"
540 " WHERE EXISTS(SELECT 1 FROM tagxref"
541 " WHERE tagid=tag.tagid"
542
M src/tag.c
+4
--- src/tag.c
+++ src/tag.c
@@ -481,10 +481,13 @@
481481
 db_end_transaction(0);
482482
 }else
483483
484484
 if( strncmp(g.argv[2],"find",n)==0 ){
485485
 Stmt q;
486
+ int fRaw = find_option("raw","",0)!=0;
487
+ const char *zFindLimit = find_option("limit","n",1);
488
+ const int nFindLimit = zFindLimit ? atoi(zFindLimit) : -2000;
486489
 const char *zType = find_option("type","t",1);
487490
 Blob sql = empty_blob;
488491
 if( zType==0 || zType[0]==0 ) zType = "*";
489492
 if( g.argc!=4 ){
490493
 usage("find ?--raw? ?-t|--type TYPE? ?-n|--limit #? TAGNAME");
@@ -528,10 +531,11 @@
528531
 }
529532
 }else
530533
531534
 if(( strncmp(g.argv[2],"list",n)==0 )||( strncmp(g.argv[2],"ls",n)==0 )){
532535
 Stmt q;
536
+ int fRaw = find_option("raw","",0)!=0;
533537
 if( g.argc==3 ){
534538
 db_prepare(&q,
535539
 "SELECT tagname FROM tag"
536540
 " WHERE EXISTS(SELECT 1 FROM tagxref"
537541
 " WHERE tagid=tag.tagid"
538542
--- src/tag.c
+++ src/tag.c
@@ -481,10 +481,13 @@
481 db_end_transaction(0);
482 }else
483
484 if( strncmp(g.argv[2],"find",n)==0 ){
485 Stmt q;
 
 
 
486 const char *zType = find_option("type","t",1);
487 Blob sql = empty_blob;
488 if( zType==0 || zType[0]==0 ) zType = "*";
489 if( g.argc!=4 ){
490 usage("find ?--raw? ?-t|--type TYPE? ?-n|--limit #? TAGNAME");
@@ -528,10 +531,11 @@
528 }
529 }else
530
531 if(( strncmp(g.argv[2],"list",n)==0 )||( strncmp(g.argv[2],"ls",n)==0 )){
532 Stmt q;
 
533 if( g.argc==3 ){
534 db_prepare(&q,
535 "SELECT tagname FROM tag"
536 " WHERE EXISTS(SELECT 1 FROM tagxref"
537 " WHERE tagid=tag.tagid"
538
--- src/tag.c
+++ src/tag.c
@@ -481,10 +481,13 @@
481 db_end_transaction(0);
482 }else
483
484 if( strncmp(g.argv[2],"find",n)==0 ){
485 Stmt q;
486 int fRaw = find_option("raw","",0)!=0;
487 const char *zFindLimit = find_option("limit","n",1);
488 const int nFindLimit = zFindLimit ? atoi(zFindLimit) : -2000;
489 const char *zType = find_option("type","t",1);
490 Blob sql = empty_blob;
491 if( zType==0 || zType[0]==0 ) zType = "*";
492 if( g.argc!=4 ){
493 usage("find ?--raw? ?-t|--type TYPE? ?-n|--limit #? TAGNAME");
@@ -528,10 +531,11 @@
531 }
532 }else
533
534 if(( strncmp(g.argv[2],"list",n)==0 )||( strncmp(g.argv[2],"ls",n)==0 )){
535 Stmt q;
536 int fRaw = find_option("raw","",0)!=0;
537 if( g.argc==3 ){
538 db_prepare(&q,
539 "SELECT tagname FROM tag"
540 " WHERE EXISTS(SELECT 1 FROM tagxref"
541 " WHERE tagid=tag.tagid"
542

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button