Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Amend 'fossil help' output for all commands to make options conform to GNU 'short|long' convention (e.g., -v|--verbose). |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
7f3c728db3da63a2090a2e5247292c3b |
| User & Date: | jamsek 2021-02-05 09:32:29.066 |
Context
|
2021-02-05
| ||
| 18:27 | Update the built-in SQLite to a 3.35.0 alpha that includes the revised RETURNING clause prototype that embargoes output until all changes have completed. This is for testing of SQLite. The change should not affect Fossil in any way. check-in: 1ba06268ad user: drh tags: trunk | |
| 09:32 | Amend 'fossil help' output for all commands to make options conform to GNU 'short|long' convention (e.g., -v|--verbose). check-in: 7f3c728db3 user: jamsek tags: trunk | |
| 03:51 | Minor reordering of diff command help, per forum suggestion. check-in: dd13191359 user: stephan tags: trunk | |
Changes
Changes to src/add.c.
| ︙ | ︙ | |||
557 558 559 560 561 562 563 | ** --case-sensitive BOOL Override the case-sensitive setting. ** -n|--dry-run If given, display instead of run actions. ** --reset Reset the DELETED state of a checkout, such ** that all newly-rm'd (but not yet committed) ** files are no longer removed. No flags other ** than --verbose or --dry-run may be used with ** --reset. | | | 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 |
** --case-sensitive BOOL Override the case-sensitive setting.
** -n|--dry-run If given, display instead of run actions.
** --reset Reset the DELETED state of a checkout, such
** that all newly-rm'd (but not yet committed)
** files are no longer removed. No flags other
** than --verbose or --dry-run may be used with
** --reset.
** -v|--verbose Outputs information about each --reset file.
** Only usable with --reset.
**
** See also: [[addremove]], [[add]]
*/
void delete_cmd(void){
int i;
int removeFiles;
|
| ︙ | ︙ | |||
749 750 751 752 753 754 755 | ** -n|--dry-run If given, display instead of run actions. ** --reset Reset the ADDED/DELETED state of a checkout, ** such that all newly-added (but not yet committed) ** files are no longer added and all newly-removed ** (but not yet committed) files are no longer ** removed. No flags other than --verbose and ** --dry-run may be used with --reset. | | | 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 |
** -n|--dry-run If given, display instead of run actions.
** --reset Reset the ADDED/DELETED state of a checkout,
** such that all newly-added (but not yet committed)
** files are no longer added and all newly-removed
** (but not yet committed) files are no longer
** removed. No flags other than --verbose and
** --dry-run may be used with --reset.
** -v|--verbose Outputs information about each --reset file.
** Only usable with --reset.
**
** See also: [[add]], [[rm]]
*/
void addremove_cmd(void){
Blob path;
const char *zCleanFlag;
|
| ︙ | ︙ |
Changes to src/checkout.c.
| ︙ | ︙ | |||
395 396 397 398 399 400 401 | ** Usage: %fossil close ?OPTIONS? ** ** The opposite of "[[open]]". Close the current database connection. ** Require a -f or --force flag if there are unsaved changes in the ** current check-out or if there is non-empty stash. ** ** Options: | | | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 |
** Usage: %fossil close ?OPTIONS?
**
** The opposite of "[[open]]". Close the current database connection.
** Require a -f or --force flag if there are unsaved changes in the
** current check-out or if there is non-empty stash.
**
** Options:
** -f|--force necessary to close a check out with uncommitted changes
**
** See also: [[open]]
*/
void close_cmd(void){
int forceFlag = find_option("force","f",0)!=0;
db_must_be_within_tree();
|
| ︙ | ︙ |
Changes to src/clone.c.
| ︙ | ︙ | |||
119 120 121 122 123 124 125 | ** local machine. ** ** By default, the current login name is used to create the default ** admin user for the new clone. This can be overridden using ** the -A|--admin-user parameter. ** ** Options: | | | | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | ** local machine. ** ** By default, the current login name is used to create the default ** admin user for the new clone. This can be overridden using ** the -A|--admin-user parameter. ** ** Options: ** -A|--admin-user USERNAME Make USERNAME the administrator ** -B|--httpauth USER:PASS Add HTTP Basic Authorization to requests ** --nested Allow opening a repository inside an opened ** checkout ** --nocompress Omit extra delta compression ** --no-open Clone only. Do not open a check-out. ** --once Don't remember the URI. ** --private Also clone private branches ** --save-http-password Remember the HTTP password without asking |
| ︙ | ︙ |
Changes to src/db.c.
| ︙ | ︙ | |||
2683 2684 2685 2686 2687 2688 2689 | ** page, either directly or indirectly, will be copied. Normal users and ** their associated permissions will not be copied; however, the system ** default users "anonymous", "nobody", "reader", "developer", and their ** associated permissions will be copied. ** ** Options: ** --template FILE Copy settings from repository file | | | 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 | ** page, either directly or indirectly, will be copied. Normal users and ** their associated permissions will not be copied; however, the system ** default users "anonymous", "nobody", "reader", "developer", and their ** associated permissions will be copied. ** ** Options: ** --template FILE Copy settings from repository file ** -A|--admin-user USERNAME Select given USERNAME as admin user ** --date-override DATETIME Use DATETIME as time of the initial check-in ** --sha1 Use an initial hash policy of "sha1" ** ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in ** year-month-day form, it may be truncated, the "T" may be replaced by ** a space, and it may also name a timezone offset from UTC as "-HH:MM" ** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z" |
| ︙ | ︙ |
Changes to src/diffcmd.c.
| ︙ | ︙ | |||
840 841 842 843 844 845 846 | ** Options: ** --binary PATTERN Treat files that match the glob PATTERN ** as binary ** --branch BRANCH Show diff of all changes on BRANCH ** --brief Show filenames only ** --checkin VERSION Show diff of all changes in VERSION ** --command PROG External diff program. Overrides "diff-command" | | | | | | 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 | ** Options: ** --binary PATTERN Treat files that match the glob PATTERN ** as binary ** --branch BRANCH Show diff of all changes on BRANCH ** --brief Show filenames only ** --checkin VERSION Show diff of all changes in VERSION ** --command PROG External diff program. Overrides "diff-command" ** -c|--context N Use N lines of context ** --diff-binary BOOL Include binary files with external commands ** --exec-abs-paths Force absolute path names on external commands ** --exec-rel-paths Force relative path names on external commands ** -r|--from VERSION Select VERSION as source for the diff ** -i|--internal Use internal diff logic ** --numstat Show only the number of lines delete and added ** -y|--side-by-side Side-by-side diff ** --strip-trailing-cr Strip trailing CR ** --tclsh PATH Tcl/Tk used for --tk (default: "tclsh") ** --tk Launch a Tcl/Tk GUI for display ** --to VERSION Select VERSION as target for the diff ** --undo Diff against the "undo" buffer ** --unified Unified diff ** -v|--verbose Output complete text of added or deleted files |
| ︙ | ︙ |
Changes to src/export.c.
| ︙ | ︙ | |||
479 480 481 482 483 484 485 | ** If the "--export-marks FILE" option is used, the rid of all commits and ** blobs written on exit for use with "--import-marks" on the next run. ** ** Options: ** --export-marks FILE export rids of exported data to FILE ** --import-marks FILE read rids of data to ignore from FILE ** --rename-trunk NAME use NAME as name of exported trunk branch | | | 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 | ** If the "--export-marks FILE" option is used, the rid of all commits and ** blobs written on exit for use with "--import-marks" on the next run. ** ** Options: ** --export-marks FILE export rids of exported data to FILE ** --import-marks FILE read rids of data to ignore from FILE ** --rename-trunk NAME use NAME as name of exported trunk branch ** -R|--repository REPOSITORY export the given REPOSITORY ** ** See also: import */ /* ** COMMAND: export* ** ** This command is deprecated. Use "fossil git export" instead. |
| ︙ | ︙ |
Changes to src/fileedit.c.
| ︙ | ︙ | |||
697 698 699 700 701 702 703 | ** Usage: %fossil test-ci-mini ?OPTIONS? FILENAME ** ** where FILENAME is a repo-relative name as it would appear in the ** vfile table. ** ** Options: ** | | | | | | 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 | ** Usage: %fossil test-ci-mini ?OPTIONS? FILENAME ** ** where FILENAME is a repo-relative name as it would appear in the ** vfile table. ** ** Options: ** ** -R|--repository REPO The repository file to commit to. ** --as FILENAME The repository-side name of the input ** file, relative to the top of the ** repository. Default is the same as the ** input file name. ** -m|--comment COMMENT Required checkin comment. ** -M|--comment-file FILE Reads checkin comment from the given file. ** -r|--revision VERSION Commit from this version. Default is ** the checkout version (if available) or ** trunk (if used without a checkout). ** --allow-fork Allows the commit to be made against a ** non-leaf parent. Note that no autosync ** is performed beforehand. ** --allow-merge-conflict Allows checkin of a file even if it ** appears to contain a fossil merge conflict |
| ︙ | ︙ | |||
733 734 735 736 737 738 739 | ** config option trumps this, as do certain ** heuristics. ** --allow-new-file Allow addition of a new file this way. ** Disabled by default to avoid that case- ** sensitivity errors inadvertently lead to ** adding a new file where an update is ** intended. | | | 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 | ** config option trumps this, as do certain ** heuristics. ** --allow-new-file Allow addition of a new file this way. ** Disabled by default to avoid that case- ** sensitivity errors inadvertently lead to ** adding a new file where an update is ** intended. ** -d|--dump-manifest Dumps the generated manifest to stdout ** immediately after it's generated. ** --save-manifest FILE Saves the generated manifest to a file ** after successfully processing it. ** --wet-run Disables the default dry-run mode. ** ** Example: ** |
| ︙ | ︙ |
Changes to src/import.c.
| ︙ | ︙ | |||
1695 1696 1697 1698 1699 1700 1701 | ** -f|--force overwrite repository if already exists ** -q|--quiet omit progress output ** --no-rebuild skip the "rebuilding metadata" step ** --no-vacuum skip the final VACUUM of the database file ** --rename-trunk NAME use NAME as name of imported trunk branch ** --rename-branch PAT rename all branch names using PAT pattern ** --rename-tag PAT rename all tag names using PAT pattern | | | 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 | ** -f|--force overwrite repository if already exists ** -q|--quiet omit progress output ** --no-rebuild skip the "rebuilding metadata" step ** --no-vacuum skip the final VACUUM of the database file ** --rename-trunk NAME use NAME as name of imported trunk branch ** --rename-branch PAT rename all branch names using PAT pattern ** --rename-tag PAT rename all tag names using PAT pattern ** -A|--admin-user NAME use NAME for the admin user ** ** The --incremental option allows an existing repository to be extended ** with new content. The --rename-* options may be useful to avoid name ** conflicts when using the --incremental option. The --admin-user ** option is ignored if --incremental is specified. ** ** The argument to --rename-* contains one "%" character to be replaced |
| ︙ | ︙ |
Changes to src/main.c.
| ︙ | ︙ | |||
1270 1271 1272 1273 1274 1275 1276 | return version; } /* ** COMMAND: version ** | | | 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 |
return version;
}
/*
** COMMAND: version
**
** Usage: %fossil version ?-v|-verbose?
**
** Print the source code version number for the fossil executable.
** If the verbose option is specified, additional details will
** be output about what optional features this binary was compiled
** with
*/
void version_cmd(void){
|
| ︙ | ︙ |
Changes to src/search.c.
| ︙ | ︙ | |||
563 564 565 566 567 568 569 | } /* ** Testing the search function. ** ** COMMAND: search* ** | | | 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 | } /* ** Testing the search function. ** ** COMMAND: search* ** ** Usage: %fossil search [-a|-all] [-n|-limit #] [-W|-width #] pattern... ** ** Search for timeline entries matching all words provided on the ** command line. Whole-word matches scope more highly than partial ** matches. ** ** Note: The command only search the EVENT table. So it will only ** display check-in comments or other comments that appear on an |
| ︙ | ︙ |
Changes to src/stat.c.
| ︙ | ︙ | |||
310 311 312 313 314 315 316 | ** Usage: %fossil dbstat OPTIONS ** ** Shows statistics and global information about the repository and/or ** verify the integrity of a repository. ** ** Options: ** | | | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 |
** Usage: %fossil dbstat OPTIONS
**
** Shows statistics and global information about the repository and/or
** verify the integrity of a repository.
**
** Options:
**
** -b|--brief Only show essential elements.
** --db-check Run "PRAGMA quick_check" on the repository database.
** --db-verify Run a full verification of the repository integrity.
** This involves decoding and reparsing all artifacts
** and can take significant time.
** --omit-version-info Omit the SQLite and Fossil version information.
*/
void dbstat_cmd(void){
|
| ︙ | ︙ |
Changes to src/sync.c.
| ︙ | ︙ | |||
381 382 383 384 385 386 387 | ** Add a new named URL to the set of remote sync URLs for use in ** place of a sync URL in commands that take one. ** ** > fossil remote delete NAME ** ** Delete a sync URL previously added by the "add" subcommand. ** | | | 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 | ** Add a new named URL to the set of remote sync URLs for use in ** place of a sync URL in commands that take one. ** ** > fossil remote delete NAME ** ** Delete a sync URL previously added by the "add" subcommand. ** ** > fossil remote list|ls ** ** Show all remote repository sync URLs. ** ** > fossil remote off ** ** Forget the default sync URL, disabling autosync. Combined with ** named sync URLs, it allows canceling this "airplane mode" with |
| ︙ | ︙ |
Changes to src/tag.c.
| ︙ | ︙ | |||
381 382 383 384 385 386 387 | ** the tag value propagates to all descendants of CHECK-IN ** ** Options: ** --raw Raw tag name. ** --propagate Propagating tag. ** --date-override DATETIME Set date and time added. ** --user-override USER Name USER when adding the tag. | | | | | 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 | ** the tag value propagates to all descendants of CHECK-IN ** ** Options: ** --raw Raw tag name. ** --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'. ** ** > fossil tag cancel ?--raw? TAGNAME CHECK-IN ** ** Remove the tag TAGNAME from CHECK-IN, and also remove ** the propagation of the tag to any descendants. Use the ** the -n|--dryrun option to see what would have happened. ** ** Options: ** --raw Raw tag name. ** --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 ** ** List all objects that use TAGNAME. TYPE can be "ci" for ** check-ins or "e" for events. The limit option limits the number ** of results to the given value. |
| ︙ | ︙ | |||
642 643 644 645 646 647 648 | ** ** Reparenting is accomplished by adding a parent tag. So to undo the ** reparenting operation, simply delete the tag. ** ** --test Make database entries but do not add the tag artifact. ** So the reparent operation will be undone by the next ** "fossil rebuild" command. | | | 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 |
**
** Reparenting is accomplished by adding a parent tag. So to undo the
** reparenting operation, simply delete the tag.
**
** --test Make database entries but do not add the tag artifact.
** So the reparent operation will be undone by the next
** "fossil rebuild" command.
** -n|--dryrun Print the tag that would have been created but do not
** actually change the database in any way.
** --date-override DATETIME Set the change time on the control artifact
** --user-override USER Set the user name on the control artifact
*/
void reparent_cmd(void){
int bTest = find_option("test","",0)!=0;
int rid;
|
| ︙ | ︙ |
Changes to src/wiki.c.
| ︙ | ︙ | |||
1911 1912 1913 1914 1915 1916 1917 | ** Sends the latest version of either a wiki page or of a tech ** note to the given file or standard output. A filename of "-" ** writes the output to standard output. The directory parts of ** the output filename are created if needed. ** If PAGENAME is provided, the named wiki page will be output. ** ** Options: | | | 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 | ** Sends the latest version of either a wiki page or of a tech ** note to the given file or standard output. A filename of "-" ** writes the output to standard output. The directory parts of ** the output filename are created if needed. ** If PAGENAME is provided, the named wiki page will be output. ** ** Options: ** -t|--technote DATETIME|TECHNOTE-ID ** Specifies that a technote, rather than a wiki page, ** will be exported. If DATETIME is used, the most ** recently modified tech note with that DATETIME will ** output. ** -h|--html The body (only) is rendered in HTML form, without ** any page header/foot or HTML/BODY tag wrappers. ** -H|--HTML Works like -h|-html but wraps the output in |
| ︙ | ︙ |