Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch plink-for-non-checkins Excluding Merge-Ins
This is equivalent to a diff from 41f0838c to d1f6b9d4
2021-06-03
| ||
23:57 | Enable propagating tags for forum, wiki, and technotes. ... (check-in: 7c64fe0b user: drh tags: trunk) | |
2021-06-01
| ||
02:51 | The tag add/cancel subcommands now accept any artifact type which is recorded in the timeline: check-in, wiki, technote, forum, ticket, control. They also now explicitly reject any tags beginning with the internal-use prefixes (wiki-, tkt-, event-). The tag find/list subcommands have not yet been updated to support the new types. ... (Closed-Leaf check-in: d1f6b9d4 user: stephan tags: plink-for-non-checkins) | |
00:02 | Minor refactoring of [41f0838cbeac] in prep for expanding the tag command to handle non-checkin artifacts. ... (check-in: b051ada9 user: stephan tags: plink-for-non-checkins) | |
2021-05-31
| ||
23:33 | Merge into trunk the enhancements that allow an admin to set an expiration time for email notification subscriptions. ... (check-in: 34d45c55 user: drh tags: trunk) | |
04:11 | Merged in trunk. ... (check-in: 24ccc481 user: stephan tags: plink-for-non-checkins) | |
03:26 | The /ci_tags page now adapts its header label based on the type of artifact hash passed to it (since it works as-is with hashes other than checkins). ... (check-in: 41f0838c user: stephan tags: trunk) | |
2021-05-30
| ||
03:46 | Added a note to release-checklist.wiki reminding the user to pass the proper binary name to valgrind so that it does not pick up another copy (or a wrapper script) from the PATH. ... (check-in: efb602b7 user: stephan tags: trunk) | |
Changes to src/info.c.
︙ | ︙ | |||
507 508 509 510 511 512 513 | style_header("Check-in Information Error"); @ No such object: %h(g.argv[2]) style_finish_page(); return; } zHash = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); style_header("Tags and Properties"); | | | 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 | style_header("Check-in Information Error"); @ No such object: %h(g.argv[2]) style_finish_page(); return; } zHash = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); style_header("Tags and Properties"); zType = whatis_rid_type_label(rid); if(!zType) zType = "Artifact"; @ <h1>Tags and Properties for %s(zType) \ @ %z(href("%R/ci/%!S",zHash))%S(zHash)</a></h1> db_prepare(&q, "SELECT tag.tagid, tagname, " " (SELECT uuid FROM blob WHERE rid=tagxref.srcid AND rid!=%d)," " value, datetime(tagxref.mtime,toLocal()), tagtype," |
︙ | ︙ |
Changes to src/manifest.c.
︙ | ︙ | |||
2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 | int c; c = fossil_strcmp(pA->zUuid, pB->zUuid); if( c==0 ){ c = fossil_strcmp(pA->zName, pB->zName); } return c; } /* ** Scan artifact rid/pContent to see if it is a control artifact of ** any type: ** ** * Manifest ** * Control | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 | int c; c = fossil_strcmp(pA->zUuid, pB->zUuid); if( c==0 ){ c = fossil_strcmp(pA->zName, pB->zName); } return c; } /* ** Inserts plink entries for FORUM, WIKI, and TECHNOTE manifests. May ** assert for other manifest types. If a parent entry exists, it also ** propagates any tags for that parent. This is a no-op if ** p->nParent==0. */ static void manifest_add_fwt_plink(int rid, Manifest *p){ int i; int parentId = 0; assert(p->type==CFTYPE_WIKI || p->type==CFTYPE_FORUM || p->type==CFTYPE_EVENT); for(i=0; i<p->nParent; ++i){ int const pid = uuid_to_rid(p->azParent[i], 1); if(0==i){ parentId = pid; } db_multi_exec( "INSERT OR IGNORE INTO plink" "(pid, cid, isprim, mtime, baseid)" "VALUES(%d, %d, %d, %.17g, NULL)", pid, rid, i==0, p->rDate); } if(parentId){ tag_propagate_all(parentId); } } /* ** Scan artifact rid/pContent to see if it is a control artifact of ** any type: ** ** * Manifest ** * Control |
︙ | ︙ | |||
2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 | tag_insert(&p->aTag[i].zName[1], type, p->aTag[i].zValue, rid, p->rDate, tid); } } if( parentid ){ tag_propagate_all(parentid); } } if( p->type==CFTYPE_WIKI ){ char *zTag = mprintf("wiki-%s", p->zWikiTitle); int prior = 0; char cPrefix; int nWiki; char zLength[40]; | > > > > | 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 | tag_insert(&p->aTag[i].zName[1], type, p->aTag[i].zValue, rid, p->rDate, tid); } } if( parentid ){ tag_propagate_all(parentid); } } if(p->type==CFTYPE_WIKI || p->type==CFTYPE_FORUM || p->type==CFTYPE_EVENT){ manifest_add_fwt_plink(rid, p); } if( p->type==CFTYPE_WIKI ){ char *zTag = mprintf("wiki-%s", p->zWikiTitle); int prior = 0; char cPrefix; int nWiki; char zLength[40]; |
︙ | ︙ | |||
2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 | ); fossil_free(zTitle); } if( p->zWiki[0] ){ backlink_extract(p->zWiki, p->zMimetype, rid, BKLNK_FORUM, p->rDate, 1); } } db_end_transaction(0); if( permitHooks ){ rc = xfer_run_common_script(); if( rc==TH_OK ){ rc = xfer_run_script(zScript, zUuid, 0); } } | > | 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 | ); fossil_free(zTitle); } if( p->zWiki[0] ){ backlink_extract(p->zWiki, p->zMimetype, rid, BKLNK_FORUM, p->rDate, 1); } } db_end_transaction(0); if( permitHooks ){ rc = xfer_run_common_script(); if( rc==TH_OK ){ rc = xfer_run_script(zScript, zUuid, 0); } } |
︙ | ︙ |
Changes to src/name.c.
︙ | ︙ | |||
738 739 740 741 742 743 744 | rid = 0; } return rid; } /* ** Given an RID of a structural artifact, which is assumed to be | | | | > > | | < | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > | 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 | rid = 0; } return rid; } /* ** Given an RID of a structural artifact, which is assumed to be ** valid, this function returns one of the CFTYPE_xxx values ** describing the record type, or 0 if the RID does not refer to an ** artifact record (as determined by reading the event table). ** ** Note that this function neve returns CFTYPE_ATTACHMENT or ** CFTYPE_CLUSTER because those are not used in the event table. Thus ** it cannot be used to distinguish those artifact types from ** non-artifact file content. */ int whatis_rid_type(int rid){ Stmt q = empty_Stmt; int type = 0; /* Check for entries on the timeline that reference this object */ db_prepare(&q, "SELECT type FROM event WHERE objid=%d", rid); if( db_step(&q)==SQLITE_ROW ){ switch( db_column_text(&q,0)[0] ){ case 'c': type = CFTYPE_MANIFEST; break; case 'w': type = CFTYPE_WIKI; break; case 'e': type = CFTYPE_EVENT; break; case 'f': type = CFTYPE_FORUM; break; case 't': type = CFTYPE_TICKET; break; case 'g': type = CFTYPE_CONTROL; break; default: break; } } db_finalize(&q); return type; } /* ** A proxy for whatis_rid_type() which returns a brief string (in ** static memory) describing the record type. Returns NULL if rid does ** not refer to an artifact record (as determined by reading the event ** table). The returned string is intended to be used in headers which ** can refer to different artifact types. It is not "definitive," in ** that it does not distinguish between closely-related types like ** wiki creation, edit, and removal. */ char const * whatis_rid_type_label(int rid){ char const * zType = 0; switch( whatis_rid_type(rid) ){ case CFTYPE_MANIFEST: zType = "Check-in"; break; case CFTYPE_WIKI: zType = "Wiki-edit"; break; case CFTYPE_EVENT: zType = "Technote"; break; case CFTYPE_FORUM: zType = "Forum-post"; break; case CFTYPE_TICKET: zType = "Ticket-change"; break; case CFTYPE_CONTROL: zType = "Tag-change"; break; default: break; } return zType; } /* ** Generate a description of artifact "rid" */ void whatis_rid(int rid, int verboseFlag){ |
︙ | ︙ |
Changes to src/tag.c.
︙ | ︙ | |||
361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 | manifest_crosslink(nrid, &ctrl, MC_PERMIT_HOOKS); } assert( blob_is_reset(&ctrl) ); if( g.localOpen ){ manifest_to_disk(rid); } } /* ** COMMAND: tag ** ** Usage: %fossil tag SUBCOMMAND ... ** ** Run various subcommands to control tags and properties. ** | > > > > > > > > > > > > > > > > | | > | | > | | > | | | | | > > > > | | | | > > | > | 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 | manifest_crosslink(nrid, &ctrl, MC_PERMIT_HOOKS); } assert( blob_is_reset(&ctrl) ); if( g.localOpen ){ manifest_to_disk(rid); } } /* ** If zTag is NULL or valid for use as a tag for the `tag add` and ** `tag cancel` commands, returns without side effects, else emits a ** fatal error message. We reject certain prefixes to avoid that ** clients cause undue grief by improperly tagging artifacts as being, ** e.g., wiki pages or tickets. */ static void tag_cmd_tagname_check(const char *zTag){ if(zTag && *zTag && (strncmp(zTag,"wiki-",5)==0 || strncmp(zTag,"tkt-",4)==0 || strncmp(zTag,"event-",6)==0)){ fossil_fatal("Invalid prefix for tag name: %s", zTag); } } /* ** COMMAND: tag ** ** Usage: %fossil tag SUBCOMMAND ... ** ** Run various subcommands to control tags and properties. ** ** > fossil tag add ?OPTIONS? TAGNAME ARTIFACT-ID ?VALUE? ** ** Add a new tag or property to an artifact referenced by ** ARTIFACT-ID. For checkins, the tag will be usable instead ** of a CHECK-IN in commands such as update and merge. If the ** --propagate flag is present and ARTIFACT-ID refers to a ** wiki page, forum post, tech-note, or check-in, the tag ** propagates to all descendants of that artifact. ** ** Options: ** --raw Raw tag name. Ignored for ** non-CHECK-IN artifacts. ** --propagate Propagating tag. ** --date-override DATETIME Set date and time added. ** --user-override USER Name USER when adding the tag. ** -n|--dryrun Display the tag text, but do not ** actually insert it into the database. ** ** The --date-override and --user-override options support ** importing history from other SCM systems. DATETIME has ** the form 'YYYY-MMM-DD HH:MM:SS'. ** ** Note that fossil uses some tag prefixes internally and this ** command will reject tags with these prefixes to avoid ** causing problems or confusion: "wiki-", "tkt-", "event-". ** ** > fossil tag cancel ?--raw? TAGNAME ARTIFACT-ID ** ** Remove the tag TAGNAME from the artifact referenced by ** ARTIFACT-ID, and also remove the propagation of the tag to ** any descendants. Use the the -n|--dryrun option to see ** what would have happened. Certain tag name prefixes are ** forbidden, as documented for the 'add' subcommand. ** ** Options: ** --raw Raw tag name. Ignored for ** non-CHECK-IN artifacts. ** --date-override DATETIME Set date and time deleted. ** --user-override USER Name USER when deleting the tag. ** -n|--dryrun Display the control artifact, but do ** not insert it into the database. ** ** > fossil tag find ?OPTIONS? TAGNAME ** |
︙ | ︙ | |||
459 460 461 462 463 464 465 | goto tag_cmd_usage; } if( strncmp(g.argv[2],"add",n)==0 ){ char *zValue; int dryRun = 0; int fRaw = find_option("raw","",0)!=0; | | > > > | > > > > > > > > > > > > > | | > > > | > > > > > > > > > > > > > | | 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 | goto tag_cmd_usage; } if( strncmp(g.argv[2],"add",n)==0 ){ char *zValue; int dryRun = 0; int fRaw = find_option("raw","",0)!=0; const char *zPrefix = ""; int fPropagate = find_option("propagate","",0)!=0; const char *zDateOvrd = find_option("date-override",0,1); const char *zUserOvrd = find_option("user-override",0,1); const char *zTag; const char *zObjId; int objType; if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN; if( g.argc!=5 && g.argc!=6 ){ usage("add ?options? TAGNAME ARTIFACT-ID ?VALUE?"); } zTag = g.argv[3]; tag_cmd_tagname_check(zTag); zObjId = g.argv[4]; zValue = g.argc==6 ? g.argv[5] : 0; objType = whatis_rid_type(symbolic_name_to_rid(zObjId, 0)); switch(objType){ case 0: fossil_fatal("Cannot resolve artifact ID: %s", zObjId); break; case CFTYPE_MANIFEST: zPrefix = fRaw ? "" : "sym-"; break; default: break; } db_begin_transaction(); tag_add_artifact(zPrefix, zTag, zObjId, zValue, 1+fPropagate+dryRun,zDateOvrd,zUserOvrd); db_end_transaction(0); }else if( strncmp(g.argv[2],"branch",n)==0 ){ fossil_fatal("the \"fossil tag branch\" command is discontinued\n" "Use the \"fossil branch new\" command instead."); }else if( strncmp(g.argv[2],"cancel",n)==0 ){ int dryRun = 0; int fRaw = find_option("raw","",0)!=0; const char *zPrefix = ""; const char *zDateOvrd = find_option("date-override",0,1); const char *zUserOvrd = find_option("user-override",0,1); const char *zTag; const char *zObjId; int objType; if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN; if( g.argc!=5 ){ usage("cancel ?options? TAGNAME ARTIFACT-ID"); } zTag = g.argv[3]; tag_cmd_tagname_check(zTag); zObjId = g.argv[4]; objType = whatis_rid_type(symbolic_name_to_rid(zObjId, 0)); switch(objType){ case 0: fossil_fatal("Cannot resolve artifact ID: %s", zObjId); break; case CFTYPE_MANIFEST: zPrefix = fRaw ? "" : "sym-"; break; default: break; } db_begin_transaction(); tag_add_artifact(zPrefix, zTag, zObjId, 0, dryRun, zDateOvrd, zUserOvrd); db_end_transaction(0); }else if( strncmp(g.argv[2],"find",n)==0 ){ Stmt q; int fRaw = find_option("raw","",0)!=0; |
︙ | ︙ |