Fossil SCM
Amend 'fossil help' output for all commands to make options conform to GNU 'short|long' convention (e.g., -v|--verbose).
Commit
7f3c728db3da63a2090a2e5247292c3b539c93786a6197fa57c6ba0d7aada103
Parent
dd13191359cd7e8…
14 files changed
+2
-2
+1
-1
+2
-2
+1
-1
+4
-4
+1
-1
+5
-5
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+4
-4
+1
-1
+2
-2
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -559,11 +559,11 @@ | ||
| 559 | 559 | ** --reset Reset the DELETED state of a checkout, such |
| 560 | 560 | ** that all newly-rm'd (but not yet committed) |
| 561 | 561 | ** files are no longer removed. No flags other |
| 562 | 562 | ** than --verbose or --dry-run may be used with |
| 563 | 563 | ** --reset. |
| 564 | -** --verbose|-v Outputs information about each --reset file. | |
| 564 | +** -v|--verbose Outputs information about each --reset file. | |
| 565 | 565 | ** Only usable with --reset. |
| 566 | 566 | ** |
| 567 | 567 | ** See also: [[addremove]], [[add]] |
| 568 | 568 | */ |
| 569 | 569 | void delete_cmd(void){ |
| @@ -751,11 +751,11 @@ | ||
| 751 | 751 | ** such that all newly-added (but not yet committed) |
| 752 | 752 | ** files are no longer added and all newly-removed |
| 753 | 753 | ** (but not yet committed) files are no longer |
| 754 | 754 | ** removed. No flags other than --verbose and |
| 755 | 755 | ** --dry-run may be used with --reset. |
| 756 | -** --verbose|-v Outputs information about each --reset file. | |
| 756 | +** -v|--verbose Outputs information about each --reset file. | |
| 757 | 757 | ** Only usable with --reset. |
| 758 | 758 | ** |
| 759 | 759 | ** See also: [[add]], [[rm]] |
| 760 | 760 | */ |
| 761 | 761 | void addremove_cmd(void){ |
| 762 | 762 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -559,11 +559,11 @@ | |
| 559 | ** --reset Reset the DELETED state of a checkout, such |
| 560 | ** that all newly-rm'd (but not yet committed) |
| 561 | ** files are no longer removed. No flags other |
| 562 | ** than --verbose or --dry-run may be used with |
| 563 | ** --reset. |
| 564 | ** --verbose|-v Outputs information about each --reset file. |
| 565 | ** Only usable with --reset. |
| 566 | ** |
| 567 | ** See also: [[addremove]], [[add]] |
| 568 | */ |
| 569 | void delete_cmd(void){ |
| @@ -751,11 +751,11 @@ | |
| 751 | ** such that all newly-added (but not yet committed) |
| 752 | ** files are no longer added and all newly-removed |
| 753 | ** (but not yet committed) files are no longer |
| 754 | ** removed. No flags other than --verbose and |
| 755 | ** --dry-run may be used with --reset. |
| 756 | ** --verbose|-v Outputs information about each --reset file. |
| 757 | ** Only usable with --reset. |
| 758 | ** |
| 759 | ** See also: [[add]], [[rm]] |
| 760 | */ |
| 761 | void addremove_cmd(void){ |
| 762 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -559,11 +559,11 @@ | |
| 559 | ** --reset Reset the DELETED state of a checkout, such |
| 560 | ** that all newly-rm'd (but not yet committed) |
| 561 | ** files are no longer removed. No flags other |
| 562 | ** than --verbose or --dry-run may be used with |
| 563 | ** --reset. |
| 564 | ** -v|--verbose Outputs information about each --reset file. |
| 565 | ** Only usable with --reset. |
| 566 | ** |
| 567 | ** See also: [[addremove]], [[add]] |
| 568 | */ |
| 569 | void delete_cmd(void){ |
| @@ -751,11 +751,11 @@ | |
| 751 | ** such that all newly-added (but not yet committed) |
| 752 | ** files are no longer added and all newly-removed |
| 753 | ** (but not yet committed) files are no longer |
| 754 | ** removed. No flags other than --verbose and |
| 755 | ** --dry-run may be used with --reset. |
| 756 | ** -v|--verbose Outputs information about each --reset file. |
| 757 | ** Only usable with --reset. |
| 758 | ** |
| 759 | ** See also: [[add]], [[rm]] |
| 760 | */ |
| 761 | void addremove_cmd(void){ |
| 762 |
+1
-1
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -397,11 +397,11 @@ | ||
| 397 | 397 | ** The opposite of "[[open]]". Close the current database connection. |
| 398 | 398 | ** Require a -f or --force flag if there are unsaved changes in the |
| 399 | 399 | ** current check-out or if there is non-empty stash. |
| 400 | 400 | ** |
| 401 | 401 | ** Options: |
| 402 | -** --force|-f necessary to close a check out with uncommitted changes | |
| 402 | +** -f|--force necessary to close a check out with uncommitted changes | |
| 403 | 403 | ** |
| 404 | 404 | ** See also: [[open]] |
| 405 | 405 | */ |
| 406 | 406 | void close_cmd(void){ |
| 407 | 407 | int forceFlag = find_option("force","f",0)!=0; |
| 408 | 408 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -397,11 +397,11 @@ | |
| 397 | ** The opposite of "[[open]]". Close the current database connection. |
| 398 | ** Require a -f or --force flag if there are unsaved changes in the |
| 399 | ** current check-out or if there is non-empty stash. |
| 400 | ** |
| 401 | ** Options: |
| 402 | ** --force|-f necessary to close a check out with uncommitted changes |
| 403 | ** |
| 404 | ** See also: [[open]] |
| 405 | */ |
| 406 | void close_cmd(void){ |
| 407 | int forceFlag = find_option("force","f",0)!=0; |
| 408 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -397,11 +397,11 @@ | |
| 397 | ** The opposite of "[[open]]". Close the current database connection. |
| 398 | ** Require a -f or --force flag if there are unsaved changes in the |
| 399 | ** current check-out or if there is non-empty stash. |
| 400 | ** |
| 401 | ** Options: |
| 402 | ** -f|--force necessary to close a check out with uncommitted changes |
| 403 | ** |
| 404 | ** See also: [[open]] |
| 405 | */ |
| 406 | void close_cmd(void){ |
| 407 | int forceFlag = find_option("force","f",0)!=0; |
| 408 |
+2
-2
| --- src/clone.c | ||
| +++ src/clone.c | ||
| @@ -121,12 +121,12 @@ | ||
| 121 | 121 | ** By default, the current login name is used to create the default |
| 122 | 122 | ** admin user for the new clone. This can be overridden using |
| 123 | 123 | ** the -A|--admin-user parameter. |
| 124 | 124 | ** |
| 125 | 125 | ** Options: |
| 126 | -** --admin-user|-A USERNAME Make USERNAME the administrator | |
| 127 | -** --httpauth|-B USER:PASS Add HTTP Basic Authorization to requests | |
| 126 | +** -A|--admin-user USERNAME Make USERNAME the administrator | |
| 127 | +** -B|--httpauth USER:PASS Add HTTP Basic Authorization to requests | |
| 128 | 128 | ** --nested Allow opening a repository inside an opened |
| 129 | 129 | ** checkout |
| 130 | 130 | ** --nocompress Omit extra delta compression |
| 131 | 131 | ** --no-open Clone only. Do not open a check-out. |
| 132 | 132 | ** --once Don't remember the URI. |
| 133 | 133 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -121,12 +121,12 @@ | |
| 121 | ** By default, the current login name is used to create the default |
| 122 | ** admin user for the new clone. This can be overridden using |
| 123 | ** the -A|--admin-user parameter. |
| 124 | ** |
| 125 | ** Options: |
| 126 | ** --admin-user|-A USERNAME Make USERNAME the administrator |
| 127 | ** --httpauth|-B USER:PASS Add HTTP Basic Authorization to requests |
| 128 | ** --nested Allow opening a repository inside an opened |
| 129 | ** checkout |
| 130 | ** --nocompress Omit extra delta compression |
| 131 | ** --no-open Clone only. Do not open a check-out. |
| 132 | ** --once Don't remember the URI. |
| 133 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -121,12 +121,12 @@ | |
| 121 | ** By default, the current login name is used to create the default |
| 122 | ** admin user for the new clone. This can be overridden using |
| 123 | ** the -A|--admin-user parameter. |
| 124 | ** |
| 125 | ** Options: |
| 126 | ** -A|--admin-user USERNAME Make USERNAME the administrator |
| 127 | ** -B|--httpauth USER:PASS Add HTTP Basic Authorization to requests |
| 128 | ** --nested Allow opening a repository inside an opened |
| 129 | ** checkout |
| 130 | ** --nocompress Omit extra delta compression |
| 131 | ** --no-open Clone only. Do not open a check-out. |
| 132 | ** --once Don't remember the URI. |
| 133 |
M
src/db.c
+1
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2685,11 +2685,11 @@ | ||
| 2685 | 2685 | ** default users "anonymous", "nobody", "reader", "developer", and their |
| 2686 | 2686 | ** associated permissions will be copied. |
| 2687 | 2687 | ** |
| 2688 | 2688 | ** Options: |
| 2689 | 2689 | ** --template FILE Copy settings from repository file |
| 2690 | -** --admin-user|-A USERNAME Select given USERNAME as admin user | |
| 2690 | +** -A|--admin-user USERNAME Select given USERNAME as admin user | |
| 2691 | 2691 | ** --date-override DATETIME Use DATETIME as time of the initial check-in |
| 2692 | 2692 | ** --sha1 Use an initial hash policy of "sha1" |
| 2693 | 2693 | ** |
| 2694 | 2694 | ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in |
| 2695 | 2695 | ** year-month-day form, it may be truncated, the "T" may be replaced by |
| 2696 | 2696 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2685,11 +2685,11 @@ | |
| 2685 | ** default users "anonymous", "nobody", "reader", "developer", and their |
| 2686 | ** associated permissions will be copied. |
| 2687 | ** |
| 2688 | ** Options: |
| 2689 | ** --template FILE Copy settings from repository file |
| 2690 | ** --admin-user|-A USERNAME Select given USERNAME as admin user |
| 2691 | ** --date-override DATETIME Use DATETIME as time of the initial check-in |
| 2692 | ** --sha1 Use an initial hash policy of "sha1" |
| 2693 | ** |
| 2694 | ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in |
| 2695 | ** year-month-day form, it may be truncated, the "T" may be replaced by |
| 2696 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2685,11 +2685,11 @@ | |
| 2685 | ** default users "anonymous", "nobody", "reader", "developer", and their |
| 2686 | ** associated permissions will be copied. |
| 2687 | ** |
| 2688 | ** Options: |
| 2689 | ** --template FILE Copy settings from repository file |
| 2690 | ** -A|--admin-user USERNAME Select given USERNAME as admin user |
| 2691 | ** --date-override DATETIME Use DATETIME as time of the initial check-in |
| 2692 | ** --sha1 Use an initial hash policy of "sha1" |
| 2693 | ** |
| 2694 | ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in |
| 2695 | ** year-month-day form, it may be truncated, the "T" may be replaced by |
| 2696 |
+4
-4
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -842,18 +842,18 @@ | ||
| 842 | 842 | ** as binary |
| 843 | 843 | ** --branch BRANCH Show diff of all changes on BRANCH |
| 844 | 844 | ** --brief Show filenames only |
| 845 | 845 | ** --checkin VERSION Show diff of all changes in VERSION |
| 846 | 846 | ** --command PROG External diff program. Overrides "diff-command" |
| 847 | -** --context|-c N Use N lines of context | |
| 847 | +** -c|--context N Use N lines of context | |
| 848 | 848 | ** --diff-binary BOOL Include binary files with external commands |
| 849 | 849 | ** --exec-abs-paths Force absolute path names on external commands |
| 850 | 850 | ** --exec-rel-paths Force relative path names on external commands |
| 851 | -** --from|-r VERSION Select VERSION as source for the diff | |
| 852 | -** --internal|-i Use internal diff logic | |
| 851 | +** -r|--from VERSION Select VERSION as source for the diff | |
| 852 | +** -i|--internal Use internal diff logic | |
| 853 | 853 | ** --numstat Show only the number of lines delete and added |
| 854 | -** --side-by-side|-y Side-by-side diff | |
| 854 | +** -y|--side-by-side Side-by-side diff | |
| 855 | 855 | ** --strip-trailing-cr Strip trailing CR |
| 856 | 856 | ** --tclsh PATH Tcl/Tk used for --tk (default: "tclsh") |
| 857 | 857 | ** --tk Launch a Tcl/Tk GUI for display |
| 858 | 858 | ** --to VERSION Select VERSION as target for the diff |
| 859 | 859 | ** --undo Diff against the "undo" buffer |
| 860 | 860 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -842,18 +842,18 @@ | |
| 842 | ** as binary |
| 843 | ** --branch BRANCH Show diff of all changes on BRANCH |
| 844 | ** --brief Show filenames only |
| 845 | ** --checkin VERSION Show diff of all changes in VERSION |
| 846 | ** --command PROG External diff program. Overrides "diff-command" |
| 847 | ** --context|-c N Use N lines of context |
| 848 | ** --diff-binary BOOL Include binary files with external commands |
| 849 | ** --exec-abs-paths Force absolute path names on external commands |
| 850 | ** --exec-rel-paths Force relative path names on external commands |
| 851 | ** --from|-r VERSION Select VERSION as source for the diff |
| 852 | ** --internal|-i Use internal diff logic |
| 853 | ** --numstat Show only the number of lines delete and added |
| 854 | ** --side-by-side|-y Side-by-side diff |
| 855 | ** --strip-trailing-cr Strip trailing CR |
| 856 | ** --tclsh PATH Tcl/Tk used for --tk (default: "tclsh") |
| 857 | ** --tk Launch a Tcl/Tk GUI for display |
| 858 | ** --to VERSION Select VERSION as target for the diff |
| 859 | ** --undo Diff against the "undo" buffer |
| 860 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -842,18 +842,18 @@ | |
| 842 | ** as binary |
| 843 | ** --branch BRANCH Show diff of all changes on BRANCH |
| 844 | ** --brief Show filenames only |
| 845 | ** --checkin VERSION Show diff of all changes in VERSION |
| 846 | ** --command PROG External diff program. Overrides "diff-command" |
| 847 | ** -c|--context N Use N lines of context |
| 848 | ** --diff-binary BOOL Include binary files with external commands |
| 849 | ** --exec-abs-paths Force absolute path names on external commands |
| 850 | ** --exec-rel-paths Force relative path names on external commands |
| 851 | ** -r|--from VERSION Select VERSION as source for the diff |
| 852 | ** -i|--internal Use internal diff logic |
| 853 | ** --numstat Show only the number of lines delete and added |
| 854 | ** -y|--side-by-side Side-by-side diff |
| 855 | ** --strip-trailing-cr Strip trailing CR |
| 856 | ** --tclsh PATH Tcl/Tk used for --tk (default: "tclsh") |
| 857 | ** --tk Launch a Tcl/Tk GUI for display |
| 858 | ** --to VERSION Select VERSION as target for the diff |
| 859 | ** --undo Diff against the "undo" buffer |
| 860 |
+1
-1
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -481,11 +481,11 @@ | ||
| 481 | 481 | ** |
| 482 | 482 | ** Options: |
| 483 | 483 | ** --export-marks FILE export rids of exported data to FILE |
| 484 | 484 | ** --import-marks FILE read rids of data to ignore from FILE |
| 485 | 485 | ** --rename-trunk NAME use NAME as name of exported trunk branch |
| 486 | -** --repository|-R REPOSITORY export the given REPOSITORY | |
| 486 | +** -R|--repository REPOSITORY export the given REPOSITORY | |
| 487 | 487 | ** |
| 488 | 488 | ** See also: import |
| 489 | 489 | */ |
| 490 | 490 | /* |
| 491 | 491 | ** COMMAND: export* |
| 492 | 492 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -481,11 +481,11 @@ | |
| 481 | ** |
| 482 | ** Options: |
| 483 | ** --export-marks FILE export rids of exported data to FILE |
| 484 | ** --import-marks FILE read rids of data to ignore from FILE |
| 485 | ** --rename-trunk NAME use NAME as name of exported trunk branch |
| 486 | ** --repository|-R REPOSITORY export the given REPOSITORY |
| 487 | ** |
| 488 | ** See also: import |
| 489 | */ |
| 490 | /* |
| 491 | ** COMMAND: export* |
| 492 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -481,11 +481,11 @@ | |
| 481 | ** |
| 482 | ** Options: |
| 483 | ** --export-marks FILE export rids of exported data to FILE |
| 484 | ** --import-marks FILE read rids of data to ignore from FILE |
| 485 | ** --rename-trunk NAME use NAME as name of exported trunk branch |
| 486 | ** -R|--repository REPOSITORY export the given REPOSITORY |
| 487 | ** |
| 488 | ** See also: import |
| 489 | */ |
| 490 | /* |
| 491 | ** COMMAND: export* |
| 492 |
+5
-5
| --- src/fileedit.c | ||
| +++ src/fileedit.c | ||
| @@ -699,18 +699,18 @@ | ||
| 699 | 699 | ** where FILENAME is a repo-relative name as it would appear in the |
| 700 | 700 | ** vfile table. |
| 701 | 701 | ** |
| 702 | 702 | ** Options: |
| 703 | 703 | ** |
| 704 | -** --repository|-R REPO The repository file to commit to. | |
| 704 | +** -R|--repository REPO The repository file to commit to. | |
| 705 | 705 | ** --as FILENAME The repository-side name of the input |
| 706 | 706 | ** file, relative to the top of the |
| 707 | 707 | ** repository. Default is the same as the |
| 708 | 708 | ** input file name. |
| 709 | -** --comment|-m COMMENT Required checkin comment. | |
| 710 | -** --comment-file|-M FILE Reads checkin comment from the given file. | |
| 711 | -** --revision|-r VERSION Commit from this version. Default is | |
| 709 | +** -m|--comment COMMENT Required checkin comment. | |
| 710 | +** -M|--comment-file FILE Reads checkin comment from the given file. | |
| 711 | +** -r|--revision VERSION Commit from this version. Default is | |
| 712 | 712 | ** the checkout version (if available) or |
| 713 | 713 | ** trunk (if used without a checkout). |
| 714 | 714 | ** --allow-fork Allows the commit to be made against a |
| 715 | 715 | ** non-leaf parent. Note that no autosync |
| 716 | 716 | ** is performed beforehand. |
| @@ -735,11 +735,11 @@ | ||
| 735 | 735 | ** --allow-new-file Allow addition of a new file this way. |
| 736 | 736 | ** Disabled by default to avoid that case- |
| 737 | 737 | ** sensitivity errors inadvertently lead to |
| 738 | 738 | ** adding a new file where an update is |
| 739 | 739 | ** intended. |
| 740 | -** --dump-manifest|-d Dumps the generated manifest to stdout | |
| 740 | +** -d|--dump-manifest Dumps the generated manifest to stdout | |
| 741 | 741 | ** immediately after it's generated. |
| 742 | 742 | ** --save-manifest FILE Saves the generated manifest to a file |
| 743 | 743 | ** after successfully processing it. |
| 744 | 744 | ** --wet-run Disables the default dry-run mode. |
| 745 | 745 | ** |
| 746 | 746 |
| --- src/fileedit.c | |
| +++ src/fileedit.c | |
| @@ -699,18 +699,18 @@ | |
| 699 | ** where FILENAME is a repo-relative name as it would appear in the |
| 700 | ** vfile table. |
| 701 | ** |
| 702 | ** Options: |
| 703 | ** |
| 704 | ** --repository|-R REPO The repository file to commit to. |
| 705 | ** --as FILENAME The repository-side name of the input |
| 706 | ** file, relative to the top of the |
| 707 | ** repository. Default is the same as the |
| 708 | ** input file name. |
| 709 | ** --comment|-m COMMENT Required checkin comment. |
| 710 | ** --comment-file|-M FILE Reads checkin comment from the given file. |
| 711 | ** --revision|-r VERSION Commit from this version. Default is |
| 712 | ** the checkout version (if available) or |
| 713 | ** trunk (if used without a checkout). |
| 714 | ** --allow-fork Allows the commit to be made against a |
| 715 | ** non-leaf parent. Note that no autosync |
| 716 | ** is performed beforehand. |
| @@ -735,11 +735,11 @@ | |
| 735 | ** --allow-new-file Allow addition of a new file this way. |
| 736 | ** Disabled by default to avoid that case- |
| 737 | ** sensitivity errors inadvertently lead to |
| 738 | ** adding a new file where an update is |
| 739 | ** intended. |
| 740 | ** --dump-manifest|-d Dumps the generated manifest to stdout |
| 741 | ** immediately after it's generated. |
| 742 | ** --save-manifest FILE Saves the generated manifest to a file |
| 743 | ** after successfully processing it. |
| 744 | ** --wet-run Disables the default dry-run mode. |
| 745 | ** |
| 746 |
| --- src/fileedit.c | |
| +++ src/fileedit.c | |
| @@ -699,18 +699,18 @@ | |
| 699 | ** where FILENAME is a repo-relative name as it would appear in the |
| 700 | ** vfile table. |
| 701 | ** |
| 702 | ** Options: |
| 703 | ** |
| 704 | ** -R|--repository REPO The repository file to commit to. |
| 705 | ** --as FILENAME The repository-side name of the input |
| 706 | ** file, relative to the top of the |
| 707 | ** repository. Default is the same as the |
| 708 | ** input file name. |
| 709 | ** -m|--comment COMMENT Required checkin comment. |
| 710 | ** -M|--comment-file FILE Reads checkin comment from the given file. |
| 711 | ** -r|--revision VERSION Commit from this version. Default is |
| 712 | ** the checkout version (if available) or |
| 713 | ** trunk (if used without a checkout). |
| 714 | ** --allow-fork Allows the commit to be made against a |
| 715 | ** non-leaf parent. Note that no autosync |
| 716 | ** is performed beforehand. |
| @@ -735,11 +735,11 @@ | |
| 735 | ** --allow-new-file Allow addition of a new file this way. |
| 736 | ** Disabled by default to avoid that case- |
| 737 | ** sensitivity errors inadvertently lead to |
| 738 | ** adding a new file where an update is |
| 739 | ** intended. |
| 740 | ** -d|--dump-manifest Dumps the generated manifest to stdout |
| 741 | ** immediately after it's generated. |
| 742 | ** --save-manifest FILE Saves the generated manifest to a file |
| 743 | ** after successfully processing it. |
| 744 | ** --wet-run Disables the default dry-run mode. |
| 745 | ** |
| 746 |
+1
-1
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -1697,11 +1697,11 @@ | ||
| 1697 | 1697 | ** --no-rebuild skip the "rebuilding metadata" step |
| 1698 | 1698 | ** --no-vacuum skip the final VACUUM of the database file |
| 1699 | 1699 | ** --rename-trunk NAME use NAME as name of imported trunk branch |
| 1700 | 1700 | ** --rename-branch PAT rename all branch names using PAT pattern |
| 1701 | 1701 | ** --rename-tag PAT rename all tag names using PAT pattern |
| 1702 | -** --admin-user|-A NAME use NAME for the admin user | |
| 1702 | +** -A|--admin-user NAME use NAME for the admin user | |
| 1703 | 1703 | ** |
| 1704 | 1704 | ** The --incremental option allows an existing repository to be extended |
| 1705 | 1705 | ** with new content. The --rename-* options may be useful to avoid name |
| 1706 | 1706 | ** conflicts when using the --incremental option. The --admin-user |
| 1707 | 1707 | ** option is ignored if --incremental is specified. |
| 1708 | 1708 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1697,11 +1697,11 @@ | |
| 1697 | ** --no-rebuild skip the "rebuilding metadata" step |
| 1698 | ** --no-vacuum skip the final VACUUM of the database file |
| 1699 | ** --rename-trunk NAME use NAME as name of imported trunk branch |
| 1700 | ** --rename-branch PAT rename all branch names using PAT pattern |
| 1701 | ** --rename-tag PAT rename all tag names using PAT pattern |
| 1702 | ** --admin-user|-A NAME use NAME for the admin user |
| 1703 | ** |
| 1704 | ** The --incremental option allows an existing repository to be extended |
| 1705 | ** with new content. The --rename-* options may be useful to avoid name |
| 1706 | ** conflicts when using the --incremental option. The --admin-user |
| 1707 | ** option is ignored if --incremental is specified. |
| 1708 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1697,11 +1697,11 @@ | |
| 1697 | ** --no-rebuild skip the "rebuilding metadata" step |
| 1698 | ** --no-vacuum skip the final VACUUM of the database file |
| 1699 | ** --rename-trunk NAME use NAME as name of imported trunk branch |
| 1700 | ** --rename-branch PAT rename all branch names using PAT pattern |
| 1701 | ** --rename-tag PAT rename all tag names using PAT pattern |
| 1702 | ** -A|--admin-user NAME use NAME for the admin user |
| 1703 | ** |
| 1704 | ** The --incremental option allows an existing repository to be extended |
| 1705 | ** with new content. The --rename-* options may be useful to avoid name |
| 1706 | ** conflicts when using the --incremental option. The --admin-user |
| 1707 | ** option is ignored if --incremental is specified. |
| 1708 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -1272,11 +1272,11 @@ | ||
| 1272 | 1272 | |
| 1273 | 1273 | |
| 1274 | 1274 | /* |
| 1275 | 1275 | ** COMMAND: version |
| 1276 | 1276 | ** |
| 1277 | -** Usage: %fossil version ?-verbose|-v? | |
| 1277 | +** Usage: %fossil version ?-v|-verbose? | |
| 1278 | 1278 | ** |
| 1279 | 1279 | ** Print the source code version number for the fossil executable. |
| 1280 | 1280 | ** If the verbose option is specified, additional details will |
| 1281 | 1281 | ** be output about what optional features this binary was compiled |
| 1282 | 1282 | ** with |
| 1283 | 1283 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1272,11 +1272,11 @@ | |
| 1272 | |
| 1273 | |
| 1274 | /* |
| 1275 | ** COMMAND: version |
| 1276 | ** |
| 1277 | ** Usage: %fossil version ?-verbose|-v? |
| 1278 | ** |
| 1279 | ** Print the source code version number for the fossil executable. |
| 1280 | ** If the verbose option is specified, additional details will |
| 1281 | ** be output about what optional features this binary was compiled |
| 1282 | ** with |
| 1283 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1272,11 +1272,11 @@ | |
| 1272 | |
| 1273 | |
| 1274 | /* |
| 1275 | ** COMMAND: version |
| 1276 | ** |
| 1277 | ** Usage: %fossil version ?-v|-verbose? |
| 1278 | ** |
| 1279 | ** Print the source code version number for the fossil executable. |
| 1280 | ** If the verbose option is specified, additional details will |
| 1281 | ** be output about what optional features this binary was compiled |
| 1282 | ** with |
| 1283 |
+1
-1
| --- src/search.c | ||
| +++ src/search.c | ||
| @@ -565,11 +565,11 @@ | ||
| 565 | 565 | /* |
| 566 | 566 | ** Testing the search function. |
| 567 | 567 | ** |
| 568 | 568 | ** COMMAND: search* |
| 569 | 569 | ** |
| 570 | -** Usage: %fossil search [-all|-a] [-limit|-n #] [-width|-W #] pattern... | |
| 570 | +** Usage: %fossil search [-a|-all] [-n|-limit #] [-W|-width #] pattern... | |
| 571 | 571 | ** |
| 572 | 572 | ** Search for timeline entries matching all words provided on the |
| 573 | 573 | ** command line. Whole-word matches scope more highly than partial |
| 574 | 574 | ** matches. |
| 575 | 575 | ** |
| 576 | 576 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -565,11 +565,11 @@ | |
| 565 | /* |
| 566 | ** Testing the search function. |
| 567 | ** |
| 568 | ** COMMAND: search* |
| 569 | ** |
| 570 | ** Usage: %fossil search [-all|-a] [-limit|-n #] [-width|-W #] pattern... |
| 571 | ** |
| 572 | ** Search for timeline entries matching all words provided on the |
| 573 | ** command line. Whole-word matches scope more highly than partial |
| 574 | ** matches. |
| 575 | ** |
| 576 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -565,11 +565,11 @@ | |
| 565 | /* |
| 566 | ** Testing the search function. |
| 567 | ** |
| 568 | ** COMMAND: search* |
| 569 | ** |
| 570 | ** Usage: %fossil search [-a|-all] [-n|-limit #] [-W|-width #] pattern... |
| 571 | ** |
| 572 | ** Search for timeline entries matching all words provided on the |
| 573 | ** command line. Whole-word matches scope more highly than partial |
| 574 | ** matches. |
| 575 | ** |
| 576 |
+1
-1
| --- src/stat.c | ||
| +++ src/stat.c | ||
| @@ -312,11 +312,11 @@ | ||
| 312 | 312 | ** Shows statistics and global information about the repository and/or |
| 313 | 313 | ** verify the integrity of a repository. |
| 314 | 314 | ** |
| 315 | 315 | ** Options: |
| 316 | 316 | ** |
| 317 | -** --brief|-b Only show essential elements. | |
| 317 | +** -b|--brief Only show essential elements. | |
| 318 | 318 | ** --db-check Run "PRAGMA quick_check" on the repository database. |
| 319 | 319 | ** --db-verify Run a full verification of the repository integrity. |
| 320 | 320 | ** This involves decoding and reparsing all artifacts |
| 321 | 321 | ** and can take significant time. |
| 322 | 322 | ** --omit-version-info Omit the SQLite and Fossil version information. |
| 323 | 323 |
| --- src/stat.c | |
| +++ src/stat.c | |
| @@ -312,11 +312,11 @@ | |
| 312 | ** Shows statistics and global information about the repository and/or |
| 313 | ** verify the integrity of a repository. |
| 314 | ** |
| 315 | ** Options: |
| 316 | ** |
| 317 | ** --brief|-b Only show essential elements. |
| 318 | ** --db-check Run "PRAGMA quick_check" on the repository database. |
| 319 | ** --db-verify Run a full verification of the repository integrity. |
| 320 | ** This involves decoding and reparsing all artifacts |
| 321 | ** and can take significant time. |
| 322 | ** --omit-version-info Omit the SQLite and Fossil version information. |
| 323 |
| --- src/stat.c | |
| +++ src/stat.c | |
| @@ -312,11 +312,11 @@ | |
| 312 | ** Shows statistics and global information about the repository and/or |
| 313 | ** verify the integrity of a repository. |
| 314 | ** |
| 315 | ** Options: |
| 316 | ** |
| 317 | ** -b|--brief Only show essential elements. |
| 318 | ** --db-check Run "PRAGMA quick_check" on the repository database. |
| 319 | ** --db-verify Run a full verification of the repository integrity. |
| 320 | ** This involves decoding and reparsing all artifacts |
| 321 | ** and can take significant time. |
| 322 | ** --omit-version-info Omit the SQLite and Fossil version information. |
| 323 |
+1
-1
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -383,11 +383,11 @@ | ||
| 383 | 383 | ** |
| 384 | 384 | ** > fossil remote delete NAME |
| 385 | 385 | ** |
| 386 | 386 | ** Delete a sync URL previously added by the "add" subcommand. |
| 387 | 387 | ** |
| 388 | -** > fossil remote list | |
| 388 | +** > fossil remote list|ls | |
| 389 | 389 | ** |
| 390 | 390 | ** Show all remote repository sync URLs. |
| 391 | 391 | ** |
| 392 | 392 | ** > fossil remote off |
| 393 | 393 | ** |
| 394 | 394 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -383,11 +383,11 @@ | |
| 383 | ** |
| 384 | ** > fossil remote delete NAME |
| 385 | ** |
| 386 | ** Delete a sync URL previously added by the "add" subcommand. |
| 387 | ** |
| 388 | ** > fossil remote list |
| 389 | ** |
| 390 | ** Show all remote repository sync URLs. |
| 391 | ** |
| 392 | ** > fossil remote off |
| 393 | ** |
| 394 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -383,11 +383,11 @@ | |
| 383 | ** |
| 384 | ** > fossil remote delete NAME |
| 385 | ** |
| 386 | ** Delete a sync URL previously added by the "add" subcommand. |
| 387 | ** |
| 388 | ** > fossil remote list|ls |
| 389 | ** |
| 390 | ** Show all remote repository sync URLs. |
| 391 | ** |
| 392 | ** > fossil remote off |
| 393 | ** |
| 394 |
+4
-4
| --- src/tag.c | ||
| +++ src/tag.c | ||
| @@ -383,11 +383,11 @@ | ||
| 383 | 383 | ** Options: |
| 384 | 384 | ** --raw Raw tag name. |
| 385 | 385 | ** --propagate Propagating tag. |
| 386 | 386 | ** --date-override DATETIME Set date and time added. |
| 387 | 387 | ** --user-override USER Name USER when adding the tag. |
| 388 | -** --dryrun|-n Display the tag text, but do not | |
| 388 | +** -n|--dryrun Display the tag text, but do not | |
| 389 | 389 | ** actually insert it into the database. |
| 390 | 390 | ** |
| 391 | 391 | ** The --date-override and --user-override options support |
| 392 | 392 | ** importing history from other SCM systems. DATETIME has |
| 393 | 393 | ** the form 'YYYY-MMM-DD HH:MM:SS'. |
| @@ -394,17 +394,17 @@ | ||
| 394 | 394 | ** |
| 395 | 395 | ** > fossil tag cancel ?--raw? TAGNAME CHECK-IN |
| 396 | 396 | ** |
| 397 | 397 | ** Remove the tag TAGNAME from CHECK-IN, and also remove |
| 398 | 398 | ** the propagation of the tag to any descendants. Use the |
| 399 | -** the --dryrun or -n options to see what would have happened. | |
| 399 | +** the -n|--dryrun option to see what would have happened. | |
| 400 | 400 | ** |
| 401 | 401 | ** Options: |
| 402 | 402 | ** --raw Raw tag name. |
| 403 | 403 | ** --date-override DATETIME Set date and time deleted. |
| 404 | 404 | ** --user-override USER Name USER when deleting the tag. |
| 405 | -** --dryrun|-n Display the control artifact, but do | |
| 405 | +** -n|--dryrun Display the control artifact, but do | |
| 406 | 406 | ** not insert it into the database. |
| 407 | 407 | ** |
| 408 | 408 | ** > fossil tag find ?OPTIONS? TAGNAME |
| 409 | 409 | ** |
| 410 | 410 | ** List all objects that use TAGNAME. TYPE can be "ci" for |
| @@ -644,11 +644,11 @@ | ||
| 644 | 644 | ** reparenting operation, simply delete the tag. |
| 645 | 645 | ** |
| 646 | 646 | ** --test Make database entries but do not add the tag artifact. |
| 647 | 647 | ** So the reparent operation will be undone by the next |
| 648 | 648 | ** "fossil rebuild" command. |
| 649 | -** --dryrun | -n Print the tag that would have been created but do not | |
| 649 | +** -n|--dryrun Print the tag that would have been created but do not | |
| 650 | 650 | ** actually change the database in any way. |
| 651 | 651 | ** --date-override DATETIME Set the change time on the control artifact |
| 652 | 652 | ** --user-override USER Set the user name on the control artifact |
| 653 | 653 | */ |
| 654 | 654 | void reparent_cmd(void){ |
| 655 | 655 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -383,11 +383,11 @@ | |
| 383 | ** Options: |
| 384 | ** --raw Raw tag name. |
| 385 | ** --propagate Propagating tag. |
| 386 | ** --date-override DATETIME Set date and time added. |
| 387 | ** --user-override USER Name USER when adding the tag. |
| 388 | ** --dryrun|-n Display the tag text, but do not |
| 389 | ** actually insert it into the database. |
| 390 | ** |
| 391 | ** The --date-override and --user-override options support |
| 392 | ** importing history from other SCM systems. DATETIME has |
| 393 | ** the form 'YYYY-MMM-DD HH:MM:SS'. |
| @@ -394,17 +394,17 @@ | |
| 394 | ** |
| 395 | ** > fossil tag cancel ?--raw? TAGNAME CHECK-IN |
| 396 | ** |
| 397 | ** Remove the tag TAGNAME from CHECK-IN, and also remove |
| 398 | ** the propagation of the tag to any descendants. Use the |
| 399 | ** the --dryrun or -n options to see what would have happened. |
| 400 | ** |
| 401 | ** Options: |
| 402 | ** --raw Raw tag name. |
| 403 | ** --date-override DATETIME Set date and time deleted. |
| 404 | ** --user-override USER Name USER when deleting the tag. |
| 405 | ** --dryrun|-n Display the control artifact, but do |
| 406 | ** not insert it into the database. |
| 407 | ** |
| 408 | ** > fossil tag find ?OPTIONS? TAGNAME |
| 409 | ** |
| 410 | ** List all objects that use TAGNAME. TYPE can be "ci" for |
| @@ -644,11 +644,11 @@ | |
| 644 | ** reparenting operation, simply delete the tag. |
| 645 | ** |
| 646 | ** --test Make database entries but do not add the tag artifact. |
| 647 | ** So the reparent operation will be undone by the next |
| 648 | ** "fossil rebuild" command. |
| 649 | ** --dryrun | -n Print the tag that would have been created but do not |
| 650 | ** actually change the database in any way. |
| 651 | ** --date-override DATETIME Set the change time on the control artifact |
| 652 | ** --user-override USER Set the user name on the control artifact |
| 653 | */ |
| 654 | void reparent_cmd(void){ |
| 655 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -383,11 +383,11 @@ | |
| 383 | ** Options: |
| 384 | ** --raw Raw tag name. |
| 385 | ** --propagate Propagating tag. |
| 386 | ** --date-override DATETIME Set date and time added. |
| 387 | ** --user-override USER Name USER when adding the tag. |
| 388 | ** -n|--dryrun Display the tag text, but do not |
| 389 | ** actually insert it into the database. |
| 390 | ** |
| 391 | ** The --date-override and --user-override options support |
| 392 | ** importing history from other SCM systems. DATETIME has |
| 393 | ** the form 'YYYY-MMM-DD HH:MM:SS'. |
| @@ -394,17 +394,17 @@ | |
| 394 | ** |
| 395 | ** > fossil tag cancel ?--raw? TAGNAME CHECK-IN |
| 396 | ** |
| 397 | ** Remove the tag TAGNAME from CHECK-IN, and also remove |
| 398 | ** the propagation of the tag to any descendants. Use the |
| 399 | ** the -n|--dryrun option to see what would have happened. |
| 400 | ** |
| 401 | ** Options: |
| 402 | ** --raw Raw tag name. |
| 403 | ** --date-override DATETIME Set date and time deleted. |
| 404 | ** --user-override USER Name USER when deleting the tag. |
| 405 | ** -n|--dryrun Display the control artifact, but do |
| 406 | ** not insert it into the database. |
| 407 | ** |
| 408 | ** > fossil tag find ?OPTIONS? TAGNAME |
| 409 | ** |
| 410 | ** List all objects that use TAGNAME. TYPE can be "ci" for |
| @@ -644,11 +644,11 @@ | |
| 644 | ** reparenting operation, simply delete the tag. |
| 645 | ** |
| 646 | ** --test Make database entries but do not add the tag artifact. |
| 647 | ** So the reparent operation will be undone by the next |
| 648 | ** "fossil rebuild" command. |
| 649 | ** -n|--dryrun Print the tag that would have been created but do not |
| 650 | ** actually change the database in any way. |
| 651 | ** --date-override DATETIME Set the change time on the control artifact |
| 652 | ** --user-override USER Set the user name on the control artifact |
| 653 | */ |
| 654 | void reparent_cmd(void){ |
| 655 |
+1
-1
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -1913,11 +1913,11 @@ | ||
| 1913 | 1913 | ** writes the output to standard output. The directory parts of |
| 1914 | 1914 | ** the output filename are created if needed. |
| 1915 | 1915 | ** If PAGENAME is provided, the named wiki page will be output. |
| 1916 | 1916 | ** |
| 1917 | 1917 | ** Options: |
| 1918 | -** --technote|-t DATETIME|TECHNOTE-ID | |
| 1918 | +** -t|--technote DATETIME|TECHNOTE-ID | |
| 1919 | 1919 | ** Specifies that a technote, rather than a wiki page, |
| 1920 | 1920 | ** will be exported. If DATETIME is used, the most |
| 1921 | 1921 | ** recently modified tech note with that DATETIME will |
| 1922 | 1922 | ** output. |
| 1923 | 1923 | ** -h|--html The body (only) is rendered in HTML form, without |
| 1924 | 1924 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -1913,11 +1913,11 @@ | |
| 1913 | ** writes the output to standard output. The directory parts of |
| 1914 | ** the output filename are created if needed. |
| 1915 | ** If PAGENAME is provided, the named wiki page will be output. |
| 1916 | ** |
| 1917 | ** Options: |
| 1918 | ** --technote|-t DATETIME|TECHNOTE-ID |
| 1919 | ** Specifies that a technote, rather than a wiki page, |
| 1920 | ** will be exported. If DATETIME is used, the most |
| 1921 | ** recently modified tech note with that DATETIME will |
| 1922 | ** output. |
| 1923 | ** -h|--html The body (only) is rendered in HTML form, without |
| 1924 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -1913,11 +1913,11 @@ | |
| 1913 | ** writes the output to standard output. The directory parts of |
| 1914 | ** the output filename are created if needed. |
| 1915 | ** If PAGENAME is provided, the named wiki page will be output. |
| 1916 | ** |
| 1917 | ** Options: |
| 1918 | ** -t|--technote DATETIME|TECHNOTE-ID |
| 1919 | ** Specifies that a technote, rather than a wiki page, |
| 1920 | ** will be exported. If DATETIME is used, the most |
| 1921 | ** recently modified tech note with that DATETIME will |
| 1922 | ** output. |
| 1923 | ** -h|--html The body (only) is rendered in HTML form, without |
| 1924 |