Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch help-full Excluding Merge-Ins
This is equivalent to a diff from bfa99a9399 to 0ac9052c38
2021-02-05
| ||
03:21 | Merged in help-full branch, which adds help --everything flag, and fixed another bit of safe-html setting docs so that they work with the HTML help text export. check-in: 89e5ac196d user: stephan tags: trunk | |
03:17 | Replaced raw SCRIPT and STYLE tag references in the safe-html docs with non-tag formulations because the tags break the HTML-format help text conversion. Closed-Leaf check-in: 0ac9052c38 user: stephan tags: help-full | |
2021-02-03
| ||
13:38 | Update the built-in SQLite to the latest 3.35.0 alpha that includes support for RETURNING and the ability to use TEMP triggers even if SQLITE_DBCONFIG_ENABLE_TRIGGER is off. check-in: 60b8c71b00 user: drh tags: trunk | |
2021-02-02
| ||
23:01 | added help --everything option that borrows functionality refactored from test-all-help check-in: c39e23cda6 user: sdr tags: help-full | |
16:01 | modified help command to output detailed help information when stdout is not a tty (note: branch name changed after consensus seemed to indicate original concept was undesirable) check-in: d792943681 user: sdr tags: help-full | |
2021-02-01
| ||
12:29 | Fix typo: added missing word to 'fossil help all' output. check-in: bfa99a9399 user: jamsek tags: trunk | |
2021-01-31
| ||
21:00 | More robust exclusion of the -v diff when extracting the comment message from the user's editor output. Enhance the -n (--dryrun) flag on "fossil commit" so that it goes through the commit prompt sequence for debugging. check-in: 4eca7eb902 user: drh tags: trunk | |
Changes to src/dispatch.c.
︙ | ︙ | |||
530 531 532 533 534 535 536 | } if( i>0 ){ blob_append(pText, zHelp, i); } } /* | < < < < < < < < < | < < < < < | < < < < < < < < < < < < < < < < < | 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 | } if( i>0 ){ blob_append(pText, zHelp, i); } } /* ** Display help for all commands based on provided flags. */ static void display_all_help(int mask, int useHtml, int rawOut){ int i; if( useHtml ) fossil_print("<!--\n"); fossil_print("Help text for:\n"); if( mask & CMDFLAG_1ST_TIER ) fossil_print(" * Commands\n"); if( mask & CMDFLAG_2ND_TIER ) fossil_print(" * Auxiliary commands\n"); if( mask & CMDFLAG_TEST ) fossil_print(" * Test commands\n"); if( mask & CMDFLAG_WEBPAGE ) fossil_print(" * Web pages\n"); if( mask & CMDFLAG_SETTING ) fossil_print(" * Settings\n"); |
︙ | ︙ | |||
606 607 608 609 610 611 612 613 614 615 616 617 618 619 | if( useHtml ){ fossil_print("<!-- end_all_help -->\n"); }else{ fossil_print("---\n"); } version_cmd(); } /* ** Count the number of entries in the aCommand[] table that match ** the given flag. */ static int countCmds(unsigned int eFlg){ int n = 0; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 | if( useHtml ){ fossil_print("<!-- end_all_help -->\n"); }else{ fossil_print("---\n"); } version_cmd(); } /* ** COMMAND: test-all-help ** ** Usage: %fossil test-all-help ?OPTIONS? ** ** Show help text for commands and pages. Useful for proof-reading. ** Defaults to just the CLI commands. Specify --www to see only the ** web pages, or --everything to see both commands and pages. ** ** Options: ** -e|--everything Show all commands and pages. ** -t|--test Include test- commands ** -w|--www Show WWW pages. ** -s|--settings Show settings. ** -h|--html Transform output to HTML. ** -r|--raw No output formatting. */ void test_all_help_cmd(void){ int mask = CMDFLAG_1ST_TIER | CMDFLAG_2ND_TIER; int useHtml = find_option("html","h",0)!=0; int rawOut = find_option("raw","r",0)!=0; if( find_option("www","w",0) ){ mask = CMDFLAG_WEBPAGE; } if( find_option("everything","e",0) ){ mask = CMDFLAG_1ST_TIER | CMDFLAG_2ND_TIER | CMDFLAG_WEBPAGE | CMDFLAG_SETTING | CMDFLAG_TEST; } if( find_option("settings","s",0) ){ mask = CMDFLAG_SETTING; } if( find_option("test","t",0) ){ mask |= CMDFLAG_TEST; } display_all_help(mask, useHtml, rawOut); } /* ** Count the number of entries in the aCommand[] table that match ** the given flag. */ static int countCmds(unsigned int eFlg){ int n = 0; |
︙ | ︙ | |||
1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 | ** ** -a|--all List both common and auxiliary commands ** -o|--options List command-line options common to all commands ** -s|--setting List setting names ** -t|--test List unsupported "test" commands ** -x|--aux List only auxiliary commands ** -w|--www List all web pages ** ** These options can be used when TOPIC is present: ** ** -h|--html Format output as HTML rather than plain text ** -c|--commands Restrict TOPIC search to commands */ void help_cmd(void){ | > > > > | 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 | ** ** -a|--all List both common and auxiliary commands ** -o|--options List command-line options common to all commands ** -s|--setting List setting names ** -t|--test List unsupported "test" commands ** -x|--aux List only auxiliary commands ** -w|--www List all web pages ** -f|--full List full set of commands (including auxiliary ** and unsupported "test" commands), options, ** settings, and web pages ** -e|--everything List all help on all topics ** ** These options can be used when TOPIC is present: ** ** -h|--html Format output as HTML rather than plain text ** -c|--commands Restrict TOPIC search to commands */ void help_cmd(void){ |
︙ | ︙ | |||
1053 1054 1055 1056 1057 1058 1059 | version_cmd(); return; } if( find_option("options","o",0) ){ fossil_print("%s", zOptions); return; } | | > > > > > > > > > > > > > > > > > > > > > | 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 | version_cmd(); return; } if( find_option("options","o",0) ){ fossil_print("%s", zOptions); return; } else if( find_option("all","a",0) ){ command_list(0, CMDFLAG_1ST_TIER | CMDFLAG_2ND_TIER); return; } else if( find_option("www","w",0) ){ command_list(0, CMDFLAG_WEBPAGE); return; } else if( find_option("aux","x",0) ){ command_list(0, CMDFLAG_2ND_TIER); return; } else if( find_option("test","t",0) ){ command_list(0, CMDFLAG_TEST); return; } else if( find_option("setting","s",0) ){ command_list(0, CMDFLAG_SETTING); return; } else if( find_option("full","f",0) ){ fossil_print("fossil commands:\n\n"); command_list(0, CMDFLAG_1ST_TIER); fossil_print("\nfossil auxiliary commands:\n\n"); command_list(0, CMDFLAG_2ND_TIER); fossil_print("\n%s", zOptions); fossil_print("\nfossil settings:\n\n"); command_list(0, CMDFLAG_SETTING); fossil_print("\nfossil web pages:\n\n"); command_list(0, CMDFLAG_WEBPAGE); fossil_print("\nfossil test commands (unsupported):\n\n"); command_list(0, CMDFLAG_TEST); fossil_print("\n"); version_cmd(); return; } else if( find_option("everything","e",0) ){ display_all_help(CMDFLAG_1ST_TIER | CMDFLAG_2ND_TIER | CMDFLAG_WEBPAGE | CMDFLAG_SETTING | CMDFLAG_TEST, 0, 0); return; } useHtml = find_option("html","h",0)!=0; isPage = ('/' == *g.argv[2]) ? 1 : 0; if(isPage){ zCmdOrPage = "page"; }else if( find_option("commands","c",0)!=0 ){ mask = CMDFLAG_COMMAND; |
︙ | ︙ |
Changes to src/wikiformat.c.
︙ | ︙ | |||
2743 2744 2745 2746 2747 2748 2749 | } safeHtmlEnable = (strchr(zSafeHtmlSetting,cPerm)==0); } /* ** SETTING: safe-html width=8 ** This setting controls whether or not unsafe HTML elements | | | 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 | } safeHtmlEnable = (strchr(zSafeHtmlSetting,cPerm)==0); } /* ** SETTING: safe-html width=8 ** This setting controls whether or not unsafe HTML elements ** (such as SCRIPT or STYLE tags) are allowed in Markdown-formatted ** documents. Unsafe HTML is disabled by default. If this setting ** exists and is a string, then letters in that string can enable ** unsafe HTML in various contexts: ** ** b Unsafe HTML allowed in embedded documentation ** f Unsafe HTML allowed in forum posts ** t Unsafe HTML allowed in tickets |
︙ | ︙ |