Fossil SCM
Numerous help text consistency tweaks based on forum discussion [forum:8c644048f0].
Commit
4cb50c4ef35d0ab2d1932600b4f4971e740a751995e1a85cfdb281529746142f
Parent
b491c196c23ec4a…
27 files changed
+7
-7
+1
-1
+1
-1
+1
-1
+2
-2
+11
-11
+1
-1
+5
-5
+1
-1
+2
-2
+1
-1
+6
-6
+2
-2
+2
-2
+1
-1
+2
-2
+1
-1
+1
-1
+12
-12
+1
-1
+4
-4
+6
-6
+4
-4
+1
-1
+1
-1
+1
-1
+3
-3
~
src/add.c
~
src/ajax.c
~
src/alerts.c
~
src/backoffice.c
~
src/bundle.c
~
src/checkin.c
~
src/checkout.c
~
src/descendants.c
~
src/dispatch.c
~
src/doc.c
~
src/fileedit.c
~
src/finfo.c
~
src/info.c
~
src/json_branch.c
~
src/lookslike.c
~
src/main.c
~
src/manifest.c
~
src/name.c
~
src/pikchrshow.c
~
src/purge.c
~
src/rebuild.c
~
src/rss.c
~
src/sha1.c
~
src/sha3.c
~
src/tar.c
~
src/undo.c
~
src/wiki.c
+7
-7
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -363,12 +363,12 @@ | ||
| 363 | 363 | ** be treated case sensitive or not. If the option is not given, the default |
| 364 | 364 | ** depends on the global setting, or the operating system default, if not set. |
| 365 | 365 | ** |
| 366 | 366 | ** Options: |
| 367 | 367 | ** |
| 368 | -** --case-sensitive BOOL Override the case-sensitive setting. | |
| 369 | -** --dotfiles include files beginning with a dot (".") | |
| 368 | +** --case-sensitive BOOL Override the case-sensitive setting | |
| 369 | +** --dotfiles Include files beginning with a dot (".") | |
| 370 | 370 | ** -f|--force Add files without prompting |
| 371 | 371 | ** --ignore CSG Ignore unmanaged files matching patterns from |
| 372 | 372 | ** the Comma Separated Glob (CSG) pattern list |
| 373 | 373 | ** --clean CSG Also ignore files matching patterns from |
| 374 | 374 | ** the Comma Separated Glob (CSG) list |
| @@ -377,12 +377,12 @@ | ||
| 377 | 377 | ** files are no longer added. No flags other |
| 378 | 378 | ** than --verbose and --dry-run may be used |
| 379 | 379 | ** with --reset. |
| 380 | 380 | ** |
| 381 | 381 | ** The following options are only valid with --reset: |
| 382 | -** -v|--verbose Outputs information about each --reset file. | |
| 383 | -** -n|--dry-run Display instead of run actions. | |
| 382 | +** -v|--verbose Output information about each --reset file | |
| 383 | +** -n|--dry-run Display instead of run actions | |
| 384 | 384 | ** |
| 385 | 385 | ** See also: [[addremove]], [[rm]] |
| 386 | 386 | */ |
| 387 | 387 | void add_cmd(void){ |
| 388 | 388 | int i; /* Loop counter */ |
| @@ -989,13 +989,13 @@ | ||
| 989 | 989 | ** as well. This does NOT apply to the 'rename' command. |
| 990 | 990 | ** |
| 991 | 991 | ** Options: |
| 992 | 992 | ** --soft Skip moving files within the checkout. |
| 993 | 993 | ** This supersedes the --hard option. |
| 994 | -** --hard Move files within the checkout. | |
| 995 | -** --case-sensitive BOOL Override the case-sensitive setting. | |
| 996 | -** -n|--dry-run If given, display instead of run actions. | |
| 994 | +** --hard Move files within the checkout | |
| 995 | +** --case-sensitive BOOL Override the case-sensitive setting | |
| 996 | +** -n|--dry-run If given, display instead of run actions | |
| 997 | 997 | ** |
| 998 | 998 | ** See also: [[changes]], [[status]] |
| 999 | 999 | */ |
| 1000 | 1000 | void mv_cmd(void){ |
| 1001 | 1001 | int i; |
| 1002 | 1002 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -363,12 +363,12 @@ | |
| 363 | ** be treated case sensitive or not. If the option is not given, the default |
| 364 | ** depends on the global setting, or the operating system default, if not set. |
| 365 | ** |
| 366 | ** Options: |
| 367 | ** |
| 368 | ** --case-sensitive BOOL Override the case-sensitive setting. |
| 369 | ** --dotfiles include files beginning with a dot (".") |
| 370 | ** -f|--force Add files without prompting |
| 371 | ** --ignore CSG Ignore unmanaged files matching patterns from |
| 372 | ** the Comma Separated Glob (CSG) pattern list |
| 373 | ** --clean CSG Also ignore files matching patterns from |
| 374 | ** the Comma Separated Glob (CSG) list |
| @@ -377,12 +377,12 @@ | |
| 377 | ** files are no longer added. No flags other |
| 378 | ** than --verbose and --dry-run may be used |
| 379 | ** with --reset. |
| 380 | ** |
| 381 | ** The following options are only valid with --reset: |
| 382 | ** -v|--verbose Outputs information about each --reset file. |
| 383 | ** -n|--dry-run Display instead of run actions. |
| 384 | ** |
| 385 | ** See also: [[addremove]], [[rm]] |
| 386 | */ |
| 387 | void add_cmd(void){ |
| 388 | int i; /* Loop counter */ |
| @@ -989,13 +989,13 @@ | |
| 989 | ** as well. This does NOT apply to the 'rename' command. |
| 990 | ** |
| 991 | ** Options: |
| 992 | ** --soft Skip moving files within the checkout. |
| 993 | ** This supersedes the --hard option. |
| 994 | ** --hard Move files within the checkout. |
| 995 | ** --case-sensitive BOOL Override the case-sensitive setting. |
| 996 | ** -n|--dry-run If given, display instead of run actions. |
| 997 | ** |
| 998 | ** See also: [[changes]], [[status]] |
| 999 | */ |
| 1000 | void mv_cmd(void){ |
| 1001 | int i; |
| 1002 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -363,12 +363,12 @@ | |
| 363 | ** be treated case sensitive or not. If the option is not given, the default |
| 364 | ** depends on the global setting, or the operating system default, if not set. |
| 365 | ** |
| 366 | ** Options: |
| 367 | ** |
| 368 | ** --case-sensitive BOOL Override the case-sensitive setting |
| 369 | ** --dotfiles Include files beginning with a dot (".") |
| 370 | ** -f|--force Add files without prompting |
| 371 | ** --ignore CSG Ignore unmanaged files matching patterns from |
| 372 | ** the Comma Separated Glob (CSG) pattern list |
| 373 | ** --clean CSG Also ignore files matching patterns from |
| 374 | ** the Comma Separated Glob (CSG) list |
| @@ -377,12 +377,12 @@ | |
| 377 | ** files are no longer added. No flags other |
| 378 | ** than --verbose and --dry-run may be used |
| 379 | ** with --reset. |
| 380 | ** |
| 381 | ** The following options are only valid with --reset: |
| 382 | ** -v|--verbose Output information about each --reset file |
| 383 | ** -n|--dry-run Display instead of run actions |
| 384 | ** |
| 385 | ** See also: [[addremove]], [[rm]] |
| 386 | */ |
| 387 | void add_cmd(void){ |
| 388 | int i; /* Loop counter */ |
| @@ -989,13 +989,13 @@ | |
| 989 | ** as well. This does NOT apply to the 'rename' command. |
| 990 | ** |
| 991 | ** Options: |
| 992 | ** --soft Skip moving files within the checkout. |
| 993 | ** This supersedes the --hard option. |
| 994 | ** --hard Move files within the checkout |
| 995 | ** --case-sensitive BOOL Override the case-sensitive setting |
| 996 | ** -n|--dry-run If given, display instead of run actions |
| 997 | ** |
| 998 | ** See also: [[changes]], [[status]] |
| 999 | */ |
| 1000 | void mv_cmd(void){ |
| 1001 | int i; |
| 1002 |
+1
-1
| --- src/ajax.c | ||
| +++ src/ajax.c | ||
| @@ -66,11 +66,11 @@ | ||
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /* |
| 70 | 70 | ** Returns a value from the ajax_render_modes enum, based on the |
| 71 | -** given mime type string (which may be NULL), defaulting to | |
| 71 | +** given mimetype string (which may be NULL), defaulting to | |
| 72 | 72 | ** AJAX_RENDER_PLAIN_TEXT. |
| 73 | 73 | */ |
| 74 | 74 | int ajax_render_mode_for_mimetype(const char * zMimetype){ |
| 75 | 75 | int rc = AJAX_RENDER_PLAIN_TEXT; |
| 76 | 76 | if( zMimetype ){ |
| 77 | 77 |
| --- src/ajax.c | |
| +++ src/ajax.c | |
| @@ -66,11 +66,11 @@ | |
| 66 | } |
| 67 | } |
| 68 | |
| 69 | /* |
| 70 | ** Returns a value from the ajax_render_modes enum, based on the |
| 71 | ** given mime type string (which may be NULL), defaulting to |
| 72 | ** AJAX_RENDER_PLAIN_TEXT. |
| 73 | */ |
| 74 | int ajax_render_mode_for_mimetype(const char * zMimetype){ |
| 75 | int rc = AJAX_RENDER_PLAIN_TEXT; |
| 76 | if( zMimetype ){ |
| 77 |
| --- src/ajax.c | |
| +++ src/ajax.c | |
| @@ -66,11 +66,11 @@ | |
| 66 | } |
| 67 | } |
| 68 | |
| 69 | /* |
| 70 | ** Returns a value from the ajax_render_modes enum, based on the |
| 71 | ** given mimetype string (which may be NULL), defaulting to |
| 72 | ** AJAX_RENDER_PLAIN_TEXT. |
| 73 | */ |
| 74 | int ajax_render_mode_for_mimetype(const char * zMimetype){ |
| 75 | int rc = AJAX_RENDER_PLAIN_TEXT; |
| 76 | if( zMimetype ){ |
| 77 |
+1
-1
| --- src/alerts.c | ||
| +++ src/alerts.c | ||
| @@ -1020,11 +1020,11 @@ | ||
| 1020 | 1020 | ** configuration. Options: |
| 1021 | 1021 | ** |
| 1022 | 1022 | ** --body FILENAME |
| 1023 | 1023 | ** --smtp-trace |
| 1024 | 1024 | ** --stdout |
| 1025 | -** --subject|-S SUBJECT | |
| 1025 | +** -S|--subject SUBJECT | |
| 1026 | 1026 | ** |
| 1027 | 1027 | ** unsubscribe EMAIL Remove a single subscriber with the given EMAIL. |
| 1028 | 1028 | */ |
| 1029 | 1029 | void alert_cmd(void){ |
| 1030 | 1030 | const char *zCmd; |
| 1031 | 1031 |
| --- src/alerts.c | |
| +++ src/alerts.c | |
| @@ -1020,11 +1020,11 @@ | |
| 1020 | ** configuration. Options: |
| 1021 | ** |
| 1022 | ** --body FILENAME |
| 1023 | ** --smtp-trace |
| 1024 | ** --stdout |
| 1025 | ** --subject|-S SUBJECT |
| 1026 | ** |
| 1027 | ** unsubscribe EMAIL Remove a single subscriber with the given EMAIL. |
| 1028 | */ |
| 1029 | void alert_cmd(void){ |
| 1030 | const char *zCmd; |
| 1031 |
| --- src/alerts.c | |
| +++ src/alerts.c | |
| @@ -1020,11 +1020,11 @@ | |
| 1020 | ** configuration. Options: |
| 1021 | ** |
| 1022 | ** --body FILENAME |
| 1023 | ** --smtp-trace |
| 1024 | ** --stdout |
| 1025 | ** -S|--subject SUBJECT |
| 1026 | ** |
| 1027 | ** unsubscribe EMAIL Remove a single subscriber with the given EMAIL. |
| 1028 | */ |
| 1029 | void alert_cmd(void){ |
| 1030 | const char *zCmd; |
| 1031 |
+1
-1
| --- src/backoffice.c | ||
| +++ src/backoffice.c | ||
| @@ -695,11 +695,11 @@ | ||
| 695 | 695 | ** backoffice has run recently, return immediately. |
| 696 | 696 | ** |
| 697 | 697 | ** --nolease Always run backoffice, even if there is a lease |
| 698 | 698 | ** conflict. This option implies --nodelay. This |
| 699 | 699 | ** option is added to secondary backoffice commands |
| 700 | -** that are invoked by the --poll option. | |
| 700 | +** that are invoked by the --poll option. | |
| 701 | 701 | */ |
| 702 | 702 | void backoffice_command(void){ |
| 703 | 703 | int nPoll; |
| 704 | 704 | int nMin; |
| 705 | 705 | const char *zPoll; |
| 706 | 706 |
| --- src/backoffice.c | |
| +++ src/backoffice.c | |
| @@ -695,11 +695,11 @@ | |
| 695 | ** backoffice has run recently, return immediately. |
| 696 | ** |
| 697 | ** --nolease Always run backoffice, even if there is a lease |
| 698 | ** conflict. This option implies --nodelay. This |
| 699 | ** option is added to secondary backoffice commands |
| 700 | ** that are invoked by the --poll option. |
| 701 | */ |
| 702 | void backoffice_command(void){ |
| 703 | int nPoll; |
| 704 | int nMin; |
| 705 | const char *zPoll; |
| 706 |
| --- src/backoffice.c | |
| +++ src/backoffice.c | |
| @@ -695,11 +695,11 @@ | |
| 695 | ** backoffice has run recently, return immediately. |
| 696 | ** |
| 697 | ** --nolease Always run backoffice, even if there is a lease |
| 698 | ** conflict. This option implies --nodelay. This |
| 699 | ** option is added to secondary backoffice commands |
| 700 | ** that are invoked by the --poll option. |
| 701 | */ |
| 702 | void backoffice_command(void){ |
| 703 | int nPoll; |
| 704 | int nMin; |
| 705 | const char *zPoll; |
| 706 |
+2
-2
| --- src/bundle.c | ||
| +++ src/bundle.c | ||
| @@ -740,12 +740,12 @@ | ||
| 740 | 740 | ** subset of the check-ins in the repository (usually a single branch) |
| 741 | 741 | ** described by the --branch, --from, --to, and/or --checkin options, |
| 742 | 742 | ** at least one of which is required. If BUNDLE already exists, the |
| 743 | 743 | ** specified content is added to the bundle. |
| 744 | 744 | ** |
| 745 | -** --branch BRANCH Package all check-ins on BRANCH. | |
| 746 | -** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2. | |
| 745 | +** --branch BRANCH Package all check-ins on BRANCH | |
| 746 | +** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2 | |
| 747 | 747 | ** --checkin TAG Package the single check-in TAG |
| 748 | 748 | ** --standalone Do no use delta-encoding against |
| 749 | 749 | ** artifacts not in the bundle |
| 750 | 750 | ** |
| 751 | 751 | ** > fossil bundle extend BUNDLE |
| 752 | 752 |
| --- src/bundle.c | |
| +++ src/bundle.c | |
| @@ -740,12 +740,12 @@ | |
| 740 | ** subset of the check-ins in the repository (usually a single branch) |
| 741 | ** described by the --branch, --from, --to, and/or --checkin options, |
| 742 | ** at least one of which is required. If BUNDLE already exists, the |
| 743 | ** specified content is added to the bundle. |
| 744 | ** |
| 745 | ** --branch BRANCH Package all check-ins on BRANCH. |
| 746 | ** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2. |
| 747 | ** --checkin TAG Package the single check-in TAG |
| 748 | ** --standalone Do no use delta-encoding against |
| 749 | ** artifacts not in the bundle |
| 750 | ** |
| 751 | ** > fossil bundle extend BUNDLE |
| 752 |
| --- src/bundle.c | |
| +++ src/bundle.c | |
| @@ -740,12 +740,12 @@ | |
| 740 | ** subset of the check-ins in the repository (usually a single branch) |
| 741 | ** described by the --branch, --from, --to, and/or --checkin options, |
| 742 | ** at least one of which is required. If BUNDLE already exists, the |
| 743 | ** specified content is added to the bundle. |
| 744 | ** |
| 745 | ** --branch BRANCH Package all check-ins on BRANCH |
| 746 | ** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2 |
| 747 | ** --checkin TAG Package the single check-in TAG |
| 748 | ** --standalone Do no use delta-encoding against |
| 749 | ** artifacts not in the bundle |
| 750 | ** |
| 751 | ** > fossil bundle extend BUNDLE |
| 752 |
+11
-11
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -831,17 +831,17 @@ | ||
| 831 | 831 | ** |
| 832 | 832 | ** Pathnames are displayed according to the "relative-paths" setting, |
| 833 | 833 | ** unless overridden by the --abs-paths or --rel-paths options. |
| 834 | 834 | ** |
| 835 | 835 | ** Options: |
| 836 | -** --abs-paths Display absolute pathnames. | |
| 836 | +** --abs-paths Display absolute pathnames | |
| 837 | 837 | ** --case-sensitive BOOL Override case-sensitive setting |
| 838 | 838 | ** --dotfiles Include files beginning with a dot (".") |
| 839 | 839 | ** --header Identify the repository if there are extras |
| 840 | 840 | ** --ignore CSG Ignore files matching patterns from the argument |
| 841 | 841 | ** --rel-paths Display pathnames relative to the current working |
| 842 | -** directory. | |
| 842 | +** directory | |
| 843 | 843 | ** |
| 844 | 844 | ** See also: [[changes]], [[clean]], [[status]] |
| 845 | 845 | */ |
| 846 | 846 | void extras_cmd(void){ |
| 847 | 847 | Blob report = BLOB_INITIALIZER; |
| @@ -928,19 +928,19 @@ | ||
| 928 | 928 | ** be removed. Using this option will automatically |
| 929 | 929 | ** enable the --emptydirs option as well. |
| 930 | 930 | ** --disable-undo WARNING: This option disables use of the undo |
| 931 | 931 | ** mechanism for this clean operation and should be |
| 932 | 932 | ** used with extreme caution. |
| 933 | -** --dotfiles Include files beginning with a dot ("."). | |
| 933 | +** --dotfiles Include files beginning with a dot (".") | |
| 934 | 934 | ** --emptydirs Remove any empty directories that are not |
| 935 | 935 | ** explicitly exempted via the empty-dirs setting |
| 936 | 936 | ** or another applicable setting or command line |
| 937 | 937 | ** argument. Matching files, if any, are removed |
| 938 | 938 | ** prior to checking for any empty directories; |
| 939 | 939 | ** therefore, directories that contain only files |
| 940 | 940 | ** that were removed will be removed as well. |
| 941 | -** -f|--force Remove files without prompting. | |
| 941 | +** -f|--force Remove files without prompting | |
| 942 | 942 | ** -i|--prompt Prompt before removing each file. This option |
| 943 | 943 | ** implies the --disable-undo option. |
| 944 | 944 | ** -x|--verily WARNING: Removes everything that is not a managed |
| 945 | 945 | ** file or the repository itself. This option |
| 946 | 946 | ** implies the --force, --emptydirs, --dotfiles, and |
| @@ -951,19 +951,19 @@ | ||
| 951 | 951 | ** --clean CSG WARNING: Never prompt to delete any files matching |
| 952 | 952 | ** this comma separated list of glob patterns. Also, |
| 953 | 953 | ** deletions of any files matching this pattern list |
| 954 | 954 | ** cannot be undone. |
| 955 | 955 | ** --ignore CSG Ignore files matching patterns from the |
| 956 | -** comma separated list of glob patterns. | |
| 956 | +** comma separated list of glob patterns | |
| 957 | 957 | ** --keep <CSG> Keep files matching this comma separated |
| 958 | -** list of glob patterns. | |
| 958 | +** list of glob patterns | |
| 959 | 959 | ** -n|--dry-run Delete nothing, but display what would have been |
| 960 | -** deleted. | |
| 961 | -** --no-prompt This option disables prompting the user for input | |
| 962 | -** and assumes an answer of 'No' for every question. | |
| 963 | -** --temp Remove only Fossil-generated temporary files. | |
| 964 | -** -v|--verbose Show all files as they are removed. | |
| 960 | +** deleted | |
| 961 | +** --no-prompt Do not prompt the user for input and assume an | |
| 962 | +** answer of 'No' for every question | |
| 963 | +** --temp Remove only Fossil-generated temporary files | |
| 964 | +** -v|--verbose Show all files as they are removed | |
| 965 | 965 | ** |
| 966 | 966 | ** See also: [[addremove]], [[extras]], [[status]] |
| 967 | 967 | */ |
| 968 | 968 | void clean_cmd(void){ |
| 969 | 969 | int allFileFlag, allDirFlag, dryRunFlag, verboseFlag; |
| 970 | 970 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -831,17 +831,17 @@ | |
| 831 | ** |
| 832 | ** Pathnames are displayed according to the "relative-paths" setting, |
| 833 | ** unless overridden by the --abs-paths or --rel-paths options. |
| 834 | ** |
| 835 | ** Options: |
| 836 | ** --abs-paths Display absolute pathnames. |
| 837 | ** --case-sensitive BOOL Override case-sensitive setting |
| 838 | ** --dotfiles Include files beginning with a dot (".") |
| 839 | ** --header Identify the repository if there are extras |
| 840 | ** --ignore CSG Ignore files matching patterns from the argument |
| 841 | ** --rel-paths Display pathnames relative to the current working |
| 842 | ** directory. |
| 843 | ** |
| 844 | ** See also: [[changes]], [[clean]], [[status]] |
| 845 | */ |
| 846 | void extras_cmd(void){ |
| 847 | Blob report = BLOB_INITIALIZER; |
| @@ -928,19 +928,19 @@ | |
| 928 | ** be removed. Using this option will automatically |
| 929 | ** enable the --emptydirs option as well. |
| 930 | ** --disable-undo WARNING: This option disables use of the undo |
| 931 | ** mechanism for this clean operation and should be |
| 932 | ** used with extreme caution. |
| 933 | ** --dotfiles Include files beginning with a dot ("."). |
| 934 | ** --emptydirs Remove any empty directories that are not |
| 935 | ** explicitly exempted via the empty-dirs setting |
| 936 | ** or another applicable setting or command line |
| 937 | ** argument. Matching files, if any, are removed |
| 938 | ** prior to checking for any empty directories; |
| 939 | ** therefore, directories that contain only files |
| 940 | ** that were removed will be removed as well. |
| 941 | ** -f|--force Remove files without prompting. |
| 942 | ** -i|--prompt Prompt before removing each file. This option |
| 943 | ** implies the --disable-undo option. |
| 944 | ** -x|--verily WARNING: Removes everything that is not a managed |
| 945 | ** file or the repository itself. This option |
| 946 | ** implies the --force, --emptydirs, --dotfiles, and |
| @@ -951,19 +951,19 @@ | |
| 951 | ** --clean CSG WARNING: Never prompt to delete any files matching |
| 952 | ** this comma separated list of glob patterns. Also, |
| 953 | ** deletions of any files matching this pattern list |
| 954 | ** cannot be undone. |
| 955 | ** --ignore CSG Ignore files matching patterns from the |
| 956 | ** comma separated list of glob patterns. |
| 957 | ** --keep <CSG> Keep files matching this comma separated |
| 958 | ** list of glob patterns. |
| 959 | ** -n|--dry-run Delete nothing, but display what would have been |
| 960 | ** deleted. |
| 961 | ** --no-prompt This option disables prompting the user for input |
| 962 | ** and assumes an answer of 'No' for every question. |
| 963 | ** --temp Remove only Fossil-generated temporary files. |
| 964 | ** -v|--verbose Show all files as they are removed. |
| 965 | ** |
| 966 | ** See also: [[addremove]], [[extras]], [[status]] |
| 967 | */ |
| 968 | void clean_cmd(void){ |
| 969 | int allFileFlag, allDirFlag, dryRunFlag, verboseFlag; |
| 970 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -831,17 +831,17 @@ | |
| 831 | ** |
| 832 | ** Pathnames are displayed according to the "relative-paths" setting, |
| 833 | ** unless overridden by the --abs-paths or --rel-paths options. |
| 834 | ** |
| 835 | ** Options: |
| 836 | ** --abs-paths Display absolute pathnames |
| 837 | ** --case-sensitive BOOL Override case-sensitive setting |
| 838 | ** --dotfiles Include files beginning with a dot (".") |
| 839 | ** --header Identify the repository if there are extras |
| 840 | ** --ignore CSG Ignore files matching patterns from the argument |
| 841 | ** --rel-paths Display pathnames relative to the current working |
| 842 | ** directory |
| 843 | ** |
| 844 | ** See also: [[changes]], [[clean]], [[status]] |
| 845 | */ |
| 846 | void extras_cmd(void){ |
| 847 | Blob report = BLOB_INITIALIZER; |
| @@ -928,19 +928,19 @@ | |
| 928 | ** be removed. Using this option will automatically |
| 929 | ** enable the --emptydirs option as well. |
| 930 | ** --disable-undo WARNING: This option disables use of the undo |
| 931 | ** mechanism for this clean operation and should be |
| 932 | ** used with extreme caution. |
| 933 | ** --dotfiles Include files beginning with a dot (".") |
| 934 | ** --emptydirs Remove any empty directories that are not |
| 935 | ** explicitly exempted via the empty-dirs setting |
| 936 | ** or another applicable setting or command line |
| 937 | ** argument. Matching files, if any, are removed |
| 938 | ** prior to checking for any empty directories; |
| 939 | ** therefore, directories that contain only files |
| 940 | ** that were removed will be removed as well. |
| 941 | ** -f|--force Remove files without prompting |
| 942 | ** -i|--prompt Prompt before removing each file. This option |
| 943 | ** implies the --disable-undo option. |
| 944 | ** -x|--verily WARNING: Removes everything that is not a managed |
| 945 | ** file or the repository itself. This option |
| 946 | ** implies the --force, --emptydirs, --dotfiles, and |
| @@ -951,19 +951,19 @@ | |
| 951 | ** --clean CSG WARNING: Never prompt to delete any files matching |
| 952 | ** this comma separated list of glob patterns. Also, |
| 953 | ** deletions of any files matching this pattern list |
| 954 | ** cannot be undone. |
| 955 | ** --ignore CSG Ignore files matching patterns from the |
| 956 | ** comma separated list of glob patterns |
| 957 | ** --keep <CSG> Keep files matching this comma separated |
| 958 | ** list of glob patterns |
| 959 | ** -n|--dry-run Delete nothing, but display what would have been |
| 960 | ** deleted |
| 961 | ** --no-prompt Do not prompt the user for input and assume an |
| 962 | ** answer of 'No' for every question |
| 963 | ** --temp Remove only Fossil-generated temporary files |
| 964 | ** -v|--verbose Show all files as they are removed |
| 965 | ** |
| 966 | ** See also: [[addremove]], [[extras]], [[status]] |
| 967 | */ |
| 968 | void clean_cmd(void){ |
| 969 | int allFileFlag, allDirFlag, dryRunFlag, verboseFlag; |
| 970 |
+1
-1
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -282,11 +282,11 @@ | ||
| 282 | 282 | ** --force Ignore edited files in the current checkout |
| 283 | 283 | ** --keep Only update the manifest and manifest.uuid files |
| 284 | 284 | ** --force-missing Force checkout even if content is missing |
| 285 | 285 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 286 | 286 | ** times (the timestamp of the last checkin which modified |
| 287 | -** them). | |
| 287 | +** them) | |
| 288 | 288 | ** |
| 289 | 289 | ** See also: [[update]] |
| 290 | 290 | */ |
| 291 | 291 | void checkout_cmd(void){ |
| 292 | 292 | int forceFlag; /* Force checkout even if edits exist */ |
| 293 | 293 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -282,11 +282,11 @@ | |
| 282 | ** --force Ignore edited files in the current checkout |
| 283 | ** --keep Only update the manifest and manifest.uuid files |
| 284 | ** --force-missing Force checkout even if content is missing |
| 285 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 286 | ** times (the timestamp of the last checkin which modified |
| 287 | ** them). |
| 288 | ** |
| 289 | ** See also: [[update]] |
| 290 | */ |
| 291 | void checkout_cmd(void){ |
| 292 | int forceFlag; /* Force checkout even if edits exist */ |
| 293 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -282,11 +282,11 @@ | |
| 282 | ** --force Ignore edited files in the current checkout |
| 283 | ** --keep Only update the manifest and manifest.uuid files |
| 284 | ** --force-missing Force checkout even if content is missing |
| 285 | ** --setmtime Set timestamps of all files to match their SCM-side |
| 286 | ** times (the timestamp of the last checkin which modified |
| 287 | ** them) |
| 288 | ** |
| 289 | ** See also: [[update]] |
| 290 | */ |
| 291 | void checkout_cmd(void){ |
| 292 | int forceFlag; /* Force checkout even if edits exist */ |
| 293 |
+5
-5
| --- src/descendants.c | ||
| +++ src/descendants.c | ||
| @@ -399,15 +399,15 @@ | ||
| 399 | 399 | ** |
| 400 | 400 | ** The --recompute flag causes the content of the "leaf" table in the |
| 401 | 401 | ** repository database to be recomputed. |
| 402 | 402 | ** |
| 403 | 403 | ** Options: |
| 404 | -** -a|--all show ALL leaves | |
| 405 | -** --bybranch order output by branch name | |
| 406 | -** -c|--closed show only closed leaves | |
| 407 | -** -m|--multiple show only cases with multiple leaves on a single branch | |
| 408 | -** --recompute recompute the "leaf" table in the repository DB | |
| 404 | +** -a|--all Show ALL leaves | |
| 405 | +** --bybranch Order output by branch name | |
| 406 | +** -c|--closed Show only closed leaves | |
| 407 | +** -m|--multiple Show only cases with multiple leaves on a single branch | |
| 408 | +** --recompute Recompute the "leaf" table in the repository DB | |
| 409 | 409 | ** -W|--width N Width of lines (default is to auto-detect). Must be |
| 410 | 410 | ** more than 39 or else 0 no limit, resulting in a single |
| 411 | 411 | ** line per entry. |
| 412 | 412 | ** |
| 413 | 413 | ** See also: [[descendants]], [[finfo]], [[info]], [[branch]] |
| 414 | 414 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -399,15 +399,15 @@ | |
| 399 | ** |
| 400 | ** The --recompute flag causes the content of the "leaf" table in the |
| 401 | ** repository database to be recomputed. |
| 402 | ** |
| 403 | ** Options: |
| 404 | ** -a|--all show ALL leaves |
| 405 | ** --bybranch order output by branch name |
| 406 | ** -c|--closed show only closed leaves |
| 407 | ** -m|--multiple show only cases with multiple leaves on a single branch |
| 408 | ** --recompute recompute the "leaf" table in the repository DB |
| 409 | ** -W|--width N Width of lines (default is to auto-detect). Must be |
| 410 | ** more than 39 or else 0 no limit, resulting in a single |
| 411 | ** line per entry. |
| 412 | ** |
| 413 | ** See also: [[descendants]], [[finfo]], [[info]], [[branch]] |
| 414 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -399,15 +399,15 @@ | |
| 399 | ** |
| 400 | ** The --recompute flag causes the content of the "leaf" table in the |
| 401 | ** repository database to be recomputed. |
| 402 | ** |
| 403 | ** Options: |
| 404 | ** -a|--all Show ALL leaves |
| 405 | ** --bybranch Order output by branch name |
| 406 | ** -c|--closed Show only closed leaves |
| 407 | ** -m|--multiple Show only cases with multiple leaves on a single branch |
| 408 | ** --recompute Recompute the "leaf" table in the repository DB |
| 409 | ** -W|--width N Width of lines (default is to auto-detect). Must be |
| 410 | ** more than 39 or else 0 no limit, resulting in a single |
| 411 | ** line per entry. |
| 412 | ** |
| 413 | ** See also: [[descendants]], [[finfo]], [[info]], [[branch]] |
| 414 |
+1
-1
| --- src/dispatch.c | ||
| +++ src/dispatch.c | ||
| @@ -1010,11 +1010,11 @@ | ||
| 1010 | 1010 | @ --sqlstats Show SQL usage statistics when done |
| 1011 | 1011 | @ --sqltrace Trace all SQL commands |
| 1012 | 1012 | @ --sshtrace Trace SSH activity |
| 1013 | 1013 | @ --ssl-identity NAME Set the SSL identity to NAME |
| 1014 | 1014 | @ --systemtrace Trace calls to system() |
| 1015 | -@ --user|-U USER Make the default user be USER | |
| 1015 | +@ -U|--user USER Make the default user be USER | |
| 1016 | 1016 | @ --utc Display times using UTC |
| 1017 | 1017 | @ --vfs NAME Cause SQLite to use the NAME VFS |
| 1018 | 1018 | ; |
| 1019 | 1019 | |
| 1020 | 1020 | /* |
| 1021 | 1021 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -1010,11 +1010,11 @@ | |
| 1010 | @ --sqlstats Show SQL usage statistics when done |
| 1011 | @ --sqltrace Trace all SQL commands |
| 1012 | @ --sshtrace Trace SSH activity |
| 1013 | @ --ssl-identity NAME Set the SSL identity to NAME |
| 1014 | @ --systemtrace Trace calls to system() |
| 1015 | @ --user|-U USER Make the default user be USER |
| 1016 | @ --utc Display times using UTC |
| 1017 | @ --vfs NAME Cause SQLite to use the NAME VFS |
| 1018 | ; |
| 1019 | |
| 1020 | /* |
| 1021 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -1010,11 +1010,11 @@ | |
| 1010 | @ --sqlstats Show SQL usage statistics when done |
| 1011 | @ --sqltrace Trace all SQL commands |
| 1012 | @ --sshtrace Trace SSH activity |
| 1013 | @ --ssl-identity NAME Set the SSL identity to NAME |
| 1014 | @ --systemtrace Trace calls to system() |
| 1015 | @ -U|--user USER Make the default user be USER |
| 1016 | @ --utc Display times using UTC |
| 1017 | @ --vfs NAME Cause SQLite to use the NAME VFS |
| 1018 | ; |
| 1019 | |
| 1020 | /* |
| 1021 |
+2
-2
| --- src/doc.c | ||
| +++ src/doc.c | ||
| @@ -73,11 +73,11 @@ | ||
| 73 | 73 | return "unknown/unknown"; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /* A table of mimetypes based on file suffixes. |
| 77 | 77 | ** Suffixes must be in sorted order so that we can do a binary |
| 78 | -** search to find the mime-type | |
| 78 | +** search to find the mimetype. | |
| 79 | 79 | */ |
| 80 | 80 | static const struct { |
| 81 | 81 | const char *zSuffix; /* The file suffix */ |
| 82 | 82 | int size; /* Length of the suffix */ |
| 83 | 83 | const char *zMimetype; /* The corresponding mimetype */ |
| @@ -427,11 +427,11 @@ | ||
| 427 | 427 | style_script_end(); |
| 428 | 428 | } |
| 429 | 429 | } |
| 430 | 430 | |
| 431 | 431 | /* |
| 432 | -** Guess the mime-type of a document based on its name. | |
| 432 | +** Guess the mimetype of a document based on its name. | |
| 433 | 433 | */ |
| 434 | 434 | const char *mimetype_from_name(const char *zName){ |
| 435 | 435 | const char *z; |
| 436 | 436 | int i; |
| 437 | 437 | int first, last; |
| 438 | 438 |
| --- src/doc.c | |
| +++ src/doc.c | |
| @@ -73,11 +73,11 @@ | |
| 73 | return "unknown/unknown"; |
| 74 | } |
| 75 | |
| 76 | /* A table of mimetypes based on file suffixes. |
| 77 | ** Suffixes must be in sorted order so that we can do a binary |
| 78 | ** search to find the mime-type |
| 79 | */ |
| 80 | static const struct { |
| 81 | const char *zSuffix; /* The file suffix */ |
| 82 | int size; /* Length of the suffix */ |
| 83 | const char *zMimetype; /* The corresponding mimetype */ |
| @@ -427,11 +427,11 @@ | |
| 427 | style_script_end(); |
| 428 | } |
| 429 | } |
| 430 | |
| 431 | /* |
| 432 | ** Guess the mime-type of a document based on its name. |
| 433 | */ |
| 434 | const char *mimetype_from_name(const char *zName){ |
| 435 | const char *z; |
| 436 | int i; |
| 437 | int first, last; |
| 438 |
| --- src/doc.c | |
| +++ src/doc.c | |
| @@ -73,11 +73,11 @@ | |
| 73 | return "unknown/unknown"; |
| 74 | } |
| 75 | |
| 76 | /* A table of mimetypes based on file suffixes. |
| 77 | ** Suffixes must be in sorted order so that we can do a binary |
| 78 | ** search to find the mimetype. |
| 79 | */ |
| 80 | static const struct { |
| 81 | const char *zSuffix; /* The file suffix */ |
| 82 | int size; /* Length of the suffix */ |
| 83 | const char *zMimetype; /* The corresponding mimetype */ |
| @@ -427,11 +427,11 @@ | |
| 427 | style_script_end(); |
| 428 | } |
| 429 | } |
| 430 | |
| 431 | /* |
| 432 | ** Guess the mimetype of a document based on its name. |
| 433 | */ |
| 434 | const char *mimetype_from_name(const char *zName){ |
| 435 | const char *z; |
| 436 | int i; |
| 437 | int first, last; |
| 438 |
+1
-1
| --- src/fileedit.c | ||
| +++ src/fileedit.c | ||
| @@ -753,11 +753,11 @@ | ||
| 753 | 753 | int newRid = 0; /* RID of new version */ |
| 754 | 754 | const char * zFilename; /* argv[2] */ |
| 755 | 755 | const char * zComment; /* -m comment */ |
| 756 | 756 | const char * zCommentFile; /* -M FILE */ |
| 757 | 757 | const char * zAsFilename; /* --as filename */ |
| 758 | - const char * zRevision; /* --revision|-r [=trunk|checkout] */ | |
| 758 | + const char * zRevision; /* -r|--revision [=trunk|checkout] */ | |
| 759 | 759 | const char * zUser; /* --user-override */ |
| 760 | 760 | const char * zDate; /* --date-override */ |
| 761 | 761 | char const * zManifestFile = 0;/* --save-manifest FILE */ |
| 762 | 762 | |
| 763 | 763 | /* This function should perform only the minimal "business logic" it |
| 764 | 764 |
| --- src/fileedit.c | |
| +++ src/fileedit.c | |
| @@ -753,11 +753,11 @@ | |
| 753 | int newRid = 0; /* RID of new version */ |
| 754 | const char * zFilename; /* argv[2] */ |
| 755 | const char * zComment; /* -m comment */ |
| 756 | const char * zCommentFile; /* -M FILE */ |
| 757 | const char * zAsFilename; /* --as filename */ |
| 758 | const char * zRevision; /* --revision|-r [=trunk|checkout] */ |
| 759 | const char * zUser; /* --user-override */ |
| 760 | const char * zDate; /* --date-override */ |
| 761 | char const * zManifestFile = 0;/* --save-manifest FILE */ |
| 762 | |
| 763 | /* This function should perform only the minimal "business logic" it |
| 764 |
| --- src/fileedit.c | |
| +++ src/fileedit.c | |
| @@ -753,11 +753,11 @@ | |
| 753 | int newRid = 0; /* RID of new version */ |
| 754 | const char * zFilename; /* argv[2] */ |
| 755 | const char * zComment; /* -m comment */ |
| 756 | const char * zCommentFile; /* -M FILE */ |
| 757 | const char * zAsFilename; /* --as filename */ |
| 758 | const char * zRevision; /* -r|--revision [=trunk|checkout] */ |
| 759 | const char * zUser; /* --user-override */ |
| 760 | const char * zDate; /* --date-override */ |
| 761 | char const * zManifestFile = 0;/* --save-manifest FILE */ |
| 762 | |
| 763 | /* This function should perform only the minimal "business logic" it |
| 764 |
+6
-6
| --- src/finfo.c | ||
| +++ src/finfo.c | ||
| @@ -39,21 +39,21 @@ | ||
| 39 | 39 | ** In the -p mode, there's an optional flag "-r|--revision REVISION". |
| 40 | 40 | ** The specified version (or the latest checked out version) is printed |
| 41 | 41 | ** to stdout. The -p mode is another form of the "cat" command. |
| 42 | 42 | ** |
| 43 | 43 | ** Options: |
| 44 | -** -b|--brief display a brief (one line / revision) summary | |
| 44 | +** -b|--brief Display a brief (one line / revision) summary | |
| 45 | 45 | ** --case-sensitive B Enable or disable case-sensitive filenames. B is a |
| 46 | 46 | ** boolean: "yes", "no", "true", "false", etc. |
| 47 | -** -l|--log select log mode (the default) | |
| 47 | +** -l|--log Select log mode (the default) | |
| 48 | 48 | ** -n|--limit N Display the first N changes (default unlimited). |
| 49 | 49 | ** N less than 0 means no limit. |
| 50 | -** --offset P skip P changes | |
| 51 | -** -p|--print select print mode | |
| 52 | -** -r|--revision R print the given revision (or ckout, if none is given) | |
| 50 | +** --offset P Skip P changes | |
| 51 | +** -p|--print Select print mode | |
| 52 | +** -r|--revision R Print the given revision (or ckout, if none is given) | |
| 53 | 53 | ** to stdout (only in print mode) |
| 54 | -** -s|--status select status mode (print a status indicator for FILE) | |
| 54 | +** -s|--status Select status mode (print a status indicator for FILE) | |
| 55 | 55 | ** -W|--width N Width of lines (default is to auto-detect). Must be |
| 56 | 56 | ** more than 22 or else 0 to indicate no limit. |
| 57 | 57 | ** |
| 58 | 58 | ** See also: [[artifact]], [[cat]], [[descendants]], [[info]], [[leaves]] |
| 59 | 59 | */ |
| 60 | 60 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -39,21 +39,21 @@ | |
| 39 | ** In the -p mode, there's an optional flag "-r|--revision REVISION". |
| 40 | ** The specified version (or the latest checked out version) is printed |
| 41 | ** to stdout. The -p mode is another form of the "cat" command. |
| 42 | ** |
| 43 | ** Options: |
| 44 | ** -b|--brief display a brief (one line / revision) summary |
| 45 | ** --case-sensitive B Enable or disable case-sensitive filenames. B is a |
| 46 | ** boolean: "yes", "no", "true", "false", etc. |
| 47 | ** -l|--log select log mode (the default) |
| 48 | ** -n|--limit N Display the first N changes (default unlimited). |
| 49 | ** N less than 0 means no limit. |
| 50 | ** --offset P skip P changes |
| 51 | ** -p|--print select print mode |
| 52 | ** -r|--revision R print the given revision (or ckout, if none is given) |
| 53 | ** to stdout (only in print mode) |
| 54 | ** -s|--status select status mode (print a status indicator for FILE) |
| 55 | ** -W|--width N Width of lines (default is to auto-detect). Must be |
| 56 | ** more than 22 or else 0 to indicate no limit. |
| 57 | ** |
| 58 | ** See also: [[artifact]], [[cat]], [[descendants]], [[info]], [[leaves]] |
| 59 | */ |
| 60 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -39,21 +39,21 @@ | |
| 39 | ** In the -p mode, there's an optional flag "-r|--revision REVISION". |
| 40 | ** The specified version (or the latest checked out version) is printed |
| 41 | ** to stdout. The -p mode is another form of the "cat" command. |
| 42 | ** |
| 43 | ** Options: |
| 44 | ** -b|--brief Display a brief (one line / revision) summary |
| 45 | ** --case-sensitive B Enable or disable case-sensitive filenames. B is a |
| 46 | ** boolean: "yes", "no", "true", "false", etc. |
| 47 | ** -l|--log Select log mode (the default) |
| 48 | ** -n|--limit N Display the first N changes (default unlimited). |
| 49 | ** N less than 0 means no limit. |
| 50 | ** --offset P Skip P changes |
| 51 | ** -p|--print Select print mode |
| 52 | ** -r|--revision R Print the given revision (or ckout, if none is given) |
| 53 | ** to stdout (only in print mode) |
| 54 | ** -s|--status Select status mode (print a status indicator for FILE) |
| 55 | ** -W|--width N Width of lines (default is to auto-detect). Must be |
| 56 | ** more than 22 or else 0 to indicate no limit. |
| 57 | ** |
| 58 | ** See also: [[artifact]], [[cat]], [[descendants]], [[info]], [[leaves]] |
| 59 | */ |
| 60 |
+2
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1867,12 +1867,12 @@ | ||
| 1867 | 1867 | } |
| 1868 | 1868 | |
| 1869 | 1869 | |
| 1870 | 1870 | /* |
| 1871 | 1871 | ** Generate a verbatim artifact as the result of an HTTP request. |
| 1872 | -** If zMime is not NULL, use it as the MIME-type. If zMime is | |
| 1873 | -** NULL, guess at the MIME-type based on the filename | |
| 1872 | +** If zMime is not NULL, use it as the mimetype. If zMime is | |
| 1873 | +** NULL, guess at the mimetype based on the filename | |
| 1874 | 1874 | ** associated with the artifact. |
| 1875 | 1875 | */ |
| 1876 | 1876 | void deliver_artifact(int rid, const char *zMime){ |
| 1877 | 1877 | Blob content; |
| 1878 | 1878 | const char *zAttachName = P("at"); |
| 1879 | 1879 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1867,12 +1867,12 @@ | |
| 1867 | } |
| 1868 | |
| 1869 | |
| 1870 | /* |
| 1871 | ** Generate a verbatim artifact as the result of an HTTP request. |
| 1872 | ** If zMime is not NULL, use it as the MIME-type. If zMime is |
| 1873 | ** NULL, guess at the MIME-type based on the filename |
| 1874 | ** associated with the artifact. |
| 1875 | */ |
| 1876 | void deliver_artifact(int rid, const char *zMime){ |
| 1877 | Blob content; |
| 1878 | const char *zAttachName = P("at"); |
| 1879 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1867,12 +1867,12 @@ | |
| 1867 | } |
| 1868 | |
| 1869 | |
| 1870 | /* |
| 1871 | ** Generate a verbatim artifact as the result of an HTTP request. |
| 1872 | ** If zMime is not NULL, use it as the mimetype. If zMime is |
| 1873 | ** NULL, guess at the mimetype based on the filename |
| 1874 | ** associated with the artifact. |
| 1875 | */ |
| 1876 | void deliver_artifact(int rid, const char *zMime){ |
| 1877 | Blob content; |
| 1878 | const char *zAttachName = P("at"); |
| 1879 |
+2
-2
| --- src/json_branch.c | ||
| +++ src/json_branch.c | ||
| @@ -50,12 +50,12 @@ | ||
| 50 | 50 | ** Impl for /json/branch/list |
| 51 | 51 | ** |
| 52 | 52 | ** |
| 53 | 53 | ** CLI mode options: |
| 54 | 54 | ** |
| 55 | -** --range X | -r X, where X is one of (open,closed,all) | |
| 56 | -** (only the first letter is significant, default=open). | |
| 55 | +** -r|--range X, where X is one of (open,closed,all) | |
| 56 | +** (only the first letter is significant, default=open) | |
| 57 | 57 | ** -a (same as --range a) |
| 58 | 58 | ** -c (same as --range c) |
| 59 | 59 | ** |
| 60 | 60 | ** HTTP mode options: |
| 61 | 61 | ** |
| 62 | 62 |
| --- src/json_branch.c | |
| +++ src/json_branch.c | |
| @@ -50,12 +50,12 @@ | |
| 50 | ** Impl for /json/branch/list |
| 51 | ** |
| 52 | ** |
| 53 | ** CLI mode options: |
| 54 | ** |
| 55 | ** --range X | -r X, where X is one of (open,closed,all) |
| 56 | ** (only the first letter is significant, default=open). |
| 57 | ** -a (same as --range a) |
| 58 | ** -c (same as --range c) |
| 59 | ** |
| 60 | ** HTTP mode options: |
| 61 | ** |
| 62 |
| --- src/json_branch.c | |
| +++ src/json_branch.c | |
| @@ -50,12 +50,12 @@ | |
| 50 | ** Impl for /json/branch/list |
| 51 | ** |
| 52 | ** |
| 53 | ** CLI mode options: |
| 54 | ** |
| 55 | ** -r|--range X, where X is one of (open,closed,all) |
| 56 | ** (only the first letter is significant, default=open) |
| 57 | ** -a (same as --range a) |
| 58 | ** -c (same as --range c) |
| 59 | ** |
| 60 | ** HTTP mode options: |
| 61 | ** |
| 62 |
+1
-1
| --- src/lookslike.c | ||
| +++ src/lookslike.c | ||
| @@ -401,11 +401,11 @@ | ||
| 401 | 401 | ** |
| 402 | 402 | ** Usage: %fossil test-looks-like-utf FILENAME |
| 403 | 403 | ** |
| 404 | 404 | ** Options: |
| 405 | 405 | ** -n|--limit N Repeat looks-like function N times, for |
| 406 | -** performance measurement. Default = 1; | |
| 406 | +** performance measurement. Default = 1 | |
| 407 | 407 | ** --utf8 Ignoring BOM and file size, force UTF-8 checking |
| 408 | 408 | ** --utf16 Ignoring BOM and file size, force UTF-16 checking |
| 409 | 409 | ** |
| 410 | 410 | ** FILENAME is the name of a file to check for textual content in the UTF-8 |
| 411 | 411 | ** and/or UTF-16 encodings. |
| 412 | 412 |
| --- src/lookslike.c | |
| +++ src/lookslike.c | |
| @@ -401,11 +401,11 @@ | |
| 401 | ** |
| 402 | ** Usage: %fossil test-looks-like-utf FILENAME |
| 403 | ** |
| 404 | ** Options: |
| 405 | ** -n|--limit N Repeat looks-like function N times, for |
| 406 | ** performance measurement. Default = 1; |
| 407 | ** --utf8 Ignoring BOM and file size, force UTF-8 checking |
| 408 | ** --utf16 Ignoring BOM and file size, force UTF-16 checking |
| 409 | ** |
| 410 | ** FILENAME is the name of a file to check for textual content in the UTF-8 |
| 411 | ** and/or UTF-16 encodings. |
| 412 |
| --- src/lookslike.c | |
| +++ src/lookslike.c | |
| @@ -401,11 +401,11 @@ | |
| 401 | ** |
| 402 | ** Usage: %fossil test-looks-like-utf FILENAME |
| 403 | ** |
| 404 | ** Options: |
| 405 | ** -n|--limit N Repeat looks-like function N times, for |
| 406 | ** performance measurement. Default = 1 |
| 407 | ** --utf8 Ignoring BOM and file size, force UTF-8 checking |
| 408 | ** --utf16 Ignoring BOM and file size, force UTF-16 checking |
| 409 | ** |
| 410 | ** FILENAME is the name of a file to check for textual content in the UTF-8 |
| 411 | ** and/or UTF-16 encodings. |
| 412 |
+2
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2715,12 +2715,12 @@ | ||
| 2715 | 2715 | ** COMMAND: test-http |
| 2716 | 2716 | ** |
| 2717 | 2717 | ** Works like the [[http]] command but gives setup permission to all users. |
| 2718 | 2718 | ** |
| 2719 | 2719 | ** Options: |
| 2720 | -** --th-trace trace TH1 execution (for debugging purposes) | |
| 2721 | -** --usercap CAP user capability string. (Default: "sx") | |
| 2720 | +** --th-trace Trace TH1 execution (for debugging purposes) | |
| 2721 | +** --usercap CAP User capability string (Default: "sx") | |
| 2722 | 2722 | ** |
| 2723 | 2723 | */ |
| 2724 | 2724 | void cmd_test_http(void){ |
| 2725 | 2725 | const char *zIpAddr; /* IP address of remote client */ |
| 2726 | 2726 | const char *zUserCap; |
| 2727 | 2727 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2715,12 +2715,12 @@ | |
| 2715 | ** COMMAND: test-http |
| 2716 | ** |
| 2717 | ** Works like the [[http]] command but gives setup permission to all users. |
| 2718 | ** |
| 2719 | ** Options: |
| 2720 | ** --th-trace trace TH1 execution (for debugging purposes) |
| 2721 | ** --usercap CAP user capability string. (Default: "sx") |
| 2722 | ** |
| 2723 | */ |
| 2724 | void cmd_test_http(void){ |
| 2725 | const char *zIpAddr; /* IP address of remote client */ |
| 2726 | const char *zUserCap; |
| 2727 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2715,12 +2715,12 @@ | |
| 2715 | ** COMMAND: test-http |
| 2716 | ** |
| 2717 | ** Works like the [[http]] command but gives setup permission to all users. |
| 2718 | ** |
| 2719 | ** Options: |
| 2720 | ** --th-trace Trace TH1 execution (for debugging purposes) |
| 2721 | ** --usercap CAP User capability string (Default: "sx") |
| 2722 | ** |
| 2723 | */ |
| 2724 | void cmd_test_http(void){ |
| 2725 | const char *zIpAddr; /* IP address of remote client */ |
| 2726 | const char *zUserCap; |
| 2727 |
+1
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1281,11 +1281,11 @@ | ||
| 1281 | 1281 | ** repositories after making any changes to the manifest_parse() |
| 1282 | 1282 | ** implementation to confirm that the changes did not break anything. |
| 1283 | 1283 | ** |
| 1284 | 1284 | ** Options: |
| 1285 | 1285 | ** |
| 1286 | -** --limit N Parse no more than N artifacts before stopping. | |
| 1286 | +** --limit N Parse no more than N artifacts before stopping | |
| 1287 | 1287 | ** --wellformed Use all BLOB table entries as input, not just |
| 1288 | 1288 | ** those entries that are believed to be valid |
| 1289 | 1289 | ** artifacts, and verify that the result the |
| 1290 | 1290 | ** manifest_is_well_formed() agrees with the |
| 1291 | 1291 | ** result of manifest_parse(). |
| 1292 | 1292 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1281,11 +1281,11 @@ | |
| 1281 | ** repositories after making any changes to the manifest_parse() |
| 1282 | ** implementation to confirm that the changes did not break anything. |
| 1283 | ** |
| 1284 | ** Options: |
| 1285 | ** |
| 1286 | ** --limit N Parse no more than N artifacts before stopping. |
| 1287 | ** --wellformed Use all BLOB table entries as input, not just |
| 1288 | ** those entries that are believed to be valid |
| 1289 | ** artifacts, and verify that the result the |
| 1290 | ** manifest_is_well_formed() agrees with the |
| 1291 | ** result of manifest_parse(). |
| 1292 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1281,11 +1281,11 @@ | |
| 1281 | ** repositories after making any changes to the manifest_parse() |
| 1282 | ** implementation to confirm that the changes did not break anything. |
| 1283 | ** |
| 1284 | ** Options: |
| 1285 | ** |
| 1286 | ** --limit N Parse no more than N artifacts before stopping |
| 1287 | ** --wellformed Use all BLOB table entries as input, not just |
| 1288 | ** those entries that are believed to be valid |
| 1289 | ** artifacts, and verify that the result the |
| 1290 | ** manifest_is_well_formed() agrees with the |
| 1291 | ** result of manifest_parse(). |
| 1292 |
+1
-1
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -909,11 +909,11 @@ | ||
| 909 | 909 | ** plays. |
| 910 | 910 | ** |
| 911 | 911 | ** Options: |
| 912 | 912 | ** |
| 913 | 913 | ** --type TYPE Only find artifacts of TYPE (one of: 'ci', 't', |
| 914 | -** 'w', 'g', or 'e'). | |
| 914 | +** 'w', 'g', or 'e') | |
| 915 | 915 | ** -v|--verbose Provide extra information (such as the RID) |
| 916 | 916 | */ |
| 917 | 917 | void whatis_cmd(void){ |
| 918 | 918 | int rid; |
| 919 | 919 | const char *zName; |
| 920 | 920 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -909,11 +909,11 @@ | |
| 909 | ** plays. |
| 910 | ** |
| 911 | ** Options: |
| 912 | ** |
| 913 | ** --type TYPE Only find artifacts of TYPE (one of: 'ci', 't', |
| 914 | ** 'w', 'g', or 'e'). |
| 915 | ** -v|--verbose Provide extra information (such as the RID) |
| 916 | */ |
| 917 | void whatis_cmd(void){ |
| 918 | int rid; |
| 919 | const char *zName; |
| 920 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -909,11 +909,11 @@ | |
| 909 | ** plays. |
| 910 | ** |
| 911 | ** Options: |
| 912 | ** |
| 913 | ** --type TYPE Only find artifacts of TYPE (one of: 'ci', 't', |
| 914 | ** 'w', 'g', or 'e') |
| 915 | ** -v|--verbose Provide extra information (such as the RID) |
| 916 | */ |
| 917 | void whatis_cmd(void){ |
| 918 | int rid; |
| 919 | const char *zName; |
| 920 |
+12
-12
| --- src/pikchrshow.c | ||
| +++ src/pikchrshow.c | ||
| @@ -389,29 +389,29 @@ | ||
| 389 | 389 | ** resp. stdout, and the names "-" can be used as aliases for those |
| 390 | 390 | ** streams. |
| 391 | 391 | ** |
| 392 | 392 | ** Options: |
| 393 | 393 | ** |
| 394 | -** -div On success, adds a DIV wrapper around the | |
| 394 | +** -div On success, add a DIV wrapper around the | |
| 395 | 395 | ** resulting SVG output which limits its max-width to |
| 396 | 396 | ** its computed maximum ideal size. |
| 397 | 397 | ** |
| 398 | -** -div-indent Like -div but indents the div. | |
| 399 | -** | |
| 400 | -** -div-center Like -div but centers the div. | |
| 401 | -** | |
| 402 | -** -div-left Like -div but floats the div left. | |
| 403 | -** | |
| 404 | -** -div-right Like -div but floats the div right. | |
| 405 | -** | |
| 406 | -** -div-toggle Sets the 'toggle' CSS class on the div (used by the | |
| 398 | +** -div-indent Like -div but indent the div. | |
| 399 | +** | |
| 400 | +** -div-center Like -div but center the div. | |
| 401 | +** | |
| 402 | +** -div-left Like -div but float the div left. | |
| 403 | +** | |
| 404 | +** -div-right Like -div but float the div right. | |
| 405 | +** | |
| 406 | +** -div-toggle Set the 'toggle' CSS class on the div (used by the | |
| 407 | 407 | ** JavaScript-side post-processor). |
| 408 | 408 | ** |
| 409 | -** -div-source Sets the 'source' CSS class on the div, which tells | |
| 409 | +** -div-source Set the 'source' CSS class on the div, which tells | |
| 410 | 410 | ** CSS to hide the SVG and reveal the source by default. |
| 411 | 411 | ** |
| 412 | -** -src Stores the input pikchr's source code in the output as | |
| 412 | +** -src Store the input pikchr's source code in the output as | |
| 413 | 413 | ** a separate element adjacent to the SVG one. Implied |
| 414 | 414 | ** by -div-source. |
| 415 | 415 | ** |
| 416 | 416 | ** |
| 417 | 417 | ** -th Process the input using TH1 before passing it to pikchr. |
| 418 | 418 |
| --- src/pikchrshow.c | |
| +++ src/pikchrshow.c | |
| @@ -389,29 +389,29 @@ | |
| 389 | ** resp. stdout, and the names "-" can be used as aliases for those |
| 390 | ** streams. |
| 391 | ** |
| 392 | ** Options: |
| 393 | ** |
| 394 | ** -div On success, adds a DIV wrapper around the |
| 395 | ** resulting SVG output which limits its max-width to |
| 396 | ** its computed maximum ideal size. |
| 397 | ** |
| 398 | ** -div-indent Like -div but indents the div. |
| 399 | ** |
| 400 | ** -div-center Like -div but centers the div. |
| 401 | ** |
| 402 | ** -div-left Like -div but floats the div left. |
| 403 | ** |
| 404 | ** -div-right Like -div but floats the div right. |
| 405 | ** |
| 406 | ** -div-toggle Sets the 'toggle' CSS class on the div (used by the |
| 407 | ** JavaScript-side post-processor). |
| 408 | ** |
| 409 | ** -div-source Sets the 'source' CSS class on the div, which tells |
| 410 | ** CSS to hide the SVG and reveal the source by default. |
| 411 | ** |
| 412 | ** -src Stores the input pikchr's source code in the output as |
| 413 | ** a separate element adjacent to the SVG one. Implied |
| 414 | ** by -div-source. |
| 415 | ** |
| 416 | ** |
| 417 | ** -th Process the input using TH1 before passing it to pikchr. |
| 418 |
| --- src/pikchrshow.c | |
| +++ src/pikchrshow.c | |
| @@ -389,29 +389,29 @@ | |
| 389 | ** resp. stdout, and the names "-" can be used as aliases for those |
| 390 | ** streams. |
| 391 | ** |
| 392 | ** Options: |
| 393 | ** |
| 394 | ** -div On success, add a DIV wrapper around the |
| 395 | ** resulting SVG output which limits its max-width to |
| 396 | ** its computed maximum ideal size. |
| 397 | ** |
| 398 | ** -div-indent Like -div but indent the div. |
| 399 | ** |
| 400 | ** -div-center Like -div but center the div. |
| 401 | ** |
| 402 | ** -div-left Like -div but float the div left. |
| 403 | ** |
| 404 | ** -div-right Like -div but float the div right. |
| 405 | ** |
| 406 | ** -div-toggle Set the 'toggle' CSS class on the div (used by the |
| 407 | ** JavaScript-side post-processor). |
| 408 | ** |
| 409 | ** -div-source Set the 'source' CSS class on the div, which tells |
| 410 | ** CSS to hide the SVG and reveal the source by default. |
| 411 | ** |
| 412 | ** -src Store the input pikchr's source code in the output as |
| 413 | ** a separate element adjacent to the SVG one. Implied |
| 414 | ** by -div-source. |
| 415 | ** |
| 416 | ** |
| 417 | ** -th Process the input using TH1 before passing it to pikchr. |
| 418 |
+1
-1
| --- src/purge.c | ||
| +++ src/purge.c | ||
| @@ -505,11 +505,11 @@ | ||
| 505 | 505 | ** |
| 506 | 506 | ** TBD... |
| 507 | 507 | ** |
| 508 | 508 | ** COMMON OPTIONS: |
| 509 | 509 | ** |
| 510 | -** --explain Make no changes, but show what would happen. | |
| 510 | +** --explain Make no changes, but show what would happen | |
| 511 | 511 | ** --dry-run An alias for --explain |
| 512 | 512 | */ |
| 513 | 513 | void purge_cmd(void){ |
| 514 | 514 | int purgeFlags = PURGE_MOVETO_GRAVEYARD | PURGE_PRINT_SUMMARY; |
| 515 | 515 | const char *zSubcmd; |
| 516 | 516 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -505,11 +505,11 @@ | |
| 505 | ** |
| 506 | ** TBD... |
| 507 | ** |
| 508 | ** COMMON OPTIONS: |
| 509 | ** |
| 510 | ** --explain Make no changes, but show what would happen. |
| 511 | ** --dry-run An alias for --explain |
| 512 | */ |
| 513 | void purge_cmd(void){ |
| 514 | int purgeFlags = PURGE_MOVETO_GRAVEYARD | PURGE_PRINT_SUMMARY; |
| 515 | const char *zSubcmd; |
| 516 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -505,11 +505,11 @@ | |
| 505 | ** |
| 506 | ** TBD... |
| 507 | ** |
| 508 | ** COMMON OPTIONS: |
| 509 | ** |
| 510 | ** --explain Make no changes, but show what would happen |
| 511 | ** --dry-run An alias for --explain |
| 512 | */ |
| 513 | void purge_cmd(void){ |
| 514 | int purgeFlags = PURGE_MOVETO_GRAVEYARD | PURGE_PRINT_SUMMARY; |
| 515 | const char *zSubcmd; |
| 516 |
+4
-4
| --- src/rebuild.c | ||
| +++ src/rebuild.c | ||
| @@ -889,13 +889,13 @@ | ||
| 889 | 889 | ** |
| 890 | 890 | ** The user is prompted to confirm the scrub unless the --force option |
| 891 | 891 | ** is used. |
| 892 | 892 | ** |
| 893 | 893 | ** Options: |
| 894 | -** --force do not prompt for confirmation | |
| 895 | -** --private only private branches are removed from the repository | |
| 896 | -** --verily scrub real thoroughly (see above) | |
| 894 | +** --force Do not prompt for confirmation | |
| 895 | +** --private Only private branches are removed from the repository | |
| 896 | +** --verily Scrub real thoroughly (see above) | |
| 897 | 897 | */ |
| 898 | 898 | void scrub_cmd(void){ |
| 899 | 899 | int bVerily = find_option("verily",0,0)!=0; |
| 900 | 900 | int bForce = find_option("force", "f", 0)!=0; |
| 901 | 901 | int privateOnly = find_option("private",0,0)!=0; |
| @@ -1114,11 +1114,11 @@ | ||
| 1114 | 1114 | ** |
| 1115 | 1115 | ** No files or directories will be created. |
| 1116 | 1116 | ** |
| 1117 | 1117 | ** Options: |
| 1118 | 1118 | ** -L|--prefixlength N Set the length of the names of the DESTINATION |
| 1119 | -** subdirectories to N. | |
| 1119 | +** subdirectories to N | |
| 1120 | 1120 | */ |
| 1121 | 1121 | void test_hash_from_path_cmd(void) { |
| 1122 | 1122 | char *zDest; |
| 1123 | 1123 | char *zUuid; |
| 1124 | 1124 | char *zFile; |
| 1125 | 1125 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -889,13 +889,13 @@ | |
| 889 | ** |
| 890 | ** The user is prompted to confirm the scrub unless the --force option |
| 891 | ** is used. |
| 892 | ** |
| 893 | ** Options: |
| 894 | ** --force do not prompt for confirmation |
| 895 | ** --private only private branches are removed from the repository |
| 896 | ** --verily scrub real thoroughly (see above) |
| 897 | */ |
| 898 | void scrub_cmd(void){ |
| 899 | int bVerily = find_option("verily",0,0)!=0; |
| 900 | int bForce = find_option("force", "f", 0)!=0; |
| 901 | int privateOnly = find_option("private",0,0)!=0; |
| @@ -1114,11 +1114,11 @@ | |
| 1114 | ** |
| 1115 | ** No files or directories will be created. |
| 1116 | ** |
| 1117 | ** Options: |
| 1118 | ** -L|--prefixlength N Set the length of the names of the DESTINATION |
| 1119 | ** subdirectories to N. |
| 1120 | */ |
| 1121 | void test_hash_from_path_cmd(void) { |
| 1122 | char *zDest; |
| 1123 | char *zUuid; |
| 1124 | char *zFile; |
| 1125 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -889,13 +889,13 @@ | |
| 889 | ** |
| 890 | ** The user is prompted to confirm the scrub unless the --force option |
| 891 | ** is used. |
| 892 | ** |
| 893 | ** Options: |
| 894 | ** --force Do not prompt for confirmation |
| 895 | ** --private Only private branches are removed from the repository |
| 896 | ** --verily Scrub real thoroughly (see above) |
| 897 | */ |
| 898 | void scrub_cmd(void){ |
| 899 | int bVerily = find_option("verily",0,0)!=0; |
| 900 | int bForce = find_option("force", "f", 0)!=0; |
| 901 | int privateOnly = find_option("private",0,0)!=0; |
| @@ -1114,11 +1114,11 @@ | |
| 1114 | ** |
| 1115 | ** No files or directories will be created. |
| 1116 | ** |
| 1117 | ** Options: |
| 1118 | ** -L|--prefixlength N Set the length of the names of the DESTINATION |
| 1119 | ** subdirectories to N |
| 1120 | */ |
| 1121 | void test_hash_from_path_cmd(void) { |
| 1122 | char *zDest; |
| 1123 | char *zUuid; |
| 1124 | char *zFile; |
| 1125 |
+6
-6
| --- src/rss.c | ||
| +++ src/rss.c | ||
| @@ -224,28 +224,28 @@ | ||
| 224 | 224 | ** Usage: %fossil rss ?OPTIONS? |
| 225 | 225 | ** |
| 226 | 226 | ** The CLI variant of the /timeline.rss page, this produces an RSS |
| 227 | 227 | ** feed of the timeline to stdout. Options: |
| 228 | 228 | ** |
| 229 | -** -type|y FLAG may be: all (default), ci (show check-ins only), | |
| 229 | +** -type|y FLAG May be: all (default), ci (show check-ins only), | |
| 230 | 230 | ** t (show tickets only), w (show wiki only). |
| 231 | 231 | ** |
| 232 | 232 | ** -limit|n LIMIT The maximum number of items to show. |
| 233 | 233 | ** |
| 234 | -** -tkt HASH Filters for only those events for the specified ticket. | |
| 234 | +** -tkt HASH Filter for only those events for the specified ticket. | |
| 235 | 235 | ** |
| 236 | -** -tag TAG filters for a tag | |
| 236 | +** -tag TAG Filter for a tag | |
| 237 | 237 | ** |
| 238 | -** -wiki NAME Filters on a specific wiki page. | |
| 238 | +** -wiki NAME Filter on a specific wiki page. | |
| 239 | 239 | ** |
| 240 | 240 | ** Only one of -tkt, -tag, or -wiki may be used. |
| 241 | 241 | ** |
| 242 | -** -name FILENAME filters for a specific file. This may be combined | |
| 242 | +** -name FILENAME Filter for a specific file. This may be combined | |
| 243 | 243 | ** with one of the other filters (useful for looking |
| 244 | 244 | ** at a specific branch). |
| 245 | 245 | ** |
| 246 | -** -url STRING Sets the RSS feed's root URL to the given string. | |
| 246 | +** -url STRING Set the RSS feed's root URL to the given string. | |
| 247 | 247 | ** The default is "URL-PLACEHOLDER" (without quotes). |
| 248 | 248 | */ |
| 249 | 249 | void cmd_timeline_rss(void){ |
| 250 | 250 | Stmt q; |
| 251 | 251 | int nLine=0; |
| 252 | 252 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -224,28 +224,28 @@ | |
| 224 | ** Usage: %fossil rss ?OPTIONS? |
| 225 | ** |
| 226 | ** The CLI variant of the /timeline.rss page, this produces an RSS |
| 227 | ** feed of the timeline to stdout. Options: |
| 228 | ** |
| 229 | ** -type|y FLAG may be: all (default), ci (show check-ins only), |
| 230 | ** t (show tickets only), w (show wiki only). |
| 231 | ** |
| 232 | ** -limit|n LIMIT The maximum number of items to show. |
| 233 | ** |
| 234 | ** -tkt HASH Filters for only those events for the specified ticket. |
| 235 | ** |
| 236 | ** -tag TAG filters for a tag |
| 237 | ** |
| 238 | ** -wiki NAME Filters on a specific wiki page. |
| 239 | ** |
| 240 | ** Only one of -tkt, -tag, or -wiki may be used. |
| 241 | ** |
| 242 | ** -name FILENAME filters for a specific file. This may be combined |
| 243 | ** with one of the other filters (useful for looking |
| 244 | ** at a specific branch). |
| 245 | ** |
| 246 | ** -url STRING Sets the RSS feed's root URL to the given string. |
| 247 | ** The default is "URL-PLACEHOLDER" (without quotes). |
| 248 | */ |
| 249 | void cmd_timeline_rss(void){ |
| 250 | Stmt q; |
| 251 | int nLine=0; |
| 252 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -224,28 +224,28 @@ | |
| 224 | ** Usage: %fossil rss ?OPTIONS? |
| 225 | ** |
| 226 | ** The CLI variant of the /timeline.rss page, this produces an RSS |
| 227 | ** feed of the timeline to stdout. Options: |
| 228 | ** |
| 229 | ** -type|y FLAG May be: all (default), ci (show check-ins only), |
| 230 | ** t (show tickets only), w (show wiki only). |
| 231 | ** |
| 232 | ** -limit|n LIMIT The maximum number of items to show. |
| 233 | ** |
| 234 | ** -tkt HASH Filter for only those events for the specified ticket. |
| 235 | ** |
| 236 | ** -tag TAG Filter for a tag |
| 237 | ** |
| 238 | ** -wiki NAME Filter on a specific wiki page. |
| 239 | ** |
| 240 | ** Only one of -tkt, -tag, or -wiki may be used. |
| 241 | ** |
| 242 | ** -name FILENAME Filter for a specific file. This may be combined |
| 243 | ** with one of the other filters (useful for looking |
| 244 | ** at a specific branch). |
| 245 | ** |
| 246 | ** -url STRING Set the RSS feed's root URL to the given string. |
| 247 | ** The default is "URL-PLACEHOLDER" (without quotes). |
| 248 | */ |
| 249 | void cmd_timeline_rss(void){ |
| 250 | Stmt q; |
| 251 | int nLine=0; |
| 252 |
+4
-4
| --- src/sha1.c | ||
| +++ src/sha1.c | ||
| @@ -503,14 +503,14 @@ | ||
| 503 | 503 | ** |
| 504 | 504 | ** Compute an SHA1 checksum of all files named on the command-line. |
| 505 | 505 | ** If a file is named "-" then take its content from standard input. |
| 506 | 506 | ** Options: |
| 507 | 507 | ** |
| 508 | -** -h, --dereference If FILE is a symbolic link, compute the hash | |
| 509 | -** on the object that the link points to. Normally, | |
| 510 | -** the hash is over the name of the object that | |
| 511 | -** the link points to. | |
| 508 | +** -h|--dereference If FILE is a symbolic link, compute the hash | |
| 509 | +** on the object that the link points to. Normally, | |
| 510 | +** the hash is over the name of the object that | |
| 511 | +** the link points to. | |
| 512 | 512 | ** |
| 513 | 513 | ** See also: [[md5sum]], [[sha3sum]] |
| 514 | 514 | */ |
| 515 | 515 | void sha1sum_test(void){ |
| 516 | 516 | int i; |
| 517 | 517 |
| --- src/sha1.c | |
| +++ src/sha1.c | |
| @@ -503,14 +503,14 @@ | |
| 503 | ** |
| 504 | ** Compute an SHA1 checksum of all files named on the command-line. |
| 505 | ** If a file is named "-" then take its content from standard input. |
| 506 | ** Options: |
| 507 | ** |
| 508 | ** -h, --dereference If FILE is a symbolic link, compute the hash |
| 509 | ** on the object that the link points to. Normally, |
| 510 | ** the hash is over the name of the object that |
| 511 | ** the link points to. |
| 512 | ** |
| 513 | ** See also: [[md5sum]], [[sha3sum]] |
| 514 | */ |
| 515 | void sha1sum_test(void){ |
| 516 | int i; |
| 517 |
| --- src/sha1.c | |
| +++ src/sha1.c | |
| @@ -503,14 +503,14 @@ | |
| 503 | ** |
| 504 | ** Compute an SHA1 checksum of all files named on the command-line. |
| 505 | ** If a file is named "-" then take its content from standard input. |
| 506 | ** Options: |
| 507 | ** |
| 508 | ** -h|--dereference If FILE is a symbolic link, compute the hash |
| 509 | ** on the object that the link points to. Normally, |
| 510 | ** the hash is over the name of the object that |
| 511 | ** the link points to. |
| 512 | ** |
| 513 | ** See also: [[md5sum]], [[sha3sum]] |
| 514 | */ |
| 515 | void sha1sum_test(void){ |
| 516 | int i; |
| 517 |
+1
-1
| --- src/sha3.c | ||
| +++ src/sha3.c | ||
| @@ -635,11 +635,11 @@ | ||
| 635 | 635 | ** --256 Compute a SHA3-256 hash (the default) |
| 636 | 636 | ** --384 Compute a SHA3-384 hash |
| 637 | 637 | ** --512 Compute a SHA3-512 hash |
| 638 | 638 | ** --size N An N-bit hash. N must be a multiple of 32 between |
| 639 | 639 | ** 128 and 512. |
| 640 | -** -h, --dereference If FILE is a symbolic link, compute the hash on | |
| 640 | +** -h|--dereference If FILE is a symbolic link, compute the hash on | |
| 641 | 641 | ** the object pointed to, not on the link itself. |
| 642 | 642 | ** |
| 643 | 643 | ** See also: [[md5sum]], [[sha1sum]] |
| 644 | 644 | */ |
| 645 | 645 | void sha3sum_test(void){ |
| 646 | 646 |
| --- src/sha3.c | |
| +++ src/sha3.c | |
| @@ -635,11 +635,11 @@ | |
| 635 | ** --256 Compute a SHA3-256 hash (the default) |
| 636 | ** --384 Compute a SHA3-384 hash |
| 637 | ** --512 Compute a SHA3-512 hash |
| 638 | ** --size N An N-bit hash. N must be a multiple of 32 between |
| 639 | ** 128 and 512. |
| 640 | ** -h, --dereference If FILE is a symbolic link, compute the hash on |
| 641 | ** the object pointed to, not on the link itself. |
| 642 | ** |
| 643 | ** See also: [[md5sum]], [[sha1sum]] |
| 644 | */ |
| 645 | void sha3sum_test(void){ |
| 646 |
| --- src/sha3.c | |
| +++ src/sha3.c | |
| @@ -635,11 +635,11 @@ | |
| 635 | ** --256 Compute a SHA3-256 hash (the default) |
| 636 | ** --384 Compute a SHA3-384 hash |
| 637 | ** --512 Compute a SHA3-512 hash |
| 638 | ** --size N An N-bit hash. N must be a multiple of 32 between |
| 639 | ** 128 and 512. |
| 640 | ** -h|--dereference If FILE is a symbolic link, compute the hash on |
| 641 | ** the object pointed to, not on the link itself. |
| 642 | ** |
| 643 | ** See also: [[md5sum]], [[sha1sum]] |
| 644 | */ |
| 645 | void sha3sum_test(void){ |
| 646 |
+1
-1
| --- src/tar.c | ||
| +++ src/tar.c | ||
| @@ -425,11 +425,11 @@ | ||
| 425 | 425 | ** COMMAND: test-tarball |
| 426 | 426 | ** |
| 427 | 427 | ** Generate a GZIP-compressed tarball in the file given by the first argument |
| 428 | 428 | ** that contains files given in the second and subsequent arguments. |
| 429 | 429 | ** |
| 430 | -** -h, --dereference Follow symlinks; archive the files they point to. | |
| 430 | +** -h|--dereference Follow symlinks and archive the files they point to | |
| 431 | 431 | */ |
| 432 | 432 | void test_tarball_cmd(void){ |
| 433 | 433 | int i; |
| 434 | 434 | Blob zip; |
| 435 | 435 | int eFType = SymFILE; |
| 436 | 436 |
| --- src/tar.c | |
| +++ src/tar.c | |
| @@ -425,11 +425,11 @@ | |
| 425 | ** COMMAND: test-tarball |
| 426 | ** |
| 427 | ** Generate a GZIP-compressed tarball in the file given by the first argument |
| 428 | ** that contains files given in the second and subsequent arguments. |
| 429 | ** |
| 430 | ** -h, --dereference Follow symlinks; archive the files they point to. |
| 431 | */ |
| 432 | void test_tarball_cmd(void){ |
| 433 | int i; |
| 434 | Blob zip; |
| 435 | int eFType = SymFILE; |
| 436 |
| --- src/tar.c | |
| +++ src/tar.c | |
| @@ -425,11 +425,11 @@ | |
| 425 | ** COMMAND: test-tarball |
| 426 | ** |
| 427 | ** Generate a GZIP-compressed tarball in the file given by the first argument |
| 428 | ** that contains files given in the second and subsequent arguments. |
| 429 | ** |
| 430 | ** -h|--dereference Follow symlinks and archive the files they point to |
| 431 | */ |
| 432 | void test_tarball_cmd(void){ |
| 433 | int i; |
| 434 | Blob zip; |
| 435 | int eFType = SymFILE; |
| 436 |
+1
-1
| --- src/undo.c | ||
| +++ src/undo.c | ||
| @@ -462,11 +462,11 @@ | ||
| 462 | 462 | ** |
| 463 | 463 | ** Future versions of Fossil might add new commands to the set of commands |
| 464 | 464 | ** that are undoable. |
| 465 | 465 | ** |
| 466 | 466 | ** Options: |
| 467 | -** -n|--dry-run do not make changes but show what would be done | |
| 467 | +** -n|--dry-run Do not make changes but show what would be done | |
| 468 | 468 | ** |
| 469 | 469 | ** See also: [[commit]], [[status]] |
| 470 | 470 | */ |
| 471 | 471 | void undo_cmd(void){ |
| 472 | 472 | int isRedo = g.argv[1][0]=='r'; |
| 473 | 473 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -462,11 +462,11 @@ | |
| 462 | ** |
| 463 | ** Future versions of Fossil might add new commands to the set of commands |
| 464 | ** that are undoable. |
| 465 | ** |
| 466 | ** Options: |
| 467 | ** -n|--dry-run do not make changes but show what would be done |
| 468 | ** |
| 469 | ** See also: [[commit]], [[status]] |
| 470 | */ |
| 471 | void undo_cmd(void){ |
| 472 | int isRedo = g.argv[1][0]=='r'; |
| 473 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -462,11 +462,11 @@ | |
| 462 | ** |
| 463 | ** Future versions of Fossil might add new commands to the set of commands |
| 464 | ** that are undoable. |
| 465 | ** |
| 466 | ** Options: |
| 467 | ** -n|--dry-run Do not make changes but show what would be done |
| 468 | ** |
| 469 | ** See also: [[commit]], [[status]] |
| 470 | */ |
| 471 | void undo_cmd(void){ |
| 472 | int isRedo = g.argv[1][0]=='r'; |
| 473 |
+3
-3
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -768,11 +768,11 @@ | ||
| 768 | 768 | ** |
| 769 | 769 | ** Output JSON format: |
| 770 | 770 | ** |
| 771 | 771 | ** { name: "page name", |
| 772 | 772 | ** type: "normal" | "tag" | "checkin" | "branch" | "sandbox", |
| 773 | -** mimetype: "mime type", | |
| 773 | +** mimetype: "mimetype", | |
| 774 | 774 | ** version: UUID string or null for a sandbox page, |
| 775 | 775 | ** parent: "parent uuid" or null if no parent, |
| 776 | 776 | ** isDeleted: true if the page has no content (is "deleted") |
| 777 | 777 | ** else not set (making it "falsy" in JS), |
| 778 | 778 | ** content: "page content" (only if includeContent is true) |
| @@ -836,11 +836,11 @@ | ||
| 836 | 836 | ** Ajax route handler for /wikiajax/save. |
| 837 | 837 | ** |
| 838 | 838 | ** URL params: |
| 839 | 839 | ** |
| 840 | 840 | ** page = the wiki page name. |
| 841 | -** mimetype = content mime type. | |
| 841 | +** mimetype = content mimetype. | |
| 842 | 842 | ** content = page content. Fossil considers an empty page to |
| 843 | 843 | ** be "deleted". |
| 844 | 844 | ** isnew = 1 if the page is to be newly-created, else 0 or |
| 845 | 845 | ** not send. |
| 846 | 846 | ** |
| @@ -2128,11 +2128,11 @@ | ||
| 2128 | 2128 | if( rid>0 ){ |
| 2129 | 2129 | pWiki = manifest_get(rid, CFTYPE_EVENT, 0); |
| 2130 | 2130 | } |
| 2131 | 2131 | } |
| 2132 | 2132 | if( !zMimeType || !*zMimeType ){ |
| 2133 | - /* Try to deduce the mime type based on the prior version. */ | |
| 2133 | + /* Try to deduce the mimetype based on the prior version. */ | |
| 2134 | 2134 | if(isSandbox){ |
| 2135 | 2135 | zMimeType = |
| 2136 | 2136 | wiki_filter_mimetypes(db_get("sandbox-mimetype", |
| 2137 | 2137 | "text/x-fossil-wiki")); |
| 2138 | 2138 | }else if( pWiki!=0 && (pWiki->zMimetype && *pWiki->zMimetype) ){ |
| 2139 | 2139 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -768,11 +768,11 @@ | |
| 768 | ** |
| 769 | ** Output JSON format: |
| 770 | ** |
| 771 | ** { name: "page name", |
| 772 | ** type: "normal" | "tag" | "checkin" | "branch" | "sandbox", |
| 773 | ** mimetype: "mime type", |
| 774 | ** version: UUID string or null for a sandbox page, |
| 775 | ** parent: "parent uuid" or null if no parent, |
| 776 | ** isDeleted: true if the page has no content (is "deleted") |
| 777 | ** else not set (making it "falsy" in JS), |
| 778 | ** content: "page content" (only if includeContent is true) |
| @@ -836,11 +836,11 @@ | |
| 836 | ** Ajax route handler for /wikiajax/save. |
| 837 | ** |
| 838 | ** URL params: |
| 839 | ** |
| 840 | ** page = the wiki page name. |
| 841 | ** mimetype = content mime type. |
| 842 | ** content = page content. Fossil considers an empty page to |
| 843 | ** be "deleted". |
| 844 | ** isnew = 1 if the page is to be newly-created, else 0 or |
| 845 | ** not send. |
| 846 | ** |
| @@ -2128,11 +2128,11 @@ | |
| 2128 | if( rid>0 ){ |
| 2129 | pWiki = manifest_get(rid, CFTYPE_EVENT, 0); |
| 2130 | } |
| 2131 | } |
| 2132 | if( !zMimeType || !*zMimeType ){ |
| 2133 | /* Try to deduce the mime type based on the prior version. */ |
| 2134 | if(isSandbox){ |
| 2135 | zMimeType = |
| 2136 | wiki_filter_mimetypes(db_get("sandbox-mimetype", |
| 2137 | "text/x-fossil-wiki")); |
| 2138 | }else if( pWiki!=0 && (pWiki->zMimetype && *pWiki->zMimetype) ){ |
| 2139 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -768,11 +768,11 @@ | |
| 768 | ** |
| 769 | ** Output JSON format: |
| 770 | ** |
| 771 | ** { name: "page name", |
| 772 | ** type: "normal" | "tag" | "checkin" | "branch" | "sandbox", |
| 773 | ** mimetype: "mimetype", |
| 774 | ** version: UUID string or null for a sandbox page, |
| 775 | ** parent: "parent uuid" or null if no parent, |
| 776 | ** isDeleted: true if the page has no content (is "deleted") |
| 777 | ** else not set (making it "falsy" in JS), |
| 778 | ** content: "page content" (only if includeContent is true) |
| @@ -836,11 +836,11 @@ | |
| 836 | ** Ajax route handler for /wikiajax/save. |
| 837 | ** |
| 838 | ** URL params: |
| 839 | ** |
| 840 | ** page = the wiki page name. |
| 841 | ** mimetype = content mimetype. |
| 842 | ** content = page content. Fossil considers an empty page to |
| 843 | ** be "deleted". |
| 844 | ** isnew = 1 if the page is to be newly-created, else 0 or |
| 845 | ** not send. |
| 846 | ** |
| @@ -2128,11 +2128,11 @@ | |
| 2128 | if( rid>0 ){ |
| 2129 | pWiki = manifest_get(rid, CFTYPE_EVENT, 0); |
| 2130 | } |
| 2131 | } |
| 2132 | if( !zMimeType || !*zMimeType ){ |
| 2133 | /* Try to deduce the mimetype based on the prior version. */ |
| 2134 | if(isSandbox){ |
| 2135 | zMimeType = |
| 2136 | wiki_filter_mimetypes(db_get("sandbox-mimetype", |
| 2137 | "text/x-fossil-wiki")); |
| 2138 | }else if( pWiki!=0 && (pWiki->zMimetype && *pWiki->zMimetype) ){ |
| 2139 |