Fossil SCM

Improved error message when the "help" command cannot find its argument.

drh 2017-08-31 03:37 trunk
Commit 281780016401769d3614a6d934e75091fc8c5b3107d72208172f591a5314d721
1 file changed +4 -3
+4 -3
--- src/dispatch.c
+++ src/dispatch.c
@@ -536,13 +536,14 @@
536536
zCmdOrPage = "command";
537537
zCmdOrPagePlural = "commands";
538538
}
539539
rc = dispatch_name_search(g.argv[2], CMDFLAG_ANY|CMDFLAG_PREFIX, &pCmd);
540540
if( rc==1 ){
541
- fossil_print("unknown %s: %s\nAvailable %s:\n",
542
- zCmdOrPage, g.argv[2], zCmdOrPagePlural);
543
- command_list(0, isPage ? CMDFLAG_WEBPAGE : (0xff & ~CMDFLAG_WEBPAGE));
541
+ fossil_print("unknown %s: %s\nConsider using:\n", zCmdOrPage, g.argv[2]);
542
+ fossil_print(" fossil help -a ;# show all commands\n");
543
+ fossil_print(" fossil help -w ;# show all web-pages\n");
544
+ fossil_print(" fossil help -s ;# show all settings\n");
544545
fossil_exit(1);
545546
}else if( rc==2 ){
546547
fossil_print("ambiguous %s prefix: %s\nMatching %s:\n",
547548
zCmdOrPage, g.argv[2], zCmdOrPagePlural);
548549
command_list(g.argv[2], 0xff);
549550
--- src/dispatch.c
+++ src/dispatch.c
@@ -536,13 +536,14 @@
536 zCmdOrPage = "command";
537 zCmdOrPagePlural = "commands";
538 }
539 rc = dispatch_name_search(g.argv[2], CMDFLAG_ANY|CMDFLAG_PREFIX, &pCmd);
540 if( rc==1 ){
541 fossil_print("unknown %s: %s\nAvailable %s:\n",
542 zCmdOrPage, g.argv[2], zCmdOrPagePlural);
543 command_list(0, isPage ? CMDFLAG_WEBPAGE : (0xff & ~CMDFLAG_WEBPAGE));
 
544 fossil_exit(1);
545 }else if( rc==2 ){
546 fossil_print("ambiguous %s prefix: %s\nMatching %s:\n",
547 zCmdOrPage, g.argv[2], zCmdOrPagePlural);
548 command_list(g.argv[2], 0xff);
549
--- src/dispatch.c
+++ src/dispatch.c
@@ -536,13 +536,14 @@
536 zCmdOrPage = "command";
537 zCmdOrPagePlural = "commands";
538 }
539 rc = dispatch_name_search(g.argv[2], CMDFLAG_ANY|CMDFLAG_PREFIX, &pCmd);
540 if( rc==1 ){
541 fossil_print("unknown %s: %s\nConsider using:\n", zCmdOrPage, g.argv[2]);
542 fossil_print(" fossil help -a ;# show all commands\n");
543 fossil_print(" fossil help -w ;# show all web-pages\n");
544 fossil_print(" fossil help -s ;# show all settings\n");
545 fossil_exit(1);
546 }else if( rc==2 ){
547 fossil_print("ambiguous %s prefix: %s\nMatching %s:\n",
548 zCmdOrPage, g.argv[2], zCmdOrPagePlural);
549 command_list(g.argv[2], 0xff);
550

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button