Following patch changes all --dryrun options to the more common form
--dry-run for all commands, but this would break working scripts!
--Florian
Index: src/tag.c
==================================================================
--- src/tag.c
+++ src/tag.c
@@ -282,11 +282,11 @@
}
/*
** OR this value into the tagtype argument to tag_add_artifact to
** cause the tag to be displayed on standard output rather than be
-** inserted. Used for --dryrun options and debugging.
+** inserted. Used for --dry-run options and debugging.
*/
#if INTERFACE
#define TAG_ADD_DRYRUN 0x04
#endif
@@ -381,11 +381,11 @@
** Options:
** --raw Raw tag name.
** --propagate Propagating tag.
** --date-override DATETIME Set date and time added.
** --user-override USER Name USER when adding the tag.
-** --dryrun|-n Display the tag text, but do not
+** --dry-run|-n Display the tag text, but do not
** actually insert it into the database.
**
** The --date-override and --user-override options support
** importing history from other SCM systems. DATETIME has
** the form 'YYYY-MMM-DD HH:MM:SS'.
@@ -392,11 +392,11 @@
**
** %fossil tag cancel ?--raw? TAGNAME CHECK-IN
**
** Remove the tag TAGNAME from CHECK-IN, and also remove
** the propagation of the tag to any descendants. Use the
-** the --dryrun or -n options to see what would have happened.
+** the --dry-run or -n options to see what would have happened.
**
** %fossil tag find ?OPTIONS? TAGNAME
**
** List all objects that use TAGNAME. TYPE can be "ci" for
** check-ins or "e" for events. The limit option limits the number
@@ -452,11 +452,11 @@
if( strncmp(g.argv[2],"add",n)==0 ){
char *zValue;
int dryRun = 0;
const char *zDateOvrd = find_option("date-override",0,1);
const char *zUserOvrd = find_option("user-override",0,1);
- if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
+ if( find_option("dry-run","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
if( g.argc!=5 && g.argc!=6 ){
usage("add ?options? TAGNAME CHECK-IN ?VALUE?");
}
zValue = g.argc==6 ? g.argv[5] : 0;
db_begin_transaction();
@@ -470,11 +470,11 @@
"Use the \"fossil branch new\" command instead.");
}else
if( strncmp(g.argv[2],"cancel",n)==0 ){
int dryRun = 0;
- if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
+ if( find_option("dry-run","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
if( g.argc!=5 ){
usage("cancel ?options? TAGNAME CHECK-IN");
}
db_begin_transaction();
tag_add_artifact(zPrefix, g.argv[3], g.argv[4], 0, dryRun, 0, 0);
@@ -604,11 +604,11 @@
** reparenting operation, simply delete the tag.
**
** --test Make database entries but do not add the tag artifact.
** So the reparent operation will be undone by the next
** "fossil rebuild" command.
-** --dryrun | -n Print the tag that would have been created but do not
+** --dry-run | -n Print the tag that would have been created but do not
** actually change the database in any way.
*/
void reparent_cmd(void){
int bTest = find_option("test","",0)!=0;
int rid;
@@ -615,11 +615,11 @@
int i;
Blob value;
char *zUuid;
int dryRun = 0;
- if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
+ if( find_option("dry-run","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
db_find_and_open_repository(0, 0);
verify_all_options();
if( g.argc<4 ){
usage("[OPTIONS] CHECK-IN PARENT ...");
}
Index: src/unversioned.c
==================================================================
--- src/unversioned.c
+++ src/unversioned.c
@@ -183,11 +183,11 @@
*/
static int unversioned_sync_flags(unsigned syncFlags){
if( find_option("verbose","v",0)!=0 ){
syncFlags |= SYNC_UV_TRACE | SYNC_VERBOSE;
}
- if( find_option("dryrun","n",0)!=0 ){
+ if( find_option("dry-run","n",0)!=0 ){
syncFlags |= SYNC_UV_DRYRUN | SYNC_UV_TRACE | SYNC_VERBOSE;
}
return syncFlags;
}
@@ -236,11 +236,11 @@
** local repository to match the remote repository
** URL.
**
** Options:
** -v|--verbose Extra diagnostic output
-** -n|--dryrun Show what would have happened
+** -n|--dry-run Show what would have happened
**
** remove|rm|delete FILE ...
** Remove unversioned files from the local repository.
** Changes are not pushed to other repositories until
** the next sync.
@@ -250,11 +250,11 @@
** of each file is propagate to all repositories and
** all prior versions are permanently forgotten.
**
** Options:
** -v|--verbose Extra diagnostic output
-** -n|--dryrun Show what would have happened
+** -n|--dry-run Show what would have happened
**
** touch FILE ... Update the TIMESTAMP on all of the listed files
**
** Options:
**
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
