Fossil SCM

Revise and simplify the list of 1st-tier commands that are shown by the "fossil help" command.

drh 2020-08-09 13:49 trunk
Commit 84f697e570a80431b2af7047eb451b995942ff2e7b0ed93164590ad02fe7e84d
Parent d2ad5f2fe71e0e7…
10 files changed +1 -1 +1 -1 +4 -3 +1 -1 +1 -1 +1 -1 +1 -1 +2 -2 +6 -4 +2 -1
~ src/bundle.c ~ src/diff.c ~ src/dispatch.c ~ src/export.c ~ src/fusefs.c ~ src/hook.c ~ src/import.c ~ src/publish.c ~ src/stat.c ~ src/sync.c
M src/bundle.c
+1 -1
--- src/bundle.c
+++ src/bundle.c
@@ -716,11 +716,11 @@
716716
 }
717717
 db_end_transaction(0);
718718
 }
719719
720720
 /*
721
-** COMMAND: bundle
721
+** COMMAND: bundle*
722722
 **
723723
 ** Usage: %fossil bundle SUBCOMMAND ARGS...
724724
 **
725725
 ** > fossil bundle append BUNDLE FILE...
726726
 **
727727
--- src/bundle.c
+++ src/bundle.c
@@ -716,11 +716,11 @@
716 }
717 db_end_transaction(0);
718 }
719
720 /*
721 ** COMMAND: bundle
722 **
723 ** Usage: %fossil bundle SUBCOMMAND ARGS...
724 **
725 ** > fossil bundle append BUNDLE FILE...
726 **
727
--- src/bundle.c
+++ src/bundle.c
@@ -716,11 +716,11 @@
716 }
717 db_end_transaction(0);
718 }
719
720 /*
721 ** COMMAND: bundle*
722 **
723 ** Usage: %fossil bundle SUBCOMMAND ARGS...
724 **
725 ** > fossil bundle append BUNDLE FILE...
726 **
727
M src/diff.c
+1 -1
--- src/diff.c
+++ src/diff.c
@@ -2562,11 +2562,11 @@
25622562
 }
25632563
25642564
 /*
25652565
 ** COMMAND: annotate
25662566
 ** COMMAND: blame
2567
-** COMMAND: praise
2567
+** COMMAND: praise*
25682568
 **
25692569
 ** Usage: %fossil annotate|blame|praise ?OPTIONS? FILENAME
25702570
 **
25712571
 ** Output the text of a file with markings to show when each line of the file
25722572
 ** was last modified. The version currently checked out is shown by default.
25732573
--- src/diff.c
+++ src/diff.c
@@ -2562,11 +2562,11 @@
2562 }
2563
2564 /*
2565 ** COMMAND: annotate
2566 ** COMMAND: blame
2567 ** COMMAND: praise
2568 **
2569 ** Usage: %fossil annotate|blame|praise ?OPTIONS? FILENAME
2570 **
2571 ** Output the text of a file with markings to show when each line of the file
2572 ** was last modified. The version currently checked out is shown by default.
2573
--- src/diff.c
+++ src/diff.c
@@ -2562,11 +2562,11 @@
2562 }
2563
2564 /*
2565 ** COMMAND: annotate
2566 ** COMMAND: blame
2567 ** COMMAND: praise*
2568 **
2569 ** Usage: %fossil annotate|blame|praise ?OPTIONS? FILENAME
2570 **
2571 ** Output the text of a file with markings to show when each line of the file
2572 ** was last modified. The version currently checked out is shown by default.
2573
M src/dispatch.c
+4 -3
--- src/dispatch.c
+++ src/dispatch.c
@@ -965,11 +965,11 @@
965965
 ** setting. Webpage names begin with "/". If TOPIC is omitted, a list of
966966
 ** topics is returned.
967967
 **
968968
 ** The following options can be used when TOPIC is omitted:
969969
 **
970
-** -a|--all List both command and auxiliary commands
970
+** -a|--all List both common and auxiliary commands
971971
 ** -o|--options List command-line options common to all commands
972972
 ** -s|--setting List setting names
973973
 ** -t|--test List unsupported "test" commands
974974
 ** -x|--aux List only auxiliary commands
975975
 ** -w|--www List all web pages
@@ -988,12 +988,13 @@
988988
 Blob txt;
989989
 if( g.argc<3 ){
990990
 z = g.argv[0];
991991
 fossil_print(
992992
 "Usage: %s help TOPIC\n"
993
- "Common commands: (use \"%s help help\" for more options)\n",
994
- z, z);
993
+ "Try \"%s help help\" or \"%s help -a\" for more options\n"
994
+ "Frequently used commands:\n",
995
+ z, z, z);
995996
 command_list(0, CMDFLAG_1ST_TIER);
996997
 version_cmd();
997998
 return;
998999
 }
9991000
 if( find_option("options","o",0) ){
10001001
--- src/dispatch.c
+++ src/dispatch.c
@@ -965,11 +965,11 @@
965 ** setting. Webpage names begin with "/". If TOPIC is omitted, a list of
966 ** topics is returned.
967 **
968 ** The following options can be used when TOPIC is omitted:
969 **
970 ** -a|--all List both command and auxiliary commands
971 ** -o|--options List command-line options common to all commands
972 ** -s|--setting List setting names
973 ** -t|--test List unsupported "test" commands
974 ** -x|--aux List only auxiliary commands
975 ** -w|--www List all web pages
@@ -988,12 +988,13 @@
988 Blob txt;
989 if( g.argc<3 ){
990 z = g.argv[0];
991 fossil_print(
992 "Usage: %s help TOPIC\n"
993 "Common commands: (use \"%s help help\" for more options)\n",
994 z, z);
 
995 command_list(0, CMDFLAG_1ST_TIER);
996 version_cmd();
997 return;
998 }
999 if( find_option("options","o",0) ){
1000
--- src/dispatch.c
+++ src/dispatch.c
@@ -965,11 +965,11 @@
965 ** setting. Webpage names begin with "/". If TOPIC is omitted, a list of
966 ** topics is returned.
967 **
968 ** The following options can be used when TOPIC is omitted:
969 **
970 ** -a|--all List both common and auxiliary commands
971 ** -o|--options List command-line options common to all commands
972 ** -s|--setting List setting names
973 ** -t|--test List unsupported "test" commands
974 ** -x|--aux List only auxiliary commands
975 ** -w|--www List all web pages
@@ -988,12 +988,13 @@
988 Blob txt;
989 if( g.argc<3 ){
990 z = g.argv[0];
991 fossil_print(
992 "Usage: %s help TOPIC\n"
993 "Try \"%s help help\" or \"%s help -a\" for more options\n"
994 "Frequently used commands:\n",
995 z, z, z);
996 command_list(0, CMDFLAG_1ST_TIER);
997 version_cmd();
998 return;
999 }
1000 if( find_option("options","o",0) ){
1001
M src/export.c
+1 -1
--- src/export.c
+++ src/export.c
@@ -1642,11 +1642,11 @@
16421642
 k = db_int(0, "SELECT count(*) FROm mmark WHERE NOT isfile");
16431643
 fossil_print("Exported: %d check-ins and %d file blobs\n", k, n);
16441644
 }
16451645
16461646
 /*
1647
-** COMMAND: git
1647
+** COMMAND: git*
16481648
 **
16491649
 ** Usage: %fossil git SUBCOMMAND
16501650
 **
16511651
 ** Do incremental import or export operations between Fossil and Git.
16521652
 ** Subcommands:
16531653
--- src/export.c
+++ src/export.c
@@ -1642,11 +1642,11 @@
1642 k = db_int(0, "SELECT count(*) FROm mmark WHERE NOT isfile");
1643 fossil_print("Exported: %d check-ins and %d file blobs\n", k, n);
1644 }
1645
1646 /*
1647 ** COMMAND: git
1648 **
1649 ** Usage: %fossil git SUBCOMMAND
1650 **
1651 ** Do incremental import or export operations between Fossil and Git.
1652 ** Subcommands:
1653
--- src/export.c
+++ src/export.c
@@ -1642,11 +1642,11 @@
1642 k = db_int(0, "SELECT count(*) FROm mmark WHERE NOT isfile");
1643 fossil_print("Exported: %d check-ins and %d file blobs\n", k, n);
1644 }
1645
1646 /*
1647 ** COMMAND: git*
1648 **
1649 ** Usage: %fossil git SUBCOMMAND
1650 **
1651 ** Do incremental import or export operations between Fossil and Git.
1652 ** Subcommands:
1653
M src/fusefs.c
+1 -1
--- src/fusefs.c
+++ src/fusefs.c
@@ -285,11 +285,11 @@
285285
 .readdir = fusefs_readdir,
286286
 .read = fusefs_read,
287287
 };
288288
289289
 /*
290
-** COMMAND: fusefs
290
+** COMMAND: fusefs*
291291
 **
292292
 ** Usage: %fossil fusefs [--debug] DIRECTORY
293293
 **
294294
 ** This command uses the Fuse Filesystem (FuseFS) to mount a directory
295295
 ** at DIRECTORY that contains the content of all check-ins in the
296296
--- src/fusefs.c
+++ src/fusefs.c
@@ -285,11 +285,11 @@
285 .readdir = fusefs_readdir,
286 .read = fusefs_read,
287 };
288
289 /*
290 ** COMMAND: fusefs
291 **
292 ** Usage: %fossil fusefs [--debug] DIRECTORY
293 **
294 ** This command uses the Fuse Filesystem (FuseFS) to mount a directory
295 ** at DIRECTORY that contains the content of all check-ins in the
296
--- src/fusefs.c
+++ src/fusefs.c
@@ -285,11 +285,11 @@
285 .readdir = fusefs_readdir,
286 .read = fusefs_read,
287 };
288
289 /*
290 ** COMMAND: fusefs*
291 **
292 ** Usage: %fossil fusefs [--debug] DIRECTORY
293 **
294 ** This command uses the Fuse Filesystem (FuseFS) to mount a directory
295 ** at DIRECTORY that contains the content of all check-ins in the
296
M src/hook.c
+1 -1
--- src/hook.c
+++ src/hook.c
@@ -174,11 +174,11 @@
174174
 }
175175
 db_finalize(&q);
176176
 }
177177
178178
 /*
179
-** COMMAND: hook
179
+** COMMAND: hook*
180180
 **
181181
 ** Usage: %fossil hook COMMAND ...
182182
 **
183183
 ** Commands include:
184184
 **
185185
--- src/hook.c
+++ src/hook.c
@@ -174,11 +174,11 @@
174 }
175 db_finalize(&q);
176 }
177
178 /*
179 ** COMMAND: hook
180 **
181 ** Usage: %fossil hook COMMAND ...
182 **
183 ** Commands include:
184 **
185
--- src/hook.c
+++ src/hook.c
@@ -174,11 +174,11 @@
174 }
175 db_finalize(&q);
176 }
177
178 /*
179 ** COMMAND: hook*
180 **
181 ** Usage: %fossil hook COMMAND ...
182 **
183 ** Commands include:
184 **
185
M src/import.c
+1 -1
--- src/import.c
+++ src/import.c
@@ -1594,11 +1594,11 @@
15941594
 db_finalize(&revSrc);
15951595
 fossil_print(" Done!\n");
15961596
 }
15971597
15981598
 /*
1599
-** COMMAND: import
1599
+** COMMAND: import*
16001600
 **
16011601
 ** Usage: %fossil import ?--git? ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
16021602
 ** or: %fossil import --svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
16031603
 **
16041604
 ** Read interchange format generated by another VCS and use it to
16051605
--- src/import.c
+++ src/import.c
@@ -1594,11 +1594,11 @@
1594 db_finalize(&revSrc);
1595 fossil_print(" Done!\n");
1596 }
1597
1598 /*
1599 ** COMMAND: import
1600 **
1601 ** Usage: %fossil import ?--git? ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
1602 ** or: %fossil import --svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
1603 **
1604 ** Read interchange format generated by another VCS and use it to
1605
--- src/import.c
+++ src/import.c
@@ -1594,11 +1594,11 @@
1594 db_finalize(&revSrc);
1595 fossil_print(" Done!\n");
1596 }
1597
1598 /*
1599 ** COMMAND: import*
1600 **
1601 ** Usage: %fossil import ?--git? ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
1602 ** or: %fossil import --svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
1603 **
1604 ** Read interchange format generated by another VCS and use it to
1605
M src/publish.c
+2 -2
--- src/publish.c
+++ src/publish.c
@@ -21,11 +21,11 @@
2121
 #include "config.h"
2222
 #include "publish.h"
2323
 #include <assert.h>
2424
2525
 /*
26
-** COMMAND: unpublished
26
+** COMMAND: unpublished*
2727
 **
2828
 ** Usage: %fossil unpublished ?OPTIONS?
2929
 **
3030
 ** Show a list of unpublished or "private" artifacts. Unpublished artifacts
3131
 ** will never push and hence will not be shared with collaborators.
@@ -50,11 +50,11 @@
5050
 " AND event.type='ci')", 0);
5151
 }
5252
 }
5353
5454
 /*
55
-** COMMAND: publish
55
+** COMMAND: publish*
5656
 **
5757
 ** Usage: %fossil publish ?--only? TAGS...
5858
 **
5959
 ** Cause artifacts identified by TAGS... to be published (made non-private).
6060
 ** This can be used (for example) to convert a private branch into a public
6161
--- src/publish.c
+++ src/publish.c
@@ -21,11 +21,11 @@
21 #include "config.h"
22 #include "publish.h"
23 #include <assert.h>
24
25 /*
26 ** COMMAND: unpublished
27 **
28 ** Usage: %fossil unpublished ?OPTIONS?
29 **
30 ** Show a list of unpublished or "private" artifacts. Unpublished artifacts
31 ** will never push and hence will not be shared with collaborators.
@@ -50,11 +50,11 @@
50 " AND event.type='ci')", 0);
51 }
52 }
53
54 /*
55 ** COMMAND: publish
56 **
57 ** Usage: %fossil publish ?--only? TAGS...
58 **
59 ** Cause artifacts identified by TAGS... to be published (made non-private).
60 ** This can be used (for example) to convert a private branch into a public
61
--- src/publish.c
+++ src/publish.c
@@ -21,11 +21,11 @@
21 #include "config.h"
22 #include "publish.h"
23 #include <assert.h>
24
25 /*
26 ** COMMAND: unpublished*
27 **
28 ** Usage: %fossil unpublished ?OPTIONS?
29 **
30 ** Show a list of unpublished or "private" artifacts. Unpublished artifacts
31 ** will never push and hence will not be shared with collaborators.
@@ -50,11 +50,11 @@
50 " AND event.type='ci')", 0);
51 }
52 }
53
54 /*
55 ** COMMAND: publish*
56 **
57 ** Usage: %fossil publish ?--only? TAGS...
58 **
59 ** Cause artifacts identified by TAGS... to be published (made non-private).
60 ** This can be used (for example) to convert a private branch into a public
61
M src/stat.c
+6 -4
--- src/stat.c
+++ src/stat.c
@@ -292,11 +292,11 @@
292292
 @ </table>
293293
 style_footer();
294294
 }
295295
296296
 /*
297
-** COMMAND: dbstat*
297
+** COMMAND: dbstat
298298
 **
299299
 ** Usage: %fossil dbstat OPTIONS
300300
 **
301301
 ** Shows statistics and global information about the repository.
302302
 **
@@ -384,13 +384,15 @@
384384
 }
385385
 n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)"
386386
 " + 0.99");
387387
 fossil_print("%*s%,d days or approximately %.2f years.\n",
388388
 colWidth, "project-age:", n, n/365.2425);
389
- p = db_get("project-code", 0);
390
- if( p ){
391
- fossil_print("%*s%s\n", colWidth, "project-id:", p);
389
+ if( !brief ){
390
+ p = db_get("project-code", 0);
391
+ if( p ){
392
+ fossil_print("%*s%s\n", colWidth, "project-id:", p);
393
+ }
392394
 }
393395
 #if 0
394396
 /* Server-id is not useful information any more */
395397
 fossil_print("%*s%s\n", colWidth, "server-id:", db_get("server-code", 0));
396398
 #endif
397399
--- src/stat.c
+++ src/stat.c
@@ -292,11 +292,11 @@
292 @ </table>
293 style_footer();
294 }
295
296 /*
297 ** COMMAND: dbstat*
298 **
299 ** Usage: %fossil dbstat OPTIONS
300 **
301 ** Shows statistics and global information about the repository.
302 **
@@ -384,13 +384,15 @@
384 }
385 n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)"
386 " + 0.99");
387 fossil_print("%*s%,d days or approximately %.2f years.\n",
388 colWidth, "project-age:", n, n/365.2425);
389 p = db_get("project-code", 0);
390 if( p ){
391 fossil_print("%*s%s\n", colWidth, "project-id:", p);
 
 
392 }
393 #if 0
394 /* Server-id is not useful information any more */
395 fossil_print("%*s%s\n", colWidth, "server-id:", db_get("server-code", 0));
396 #endif
397
--- src/stat.c
+++ src/stat.c
@@ -292,11 +292,11 @@
292 @ </table>
293 style_footer();
294 }
295
296 /*
297 ** COMMAND: dbstat
298 **
299 ** Usage: %fossil dbstat OPTIONS
300 **
301 ** Shows statistics and global information about the repository.
302 **
@@ -384,13 +384,15 @@
384 }
385 n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)"
386 " + 0.99");
387 fossil_print("%*s%,d days or approximately %.2f years.\n",
388 colWidth, "project-age:", n, n/365.2425);
389 if( !brief ){
390 p = db_get("project-code", 0);
391 if( p ){
392 fossil_print("%*s%s\n", colWidth, "project-id:", p);
393 }
394 }
395 #if 0
396 /* Server-id is not useful information any more */
397 fossil_print("%*s%s\n", colWidth, "server-id:", db_get("server-code", 0));
398 #endif
399
M src/sync.c
+2 -1
--- src/sync.c
+++ src/sync.c
@@ -345,11 +345,12 @@
345345
 verify_all_options();
346346
 client_sync(syncFlags, 0, 0, 0);
347347
 }
348348
349349
 /*
350
-** COMMAND: remote-url
350
+** COMMAND: remote
351
+** COMMAND: remote-url*
351352
 **
352353
 ** Usage: %fossil remote ?SUBCOMMAND ...?
353354
 **
354355
 ** Use this command to view or modify the set of remote repositories
355356
 ** used as the default target for sync, push, and pull and for autosync.
356357
--- src/sync.c
+++ src/sync.c
@@ -345,11 +345,12 @@
345 verify_all_options();
346 client_sync(syncFlags, 0, 0, 0);
347 }
348
349 /*
350 ** COMMAND: remote-url
 
351 **
352 ** Usage: %fossil remote ?SUBCOMMAND ...?
353 **
354 ** Use this command to view or modify the set of remote repositories
355 ** used as the default target for sync, push, and pull and for autosync.
356
--- src/sync.c
+++ src/sync.c
@@ -345,11 +345,12 @@
345 verify_all_options();
346 client_sync(syncFlags, 0, 0, 0);
347 }
348
349 /*
350 ** COMMAND: remote
351 ** COMMAND: remote-url*
352 **
353 ** Usage: %fossil remote ?SUBCOMMAND ...?
354 **
355 ** Use this command to view or modify the set of remote repositories
356 ** used as the default target for sync, push, and pull and for autosync.
357

Keyboard Shortcuts

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