Fossil SCM
removed quotes from command cross references and add them in help command
Commit
b3bf08cc843a7de39968ecb41c8b14e5c9adae18
Parent
ad29dc11328e14a…
7 files changed
+3
-3
+2
-2
+2
-2
+1
-1
+30
-28
+6
-6
+1
-1
+3
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -101,11 +101,11 @@ | ||
| 101 | 101 | ** COMMAND: changes |
| 102 | 102 | ** |
| 103 | 103 | ** Usage: %fossil changes |
| 104 | 104 | ** |
| 105 | 105 | ** Report on the edit status of all files in the current checkout. |
| 106 | -** See also the "<a>status</a>" and "<a>extra</a>" commands. | |
| 106 | +** See also the <a>status</a> and <a>extra</a> commands. | |
| 107 | 107 | */ |
| 108 | 108 | void changes_cmd(void){ |
| 109 | 109 | Blob report; |
| 110 | 110 | int vid; |
| 111 | 111 | db_must_be_within_tree(); |
| @@ -247,11 +247,11 @@ | ||
| 247 | 247 | /* |
| 248 | 248 | ** COMMAND: extras |
| 249 | 249 | ** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN? |
| 250 | 250 | ** |
| 251 | 251 | ** Print a list of all files in the source tree that are not part of |
| 252 | -** the current checkout. See also the "<a>clean</a>" command. | |
| 252 | +** the current checkout. See also the <a>clean</a> command. | |
| 253 | 253 | ** |
| 254 | 254 | ** Files and subdirectories whose names begin with "." are normally |
| 255 | 255 | ** ignored but can be included by adding the --dotfiles option. |
| 256 | 256 | */ |
| 257 | 257 | void extra_cmd(void){ |
| @@ -293,11 +293,11 @@ | ||
| 293 | 293 | ** COMMAND: clean |
| 294 | 294 | ** Usage: %fossil clean ?--force? ?--dotfiles? |
| 295 | 295 | ** |
| 296 | 296 | ** Delete all "extra" files in the source tree. "Extra" files are |
| 297 | 297 | ** files that are not officially part of the checkout. See also |
| 298 | -** the "<a>extras</a>" command. This operation cannot be undone. | |
| 298 | +** the <a>extras</a> command. This operation cannot be undone. | |
| 299 | 299 | ** |
| 300 | 300 | ** You will be prompted before removing each file. If you are |
| 301 | 301 | ** sure you wish to remove all "extra" files you can specify the |
| 302 | 302 | ** optional --force flag and no prompts will be issued. |
| 303 | 303 | ** |
| 304 | 304 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -101,11 +101,11 @@ | |
| 101 | ** COMMAND: changes |
| 102 | ** |
| 103 | ** Usage: %fossil changes |
| 104 | ** |
| 105 | ** Report on the edit status of all files in the current checkout. |
| 106 | ** See also the "<a>status</a>" and "<a>extra</a>" commands. |
| 107 | */ |
| 108 | void changes_cmd(void){ |
| 109 | Blob report; |
| 110 | int vid; |
| 111 | db_must_be_within_tree(); |
| @@ -247,11 +247,11 @@ | |
| 247 | /* |
| 248 | ** COMMAND: extras |
| 249 | ** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN? |
| 250 | ** |
| 251 | ** Print a list of all files in the source tree that are not part of |
| 252 | ** the current checkout. See also the "<a>clean</a>" command. |
| 253 | ** |
| 254 | ** Files and subdirectories whose names begin with "." are normally |
| 255 | ** ignored but can be included by adding the --dotfiles option. |
| 256 | */ |
| 257 | void extra_cmd(void){ |
| @@ -293,11 +293,11 @@ | |
| 293 | ** COMMAND: clean |
| 294 | ** Usage: %fossil clean ?--force? ?--dotfiles? |
| 295 | ** |
| 296 | ** Delete all "extra" files in the source tree. "Extra" files are |
| 297 | ** files that are not officially part of the checkout. See also |
| 298 | ** the "<a>extras</a>" command. This operation cannot be undone. |
| 299 | ** |
| 300 | ** You will be prompted before removing each file. If you are |
| 301 | ** sure you wish to remove all "extra" files you can specify the |
| 302 | ** optional --force flag and no prompts will be issued. |
| 303 | ** |
| 304 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -101,11 +101,11 @@ | |
| 101 | ** COMMAND: changes |
| 102 | ** |
| 103 | ** Usage: %fossil changes |
| 104 | ** |
| 105 | ** Report on the edit status of all files in the current checkout. |
| 106 | ** See also the <a>status</a> and <a>extra</a> commands. |
| 107 | */ |
| 108 | void changes_cmd(void){ |
| 109 | Blob report; |
| 110 | int vid; |
| 111 | db_must_be_within_tree(); |
| @@ -247,11 +247,11 @@ | |
| 247 | /* |
| 248 | ** COMMAND: extras |
| 249 | ** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN? |
| 250 | ** |
| 251 | ** Print a list of all files in the source tree that are not part of |
| 252 | ** the current checkout. See also the <a>clean</a> command. |
| 253 | ** |
| 254 | ** Files and subdirectories whose names begin with "." are normally |
| 255 | ** ignored but can be included by adding the --dotfiles option. |
| 256 | */ |
| 257 | void extra_cmd(void){ |
| @@ -293,11 +293,11 @@ | |
| 293 | ** COMMAND: clean |
| 294 | ** Usage: %fossil clean ?--force? ?--dotfiles? |
| 295 | ** |
| 296 | ** Delete all "extra" files in the source tree. "Extra" files are |
| 297 | ** files that are not officially part of the checkout. See also |
| 298 | ** the <a>extras</a> command. This operation cannot be undone. |
| 299 | ** |
| 300 | ** You will be prompted before removing each file. If you are |
| 301 | ** sure you wish to remove all "extra" files you can specify the |
| 302 | ** optional --force flag and no prompts will be issued. |
| 303 | ** |
| 304 |
+2
-2
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -172,11 +172,11 @@ | ||
| 172 | 172 | ** files. |
| 173 | 173 | ** |
| 174 | 174 | ** The --latest flag can be used in place of VERSION to checkout the |
| 175 | 175 | ** latest version in the repository. |
| 176 | 176 | ** |
| 177 | -** See also the "<a>update</a>" command. | |
| 177 | +** See also the <a>update</a> command. | |
| 178 | 178 | */ |
| 179 | 179 | void checkout_cmd(void){ |
| 180 | 180 | int forceFlag; /* Force checkout even if edits exist */ |
| 181 | 181 | int keepFlag; /* Do not change any files on disk */ |
| 182 | 182 | int latestFlag; /* Checkout the latest version */ |
| @@ -272,11 +272,11 @@ | ||
| 272 | 272 | /* |
| 273 | 273 | ** COMMAND: close |
| 274 | 274 | ** |
| 275 | 275 | ** Usage: %fossil close ?-f|--force? |
| 276 | 276 | ** |
| 277 | -** The opposite of "<a>open</a>". Close the current database connection. | |
| 277 | +** The opposite of <a>open</a>. Close the current database connection. | |
| 278 | 278 | ** Require a -f or --force flag if there are unsaved changed in the |
| 279 | 279 | ** current check-out. |
| 280 | 280 | */ |
| 281 | 281 | void close_cmd(void){ |
| 282 | 282 | int forceFlag = find_option("force","f",0)!=0; |
| 283 | 283 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -172,11 +172,11 @@ | |
| 172 | ** files. |
| 173 | ** |
| 174 | ** The --latest flag can be used in place of VERSION to checkout the |
| 175 | ** latest version in the repository. |
| 176 | ** |
| 177 | ** See also the "<a>update</a>" command. |
| 178 | */ |
| 179 | void checkout_cmd(void){ |
| 180 | int forceFlag; /* Force checkout even if edits exist */ |
| 181 | int keepFlag; /* Do not change any files on disk */ |
| 182 | int latestFlag; /* Checkout the latest version */ |
| @@ -272,11 +272,11 @@ | |
| 272 | /* |
| 273 | ** COMMAND: close |
| 274 | ** |
| 275 | ** Usage: %fossil close ?-f|--force? |
| 276 | ** |
| 277 | ** The opposite of "<a>open</a>". Close the current database connection. |
| 278 | ** Require a -f or --force flag if there are unsaved changed in the |
| 279 | ** current check-out. |
| 280 | */ |
| 281 | void close_cmd(void){ |
| 282 | int forceFlag = find_option("force","f",0)!=0; |
| 283 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -172,11 +172,11 @@ | |
| 172 | ** files. |
| 173 | ** |
| 174 | ** The --latest flag can be used in place of VERSION to checkout the |
| 175 | ** latest version in the repository. |
| 176 | ** |
| 177 | ** See also the <a>update</a> command. |
| 178 | */ |
| 179 | void checkout_cmd(void){ |
| 180 | int forceFlag; /* Force checkout even if edits exist */ |
| 181 | int keepFlag; /* Do not change any files on disk */ |
| 182 | int latestFlag; /* Checkout the latest version */ |
| @@ -272,11 +272,11 @@ | |
| 272 | /* |
| 273 | ** COMMAND: close |
| 274 | ** |
| 275 | ** Usage: %fossil close ?-f|--force? |
| 276 | ** |
| 277 | ** The opposite of <a>open</a>. Close the current database connection. |
| 278 | ** Require a -f or --force flag if there are unsaved changed in the |
| 279 | ** current check-out. |
| 280 | */ |
| 281 | void close_cmd(void){ |
| 282 | int forceFlag = find_option("force","f",0)!=0; |
| 283 |
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1035,11 +1035,11 @@ | ||
| 1035 | 1035 | ** COMMAND: new |
| 1036 | 1036 | ** |
| 1037 | 1037 | ** Usage: %fossil new ?OPTIONS? FILENAME |
| 1038 | 1038 | ** |
| 1039 | 1039 | ** Create a repository for a new project in the file named FILENAME. |
| 1040 | -** This command is distinct from "clone". The "<a>clone</a>" command makes | |
| 1040 | +** This command is distinct from "clone". The <a>clone</a> command makes | |
| 1041 | 1041 | ** a copy of an existing project. This command starts a new project. |
| 1042 | 1042 | ** |
| 1043 | 1043 | ** By default, your current login name is used to create the default |
| 1044 | 1044 | ** admin user. This can be overridden using the -A|--admin-user |
| 1045 | 1045 | ** parameter. |
| @@ -1420,11 +1420,11 @@ | ||
| 1420 | 1420 | ** for the repository is created with its root at the working directory. |
| 1421 | 1421 | ** If VERSION is specified then that version is checked out. Otherwise |
| 1422 | 1422 | ** the latest version is checked out. No files other than "manifest" |
| 1423 | 1423 | ** and "manifest.uuid" are modified if the --keep option is present. |
| 1424 | 1424 | ** |
| 1425 | -** See also the "<a>close</a>" command. | |
| 1425 | +** See also the <a>close</a> command. | |
| 1426 | 1426 | */ |
| 1427 | 1427 | void cmd_open(void){ |
| 1428 | 1428 | Blob path; |
| 1429 | 1429 | int vid; |
| 1430 | 1430 | int keepFlag; |
| 1431 | 1431 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1035,11 +1035,11 @@ | |
| 1035 | ** COMMAND: new |
| 1036 | ** |
| 1037 | ** Usage: %fossil new ?OPTIONS? FILENAME |
| 1038 | ** |
| 1039 | ** Create a repository for a new project in the file named FILENAME. |
| 1040 | ** This command is distinct from "clone". The "<a>clone</a>" command makes |
| 1041 | ** a copy of an existing project. This command starts a new project. |
| 1042 | ** |
| 1043 | ** By default, your current login name is used to create the default |
| 1044 | ** admin user. This can be overridden using the -A|--admin-user |
| 1045 | ** parameter. |
| @@ -1420,11 +1420,11 @@ | |
| 1420 | ** for the repository is created with its root at the working directory. |
| 1421 | ** If VERSION is specified then that version is checked out. Otherwise |
| 1422 | ** the latest version is checked out. No files other than "manifest" |
| 1423 | ** and "manifest.uuid" are modified if the --keep option is present. |
| 1424 | ** |
| 1425 | ** See also the "<a>close</a>" command. |
| 1426 | */ |
| 1427 | void cmd_open(void){ |
| 1428 | Blob path; |
| 1429 | int vid; |
| 1430 | int keepFlag; |
| 1431 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1035,11 +1035,11 @@ | |
| 1035 | ** COMMAND: new |
| 1036 | ** |
| 1037 | ** Usage: %fossil new ?OPTIONS? FILENAME |
| 1038 | ** |
| 1039 | ** Create a repository for a new project in the file named FILENAME. |
| 1040 | ** This command is distinct from "clone". The <a>clone</a> command makes |
| 1041 | ** a copy of an existing project. This command starts a new project. |
| 1042 | ** |
| 1043 | ** By default, your current login name is used to create the default |
| 1044 | ** admin user. This can be overridden using the -A|--admin-user |
| 1045 | ** parameter. |
| @@ -1420,11 +1420,11 @@ | |
| 1420 | ** for the repository is created with its root at the working directory. |
| 1421 | ** If VERSION is specified then that version is checked out. Otherwise |
| 1422 | ** the latest version is checked out. No files other than "manifest" |
| 1423 | ** and "manifest.uuid" are modified if the --keep option is present. |
| 1424 | ** |
| 1425 | ** See also the <a>close</a> command. |
| 1426 | */ |
| 1427 | void cmd_open(void){ |
| 1428 | Blob path; |
| 1429 | int vid; |
| 1430 | int keepFlag; |
| 1431 |
+1
-1
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -364,11 +364,11 @@ | ||
| 364 | 364 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 365 | 365 | ** are used. |
| 366 | 366 | ** |
| 367 | 367 | ** The "-i" command-line option forces the use of the internal diff logic |
| 368 | 368 | ** rather than any external diff program that might be configured using |
| 369 | -** the "<a>setting</a>" command. If no external diff program is configured, then | |
| 369 | +** the <a>setting</a> command. If no external diff program is configured, then | |
| 370 | 370 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 371 | 371 | */ |
| 372 | 372 | void diff_cmd(void){ |
| 373 | 373 | int isGDiff; /* True for gdiff. False for normal diff */ |
| 374 | 374 | int isInternDiff; /* True for internal diff */ |
| 375 | 375 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -364,11 +364,11 @@ | |
| 364 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 365 | ** are used. |
| 366 | ** |
| 367 | ** The "-i" command-line option forces the use of the internal diff logic |
| 368 | ** rather than any external diff program that might be configured using |
| 369 | ** the "<a>setting</a>" command. If no external diff program is configured, then |
| 370 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 371 | */ |
| 372 | void diff_cmd(void){ |
| 373 | int isGDiff; /* True for gdiff. False for normal diff */ |
| 374 | int isInternDiff; /* True for internal diff */ |
| 375 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -364,11 +364,11 @@ | |
| 364 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 365 | ** are used. |
| 366 | ** |
| 367 | ** The "-i" command-line option forces the use of the internal diff logic |
| 368 | ** rather than any external diff program that might be configured using |
| 369 | ** the <a>setting</a> command. If no external diff program is configured, then |
| 370 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 371 | */ |
| 372 | void diff_cmd(void){ |
| 373 | int isGDiff; /* True for gdiff. False for normal diff */ |
| 374 | int isInternDiff; /* True for internal diff */ |
| 375 |
+30
-28
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -585,12 +585,14 @@ | ||
| 585 | 585 | while( *z ){ |
| 586 | 586 | if( *z=='%' && strncmp(z, "%fossil", 7)==0 ){ |
| 587 | 587 | printf("%s", g.argv[0]); |
| 588 | 588 | z += 7; |
| 589 | 589 | }else if( *z=='<' && strncmp(z,"<a>",3)==0 ){ |
| 590 | + putchar('"'); | |
| 590 | 591 | z += 3; |
| 591 | 592 | }else if( *z=='<' && strncmp(z,"</a>",4)==0 ){ |
| 593 | + putchar('"'); | |
| 592 | 594 | z += 4; |
| 593 | 595 | }else{ |
| 594 | 596 | putchar(*z); |
| 595 | 597 | z++; |
| 596 | 598 | } |
| @@ -616,29 +618,29 @@ | ||
| 616 | 618 | }else if( rc==2 ){ |
| 617 | 619 | @ ambiguous command prefix: %s(zCmd) |
| 618 | 620 | }else{ |
| 619 | 621 | char *zSrc, *zDest; |
| 620 | 622 | int src,dest,len; |
| 621 | - | |
| 623 | + | |
| 622 | 624 | zSrc = (char*)aCmdHelp[idx]; |
| 623 | 625 | if( zSrc==0 || *zSrc==0 ){ |
| 624 | 626 | @ no help available for the %s(aCommand[idx].zName) command |
| 625 | 627 | }else{ |
| 626 | - len = strlen(zSrc); | |
| 628 | + len = strlen(zSrc); | |
| 627 | 629 | zDest = malloc(len+1); |
| 628 | - for(src=dest=0;zSrc[src];){ | |
| 629 | - if( zSrc[src]=='%' && strncmp(zSrc+src, "%fossil", 7)==0 ){ | |
| 630 | - src++; /* skip % for fossil argv[0] expansion */ | |
| 631 | - }else if( zSrc[src]=='<' && strncmp(zSrc+src, "<a>", 3)==0 ){ | |
| 632 | - /* found an internal command cross reference, | |
| 633 | - ** create an additional link | |
| 634 | - */ | |
| 635 | - int start; | |
| 630 | + for(src=dest=0;zSrc[src];){ | |
| 631 | + if( zSrc[src]=='%' && strncmp(zSrc+src, "%fossil", 7)==0 ){ | |
| 632 | + src++; /* skip % for fossil argv[0] expansion */ | |
| 633 | + }else if( zSrc[src]=='<' && strncmp(zSrc+src, "<a>", 3)==0 ){ | |
| 634 | + /* found an internal command cross reference, | |
| 635 | + ** create an additional link | |
| 636 | + */ | |
| 637 | + int start; | |
| 636 | 638 | |
| 637 | 639 | len+=80; |
| 638 | - zDest=realloc(zDest,len); | |
| 639 | - zDest[dest++]=zSrc[src++]; /* < */ | |
| 640 | + zDest=realloc(zDest,len); | |
| 641 | + zDest[dest++]=zSrc[src++]; /* < */ | |
| 640 | 642 | zDest[dest++]=zSrc[src++]; /* a */ |
| 641 | 643 | zDest[dest++]=' '; |
| 642 | 644 | zDest[dest++]='h'; |
| 643 | 645 | zDest[dest++]='r'; |
| 644 | 646 | zDest[dest++]='e'; |
| @@ -652,36 +654,36 @@ | ||
| 652 | 654 | zDest[dest++]='?'; |
| 653 | 655 | zDest[dest++]='c'; |
| 654 | 656 | zDest[dest++]='m'; |
| 655 | 657 | zDest[dest++]='d'; |
| 656 | 658 | zDest[dest++]='='; |
| 657 | - start = src+1; | |
| 658 | - for( src=start; zSrc[src] && zSrc[src]!='<'; ){ | |
| 659 | - zDest[dest++]=zSrc[src++]; /* command name */ | |
| 660 | - } | |
| 659 | + start = src+1; | |
| 660 | + for( src=start; zSrc[src] && zSrc[src]!='<'; ){ | |
| 661 | + zDest[dest++]=zSrc[src++]; /* command name */ | |
| 662 | + } | |
| 661 | 663 | zDest[dest++]='"'; |
| 662 | 664 | zDest[dest++]='>'; |
| 663 | - for( src=start; zSrc[src] && zSrc[src]!='<'; ){ | |
| 664 | - zDest[dest++]=zSrc[src++]; /* command name */ | |
| 665 | - } | |
| 666 | - }else{ | |
| 667 | - zDest[dest++] = zSrc[src++]; | |
| 668 | - } | |
| 669 | - } | |
| 670 | - zDest[dest] = 0; | |
| 671 | - @ <pre>%s(zDest)</pre> | |
| 672 | - free(zDest); | |
| 673 | - } | |
| 665 | + for( src=start; zSrc[src] && zSrc[src]!='<'; ){ | |
| 666 | + zDest[dest++]=zSrc[src++]; /* command name */ | |
| 667 | + } | |
| 668 | + }else{ | |
| 669 | + zDest[dest++] = zSrc[src++]; | |
| 670 | + } | |
| 671 | + } | |
| 672 | + zDest[dest] = 0; | |
| 673 | + @ <pre>%s(zDest)</pre> | |
| 674 | + free(zDest); | |
| 675 | + } | |
| 674 | 676 | } |
| 675 | 677 | @ <hr>additional information may be found in the web documentation: |
| 676 | 678 | @ <a href="doc/tip/www/cmd_%s(aCommand[idx].zName).wiki"> |
| 677 | 679 | @ cmd_%s(aCommand[idx].zName)</a>, see also the list of |
| 678 | 680 | @ <a href="help">available commands</a> in fossil |
| 679 | 681 | @ version %s(MANIFEST_VERSION" "MANIFEST_DATE) UTC |
| 680 | 682 | }else{ |
| 681 | 683 | int i; |
| 682 | - | |
| 684 | + | |
| 683 | 685 | @ <h1>Available commands</h1> |
| 684 | 686 | for(i=0; i<count(aCommand); i++){ |
| 685 | 687 | if( strncmp(aCommand[i].zName,"test",4)==0 ) continue; |
| 686 | 688 | @ <kbd><a href="help?cmd=%s(aCommand[i].zName)"> |
| 687 | 689 | @ %s(aCommand[i].zName)</a></kbd> |
| 688 | 690 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -585,12 +585,14 @@ | |
| 585 | while( *z ){ |
| 586 | if( *z=='%' && strncmp(z, "%fossil", 7)==0 ){ |
| 587 | printf("%s", g.argv[0]); |
| 588 | z += 7; |
| 589 | }else if( *z=='<' && strncmp(z,"<a>",3)==0 ){ |
| 590 | z += 3; |
| 591 | }else if( *z=='<' && strncmp(z,"</a>",4)==0 ){ |
| 592 | z += 4; |
| 593 | }else{ |
| 594 | putchar(*z); |
| 595 | z++; |
| 596 | } |
| @@ -616,29 +618,29 @@ | |
| 616 | }else if( rc==2 ){ |
| 617 | @ ambiguous command prefix: %s(zCmd) |
| 618 | }else{ |
| 619 | char *zSrc, *zDest; |
| 620 | int src,dest,len; |
| 621 | |
| 622 | zSrc = (char*)aCmdHelp[idx]; |
| 623 | if( zSrc==0 || *zSrc==0 ){ |
| 624 | @ no help available for the %s(aCommand[idx].zName) command |
| 625 | }else{ |
| 626 | len = strlen(zSrc); |
| 627 | zDest = malloc(len+1); |
| 628 | for(src=dest=0;zSrc[src];){ |
| 629 | if( zSrc[src]=='%' && strncmp(zSrc+src, "%fossil", 7)==0 ){ |
| 630 | src++; /* skip % for fossil argv[0] expansion */ |
| 631 | }else if( zSrc[src]=='<' && strncmp(zSrc+src, "<a>", 3)==0 ){ |
| 632 | /* found an internal command cross reference, |
| 633 | ** create an additional link |
| 634 | */ |
| 635 | int start; |
| 636 | |
| 637 | len+=80; |
| 638 | zDest=realloc(zDest,len); |
| 639 | zDest[dest++]=zSrc[src++]; /* < */ |
| 640 | zDest[dest++]=zSrc[src++]; /* a */ |
| 641 | zDest[dest++]=' '; |
| 642 | zDest[dest++]='h'; |
| 643 | zDest[dest++]='r'; |
| 644 | zDest[dest++]='e'; |
| @@ -652,36 +654,36 @@ | |
| 652 | zDest[dest++]='?'; |
| 653 | zDest[dest++]='c'; |
| 654 | zDest[dest++]='m'; |
| 655 | zDest[dest++]='d'; |
| 656 | zDest[dest++]='='; |
| 657 | start = src+1; |
| 658 | for( src=start; zSrc[src] && zSrc[src]!='<'; ){ |
| 659 | zDest[dest++]=zSrc[src++]; /* command name */ |
| 660 | } |
| 661 | zDest[dest++]='"'; |
| 662 | zDest[dest++]='>'; |
| 663 | for( src=start; zSrc[src] && zSrc[src]!='<'; ){ |
| 664 | zDest[dest++]=zSrc[src++]; /* command name */ |
| 665 | } |
| 666 | }else{ |
| 667 | zDest[dest++] = zSrc[src++]; |
| 668 | } |
| 669 | } |
| 670 | zDest[dest] = 0; |
| 671 | @ <pre>%s(zDest)</pre> |
| 672 | free(zDest); |
| 673 | } |
| 674 | } |
| 675 | @ <hr>additional information may be found in the web documentation: |
| 676 | @ <a href="doc/tip/www/cmd_%s(aCommand[idx].zName).wiki"> |
| 677 | @ cmd_%s(aCommand[idx].zName)</a>, see also the list of |
| 678 | @ <a href="help">available commands</a> in fossil |
| 679 | @ version %s(MANIFEST_VERSION" "MANIFEST_DATE) UTC |
| 680 | }else{ |
| 681 | int i; |
| 682 | |
| 683 | @ <h1>Available commands</h1> |
| 684 | for(i=0; i<count(aCommand); i++){ |
| 685 | if( strncmp(aCommand[i].zName,"test",4)==0 ) continue; |
| 686 | @ <kbd><a href="help?cmd=%s(aCommand[i].zName)"> |
| 687 | @ %s(aCommand[i].zName)</a></kbd> |
| 688 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -585,12 +585,14 @@ | |
| 585 | while( *z ){ |
| 586 | if( *z=='%' && strncmp(z, "%fossil", 7)==0 ){ |
| 587 | printf("%s", g.argv[0]); |
| 588 | z += 7; |
| 589 | }else if( *z=='<' && strncmp(z,"<a>",3)==0 ){ |
| 590 | putchar('"'); |
| 591 | z += 3; |
| 592 | }else if( *z=='<' && strncmp(z,"</a>",4)==0 ){ |
| 593 | putchar('"'); |
| 594 | z += 4; |
| 595 | }else{ |
| 596 | putchar(*z); |
| 597 | z++; |
| 598 | } |
| @@ -616,29 +618,29 @@ | |
| 618 | }else if( rc==2 ){ |
| 619 | @ ambiguous command prefix: %s(zCmd) |
| 620 | }else{ |
| 621 | char *zSrc, *zDest; |
| 622 | int src,dest,len; |
| 623 | |
| 624 | zSrc = (char*)aCmdHelp[idx]; |
| 625 | if( zSrc==0 || *zSrc==0 ){ |
| 626 | @ no help available for the %s(aCommand[idx].zName) command |
| 627 | }else{ |
| 628 | len = strlen(zSrc); |
| 629 | zDest = malloc(len+1); |
| 630 | for(src=dest=0;zSrc[src];){ |
| 631 | if( zSrc[src]=='%' && strncmp(zSrc+src, "%fossil", 7)==0 ){ |
| 632 | src++; /* skip % for fossil argv[0] expansion */ |
| 633 | }else if( zSrc[src]=='<' && strncmp(zSrc+src, "<a>", 3)==0 ){ |
| 634 | /* found an internal command cross reference, |
| 635 | ** create an additional link |
| 636 | */ |
| 637 | int start; |
| 638 | |
| 639 | len+=80; |
| 640 | zDest=realloc(zDest,len); |
| 641 | zDest[dest++]=zSrc[src++]; /* < */ |
| 642 | zDest[dest++]=zSrc[src++]; /* a */ |
| 643 | zDest[dest++]=' '; |
| 644 | zDest[dest++]='h'; |
| 645 | zDest[dest++]='r'; |
| 646 | zDest[dest++]='e'; |
| @@ -652,36 +654,36 @@ | |
| 654 | zDest[dest++]='?'; |
| 655 | zDest[dest++]='c'; |
| 656 | zDest[dest++]='m'; |
| 657 | zDest[dest++]='d'; |
| 658 | zDest[dest++]='='; |
| 659 | start = src+1; |
| 660 | for( src=start; zSrc[src] && zSrc[src]!='<'; ){ |
| 661 | zDest[dest++]=zSrc[src++]; /* command name */ |
| 662 | } |
| 663 | zDest[dest++]='"'; |
| 664 | zDest[dest++]='>'; |
| 665 | for( src=start; zSrc[src] && zSrc[src]!='<'; ){ |
| 666 | zDest[dest++]=zSrc[src++]; /* command name */ |
| 667 | } |
| 668 | }else{ |
| 669 | zDest[dest++] = zSrc[src++]; |
| 670 | } |
| 671 | } |
| 672 | zDest[dest] = 0; |
| 673 | @ <pre>%s(zDest)</pre> |
| 674 | free(zDest); |
| 675 | } |
| 676 | } |
| 677 | @ <hr>additional information may be found in the web documentation: |
| 678 | @ <a href="doc/tip/www/cmd_%s(aCommand[idx].zName).wiki"> |
| 679 | @ cmd_%s(aCommand[idx].zName)</a>, see also the list of |
| 680 | @ <a href="help">available commands</a> in fossil |
| 681 | @ version %s(MANIFEST_VERSION" "MANIFEST_DATE) UTC |
| 682 | }else{ |
| 683 | int i; |
| 684 | |
| 685 | @ <h1>Available commands</h1> |
| 686 | for(i=0; i<count(aCommand); i++){ |
| 687 | if( strncmp(aCommand[i].zName,"test",4)==0 ) continue; |
| 688 | @ <kbd><a href="help?cmd=%s(aCommand[i].zName)"> |
| 689 | @ %s(aCommand[i].zName)</a></kbd> |
| 690 |
+6
-6
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -179,11 +179,11 @@ | ||
| 179 | 179 | ** COMMAND: sync |
| 180 | 180 | ** |
| 181 | 181 | ** Usage: %fossil sync ?URL? ?options? |
| 182 | 182 | ** |
| 183 | 183 | ** Synchronize the local repository with a remote repository. This is |
| 184 | -** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same | |
| 184 | +** the equivalent of running both <a>push</a> and <a>pull</a> at the same | |
| 185 | 185 | ** time. Use the "-R REPO" or "--repository REPO" command-line options |
| 186 | 186 | ** to specify an alternative repository file. |
| 187 | 187 | ** |
| 188 | 188 | ** If a user-id and password are required, specify them as follows: |
| 189 | 189 | ** |
| @@ -208,17 +208,17 @@ | ||
| 208 | 208 | /* |
| 209 | 209 | ** COMMAND: remote-url |
| 210 | 210 | ** |
| 211 | 211 | ** Usage: %fossil remote-url ?URL|off? |
| 212 | 212 | ** |
| 213 | -** Query and/or change the default server URL used by the "<a>pull</a>", | |
| 214 | -** "<a>push</a>", and "<a>sync</a>" commands. | |
| 213 | +** Query and/or change the default server URL used by the <a>pull</a>, | |
| 214 | +** <a>push</a>, and <a>sync</a> commands. | |
| 215 | 215 | ** |
| 216 | -** The remote-url is set automatically by a "<a>clone</a>" command or by any | |
| 217 | -** "<a>sync</a>", "<a>push</a>", or "<a>pull</a>" command that specifies an | |
| 216 | +** The remote-url is set automatically by a <a>clone</a> command or by any | |
| 217 | +** <a>sync</a>, <a>push</a>, or <a>pull</a> command that specifies an | |
| 218 | 218 | ** explicit URL. The default remote-url is used by auto-syncing and by |
| 219 | -** "<a>sync</a>", "<a>push</a>", "<a>pull</a>" that omit the server URL. | |
| 219 | +** <a>sync</a>, <a>push</a>, <a>pull</a> that omit the server URL. | |
| 220 | 220 | ** |
| 221 | 221 | ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a> |
| 222 | 222 | */ |
| 223 | 223 | void remote_url_cmd(void){ |
| 224 | 224 | char *zUrl; |
| 225 | 225 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | ** COMMAND: sync |
| 180 | ** |
| 181 | ** Usage: %fossil sync ?URL? ?options? |
| 182 | ** |
| 183 | ** Synchronize the local repository with a remote repository. This is |
| 184 | ** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same |
| 185 | ** time. Use the "-R REPO" or "--repository REPO" command-line options |
| 186 | ** to specify an alternative repository file. |
| 187 | ** |
| 188 | ** If a user-id and password are required, specify them as follows: |
| 189 | ** |
| @@ -208,17 +208,17 @@ | |
| 208 | /* |
| 209 | ** COMMAND: remote-url |
| 210 | ** |
| 211 | ** Usage: %fossil remote-url ?URL|off? |
| 212 | ** |
| 213 | ** Query and/or change the default server URL used by the "<a>pull</a>", |
| 214 | ** "<a>push</a>", and "<a>sync</a>" commands. |
| 215 | ** |
| 216 | ** The remote-url is set automatically by a "<a>clone</a>" command or by any |
| 217 | ** "<a>sync</a>", "<a>push</a>", or "<a>pull</a>" command that specifies an |
| 218 | ** explicit URL. The default remote-url is used by auto-syncing and by |
| 219 | ** "<a>sync</a>", "<a>push</a>", "<a>pull</a>" that omit the server URL. |
| 220 | ** |
| 221 | ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a> |
| 222 | */ |
| 223 | void remote_url_cmd(void){ |
| 224 | char *zUrl; |
| 225 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | ** COMMAND: sync |
| 180 | ** |
| 181 | ** Usage: %fossil sync ?URL? ?options? |
| 182 | ** |
| 183 | ** Synchronize the local repository with a remote repository. This is |
| 184 | ** the equivalent of running both <a>push</a> and <a>pull</a> at the same |
| 185 | ** time. Use the "-R REPO" or "--repository REPO" command-line options |
| 186 | ** to specify an alternative repository file. |
| 187 | ** |
| 188 | ** If a user-id and password are required, specify them as follows: |
| 189 | ** |
| @@ -208,17 +208,17 @@ | |
| 208 | /* |
| 209 | ** COMMAND: remote-url |
| 210 | ** |
| 211 | ** Usage: %fossil remote-url ?URL|off? |
| 212 | ** |
| 213 | ** Query and/or change the default server URL used by the <a>pull</a>, |
| 214 | ** <a>push</a>, and <a>sync</a> commands. |
| 215 | ** |
| 216 | ** The remote-url is set automatically by a <a>clone</a> command or by any |
| 217 | ** <a>sync</a>, <a>push</a>, or <a>pull</a> command that specifies an |
| 218 | ** explicit URL. The default remote-url is used by auto-syncing and by |
| 219 | ** <a>sync</a>, <a>push</a>, <a>pull</a> that omit the server URL. |
| 220 | ** |
| 221 | ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a> |
| 222 | */ |
| 223 | void remote_url_cmd(void){ |
| 224 | char *zUrl; |
| 225 |
+1
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -348,11 +348,11 @@ | ||
| 348 | 348 | ** appears. |
| 349 | 349 | ** |
| 350 | 350 | ** Revert all files if no file name is provided. |
| 351 | 351 | ** |
| 352 | 352 | ** If a file is reverted accidently, it can be restored using |
| 353 | -** the "<a>undo</a>" command. | |
| 353 | +** the <a>undo</a> command. | |
| 354 | 354 | */ |
| 355 | 355 | void revert_cmd(void){ |
| 356 | 356 | const char *zFile; |
| 357 | 357 | const char *zRevision; |
| 358 | 358 | Blob record; |
| 359 | 359 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -348,11 +348,11 @@ | |
| 348 | ** appears. |
| 349 | ** |
| 350 | ** Revert all files if no file name is provided. |
| 351 | ** |
| 352 | ** If a file is reverted accidently, it can be restored using |
| 353 | ** the "<a>undo</a>" command. |
| 354 | */ |
| 355 | void revert_cmd(void){ |
| 356 | const char *zFile; |
| 357 | const char *zRevision; |
| 358 | Blob record; |
| 359 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -348,11 +348,11 @@ | |
| 348 | ** appears. |
| 349 | ** |
| 350 | ** Revert all files if no file name is provided. |
| 351 | ** |
| 352 | ** If a file is reverted accidently, it can be restored using |
| 353 | ** the <a>undo</a> command. |
| 354 | */ |
| 355 | void revert_cmd(void){ |
| 356 | const char *zFile; |
| 357 | const char *zRevision; |
| 358 | Blob record; |
| 359 |