Fossil SCM
Help syntax change to match project conventions: [--] to ?--?
Commit
95ed189424cc8568fc8b0503959d2496df995a7799304222398c8a3c973f249d
Parent
1b649b9d4e94168…
4 files changed
+6
-6
+6
-6
+9
-9
+5
-5
+6
-6
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -244,11 +244,11 @@ | ||
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | /* |
| 247 | 247 | ** COMMAND: add |
| 248 | 248 | ** |
| 249 | -** Usage: %fossil add ?OPTIONS? [--] FILE1 ?FILE2 ...? | |
| 249 | +** Usage: %fossil add ?OPTIONS? ?--? FILE1 ?FILE2 ...? | |
| 250 | 250 | ** |
| 251 | 251 | ** Make arrangements to add one or more files or directories to the |
| 252 | 252 | ** current checkout at the next commit. |
| 253 | 253 | ** |
| 254 | 254 | ** When adding files or directories recursively, filenames that begin |
| @@ -420,11 +420,11 @@ | ||
| 420 | 420 | /* |
| 421 | 421 | ** COMMAND: rm |
| 422 | 422 | ** COMMAND: delete |
| 423 | 423 | ** COMMAND: forget* |
| 424 | 424 | ** |
| 425 | -** Usage: %fossil rm|delete|forget ?OPTIONS? [--] FILE1 ?FILE2 ...? | |
| 425 | +** Usage: %fossil rm|delete|forget ?OPTIONS? ?--? FILE1 ?FILE2 ...? | |
| 426 | 426 | ** |
| 427 | 427 | ** Remove one or more files or directories from the repository. |
| 428 | 428 | ** |
| 429 | 429 | ** The 'rm' and 'delete' commands do NOT normally remove the files from |
| 430 | 430 | ** disk. They just mark the files as no longer being part of the project. |
| @@ -828,12 +828,12 @@ | ||
| 828 | 828 | |
| 829 | 829 | /* |
| 830 | 830 | ** COMMAND: mv |
| 831 | 831 | ** COMMAND: rename* |
| 832 | 832 | ** |
| 833 | -** Usage: %fossil mv|rename ?OPTIONS? [--] OLDNAME NEWNAME | |
| 834 | -** or: %fossil mv|rename ?OPTIONS? [--] OLDNAME... DIR | |
| 833 | +** Usage: %fossil mv|rename ?OPTIONS? ?--? OLDNAME NEWNAME | |
| 834 | +** or: %fossil mv|rename ?OPTIONS? ?--? OLDNAME... DIR | |
| 835 | 835 | ** |
| 836 | 836 | ** Move or rename one or more files or directories within the repository tree. |
| 837 | 837 | ** You can either rename a file or directory or move it to another subdirectory. |
| 838 | 838 | ** |
| 839 | 839 | ** The 'mv' command does NOT normally rename or move the files on disk. |
| @@ -885,11 +885,11 @@ | ||
| 885 | 885 | vid = db_lget_int("checkout", 0); |
| 886 | 886 | if( vid==0 ){ |
| 887 | 887 | fossil_fatal("no checkout in which to rename files"); |
| 888 | 888 | } |
| 889 | 889 | if( g.argc<4 ){ |
| 890 | - usage("?OPTIONS? [--] OLDNAME NEWNAME"); | |
| 890 | + usage("?OPTIONS? ?--? OLDNAME NEWNAME"); | |
| 891 | 891 | } |
| 892 | 892 | zDest = g.argv[g.argc-1]; |
| 893 | 893 | db_begin_transaction(); |
| 894 | 894 | if( g.argv[1][0]=='r' ){ /* i.e. "rename" */ |
| 895 | 895 | moveFiles = 0; |
| @@ -916,11 +916,11 @@ | ||
| 916 | 916 | }else{ |
| 917 | 917 | origType = (file_isdir(g.argv[2], RepoFILE) == 1); |
| 918 | 918 | } |
| 919 | 919 | destType = file_isdir(zDest, RepoFILE); |
| 920 | 920 | if( origType==-1 && destType!=1 ){ |
| 921 | - usage("?OPTIONS? [--] OLDNAME NEWNAME"); | |
| 921 | + usage("?OPTIONS? ?--? OLDNAME NEWNAME"); | |
| 922 | 922 | }else if( origType==1 && destType==2 ){ |
| 923 | 923 | fossil_fatal("cannot rename '%s' to '%s' since another file named" |
| 924 | 924 | " '%s' exists", g.argv[2], zDest, zDest); |
| 925 | 925 | }else if( origType==0 && destType!=1 ){ |
| 926 | 926 | Blob orig; |
| 927 | 927 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -244,11 +244,11 @@ | |
| 244 | } |
| 245 | |
| 246 | /* |
| 247 | ** COMMAND: add |
| 248 | ** |
| 249 | ** Usage: %fossil add ?OPTIONS? [--] FILE1 ?FILE2 ...? |
| 250 | ** |
| 251 | ** Make arrangements to add one or more files or directories to the |
| 252 | ** current checkout at the next commit. |
| 253 | ** |
| 254 | ** When adding files or directories recursively, filenames that begin |
| @@ -420,11 +420,11 @@ | |
| 420 | /* |
| 421 | ** COMMAND: rm |
| 422 | ** COMMAND: delete |
| 423 | ** COMMAND: forget* |
| 424 | ** |
| 425 | ** Usage: %fossil rm|delete|forget ?OPTIONS? [--] FILE1 ?FILE2 ...? |
| 426 | ** |
| 427 | ** Remove one or more files or directories from the repository. |
| 428 | ** |
| 429 | ** The 'rm' and 'delete' commands do NOT normally remove the files from |
| 430 | ** disk. They just mark the files as no longer being part of the project. |
| @@ -828,12 +828,12 @@ | |
| 828 | |
| 829 | /* |
| 830 | ** COMMAND: mv |
| 831 | ** COMMAND: rename* |
| 832 | ** |
| 833 | ** Usage: %fossil mv|rename ?OPTIONS? [--] OLDNAME NEWNAME |
| 834 | ** or: %fossil mv|rename ?OPTIONS? [--] OLDNAME... DIR |
| 835 | ** |
| 836 | ** Move or rename one or more files or directories within the repository tree. |
| 837 | ** You can either rename a file or directory or move it to another subdirectory. |
| 838 | ** |
| 839 | ** The 'mv' command does NOT normally rename or move the files on disk. |
| @@ -885,11 +885,11 @@ | |
| 885 | vid = db_lget_int("checkout", 0); |
| 886 | if( vid==0 ){ |
| 887 | fossil_fatal("no checkout in which to rename files"); |
| 888 | } |
| 889 | if( g.argc<4 ){ |
| 890 | usage("?OPTIONS? [--] OLDNAME NEWNAME"); |
| 891 | } |
| 892 | zDest = g.argv[g.argc-1]; |
| 893 | db_begin_transaction(); |
| 894 | if( g.argv[1][0]=='r' ){ /* i.e. "rename" */ |
| 895 | moveFiles = 0; |
| @@ -916,11 +916,11 @@ | |
| 916 | }else{ |
| 917 | origType = (file_isdir(g.argv[2], RepoFILE) == 1); |
| 918 | } |
| 919 | destType = file_isdir(zDest, RepoFILE); |
| 920 | if( origType==-1 && destType!=1 ){ |
| 921 | usage("?OPTIONS? [--] OLDNAME NEWNAME"); |
| 922 | }else if( origType==1 && destType==2 ){ |
| 923 | fossil_fatal("cannot rename '%s' to '%s' since another file named" |
| 924 | " '%s' exists", g.argv[2], zDest, zDest); |
| 925 | }else if( origType==0 && destType!=1 ){ |
| 926 | Blob orig; |
| 927 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -244,11 +244,11 @@ | |
| 244 | } |
| 245 | |
| 246 | /* |
| 247 | ** COMMAND: add |
| 248 | ** |
| 249 | ** Usage: %fossil add ?OPTIONS? ?--? FILE1 ?FILE2 ...? |
| 250 | ** |
| 251 | ** Make arrangements to add one or more files or directories to the |
| 252 | ** current checkout at the next commit. |
| 253 | ** |
| 254 | ** When adding files or directories recursively, filenames that begin |
| @@ -420,11 +420,11 @@ | |
| 420 | /* |
| 421 | ** COMMAND: rm |
| 422 | ** COMMAND: delete |
| 423 | ** COMMAND: forget* |
| 424 | ** |
| 425 | ** Usage: %fossil rm|delete|forget ?OPTIONS? ?--? FILE1 ?FILE2 ...? |
| 426 | ** |
| 427 | ** Remove one or more files or directories from the repository. |
| 428 | ** |
| 429 | ** The 'rm' and 'delete' commands do NOT normally remove the files from |
| 430 | ** disk. They just mark the files as no longer being part of the project. |
| @@ -828,12 +828,12 @@ | |
| 828 | |
| 829 | /* |
| 830 | ** COMMAND: mv |
| 831 | ** COMMAND: rename* |
| 832 | ** |
| 833 | ** Usage: %fossil mv|rename ?OPTIONS? ?--? OLDNAME NEWNAME |
| 834 | ** or: %fossil mv|rename ?OPTIONS? ?--? OLDNAME... DIR |
| 835 | ** |
| 836 | ** Move or rename one or more files or directories within the repository tree. |
| 837 | ** You can either rename a file or directory or move it to another subdirectory. |
| 838 | ** |
| 839 | ** The 'mv' command does NOT normally rename or move the files on disk. |
| @@ -885,11 +885,11 @@ | |
| 885 | vid = db_lget_int("checkout", 0); |
| 886 | if( vid==0 ){ |
| 887 | fossil_fatal("no checkout in which to rename files"); |
| 888 | } |
| 889 | if( g.argc<4 ){ |
| 890 | usage("?OPTIONS? ?--? OLDNAME NEWNAME"); |
| 891 | } |
| 892 | zDest = g.argv[g.argc-1]; |
| 893 | db_begin_transaction(); |
| 894 | if( g.argv[1][0]=='r' ){ /* i.e. "rename" */ |
| 895 | moveFiles = 0; |
| @@ -916,11 +916,11 @@ | |
| 916 | }else{ |
| 917 | origType = (file_isdir(g.argv[2], RepoFILE) == 1); |
| 918 | } |
| 919 | destType = file_isdir(zDest, RepoFILE); |
| 920 | if( origType==-1 && destType!=1 ){ |
| 921 | usage("?OPTIONS? ?--? OLDNAME NEWNAME"); |
| 922 | }else if( origType==1 && destType==2 ){ |
| 923 | fossil_fatal("cannot rename '%s' to '%s' since another file named" |
| 924 | " '%s' exists", g.argv[2], zDest, zDest); |
| 925 | }else if( origType==0 && destType!=1 ){ |
| 926 | Blob orig; |
| 927 |
+6
-6
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -352,11 +352,11 @@ | ||
| 352 | 352 | |
| 353 | 353 | /* |
| 354 | 354 | ** COMMAND: changes |
| 355 | 355 | ** COMMAND: status |
| 356 | 356 | ** |
| 357 | -** Usage: %fossil changes|status ?OPTIONS? [--] ?PATHS ...? | |
| 357 | +** Usage: %fossil changes|status ?OPTIONS? ?--? ?PATHS ...? | |
| 358 | 358 | ** |
| 359 | 359 | ** Report the change status of files in the current checkout. If one or |
| 360 | 360 | ** more PATHS are specified, only changes among the named files and |
| 361 | 361 | ** directories are reported. Directories are searched recursively. |
| 362 | 362 | ** |
| @@ -649,11 +649,11 @@ | ||
| 649 | 649 | } |
| 650 | 650 | |
| 651 | 651 | /* |
| 652 | 652 | ** COMMAND: ls |
| 653 | 653 | ** |
| 654 | -** Usage: %fossil ls ?OPTIONS? [--] ?PATHS ...? | |
| 654 | +** Usage: %fossil ls ?OPTIONS? ?--? ?PATHS ...? | |
| 655 | 655 | ** |
| 656 | 656 | ** List all files in the current checkout. If PATHS is included, only the |
| 657 | 657 | ** named files (or their children if directories) are shown. |
| 658 | 658 | ** |
| 659 | 659 | ** The ls command is essentially two related commands in one, depending on |
| @@ -809,11 +809,11 @@ | ||
| 809 | 809 | } |
| 810 | 810 | |
| 811 | 811 | /* |
| 812 | 812 | ** COMMAND: extras |
| 813 | 813 | ** |
| 814 | -** Usage: %fossil extras ?OPTIONS? [--] ?PATH1 ...? | |
| 814 | +** Usage: %fossil extras ?OPTIONS? ?--? ?PATH1 ...? | |
| 815 | 815 | ** |
| 816 | 816 | ** Print a list of all files in the source tree that are not part of the |
| 817 | 817 | ** current checkout. See also the "clean" command. If paths are specified, |
| 818 | 818 | ** only files in the given directories will be listed. |
| 819 | 819 | ** |
| @@ -882,11 +882,11 @@ | ||
| 882 | 882 | } |
| 883 | 883 | |
| 884 | 884 | /* |
| 885 | 885 | ** COMMAND: clean |
| 886 | 886 | ** |
| 887 | -** Usage: %fossil clean ?OPTIONS? [--] ?PATH ...? | |
| 887 | +** Usage: %fossil clean ?OPTIONS? ?--? ?PATH ...? | |
| 888 | 888 | ** |
| 889 | 889 | ** Delete all "extra" files in the source tree. "Extra" files are files |
| 890 | 890 | ** that are not officially part of the checkout. If one or more PATH |
| 891 | 891 | ** arguments appear, then only the files named, or files contained with |
| 892 | 892 | ** directories named, will be removed. |
| @@ -1946,12 +1946,12 @@ | ||
| 1946 | 1946 | |
| 1947 | 1947 | /* |
| 1948 | 1948 | ** COMMAND: ci* |
| 1949 | 1949 | ** COMMAND: commit |
| 1950 | 1950 | ** |
| 1951 | -** Usage: %fossil commit ?OPTIONS? [--] ?FILE...? | |
| 1952 | -** or: %fossil ci ?OPTIONS? [--] ?FILE...? | |
| 1951 | +** Usage: %fossil commit ?OPTIONS? ?--? ?FILE...? | |
| 1952 | +** or: %fossil ci ?OPTIONS? ?--? ?FILE...? | |
| 1953 | 1953 | ** |
| 1954 | 1954 | ** Create a new version containing all of the changes in the current |
| 1955 | 1955 | ** checkout. You will be prompted to enter a check-in comment unless |
| 1956 | 1956 | ** the comment has been specified on the command-line using "-m" or a |
| 1957 | 1957 | ** file containing the comment using -M. The editor defined in the |
| 1958 | 1958 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -352,11 +352,11 @@ | |
| 352 | |
| 353 | /* |
| 354 | ** COMMAND: changes |
| 355 | ** COMMAND: status |
| 356 | ** |
| 357 | ** Usage: %fossil changes|status ?OPTIONS? [--] ?PATHS ...? |
| 358 | ** |
| 359 | ** Report the change status of files in the current checkout. If one or |
| 360 | ** more PATHS are specified, only changes among the named files and |
| 361 | ** directories are reported. Directories are searched recursively. |
| 362 | ** |
| @@ -649,11 +649,11 @@ | |
| 649 | } |
| 650 | |
| 651 | /* |
| 652 | ** COMMAND: ls |
| 653 | ** |
| 654 | ** Usage: %fossil ls ?OPTIONS? [--] ?PATHS ...? |
| 655 | ** |
| 656 | ** List all files in the current checkout. If PATHS is included, only the |
| 657 | ** named files (or their children if directories) are shown. |
| 658 | ** |
| 659 | ** The ls command is essentially two related commands in one, depending on |
| @@ -809,11 +809,11 @@ | |
| 809 | } |
| 810 | |
| 811 | /* |
| 812 | ** COMMAND: extras |
| 813 | ** |
| 814 | ** Usage: %fossil extras ?OPTIONS? [--] ?PATH1 ...? |
| 815 | ** |
| 816 | ** Print a list of all files in the source tree that are not part of the |
| 817 | ** current checkout. See also the "clean" command. If paths are specified, |
| 818 | ** only files in the given directories will be listed. |
| 819 | ** |
| @@ -882,11 +882,11 @@ | |
| 882 | } |
| 883 | |
| 884 | /* |
| 885 | ** COMMAND: clean |
| 886 | ** |
| 887 | ** Usage: %fossil clean ?OPTIONS? [--] ?PATH ...? |
| 888 | ** |
| 889 | ** Delete all "extra" files in the source tree. "Extra" files are files |
| 890 | ** that are not officially part of the checkout. If one or more PATH |
| 891 | ** arguments appear, then only the files named, or files contained with |
| 892 | ** directories named, will be removed. |
| @@ -1946,12 +1946,12 @@ | |
| 1946 | |
| 1947 | /* |
| 1948 | ** COMMAND: ci* |
| 1949 | ** COMMAND: commit |
| 1950 | ** |
| 1951 | ** Usage: %fossil commit ?OPTIONS? [--] ?FILE...? |
| 1952 | ** or: %fossil ci ?OPTIONS? [--] ?FILE...? |
| 1953 | ** |
| 1954 | ** Create a new version containing all of the changes in the current |
| 1955 | ** checkout. You will be prompted to enter a check-in comment unless |
| 1956 | ** the comment has been specified on the command-line using "-m" or a |
| 1957 | ** file containing the comment using -M. The editor defined in the |
| 1958 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -352,11 +352,11 @@ | |
| 352 | |
| 353 | /* |
| 354 | ** COMMAND: changes |
| 355 | ** COMMAND: status |
| 356 | ** |
| 357 | ** Usage: %fossil changes|status ?OPTIONS? ?--? ?PATHS ...? |
| 358 | ** |
| 359 | ** Report the change status of files in the current checkout. If one or |
| 360 | ** more PATHS are specified, only changes among the named files and |
| 361 | ** directories are reported. Directories are searched recursively. |
| 362 | ** |
| @@ -649,11 +649,11 @@ | |
| 649 | } |
| 650 | |
| 651 | /* |
| 652 | ** COMMAND: ls |
| 653 | ** |
| 654 | ** Usage: %fossil ls ?OPTIONS? ?--? ?PATHS ...? |
| 655 | ** |
| 656 | ** List all files in the current checkout. If PATHS is included, only the |
| 657 | ** named files (or their children if directories) are shown. |
| 658 | ** |
| 659 | ** The ls command is essentially two related commands in one, depending on |
| @@ -809,11 +809,11 @@ | |
| 809 | } |
| 810 | |
| 811 | /* |
| 812 | ** COMMAND: extras |
| 813 | ** |
| 814 | ** Usage: %fossil extras ?OPTIONS? ?--? ?PATH1 ...? |
| 815 | ** |
| 816 | ** Print a list of all files in the source tree that are not part of the |
| 817 | ** current checkout. See also the "clean" command. If paths are specified, |
| 818 | ** only files in the given directories will be listed. |
| 819 | ** |
| @@ -882,11 +882,11 @@ | |
| 882 | } |
| 883 | |
| 884 | /* |
| 885 | ** COMMAND: clean |
| 886 | ** |
| 887 | ** Usage: %fossil clean ?OPTIONS? ?--? ?PATH ...? |
| 888 | ** |
| 889 | ** Delete all "extra" files in the source tree. "Extra" files are files |
| 890 | ** that are not officially part of the checkout. If one or more PATH |
| 891 | ** arguments appear, then only the files named, or files contained with |
| 892 | ** directories named, will be removed. |
| @@ -1946,12 +1946,12 @@ | |
| 1946 | |
| 1947 | /* |
| 1948 | ** COMMAND: ci* |
| 1949 | ** COMMAND: commit |
| 1950 | ** |
| 1951 | ** Usage: %fossil commit ?OPTIONS? ?--? ?FILE...? |
| 1952 | ** or: %fossil ci ?OPTIONS? ?--? ?FILE...? |
| 1953 | ** |
| 1954 | ** Create a new version containing all of the changes in the current |
| 1955 | ** checkout. You will be prompted to enter a check-in comment unless |
| 1956 | ** the comment has been specified on the command-line using "-m" or a |
| 1957 | ** file containing the comment using -M. The editor defined in the |
| 1958 |
+9
-9
| --- src/unversioned.c | ||
| +++ src/unversioned.c | ||
| @@ -218,11 +218,11 @@ | ||
| 218 | 218 | ** of each UV-file is retained. Changes to an UV-file are permanent and cannot |
| 219 | 219 | ** be undone, so use appropriate caution with this command. |
| 220 | 220 | ** |
| 221 | 221 | ** Subcommands: |
| 222 | 222 | ** |
| 223 | -** add [--] FILE ... Add or update one or more unversioned files in | |
| 223 | +** add ?--? FILE ... Add or update one or more unversioned files in | |
| 224 | 224 | ** the local repository so that they match FILEs |
| 225 | 225 | ** on disk. Changes are not pushed to other |
| 226 | 226 | ** repositories until the next sync. |
| 227 | 227 | ** |
| 228 | 228 | ** add FILE --as UVFILE |
| @@ -232,15 +232,15 @@ | ||
| 232 | 232 | ** namespace. This variant of the 'add' command allows |
| 233 | 233 | ** the name to be different in the repository versus |
| 234 | 234 | ** what appears on disk, but it only allows adding |
| 235 | 235 | ** a single file at a time. |
| 236 | 236 | ** |
| 237 | -** cat [--] FILE ... Concatenate the content of FILEs to stdout. | |
| 237 | +** cat ?--? FILE ... Concatenate the content of FILEs to stdout. | |
| 238 | 238 | ** |
| 239 | -** edit [--] FILE Bring up FILE in a text editor for modification. | |
| 239 | +** edit ?--? FILE Bring up FILE in a text editor for modification. | |
| 240 | 240 | ** |
| 241 | -** export [--] FILE OUTPUT | |
| 241 | +** export ?--? FILE OUTPUT | |
| 242 | 242 | ** Write the content of FILE into OUTPUT on disk |
| 243 | 243 | ** |
| 244 | 244 | ** list | ls Show all unversioned files held in the local |
| 245 | 245 | ** repository. |
| 246 | 246 | ** |
| @@ -250,11 +250,11 @@ | ||
| 250 | 250 | ** |
| 251 | 251 | ** Options: |
| 252 | 252 | ** -v|--verbose Extra diagnostic output |
| 253 | 253 | ** -n|--dryrun Show what would have happened |
| 254 | 254 | ** |
| 255 | -** remove|rm|delete [--] FILE ... | |
| 255 | +** remove|rm|delete ?--? FILE ... | |
| 256 | 256 | ** Remove unversioned files from the local repository. |
| 257 | 257 | ** Changes are not pushed to other repositories until |
| 258 | 258 | ** the next sync. |
| 259 | 259 | ** |
| 260 | 260 | ** sync ?URL? Synchronize the state of all unversioned files with |
| @@ -264,11 +264,11 @@ | ||
| 264 | 264 | ** |
| 265 | 265 | ** Options: |
| 266 | 266 | ** -v|--verbose Extra diagnostic output |
| 267 | 267 | ** -n|--dryrun Show what would have happened |
| 268 | 268 | ** |
| 269 | -** touch [--] FILE ... Update the TIMESTAMP on all of the listed files | |
| 269 | +** touch ?--? FILE ... Update the TIMESTAMP on all of the listed files | |
| 270 | 270 | ** |
| 271 | 271 | ** Options: |
| 272 | 272 | ** |
| 273 | 273 | ** --mtime TIMESTAMP Use TIMESTAMP instead of "now" for the "add", |
| 274 | 274 | ** "edit", "remove", and "touch" subcommands. |
| @@ -298,11 +298,11 @@ | ||
| 298 | 298 | const char *zFileArg; |
| 299 | 299 | Blob file; |
| 300 | 300 | int i; |
| 301 | 301 | zAs = find_option("as",0,1); |
| 302 | 302 | verify_all_options2(); |
| 303 | - if( zAs && g.argc!=4 ) usage("add --as UVFILE [--] DISKFILE"); | |
| 303 | + if( zAs && g.argc!=4 ) usage("add --as UVFILE ?--? DISKFILE"); | |
| 304 | 304 | db_begin_transaction(); |
| 305 | 305 | content_rcvid_init("#!fossil unversioned add"); |
| 306 | 306 | for(i=3; i<g.argc; i++){ |
| 307 | 307 | zIn = zAs ? zAs : g.argv[i]; |
| 308 | 308 | if( zIn[0]==0 ){ |
| @@ -342,11 +342,11 @@ | ||
| 342 | 342 | const char *zUVFile; /* Name of the unversioned file */ |
| 343 | 343 | char *zCmd; /* Command to run the text editor */ |
| 344 | 344 | Blob content; /* Content of the unversioned file */ |
| 345 | 345 | |
| 346 | 346 | verify_all_options2(); |
| 347 | - if( g.argc!=4) usage("edit [--] UVFILE"); | |
| 347 | + if( g.argc!=4) usage("edit ?--? UVFILE"); | |
| 348 | 348 | zUVFile = g.argv[3]; |
| 349 | 349 | zEditor = fossil_text_editor(); |
| 350 | 350 | if( zEditor==0 ) fossil_fatal("no text editor - set the VISUAL env variable"); |
| 351 | 351 | zTFile = fossil_temp_filename(); |
| 352 | 352 | if( zTFile==0 ) fossil_fatal("cannot find a temporary filename"); |
| @@ -379,11 +379,11 @@ | ||
| 379 | 379 | blob_reset(&content); |
| 380 | 380 | }else if( memcmp(zCmd, "export", nCmd)==0 ){ |
| 381 | 381 | Blob content; |
| 382 | 382 | const char * zOutfile; |
| 383 | 383 | verify_all_options2(); |
| 384 | - if( g.argc!=5 ) usage("export [--] UVFILE OUTPUT"); | |
| 384 | + if( g.argc!=5 ) usage("export ?--? UVFILE OUTPUT"); | |
| 385 | 385 | if( unversioned_content(g.argv[3], &content) ){ |
| 386 | 386 | fossil_fatal("no such uv-file: %Q", g.argv[3]); |
| 387 | 387 | } |
| 388 | 388 | /* |
| 389 | 389 | ** Pathological(?) corner case: |
| 390 | 390 |
| --- src/unversioned.c | |
| +++ src/unversioned.c | |
| @@ -218,11 +218,11 @@ | |
| 218 | ** of each UV-file is retained. Changes to an UV-file are permanent and cannot |
| 219 | ** be undone, so use appropriate caution with this command. |
| 220 | ** |
| 221 | ** Subcommands: |
| 222 | ** |
| 223 | ** add [--] FILE ... Add or update one or more unversioned files in |
| 224 | ** the local repository so that they match FILEs |
| 225 | ** on disk. Changes are not pushed to other |
| 226 | ** repositories until the next sync. |
| 227 | ** |
| 228 | ** add FILE --as UVFILE |
| @@ -232,15 +232,15 @@ | |
| 232 | ** namespace. This variant of the 'add' command allows |
| 233 | ** the name to be different in the repository versus |
| 234 | ** what appears on disk, but it only allows adding |
| 235 | ** a single file at a time. |
| 236 | ** |
| 237 | ** cat [--] FILE ... Concatenate the content of FILEs to stdout. |
| 238 | ** |
| 239 | ** edit [--] FILE Bring up FILE in a text editor for modification. |
| 240 | ** |
| 241 | ** export [--] FILE OUTPUT |
| 242 | ** Write the content of FILE into OUTPUT on disk |
| 243 | ** |
| 244 | ** list | ls Show all unversioned files held in the local |
| 245 | ** repository. |
| 246 | ** |
| @@ -250,11 +250,11 @@ | |
| 250 | ** |
| 251 | ** Options: |
| 252 | ** -v|--verbose Extra diagnostic output |
| 253 | ** -n|--dryrun Show what would have happened |
| 254 | ** |
| 255 | ** remove|rm|delete [--] FILE ... |
| 256 | ** Remove unversioned files from the local repository. |
| 257 | ** Changes are not pushed to other repositories until |
| 258 | ** the next sync. |
| 259 | ** |
| 260 | ** sync ?URL? Synchronize the state of all unversioned files with |
| @@ -264,11 +264,11 @@ | |
| 264 | ** |
| 265 | ** Options: |
| 266 | ** -v|--verbose Extra diagnostic output |
| 267 | ** -n|--dryrun Show what would have happened |
| 268 | ** |
| 269 | ** touch [--] FILE ... Update the TIMESTAMP on all of the listed files |
| 270 | ** |
| 271 | ** Options: |
| 272 | ** |
| 273 | ** --mtime TIMESTAMP Use TIMESTAMP instead of "now" for the "add", |
| 274 | ** "edit", "remove", and "touch" subcommands. |
| @@ -298,11 +298,11 @@ | |
| 298 | const char *zFileArg; |
| 299 | Blob file; |
| 300 | int i; |
| 301 | zAs = find_option("as",0,1); |
| 302 | verify_all_options2(); |
| 303 | if( zAs && g.argc!=4 ) usage("add --as UVFILE [--] DISKFILE"); |
| 304 | db_begin_transaction(); |
| 305 | content_rcvid_init("#!fossil unversioned add"); |
| 306 | for(i=3; i<g.argc; i++){ |
| 307 | zIn = zAs ? zAs : g.argv[i]; |
| 308 | if( zIn[0]==0 ){ |
| @@ -342,11 +342,11 @@ | |
| 342 | const char *zUVFile; /* Name of the unversioned file */ |
| 343 | char *zCmd; /* Command to run the text editor */ |
| 344 | Blob content; /* Content of the unversioned file */ |
| 345 | |
| 346 | verify_all_options2(); |
| 347 | if( g.argc!=4) usage("edit [--] UVFILE"); |
| 348 | zUVFile = g.argv[3]; |
| 349 | zEditor = fossil_text_editor(); |
| 350 | if( zEditor==0 ) fossil_fatal("no text editor - set the VISUAL env variable"); |
| 351 | zTFile = fossil_temp_filename(); |
| 352 | if( zTFile==0 ) fossil_fatal("cannot find a temporary filename"); |
| @@ -379,11 +379,11 @@ | |
| 379 | blob_reset(&content); |
| 380 | }else if( memcmp(zCmd, "export", nCmd)==0 ){ |
| 381 | Blob content; |
| 382 | const char * zOutfile; |
| 383 | verify_all_options2(); |
| 384 | if( g.argc!=5 ) usage("export [--] UVFILE OUTPUT"); |
| 385 | if( unversioned_content(g.argv[3], &content) ){ |
| 386 | fossil_fatal("no such uv-file: %Q", g.argv[3]); |
| 387 | } |
| 388 | /* |
| 389 | ** Pathological(?) corner case: |
| 390 |
| --- src/unversioned.c | |
| +++ src/unversioned.c | |
| @@ -218,11 +218,11 @@ | |
| 218 | ** of each UV-file is retained. Changes to an UV-file are permanent and cannot |
| 219 | ** be undone, so use appropriate caution with this command. |
| 220 | ** |
| 221 | ** Subcommands: |
| 222 | ** |
| 223 | ** add ?--? FILE ... Add or update one or more unversioned files in |
| 224 | ** the local repository so that they match FILEs |
| 225 | ** on disk. Changes are not pushed to other |
| 226 | ** repositories until the next sync. |
| 227 | ** |
| 228 | ** add FILE --as UVFILE |
| @@ -232,15 +232,15 @@ | |
| 232 | ** namespace. This variant of the 'add' command allows |
| 233 | ** the name to be different in the repository versus |
| 234 | ** what appears on disk, but it only allows adding |
| 235 | ** a single file at a time. |
| 236 | ** |
| 237 | ** cat ?--? FILE ... Concatenate the content of FILEs to stdout. |
| 238 | ** |
| 239 | ** edit ?--? FILE Bring up FILE in a text editor for modification. |
| 240 | ** |
| 241 | ** export ?--? FILE OUTPUT |
| 242 | ** Write the content of FILE into OUTPUT on disk |
| 243 | ** |
| 244 | ** list | ls Show all unversioned files held in the local |
| 245 | ** repository. |
| 246 | ** |
| @@ -250,11 +250,11 @@ | |
| 250 | ** |
| 251 | ** Options: |
| 252 | ** -v|--verbose Extra diagnostic output |
| 253 | ** -n|--dryrun Show what would have happened |
| 254 | ** |
| 255 | ** remove|rm|delete ?--? FILE ... |
| 256 | ** Remove unversioned files from the local repository. |
| 257 | ** Changes are not pushed to other repositories until |
| 258 | ** the next sync. |
| 259 | ** |
| 260 | ** sync ?URL? Synchronize the state of all unversioned files with |
| @@ -264,11 +264,11 @@ | |
| 264 | ** |
| 265 | ** Options: |
| 266 | ** -v|--verbose Extra diagnostic output |
| 267 | ** -n|--dryrun Show what would have happened |
| 268 | ** |
| 269 | ** touch ?--? FILE ... Update the TIMESTAMP on all of the listed files |
| 270 | ** |
| 271 | ** Options: |
| 272 | ** |
| 273 | ** --mtime TIMESTAMP Use TIMESTAMP instead of "now" for the "add", |
| 274 | ** "edit", "remove", and "touch" subcommands. |
| @@ -298,11 +298,11 @@ | |
| 298 | const char *zFileArg; |
| 299 | Blob file; |
| 300 | int i; |
| 301 | zAs = find_option("as",0,1); |
| 302 | verify_all_options2(); |
| 303 | if( zAs && g.argc!=4 ) usage("add --as UVFILE ?--? DISKFILE"); |
| 304 | db_begin_transaction(); |
| 305 | content_rcvid_init("#!fossil unversioned add"); |
| 306 | for(i=3; i<g.argc; i++){ |
| 307 | zIn = zAs ? zAs : g.argv[i]; |
| 308 | if( zIn[0]==0 ){ |
| @@ -342,11 +342,11 @@ | |
| 342 | const char *zUVFile; /* Name of the unversioned file */ |
| 343 | char *zCmd; /* Command to run the text editor */ |
| 344 | Blob content; /* Content of the unversioned file */ |
| 345 | |
| 346 | verify_all_options2(); |
| 347 | if( g.argc!=4) usage("edit ?--? UVFILE"); |
| 348 | zUVFile = g.argv[3]; |
| 349 | zEditor = fossil_text_editor(); |
| 350 | if( zEditor==0 ) fossil_fatal("no text editor - set the VISUAL env variable"); |
| 351 | zTFile = fossil_temp_filename(); |
| 352 | if( zTFile==0 ) fossil_fatal("cannot find a temporary filename"); |
| @@ -379,11 +379,11 @@ | |
| 379 | blob_reset(&content); |
| 380 | }else if( memcmp(zCmd, "export", nCmd)==0 ){ |
| 381 | Blob content; |
| 382 | const char * zOutfile; |
| 383 | verify_all_options2(); |
| 384 | if( g.argc!=5 ) usage("export ?--? UVFILE OUTPUT"); |
| 385 | if( unversioned_content(g.argv[3], &content) ){ |
| 386 | fossil_fatal("no such uv-file: %Q", g.argv[3]); |
| 387 | } |
| 388 | /* |
| 389 | ** Pathological(?) corner case: |
| 390 |
+5
-5
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -1364,12 +1364,12 @@ | ||
| 1364 | 1364 | ** |
| 1365 | 1365 | ** Usage: %fossil wiki (export|create|commit|list) WikiName |
| 1366 | 1366 | ** |
| 1367 | 1367 | ** Run various subcommands to work with wiki entries or tech notes. |
| 1368 | 1368 | ** |
| 1369 | -** %fossil wiki export PAGENAME [--] ?FILE? | |
| 1370 | -** %fossil wiki export -t|--technote DATETIME|TECHNOTE-ID [--] ?FILE? | |
| 1369 | +** %fossil wiki export PAGENAME ?--? ?FILE? | |
| 1370 | +** %fossil wiki export -t|--technote DATETIME|TECHNOTE-ID ?--? ?FILE? | |
| 1371 | 1371 | ** |
| 1372 | 1372 | ** Sends the latest version of either a wiki page or of a tech note |
| 1373 | 1373 | ** to the given file or standard output. |
| 1374 | 1374 | ** If PAGENAME is provided, the wiki page will be output. For |
| 1375 | 1375 | ** a tech note either DATETIME or TECHNOTE-ID must be specified. If |
| @@ -1454,11 +1454,11 @@ | ||
| 1454 | 1454 | Manifest *pWiki = 0; /* Parsed wiki page content */ |
| 1455 | 1455 | zETime = find_option("technote","t",1); |
| 1456 | 1456 | verify_all_options2(); |
| 1457 | 1457 | if( !zETime ){ |
| 1458 | 1458 | if( (g.argc!=4) && (g.argc!=5) ){ |
| 1459 | - usage("export PAGENAME [--] ?FILE?"); | |
| 1459 | + usage("export PAGENAME ?--? ?FILE?"); | |
| 1460 | 1460 | } |
| 1461 | 1461 | zPageName = g.argv[3]; |
| 1462 | 1462 | rid = db_int(0, "SELECT x.rid FROM tag t, tagxref x" |
| 1463 | 1463 | " WHERE x.tagid=t.tagid AND t.tagname='wiki-%q'" |
| 1464 | 1464 | " ORDER BY x.mtime DESC LIMIT 1", |
| @@ -1471,11 +1471,11 @@ | ||
| 1471 | 1471 | fossil_fatal("wiki page [%s] not found",zPageName); |
| 1472 | 1472 | } |
| 1473 | 1473 | zFile = g.argc==4 ? "-" : get_dash_filename_arg(4); |
| 1474 | 1474 | }else{ |
| 1475 | 1475 | if( (g.argc!=3) && (g.argc!=4) ){ |
| 1476 | - usage("export --technote DATETIME|TECHNOTE-ID [--] ?FILE?"); | |
| 1476 | + usage("export --technote DATETIME|TECHNOTE-ID ?--? ?FILE?"); | |
| 1477 | 1477 | } |
| 1478 | 1478 | rid = wiki_technote_to_rid(zETime); |
| 1479 | 1479 | if ( rid==-1 ){ |
| 1480 | 1480 | fossil_fatal("ambiguous tech note id: %s", zETime); |
| 1481 | 1481 | } |
| @@ -1507,11 +1507,11 @@ | ||
| 1507 | 1507 | const char *zClr = find_option("technote-bgcolor", NULL, 1); |
| 1508 | 1508 | verify_all_options2(); |
| 1509 | 1509 | if( g.argc!=4 && g.argc!=5 ){ |
| 1510 | 1510 | usage("commit|create PAGENAME [--mimetype TEXT-FORMAT]" |
| 1511 | 1511 | " [--technote DATETIME] [--technote-tags TAGS]" |
| 1512 | - " [--technote-bgcolor COLOR] [--] ?FILE?"); | |
| 1512 | + " [--technote-bgcolor COLOR] ?--? ?FILE?"); | |
| 1513 | 1513 | } |
| 1514 | 1514 | zPageName = g.argv[3]; |
| 1515 | 1515 | if( g.argc==4 ){ |
| 1516 | 1516 | blob_read_from_channel(&content, stdin, -1); |
| 1517 | 1517 | }else{ |
| 1518 | 1518 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -1364,12 +1364,12 @@ | |
| 1364 | ** |
| 1365 | ** Usage: %fossil wiki (export|create|commit|list) WikiName |
| 1366 | ** |
| 1367 | ** Run various subcommands to work with wiki entries or tech notes. |
| 1368 | ** |
| 1369 | ** %fossil wiki export PAGENAME [--] ?FILE? |
| 1370 | ** %fossil wiki export -t|--technote DATETIME|TECHNOTE-ID [--] ?FILE? |
| 1371 | ** |
| 1372 | ** Sends the latest version of either a wiki page or of a tech note |
| 1373 | ** to the given file or standard output. |
| 1374 | ** If PAGENAME is provided, the wiki page will be output. For |
| 1375 | ** a tech note either DATETIME or TECHNOTE-ID must be specified. If |
| @@ -1454,11 +1454,11 @@ | |
| 1454 | Manifest *pWiki = 0; /* Parsed wiki page content */ |
| 1455 | zETime = find_option("technote","t",1); |
| 1456 | verify_all_options2(); |
| 1457 | if( !zETime ){ |
| 1458 | if( (g.argc!=4) && (g.argc!=5) ){ |
| 1459 | usage("export PAGENAME [--] ?FILE?"); |
| 1460 | } |
| 1461 | zPageName = g.argv[3]; |
| 1462 | rid = db_int(0, "SELECT x.rid FROM tag t, tagxref x" |
| 1463 | " WHERE x.tagid=t.tagid AND t.tagname='wiki-%q'" |
| 1464 | " ORDER BY x.mtime DESC LIMIT 1", |
| @@ -1471,11 +1471,11 @@ | |
| 1471 | fossil_fatal("wiki page [%s] not found",zPageName); |
| 1472 | } |
| 1473 | zFile = g.argc==4 ? "-" : get_dash_filename_arg(4); |
| 1474 | }else{ |
| 1475 | if( (g.argc!=3) && (g.argc!=4) ){ |
| 1476 | usage("export --technote DATETIME|TECHNOTE-ID [--] ?FILE?"); |
| 1477 | } |
| 1478 | rid = wiki_technote_to_rid(zETime); |
| 1479 | if ( rid==-1 ){ |
| 1480 | fossil_fatal("ambiguous tech note id: %s", zETime); |
| 1481 | } |
| @@ -1507,11 +1507,11 @@ | |
| 1507 | const char *zClr = find_option("technote-bgcolor", NULL, 1); |
| 1508 | verify_all_options2(); |
| 1509 | if( g.argc!=4 && g.argc!=5 ){ |
| 1510 | usage("commit|create PAGENAME [--mimetype TEXT-FORMAT]" |
| 1511 | " [--technote DATETIME] [--technote-tags TAGS]" |
| 1512 | " [--technote-bgcolor COLOR] [--] ?FILE?"); |
| 1513 | } |
| 1514 | zPageName = g.argv[3]; |
| 1515 | if( g.argc==4 ){ |
| 1516 | blob_read_from_channel(&content, stdin, -1); |
| 1517 | }else{ |
| 1518 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -1364,12 +1364,12 @@ | |
| 1364 | ** |
| 1365 | ** Usage: %fossil wiki (export|create|commit|list) WikiName |
| 1366 | ** |
| 1367 | ** Run various subcommands to work with wiki entries or tech notes. |
| 1368 | ** |
| 1369 | ** %fossil wiki export PAGENAME ?--? ?FILE? |
| 1370 | ** %fossil wiki export -t|--technote DATETIME|TECHNOTE-ID ?--? ?FILE? |
| 1371 | ** |
| 1372 | ** Sends the latest version of either a wiki page or of a tech note |
| 1373 | ** to the given file or standard output. |
| 1374 | ** If PAGENAME is provided, the wiki page will be output. For |
| 1375 | ** a tech note either DATETIME or TECHNOTE-ID must be specified. If |
| @@ -1454,11 +1454,11 @@ | |
| 1454 | Manifest *pWiki = 0; /* Parsed wiki page content */ |
| 1455 | zETime = find_option("technote","t",1); |
| 1456 | verify_all_options2(); |
| 1457 | if( !zETime ){ |
| 1458 | if( (g.argc!=4) && (g.argc!=5) ){ |
| 1459 | usage("export PAGENAME ?--? ?FILE?"); |
| 1460 | } |
| 1461 | zPageName = g.argv[3]; |
| 1462 | rid = db_int(0, "SELECT x.rid FROM tag t, tagxref x" |
| 1463 | " WHERE x.tagid=t.tagid AND t.tagname='wiki-%q'" |
| 1464 | " ORDER BY x.mtime DESC LIMIT 1", |
| @@ -1471,11 +1471,11 @@ | |
| 1471 | fossil_fatal("wiki page [%s] not found",zPageName); |
| 1472 | } |
| 1473 | zFile = g.argc==4 ? "-" : get_dash_filename_arg(4); |
| 1474 | }else{ |
| 1475 | if( (g.argc!=3) && (g.argc!=4) ){ |
| 1476 | usage("export --technote DATETIME|TECHNOTE-ID ?--? ?FILE?"); |
| 1477 | } |
| 1478 | rid = wiki_technote_to_rid(zETime); |
| 1479 | if ( rid==-1 ){ |
| 1480 | fossil_fatal("ambiguous tech note id: %s", zETime); |
| 1481 | } |
| @@ -1507,11 +1507,11 @@ | |
| 1507 | const char *zClr = find_option("technote-bgcolor", NULL, 1); |
| 1508 | verify_all_options2(); |
| 1509 | if( g.argc!=4 && g.argc!=5 ){ |
| 1510 | usage("commit|create PAGENAME [--mimetype TEXT-FORMAT]" |
| 1511 | " [--technote DATETIME] [--technote-tags TAGS]" |
| 1512 | " [--technote-bgcolor COLOR] ?--? ?FILE?"); |
| 1513 | } |
| 1514 | zPageName = g.argv[3]; |
| 1515 | if( g.argc==4 ){ |
| 1516 | blob_read_from_channel(&content, stdin, -1); |
| 1517 | }else{ |
| 1518 |