Fossil SCM

Replaced --dryrun with --dry-run in the commands which still used the former, except for two related internal-use/debugging-only flags where the change might have had undesired side effects. Removed the undocumented --dryrun backwards-compatibility flag from a couple commands for consistency's sake (else we need to have that option in all dry-run-capable commands). Discussion is in [forum:d732b4026f44bdba | forum post d732b4026f44bdba].

stephan 2022-07-05 07:38 trunk
Commit 360d8652e76ca0930a2ba52353843d45d594201194f84e70b01c9b95028a56cb
Parent d18a2f6105c85b9…
6 files changed +1 -1 +1 -2 -1 +5 -5 +8 -8 +3 -3
~ src/db.c ~ src/file.c ~ src/info.c ~ src/patch.c ~ src/tag.c ~ src/unversioned.c
M src/db.c
+1 -1
--- src/db.c
+++ src/db.c
@@ -4769,11 +4769,11 @@
47694769
 **
47704770
 ** The purpose of this command is for testing the WITHOUT ROWID capabilities
47714771
 ** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
47724772
 **
47734773
 ** Options:
4774
-** --dryrun | -n No changes. Just print what would happen.
4774
+** --dry-run | -n No changes. Just print what would happen.
47754775
 */
47764776
 void test_without_rowid(void){
47774777
 int i, j;
47784778
 Stmt q;
47794779
 Blob allSql;
47804780
--- src/db.c
+++ src/db.c
@@ -4769,11 +4769,11 @@
4769 **
4770 ** The purpose of this command is for testing the WITHOUT ROWID capabilities
4771 ** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
4772 **
4773 ** Options:
4774 ** --dryrun | -n No changes. Just print what would happen.
4775 */
4776 void test_without_rowid(void){
4777 int i, j;
4778 Stmt q;
4779 Blob allSql;
4780
--- src/db.c
+++ src/db.c
@@ -4769,11 +4769,11 @@
4769 **
4770 ** The purpose of this command is for testing the WITHOUT ROWID capabilities
4771 ** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
4772 **
4773 ** Options:
4774 ** --dry-run | -n No changes. Just print what would happen.
4775 */
4776 void test_without_rowid(void){
4777 int i, j;
4778 Stmt q;
4779 Blob allSql;
4780
M src/file.c
+1 -2
--- src/file.c
+++ src/file.c
@@ -2492,12 +2492,11 @@
24922492
 Stmt q;
24932493
 Blob absBuffer = empty_blob; /* Absolute filename buffer */
24942494
24952495
 verboseFlag = find_option("verbose","v",0)!=0;
24962496
 quietFlag = find_option("quiet","q",0)!=0 || g.fQuiet;
2497
- dryRunFlag = find_option("dry-run","n",0)!=0
2498
- || find_option("dryrun",0,0)!=0;
2497
+ dryRunFlag = find_option("dry-run","n",0)!=0;
24992498
 zGlobList = find_option("glob", "g",1);
25002499
 zGlobFile = find_option("globfile", "G",1);
25012500
25022501
 if(zGlobList && zGlobFile){
25032502
 fossil_fatal("Options -g and -G may not be used together.");
25042503
--- src/file.c
+++ src/file.c
@@ -2492,12 +2492,11 @@
2492 Stmt q;
2493 Blob absBuffer = empty_blob; /* Absolute filename buffer */
2494
2495 verboseFlag = find_option("verbose","v",0)!=0;
2496 quietFlag = find_option("quiet","q",0)!=0 || g.fQuiet;
2497 dryRunFlag = find_option("dry-run","n",0)!=0
2498 || find_option("dryrun",0,0)!=0;
2499 zGlobList = find_option("glob", "g",1);
2500 zGlobFile = find_option("globfile", "G",1);
2501
2502 if(zGlobList && zGlobFile){
2503 fossil_fatal("Options -g and -G may not be used together.");
2504
--- src/file.c
+++ src/file.c
@@ -2492,12 +2492,11 @@
2492 Stmt q;
2493 Blob absBuffer = empty_blob; /* Absolute filename buffer */
2494
2495 verboseFlag = find_option("verbose","v",0)!=0;
2496 quietFlag = find_option("quiet","q",0)!=0 || g.fQuiet;
2497 dryRunFlag = find_option("dry-run","n",0)!=0;
 
2498 zGlobList = find_option("glob", "g",1);
2499 zGlobFile = find_option("globfile", "G",1);
2500
2501 if(zGlobList && zGlobFile){
2502 fossil_fatal("Options -g and -G may not be used together.");
2503
M src/info.c
-1
--- src/info.c
+++ src/info.c
@@ -3539,11 +3539,10 @@
35393539
 pzNewTags = find_repeatable_option("tag",0,&nTags);
35403540
 pzCancelTags = find_repeatable_option("cancel",0,&nCancels);
35413541
 fClose = find_option("close",0,0)!=0;
35423542
 fHide = find_option("hide",0,0)!=0;
35433543
 fDryRun = find_option("dry-run","n",0)!=0;
3544
- if( fDryRun==0 ) fDryRun = find_option("dryrun","n",0)!=0;
35453544
 zChngTime = find_option("date-override",0,1);
35463545
 if( zChngTime==0 ) zChngTime = find_option("chngtime",0,1);
35473546
 zUserOvrd = find_option("user-override",0,1);
35483547
 db_find_and_open_repository(0,0);
35493548
 user_select();
35503549
--- src/info.c
+++ src/info.c
@@ -3539,11 +3539,10 @@
3539 pzNewTags = find_repeatable_option("tag",0,&nTags);
3540 pzCancelTags = find_repeatable_option("cancel",0,&nCancels);
3541 fClose = find_option("close",0,0)!=0;
3542 fHide = find_option("hide",0,0)!=0;
3543 fDryRun = find_option("dry-run","n",0)!=0;
3544 if( fDryRun==0 ) fDryRun = find_option("dryrun","n",0)!=0;
3545 zChngTime = find_option("date-override",0,1);
3546 if( zChngTime==0 ) zChngTime = find_option("chngtime",0,1);
3547 zUserOvrd = find_option("user-override",0,1);
3548 db_find_and_open_repository(0,0);
3549 user_select();
3550
--- src/info.c
+++ src/info.c
@@ -3539,11 +3539,10 @@
3539 pzNewTags = find_repeatable_option("tag",0,&nTags);
3540 pzCancelTags = find_repeatable_option("cancel",0,&nCancels);
3541 fClose = find_option("close",0,0)!=0;
3542 fHide = find_option("hide",0,0)!=0;
3543 fDryRun = find_option("dry-run","n",0)!=0;
 
3544 zChngTime = find_option("date-override",0,1);
3545 if( zChngTime==0 ) zChngTime = find_option("chngtime",0,1);
3546 zUserOvrd = find_option("user-override",0,1);
3547 db_find_and_open_repository(0,0);
3548 user_select();
3549
M src/patch.c
+5 -5
--- src/patch.c
+++ src/patch.c
@@ -855,11 +855,11 @@
855855
 ** in the current directory if DIRECTORY is omitted. Options:
856856
 **
857857
 ** -f|--force Apply the patch even though there are unsaved
858858
 ** changes in the current check-out. Unsaved changes
859859
 ** are reverted and permanently lost.
860
-** -n|--dryrun Do nothing, but print what would have happened.
860
+** -n|--dry-run Do nothing, but print what would have happened.
861861
 ** -v|--verbose Extra output explaining what happens.
862862
 **
863863
 ** > fossil patch diff [DIRECTORY] FILENAME
864864
 **
865865
 ** Show a human-readable diff for the patch. All the usual
@@ -884,11 +884,11 @@
884884
 ** -f|--force Apply the patch even though there are unsaved
885885
 ** changes in the current check-out. Unsaved
886886
 ** changes will be reverted and then the patch is
887887
 ** applied.
888888
 ** --fossilcmd EXE Name of the "fossil" executable on the remote
889
-** -n|--dryrun Do nothing, but print what would have happened.
889
+** -n|--dry-run Do nothing, but print what would have happened.
890890
 ** -v|--verbose Extra output explaining what happens.
891891
 **
892892
 **
893893
 ** > fossil patch pull REMOTE-CHECKOUT
894894
 **
@@ -913,11 +913,11 @@
913913
 zCmd = g.argv[2];
914914
 n = strlen(zCmd);
915915
 if( strncmp(zCmd, "apply", n)==0 ){
916916
 char *zIn;
917917
 unsigned flags = 0;
918
- if( find_option("dryrun","n",0) ) flags |= PATCH_DRYRUN;
918
+ if( find_option("dry-run","n",0) ) flags |= PATCH_DRYRUN;
919919
 if( find_option("verbose","v",0) ) flags |= PATCH_VERBOSE;
920920
 if( find_option("force","f",0) ) flags |= PATCH_FORCE;
921921
 zIn = patch_find_patch_filename("apply");
922922
 db_must_be_within_tree();
923923
 patch_attach(zIn, stdin);
@@ -955,11 +955,11 @@
955955
 }else
956956
 if( strncmp(zCmd, "pull", n)==0 ){
957957
 FILE *pIn = 0;
958958
 unsigned flags = 0;
959959
 const char *zFossilCmd = find_option("fossilcmd",0,1);
960
- if( find_option("dryrun","n",0) ) flags |= PATCH_DRYRUN;
960
+ if( find_option("dry-run","n",0) ) flags |= PATCH_DRYRUN;
961961
 if( find_option("verbose","v",0) ) flags |= PATCH_VERBOSE;
962962
 if( find_option("force","f",0) ) flags |= PATCH_FORCE;
963963
 db_must_be_within_tree();
964964
 verify_all_options();
965965
 pIn = patch_remote_command(flags & (~PATCH_FORCE),
@@ -972,11 +972,11 @@
972972
 }else
973973
 if( strncmp(zCmd, "push", n)==0 ){
974974
 FILE *pOut = 0;
975975
 unsigned flags = 0;
976976
 const char *zFossilCmd = find_option("fossilcmd",0,1);
977
- if( find_option("dryrun","n",0) ) flags |= PATCH_DRYRUN;
977
+ if( find_option("dry-run","n",0) ) flags |= PATCH_DRYRUN;
978978
 if( find_option("verbose","v",0) ) flags |= PATCH_VERBOSE;
979979
 if( find_option("force","f",0) ) flags |= PATCH_FORCE;
980980
 db_must_be_within_tree();
981981
 verify_all_options();
982982
 pOut = patch_remote_command(flags, "push", "apply", zFossilCmd, "w");
983983
--- src/patch.c
+++ src/patch.c
@@ -855,11 +855,11 @@
855 ** in the current directory if DIRECTORY is omitted. Options:
856 **
857 ** -f|--force Apply the patch even though there are unsaved
858 ** changes in the current check-out. Unsaved changes
859 ** are reverted and permanently lost.
860 ** -n|--dryrun Do nothing, but print what would have happened.
861 ** -v|--verbose Extra output explaining what happens.
862 **
863 ** > fossil patch diff [DIRECTORY] FILENAME
864 **
865 ** Show a human-readable diff for the patch. All the usual
@@ -884,11 +884,11 @@
884 ** -f|--force Apply the patch even though there are unsaved
885 ** changes in the current check-out. Unsaved
886 ** changes will be reverted and then the patch is
887 ** applied.
888 ** --fossilcmd EXE Name of the "fossil" executable on the remote
889 ** -n|--dryrun Do nothing, but print what would have happened.
890 ** -v|--verbose Extra output explaining what happens.
891 **
892 **
893 ** > fossil patch pull REMOTE-CHECKOUT
894 **
@@ -913,11 +913,11 @@
913 zCmd = g.argv[2];
914 n = strlen(zCmd);
915 if( strncmp(zCmd, "apply", n)==0 ){
916 char *zIn;
917 unsigned flags = 0;
918 if( find_option("dryrun","n",0) ) flags |= PATCH_DRYRUN;
919 if( find_option("verbose","v",0) ) flags |= PATCH_VERBOSE;
920 if( find_option("force","f",0) ) flags |= PATCH_FORCE;
921 zIn = patch_find_patch_filename("apply");
922 db_must_be_within_tree();
923 patch_attach(zIn, stdin);
@@ -955,11 +955,11 @@
955 }else
956 if( strncmp(zCmd, "pull", n)==0 ){
957 FILE *pIn = 0;
958 unsigned flags = 0;
959 const char *zFossilCmd = find_option("fossilcmd",0,1);
960 if( find_option("dryrun","n",0) ) flags |= PATCH_DRYRUN;
961 if( find_option("verbose","v",0) ) flags |= PATCH_VERBOSE;
962 if( find_option("force","f",0) ) flags |= PATCH_FORCE;
963 db_must_be_within_tree();
964 verify_all_options();
965 pIn = patch_remote_command(flags & (~PATCH_FORCE),
@@ -972,11 +972,11 @@
972 }else
973 if( strncmp(zCmd, "push", n)==0 ){
974 FILE *pOut = 0;
975 unsigned flags = 0;
976 const char *zFossilCmd = find_option("fossilcmd",0,1);
977 if( find_option("dryrun","n",0) ) flags |= PATCH_DRYRUN;
978 if( find_option("verbose","v",0) ) flags |= PATCH_VERBOSE;
979 if( find_option("force","f",0) ) flags |= PATCH_FORCE;
980 db_must_be_within_tree();
981 verify_all_options();
982 pOut = patch_remote_command(flags, "push", "apply", zFossilCmd, "w");
983
--- src/patch.c
+++ src/patch.c
@@ -855,11 +855,11 @@
855 ** in the current directory if DIRECTORY is omitted. Options:
856 **
857 ** -f|--force Apply the patch even though there are unsaved
858 ** changes in the current check-out. Unsaved changes
859 ** are reverted and permanently lost.
860 ** -n|--dry-run Do nothing, but print what would have happened.
861 ** -v|--verbose Extra output explaining what happens.
862 **
863 ** > fossil patch diff [DIRECTORY] FILENAME
864 **
865 ** Show a human-readable diff for the patch. All the usual
@@ -884,11 +884,11 @@
884 ** -f|--force Apply the patch even though there are unsaved
885 ** changes in the current check-out. Unsaved
886 ** changes will be reverted and then the patch is
887 ** applied.
888 ** --fossilcmd EXE Name of the "fossil" executable on the remote
889 ** -n|--dry-run Do nothing, but print what would have happened.
890 ** -v|--verbose Extra output explaining what happens.
891 **
892 **
893 ** > fossil patch pull REMOTE-CHECKOUT
894 **
@@ -913,11 +913,11 @@
913 zCmd = g.argv[2];
914 n = strlen(zCmd);
915 if( strncmp(zCmd, "apply", n)==0 ){
916 char *zIn;
917 unsigned flags = 0;
918 if( find_option("dry-run","n",0) ) flags |= PATCH_DRYRUN;
919 if( find_option("verbose","v",0) ) flags |= PATCH_VERBOSE;
920 if( find_option("force","f",0) ) flags |= PATCH_FORCE;
921 zIn = patch_find_patch_filename("apply");
922 db_must_be_within_tree();
923 patch_attach(zIn, stdin);
@@ -955,11 +955,11 @@
955 }else
956 if( strncmp(zCmd, "pull", n)==0 ){
957 FILE *pIn = 0;
958 unsigned flags = 0;
959 const char *zFossilCmd = find_option("fossilcmd",0,1);
960 if( find_option("dry-run","n",0) ) flags |= PATCH_DRYRUN;
961 if( find_option("verbose","v",0) ) flags |= PATCH_VERBOSE;
962 if( find_option("force","f",0) ) flags |= PATCH_FORCE;
963 db_must_be_within_tree();
964 verify_all_options();
965 pIn = patch_remote_command(flags & (~PATCH_FORCE),
@@ -972,11 +972,11 @@
972 }else
973 if( strncmp(zCmd, "push", n)==0 ){
974 FILE *pOut = 0;
975 unsigned flags = 0;
976 const char *zFossilCmd = find_option("fossilcmd",0,1);
977 if( find_option("dry-run","n",0) ) flags |= PATCH_DRYRUN;
978 if( find_option("verbose","v",0) ) flags |= PATCH_VERBOSE;
979 if( find_option("force","f",0) ) flags |= PATCH_FORCE;
980 db_must_be_within_tree();
981 verify_all_options();
982 pOut = patch_remote_command(flags, "push", "apply", zFossilCmd, "w");
983
M src/tag.c
+8 -8
--- src/tag.c
+++ src/tag.c
@@ -282,11 +282,11 @@
282282
 }
283283
284284
 /*
285285
 ** OR this value into the tagtype argument to tag_add_artifact to
286286
 ** cause the tag to be displayed on standard output rather than be
287
-** inserted. Used for --dryrun options and debugging.
287
+** inserted. Used for --dry-run options and debugging.
288288
 */
289289
 #if INTERFACE
290290
 #define TAG_ADD_DRYRUN 0x04
291291
 #endif
292292
@@ -407,11 +407,11 @@
407407
 ** --raw Raw tag name. Ignored for
408408
 ** non-CHECK-IN artifacts.
409409
 ** --propagate Propagating tag.
410410
 ** --date-override DATETIME Set date and time added.
411411
 ** --user-override USER Name USER when adding the tag.
412
-** -n|--dryrun Display the tag text, but do not
412
+** -n|--dry-run Display the tag text, but do not
413413
 ** actually insert it into the database.
414414
 **
415415
 ** The --date-override and --user-override options support
416416
 ** importing history from other SCM systems. DATETIME has
417417
 ** the form 'YYYY-MMM-DD HH:MM:SS'.
@@ -422,20 +422,20 @@
422422
 **
423423
 ** > fossil tag cancel ?--raw? TAGNAME ARTIFACT-ID
424424
 **
425425
 ** Remove the tag TAGNAME from the artifact referenced by
426426
 ** ARTIFACT-ID, and also remove the propagation of the tag to
427
-** any descendants. Use the the -n|--dryrun option to see
427
+** any descendants. Use the the -n|--dry-run option to see
428428
 ** what would have happened. Certain tag name prefixes are
429429
 ** forbidden, as documented for the 'add' subcommand.
430430
 **
431431
 ** Options:
432432
 ** --raw Raw tag name. Ignored for
433433
 ** non-CHECK-IN artifacts.
434434
 ** --date-override DATETIME Set date and time deleted.
435435
 ** --user-override USER Name USER when deleting the tag.
436
-** -n|--dryrun Display the control artifact, but do
436
+** -n|--dry-run Display the control artifact, but do
437437
 ** not insert it into the database.
438438
 **
439439
 ** > fossil tag find ?OPTIONS? TAGNAME
440440
 **
441441
 ** List all objects that use TAGNAME.
@@ -514,11 +514,11 @@
514514
 const char *zDateOvrd = find_option("date-override",0,1);
515515
 const char *zUserOvrd = find_option("user-override",0,1);
516516
 const char *zTag;
517517
 const char *zObjId;
518518
 int objType;
519
- if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
519
+ if( find_option("dry-run","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
520520
 if( g.argc!=5 && g.argc!=6 ){
521521
 usage("add ?options? TAGNAME ARTIFACT-ID ?VALUE?");
522522
 }
523523
 zTag = g.argv[3];
524524
 tag_cmd_tagname_check(zTag);
@@ -552,11 +552,11 @@
552552
 const char *zDateOvrd = find_option("date-override",0,1);
553553
 const char *zUserOvrd = find_option("user-override",0,1);
554554
 const char *zTag;
555555
 const char *zObjId;
556556
 int objType;
557
- if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
557
+ if( find_option("dry-run","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
558558
 if( g.argc!=5 ){
559559
 usage("cancel ?options? TAGNAME ARTIFACT-ID");
560560
 }
561561
 zTag = g.argv[3];
562562
 tag_cmd_tagname_check(zTag);
@@ -751,11 +751,11 @@
751751
 ** reparenting operation, simply delete the tag.
752752
 **
753753
 ** --test Make database entries but do not add the tag artifact.
754754
 ** So the reparent operation will be undone by the next
755755
 ** "fossil rebuild" command.
756
-** -n|--dryrun Print the tag that would have been created but do not
756
+** -n|--dry-run Print the tag that would have been created but do not
757757
 ** actually change the database in any way.
758758
 ** --date-override DATETIME Set the change time on the control artifact
759759
 ** --user-override USER Set the user name on the control artifact
760760
 */
761761
 void reparent_cmd(void){
@@ -766,11 +766,11 @@
766766
 char *zUuid;
767767
 int dryRun = 0;
768768
 const char *zDateOvrd; /* The change time on the control artifact */
769769
 const char *zUserOvrd; /* The user name on the control artifact */
770770
771
- if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
771
+ if( find_option("dry-run","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
772772
 zDateOvrd = find_option("date-override",0,1);
773773
 zUserOvrd = find_option("user-override",0,1);
774774
 db_find_and_open_repository(0, 0);
775775
 verify_all_options();
776776
 if( g.argc<4 ){
777777
--- src/tag.c
+++ src/tag.c
@@ -282,11 +282,11 @@
282 }
283
284 /*
285 ** OR this value into the tagtype argument to tag_add_artifact to
286 ** cause the tag to be displayed on standard output rather than be
287 ** inserted. Used for --dryrun options and debugging.
288 */
289 #if INTERFACE
290 #define TAG_ADD_DRYRUN 0x04
291 #endif
292
@@ -407,11 +407,11 @@
407 ** --raw Raw tag name. Ignored for
408 ** non-CHECK-IN artifacts.
409 ** --propagate Propagating tag.
410 ** --date-override DATETIME Set date and time added.
411 ** --user-override USER Name USER when adding the tag.
412 ** -n|--dryrun Display the tag text, but do not
413 ** actually insert it into the database.
414 **
415 ** The --date-override and --user-override options support
416 ** importing history from other SCM systems. DATETIME has
417 ** the form 'YYYY-MMM-DD HH:MM:SS'.
@@ -422,20 +422,20 @@
422 **
423 ** > fossil tag cancel ?--raw? TAGNAME ARTIFACT-ID
424 **
425 ** Remove the tag TAGNAME from the artifact referenced by
426 ** ARTIFACT-ID, and also remove the propagation of the tag to
427 ** any descendants. Use the the -n|--dryrun option to see
428 ** what would have happened. Certain tag name prefixes are
429 ** forbidden, as documented for the 'add' subcommand.
430 **
431 ** Options:
432 ** --raw Raw tag name. Ignored for
433 ** non-CHECK-IN artifacts.
434 ** --date-override DATETIME Set date and time deleted.
435 ** --user-override USER Name USER when deleting the tag.
436 ** -n|--dryrun Display the control artifact, but do
437 ** not insert it into the database.
438 **
439 ** > fossil tag find ?OPTIONS? TAGNAME
440 **
441 ** List all objects that use TAGNAME.
@@ -514,11 +514,11 @@
514 const char *zDateOvrd = find_option("date-override",0,1);
515 const char *zUserOvrd = find_option("user-override",0,1);
516 const char *zTag;
517 const char *zObjId;
518 int objType;
519 if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
520 if( g.argc!=5 && g.argc!=6 ){
521 usage("add ?options? TAGNAME ARTIFACT-ID ?VALUE?");
522 }
523 zTag = g.argv[3];
524 tag_cmd_tagname_check(zTag);
@@ -552,11 +552,11 @@
552 const char *zDateOvrd = find_option("date-override",0,1);
553 const char *zUserOvrd = find_option("user-override",0,1);
554 const char *zTag;
555 const char *zObjId;
556 int objType;
557 if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
558 if( g.argc!=5 ){
559 usage("cancel ?options? TAGNAME ARTIFACT-ID");
560 }
561 zTag = g.argv[3];
562 tag_cmd_tagname_check(zTag);
@@ -751,11 +751,11 @@
751 ** reparenting operation, simply delete the tag.
752 **
753 ** --test Make database entries but do not add the tag artifact.
754 ** So the reparent operation will be undone by the next
755 ** "fossil rebuild" command.
756 ** -n|--dryrun Print the tag that would have been created but do not
757 ** actually change the database in any way.
758 ** --date-override DATETIME Set the change time on the control artifact
759 ** --user-override USER Set the user name on the control artifact
760 */
761 void reparent_cmd(void){
@@ -766,11 +766,11 @@
766 char *zUuid;
767 int dryRun = 0;
768 const char *zDateOvrd; /* The change time on the control artifact */
769 const char *zUserOvrd; /* The user name on the control artifact */
770
771 if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
772 zDateOvrd = find_option("date-override",0,1);
773 zUserOvrd = find_option("user-override",0,1);
774 db_find_and_open_repository(0, 0);
775 verify_all_options();
776 if( g.argc<4 ){
777
--- src/tag.c
+++ src/tag.c
@@ -282,11 +282,11 @@
282 }
283
284 /*
285 ** OR this value into the tagtype argument to tag_add_artifact to
286 ** cause the tag to be displayed on standard output rather than be
287 ** inserted. Used for --dry-run options and debugging.
288 */
289 #if INTERFACE
290 #define TAG_ADD_DRYRUN 0x04
291 #endif
292
@@ -407,11 +407,11 @@
407 ** --raw Raw tag name. Ignored for
408 ** non-CHECK-IN artifacts.
409 ** --propagate Propagating tag.
410 ** --date-override DATETIME Set date and time added.
411 ** --user-override USER Name USER when adding the tag.
412 ** -n|--dry-run Display the tag text, but do not
413 ** actually insert it into the database.
414 **
415 ** The --date-override and --user-override options support
416 ** importing history from other SCM systems. DATETIME has
417 ** the form 'YYYY-MMM-DD HH:MM:SS'.
@@ -422,20 +422,20 @@
422 **
423 ** > fossil tag cancel ?--raw? TAGNAME ARTIFACT-ID
424 **
425 ** Remove the tag TAGNAME from the artifact referenced by
426 ** ARTIFACT-ID, and also remove the propagation of the tag to
427 ** any descendants. Use the the -n|--dry-run option to see
428 ** what would have happened. Certain tag name prefixes are
429 ** forbidden, as documented for the 'add' subcommand.
430 **
431 ** Options:
432 ** --raw Raw tag name. Ignored for
433 ** non-CHECK-IN artifacts.
434 ** --date-override DATETIME Set date and time deleted.
435 ** --user-override USER Name USER when deleting the tag.
436 ** -n|--dry-run Display the control artifact, but do
437 ** not insert it into the database.
438 **
439 ** > fossil tag find ?OPTIONS? TAGNAME
440 **
441 ** List all objects that use TAGNAME.
@@ -514,11 +514,11 @@
514 const char *zDateOvrd = find_option("date-override",0,1);
515 const char *zUserOvrd = find_option("user-override",0,1);
516 const char *zTag;
517 const char *zObjId;
518 int objType;
519 if( find_option("dry-run","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
520 if( g.argc!=5 && g.argc!=6 ){
521 usage("add ?options? TAGNAME ARTIFACT-ID ?VALUE?");
522 }
523 zTag = g.argv[3];
524 tag_cmd_tagname_check(zTag);
@@ -552,11 +552,11 @@
552 const char *zDateOvrd = find_option("date-override",0,1);
553 const char *zUserOvrd = find_option("user-override",0,1);
554 const char *zTag;
555 const char *zObjId;
556 int objType;
557 if( find_option("dry-run","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
558 if( g.argc!=5 ){
559 usage("cancel ?options? TAGNAME ARTIFACT-ID");
560 }
561 zTag = g.argv[3];
562 tag_cmd_tagname_check(zTag);
@@ -751,11 +751,11 @@
751 ** reparenting operation, simply delete the tag.
752 **
753 ** --test Make database entries but do not add the tag artifact.
754 ** So the reparent operation will be undone by the next
755 ** "fossil rebuild" command.
756 ** -n|--dry-run Print the tag that would have been created but do not
757 ** actually change the database in any way.
758 ** --date-override DATETIME Set the change time on the control artifact
759 ** --user-override USER Set the user name on the control artifact
760 */
761 void reparent_cmd(void){
@@ -766,11 +766,11 @@
766 char *zUuid;
767 int dryRun = 0;
768 const char *zDateOvrd; /* The change time on the control artifact */
769 const char *zUserOvrd; /* The user name on the control artifact */
770
771 if( find_option("dry-run","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
772 zDateOvrd = find_option("date-override",0,1);
773 zUserOvrd = find_option("user-override",0,1);
774 db_find_and_open_repository(0, 0);
775 verify_all_options();
776 if( g.argc<4 ){
777
M src/unversioned.c
+3 -3
--- src/unversioned.c
+++ src/unversioned.c
@@ -200,11 +200,11 @@
200200
 */
201201
 static int unversioned_sync_flags(unsigned syncFlags){
202202
 if( find_option("verbose","v",0)!=0 ){
203203
 syncFlags |= SYNC_UV_TRACE | SYNC_VERBOSE;
204204
 }
205
- if( find_option("dryrun","n",0)!=0 ){
205
+ if( find_option("dry-run","n",0)!=0 ){
206206
 syncFlags |= SYNC_UV_DRYRUN | SYNC_UV_TRACE | SYNC_VERBOSE;
207207
 }
208208
 return syncFlags;
209209
 }
210210
@@ -264,11 +264,11 @@
264264
 ** local repository to match the remote repository
265265
 ** URL.
266266
 **
267267
 ** Options:
268268
 ** -v|--verbose Extra diagnostic output
269
-** -n|--dryrun Show what would have happened
269
+** -n|--dry-run Show what would have happened
270270
 **
271271
 ** remove|rm|delete FILE ...
272272
 ** Remove unversioned files from the local repository.
273273
 ** Changes are not pushed to other repositories until
274274
 ** the next sync. Options:
@@ -281,11 +281,11 @@
281281
 ** of each file is propagated to all repositories and
282282
 ** all prior versions are permanently forgotten.
283283
 **
284284
 ** Options:
285285
 ** -v|--verbose Extra diagnostic output
286
-** -n|--dryrun Show what would have happened
286
+** -n|--dry-run Show what would have happened
287287
 **
288288
 ** touch FILE ... Update the TIMESTAMP on all of the listed files
289289
 **
290290
 ** Options:
291291
 **
292292
--- src/unversioned.c
+++ src/unversioned.c
@@ -200,11 +200,11 @@
200 */
201 static int unversioned_sync_flags(unsigned syncFlags){
202 if( find_option("verbose","v",0)!=0 ){
203 syncFlags |= SYNC_UV_TRACE | SYNC_VERBOSE;
204 }
205 if( find_option("dryrun","n",0)!=0 ){
206 syncFlags |= SYNC_UV_DRYRUN | SYNC_UV_TRACE | SYNC_VERBOSE;
207 }
208 return syncFlags;
209 }
210
@@ -264,11 +264,11 @@
264 ** local repository to match the remote repository
265 ** URL.
266 **
267 ** Options:
268 ** -v|--verbose Extra diagnostic output
269 ** -n|--dryrun Show what would have happened
270 **
271 ** remove|rm|delete FILE ...
272 ** Remove unversioned files from the local repository.
273 ** Changes are not pushed to other repositories until
274 ** the next sync. Options:
@@ -281,11 +281,11 @@
281 ** of each file is propagated to all repositories and
282 ** all prior versions are permanently forgotten.
283 **
284 ** Options:
285 ** -v|--verbose Extra diagnostic output
286 ** -n|--dryrun Show what would have happened
287 **
288 ** touch FILE ... Update the TIMESTAMP on all of the listed files
289 **
290 ** Options:
291 **
292
--- src/unversioned.c
+++ src/unversioned.c
@@ -200,11 +200,11 @@
200 */
201 static int unversioned_sync_flags(unsigned syncFlags){
202 if( find_option("verbose","v",0)!=0 ){
203 syncFlags |= SYNC_UV_TRACE | SYNC_VERBOSE;
204 }
205 if( find_option("dry-run","n",0)!=0 ){
206 syncFlags |= SYNC_UV_DRYRUN | SYNC_UV_TRACE | SYNC_VERBOSE;
207 }
208 return syncFlags;
209 }
210
@@ -264,11 +264,11 @@
264 ** local repository to match the remote repository
265 ** URL.
266 **
267 ** Options:
268 ** -v|--verbose Extra diagnostic output
269 ** -n|--dry-run Show what would have happened
270 **
271 ** remove|rm|delete FILE ...
272 ** Remove unversioned files from the local repository.
273 ** Changes are not pushed to other repositories until
274 ** the next sync. Options:
@@ -281,11 +281,11 @@
281 ** of each file is propagated to all repositories and
282 ** all prior versions are permanently forgotten.
283 **
284 ** Options:
285 ** -v|--verbose Extra diagnostic output
286 ** -n|--dry-run Show what would have happened
287 **
288 ** touch FILE ... Update the TIMESTAMP on all of the listed files
289 **
290 ** Options:
291 **
292

Keyboard Shortcuts

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