Fossil SCM
Fix the usage comment for incorrect parameters on "fossil config sync". Separately, remove an extra newline from the usage output.
Commit
69fe4237cee86c0593edca3f4bde353d45783e45
Parent
c06e474f68e9a30…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -888,11 +888,11 @@ | ||
| 888 | 888 | if( strncmp(zMethod,"pull",n)==0 ){ |
| 889 | 889 | overwriteFlag = find_option("overwrite",0,0)!=0; |
| 890 | 890 | } |
| 891 | 891 | url_proxy_options(); |
| 892 | 892 | if( g.argc!=4 && g.argc!=5 ){ |
| 893 | - usage("pull AREA ?URL?"); | |
| 893 | + usage(mprintf("%s AREA ?URL?", zMethod)); | |
| 894 | 894 | } |
| 895 | 895 | mask = configure_name_to_mask(g.argv[3], 1); |
| 896 | 896 | if( g.argc==5 ){ |
| 897 | 897 | zServer = g.argv[4]; |
| 898 | 898 | } |
| 899 | 899 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -888,11 +888,11 @@ | |
| 888 | if( strncmp(zMethod,"pull",n)==0 ){ |
| 889 | overwriteFlag = find_option("overwrite",0,0)!=0; |
| 890 | } |
| 891 | url_proxy_options(); |
| 892 | if( g.argc!=4 && g.argc!=5 ){ |
| 893 | usage("pull AREA ?URL?"); |
| 894 | } |
| 895 | mask = configure_name_to_mask(g.argv[3], 1); |
| 896 | if( g.argc==5 ){ |
| 897 | zServer = g.argv[4]; |
| 898 | } |
| 899 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -888,11 +888,11 @@ | |
| 888 | if( strncmp(zMethod,"pull",n)==0 ){ |
| 889 | overwriteFlag = find_option("overwrite",0,0)!=0; |
| 890 | } |
| 891 | url_proxy_options(); |
| 892 | if( g.argc!=4 && g.argc!=5 ){ |
| 893 | usage(mprintf("%s AREA ?URL?", zMethod)); |
| 894 | } |
| 895 | mask = configure_name_to_mask(g.argv[3], 1); |
| 896 | if( g.argc==5 ){ |
| 897 | zServer = g.argv[4]; |
| 898 | } |
| 899 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -605,11 +605,11 @@ | ||
| 605 | 605 | |
| 606 | 606 | /* |
| 607 | 607 | ** Print a usage comment and quit |
| 608 | 608 | */ |
| 609 | 609 | void usage(const char *zFormat){ |
| 610 | - fossil_fatal("Usage: %s %s %s\n", g.argv[0], g.argv[1], zFormat); | |
| 610 | + fossil_fatal("Usage: %s %s %s", g.argv[0], g.argv[1], zFormat); | |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | /* |
| 614 | 614 | ** Remove n elements from g.argv beginning with the i-th element. |
| 615 | 615 | */ |
| 616 | 616 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -605,11 +605,11 @@ | |
| 605 | |
| 606 | /* |
| 607 | ** Print a usage comment and quit |
| 608 | */ |
| 609 | void usage(const char *zFormat){ |
| 610 | fossil_fatal("Usage: %s %s %s\n", g.argv[0], g.argv[1], zFormat); |
| 611 | } |
| 612 | |
| 613 | /* |
| 614 | ** Remove n elements from g.argv beginning with the i-th element. |
| 615 | */ |
| 616 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -605,11 +605,11 @@ | |
| 605 | |
| 606 | /* |
| 607 | ** Print a usage comment and quit |
| 608 | */ |
| 609 | void usage(const char *zFormat){ |
| 610 | fossil_fatal("Usage: %s %s %s", g.argv[0], g.argv[1], zFormat); |
| 611 | } |
| 612 | |
| 613 | /* |
| 614 | ** Remove n elements from g.argv beginning with the i-th element. |
| 615 | */ |
| 616 |