d03ed299d2a… — Fossil SCM

M src/backoffice.c

+9 -7

		--- src/backoffice.c
		+++ src/backoffice.c
		@@ -699,16 +699,16 @@
699	699	** --trace Enable debugging output on stderr
700	700	**
701	701	** Options intended for internal use only which may change or be
702	702	** discontinued in future releases:
703	703	**
704		-** --nodelay Do not queue up or wait for a backoffice job
	704	+** --no-delay Do not queue up or wait for a backoffice job
705	705	** to complete. If no work is available or if
706	706	** backoffice has run recently, return immediately.
707	707	**
708		-** --nolease Always run backoffice, even if there is a lease
709		-** conflict. This option implies --nodelay. This
	708	+** --no-lease Always run backoffice, even if there is a lease
	709	+** conflict. This option implies --no-delay. This
710	710	** option is added to secondary backoffice commands
711	711	** that are invoked by the --poll option.
712	712	*/
713	713	void backoffice_command(void){
714	714	int nPoll;
		@@ -716,18 +716,20 @@
716	716	const char *zPoll;
717	717	int bDebug = 0;
718	718	int bNoLease = 0;
719	719	unsigned int nCmd = 0;
720	720	if( find_option("trace",0,0)!=0 ) g.fAnyTrace = 1;
721		- if( find_option("nodelay",0,0)!=0 ) backofficeNoDelay = 1;
	721	+ if( find_option("no-delay",0,0)!=0 \|\| find_option("nodelay",0,0)!=0 ){
	722	+ backofficeNoDelay = 1;
	723	+ }
722	724	backofficeLogfile = find_option("logfile",0,1);
723	725	zPoll = find_option("poll",0,1);
724	726	nPoll = zPoll ? atoi(zPoll) : 0;
725	727	zPoll = find_option("min",0,1);
726	728	nMin = zPoll ? atoi(zPoll) : 3600;
727	729	bDebug = find_option("debug",0,0)!=0;
728		- bNoLease = find_option("nolease",0,0)!=0;
	730	+ bNoLease = find_option("no-lease",0,0)!=0 \|\| find_option("nolease",0,0)!=0;
729	731
730	732	/* Silently consume the -R or --repository flag, leaving behind its
731	733	** argument. This is for legacy compatibility. Older versions of the
732	734	** backoffice command only ran on a single repository that was specified
733	735	** using the -R option. */
		@@ -756,19 +758,19 @@
756	758	){
757	759	continue; /* Not yet time to run this one */
758	760	}
759	761	blob_init(&cmd, 0, 0);
760	762	blob_append_escaped_arg(&cmd, g.nameOfExe, 1);
761		- blob_append(&cmd, " backoffice --nodelay", -1);
	763	+ blob_append(&cmd, " backoffice --no-delay", -1);
762	764	if( g.fAnyTrace ){
763	765	blob_append(&cmd, " --trace", -1);
764	766	}
765	767	if( bDebug ){
766	768	blob_append(&cmd, " --debug", -1);
767	769	}
768	770	if( nPoll>0 ){
769		- blob_append(&cmd, " --nolease", -1);
	771	+ blob_append(&cmd, " --no-lease", -1);
770	772	}
771	773	if( backofficeLogfile ){
772	774	blob_append(&cmd, " --logfile", -1);
773	775	blob_append_escaped_arg(&cmd, backofficeLogfile, 1);
774	776	}
775	777

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -699,16 +699,16 @@
699	** --trace Enable debugging output on stderr
700	**
701	** Options intended for internal use only which may change or be
702	** discontinued in future releases:
703	**
704	** --nodelay Do not queue up or wait for a backoffice job
705	** to complete. If no work is available or if
706	** backoffice has run recently, return immediately.
707	**
708	** --nolease Always run backoffice, even if there is a lease
709	** conflict. This option implies --nodelay. This
710	** option is added to secondary backoffice commands
711	** that are invoked by the --poll option.
712	*/
713	void backoffice_command(void){
714	int nPoll;
	@@ -716,18 +716,20 @@
716	const char *zPoll;
717	int bDebug = 0;
718	int bNoLease = 0;
719	unsigned int nCmd = 0;
720	if( find_option("trace",0,0)!=0 ) g.fAnyTrace = 1;
721	if( find_option("nodelay",0,0)!=0 ) backofficeNoDelay = 1;


722	backofficeLogfile = find_option("logfile",0,1);
723	zPoll = find_option("poll",0,1);
724	nPoll = zPoll ? atoi(zPoll) : 0;
725	zPoll = find_option("min",0,1);
726	nMin = zPoll ? atoi(zPoll) : 3600;
727	bDebug = find_option("debug",0,0)!=0;
728	bNoLease = find_option("nolease",0,0)!=0;
729
730	/* Silently consume the -R or --repository flag, leaving behind its
731	** argument. This is for legacy compatibility. Older versions of the
732	** backoffice command only ran on a single repository that was specified
733	** using the -R option. */
	@@ -756,19 +758,19 @@
756	){
757	continue; /* Not yet time to run this one */
758	}
759	blob_init(&cmd, 0, 0);
760	blob_append_escaped_arg(&cmd, g.nameOfExe, 1);
761	blob_append(&cmd, " backoffice --nodelay", -1);
762	if( g.fAnyTrace ){
763	blob_append(&cmd, " --trace", -1);
764	}
765	if( bDebug ){
766	blob_append(&cmd, " --debug", -1);
767	}
768	if( nPoll>0 ){
769	blob_append(&cmd, " --nolease", -1);
770	}
771	if( backofficeLogfile ){
772	blob_append(&cmd, " --logfile", -1);
773	blob_append_escaped_arg(&cmd, backofficeLogfile, 1);
774	}
775

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -699,16 +699,16 @@
699	** --trace Enable debugging output on stderr
700	**
701	** Options intended for internal use only which may change or be
702	** discontinued in future releases:
703	**
704	** --no-delay Do not queue up or wait for a backoffice job
705	** to complete. If no work is available or if
706	** backoffice has run recently, return immediately.
707	**
708	** --no-lease Always run backoffice, even if there is a lease
709	** conflict. This option implies --no-delay. This
710	** option is added to secondary backoffice commands
711	** that are invoked by the --poll option.
712	*/
713	void backoffice_command(void){
714	int nPoll;
	@@ -716,18 +716,20 @@
716	const char *zPoll;
717	int bDebug = 0;
718	int bNoLease = 0;
719	unsigned int nCmd = 0;
720	if( find_option("trace",0,0)!=0 ) g.fAnyTrace = 1;
721	if( find_option("no-delay",0,0)!=0 \|\| find_option("nodelay",0,0)!=0 ){
722	backofficeNoDelay = 1;
723	}
724	backofficeLogfile = find_option("logfile",0,1);
725	zPoll = find_option("poll",0,1);
726	nPoll = zPoll ? atoi(zPoll) : 0;
727	zPoll = find_option("min",0,1);
728	nMin = zPoll ? atoi(zPoll) : 3600;
729	bDebug = find_option("debug",0,0)!=0;
730	bNoLease = find_option("no-lease",0,0)!=0 \|\| find_option("nolease",0,0)!=0;
731
732	/* Silently consume the -R or --repository flag, leaving behind its
733	** argument. This is for legacy compatibility. Older versions of the
734	** backoffice command only ran on a single repository that was specified
735	** using the -R option. */
	@@ -756,19 +758,19 @@
758	){
759	continue; /* Not yet time to run this one */
760	}
761	blob_init(&cmd, 0, 0);
762	blob_append_escaped_arg(&cmd, g.nameOfExe, 1);
763	blob_append(&cmd, " backoffice --no-delay", -1);
764	if( g.fAnyTrace ){
765	blob_append(&cmd, " --trace", -1);
766	}
767	if( bDebug ){
768	blob_append(&cmd, " --debug", -1);
769	}
770	if( nPoll>0 ){
771	blob_append(&cmd, " --no-lease", -1);
772	}
773	if( backofficeLogfile ){
774	blob_append(&cmd, " --logfile", -1);
775	blob_append_escaped_arg(&cmd, backofficeLogfile, 1);
776	}
777

M src/branch.c

+4 -4

		--- src/branch.c
		+++ src/branch.c
		@@ -82,12 +82,12 @@
82	82	Blob mcksum; /* Self-checksum on the manifest */
83	83	const char zDateOvrd; / Override date string */
84	84	const char zUserOvrd; / Override user name */
85	85	int isPrivate = 0; /* True if the branch should be private */
86	86
87		- noSign = find_option("nosign","",0)!=0;
88		- if( find_option("nosync",0,0) ) g.fNoSync = 1;
	87	+ noSign = find_option("no-sign","",0)!=0 \|\| find_option("nosign","",0)!=0;
	88	+ if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
89	89	zColor = find_option("bgcolor","c",1);
90	90	isPrivate = find_option("private",0,0)!=0;
91	91	zDateOvrd = find_option("date-override",0,1);
92	92	zUserOvrd = find_option("user-override",0,1);
93	93	verify_all_options();
		@@ -660,12 +660,12 @@
660	660	** Create a new branch BRANCH-NAME off of check-in BASIS.
661	661	**
662	662	** Options:
663	663	** --private Branch is private (i.e., remains local)
664	664	** --bgcolor COLOR Use COLOR instead of automatic background
665		-** --nosign Do not sign contents on this branch
666		-** --nosync Do not auto-sync prior to creating the branch
	665	+** --no-sign Do not sign contents on this branch
	666	+** --no-sync Do not auto-sync prior to creating the branch
667	667	** --date-override DATE DATE to use instead of 'now'
668	668	** --user-override USER USER to use instead of the current default
669	669	**
670	670	** DATE may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
671	671	** year-month-day form, it may be truncated, the "T" may be
672	672

	--- src/branch.c
	+++ src/branch.c
	@@ -82,12 +82,12 @@
82	Blob mcksum; /* Self-checksum on the manifest */
83	const char zDateOvrd; / Override date string */
84	const char zUserOvrd; / Override user name */
85	int isPrivate = 0; /* True if the branch should be private */
86
87	noSign = find_option("nosign","",0)!=0;
88	if( find_option("nosync",0,0) ) g.fNoSync = 1;
89	zColor = find_option("bgcolor","c",1);
90	isPrivate = find_option("private",0,0)!=0;
91	zDateOvrd = find_option("date-override",0,1);
92	zUserOvrd = find_option("user-override",0,1);
93	verify_all_options();
	@@ -660,12 +660,12 @@
660	** Create a new branch BRANCH-NAME off of check-in BASIS.
661	**
662	** Options:
663	** --private Branch is private (i.e., remains local)
664	** --bgcolor COLOR Use COLOR instead of automatic background
665	** --nosign Do not sign contents on this branch
666	** --nosync Do not auto-sync prior to creating the branch
667	** --date-override DATE DATE to use instead of 'now'
668	** --user-override USER USER to use instead of the current default
669	**
670	** DATE may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
671	** year-month-day form, it may be truncated, the "T" may be
672

	--- src/branch.c
	+++ src/branch.c
	@@ -82,12 +82,12 @@
82	Blob mcksum; /* Self-checksum on the manifest */
83	const char zDateOvrd; / Override date string */
84	const char zUserOvrd; / Override user name */
85	int isPrivate = 0; /* True if the branch should be private */
86
87	noSign = find_option("no-sign","",0)!=0 \|\| find_option("nosign","",0)!=0;
88	if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
89	zColor = find_option("bgcolor","c",1);
90	isPrivate = find_option("private",0,0)!=0;
91	zDateOvrd = find_option("date-override",0,1);
92	zUserOvrd = find_option("user-override",0,1);
93	verify_all_options();
	@@ -660,12 +660,12 @@
660	** Create a new branch BRANCH-NAME off of check-in BASIS.
661	**
662	** Options:
663	** --private Branch is private (i.e., remains local)
664	** --bgcolor COLOR Use COLOR instead of automatic background
665	** --no-sign Do not sign contents on this branch
666	** --no-sync Do not auto-sync prior to creating the branch
667	** --date-override DATE DATE to use instead of 'now'
668	** --user-override USER USER to use instead of the current default
669	**
670	** DATE may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
671	** year-month-day form, it may be truncated, the "T" may be
672

M src/checkin.c

+4 -4

		--- src/checkin.c
		+++ src/checkin.c
		@@ -2331,12 +2331,12 @@
2331	2331	** --no-prompt This option disables prompting the user for
2332	2332	** input and assumes an answer of 'No' for every
2333	2333	** question.
2334	2334	** --no-warnings Omit all warnings about file contents
2335	2335	** --no-verify Do not run before-commit hooks
2336		-** --nosign Do not attempt to sign this commit with gpg
2337		-** --nosync Do not auto-sync prior to committing
	2336	+** --no-sign Do not attempt to sign this commit with gpg
	2337	+** --no-sync Do not auto-sync prior to committing
2338	2338	** --override-lock Allow a check-in even though parent is locked
2339	2339	** --private Do not sync changes and their descendants
2340	2340	** --tag TAG-NAME Assign given tag TAG-NAME to the check-in
2341	2341	** --trace Debug tracing
2342	2342	** --user-override USER USER to use instead of the current default
		@@ -2400,12 +2400,12 @@
2400	2400
2401	2401	memset(&sCiInfo, 0, sizeof(sCiInfo));
2402	2402	url_proxy_options();
2403	2403	/* --sha1sum is an undocumented alias for --hash for backwards compatiblity */
2404	2404	useHash = find_option("hash",0,0)!=0 \|\| find_option("sha1sum",0,0)!=0;
2405		- noSign = find_option("nosign",0,0)!=0;
2406		- if( find_option("nosync",0,0) ) g.fNoSync = 1;
	2405	+ noSign = find_option("no-sign",0,0)!=0 \|\| find_option("nosign",0,0)!=0;
	2406	+ if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
2407	2407	privateFlag = find_option("private",0,0)!=0;
2408	2408	forceDelta = find_option("delta",0,0)!=0;
2409	2409	forceBaseline = find_option("baseline",0,0)!=0;
2410	2410	db_must_be_within_tree();
2411	2411	if( db_get_boolean("dont-commit",0) ){
2412	2412

	--- src/checkin.c
	+++ src/checkin.c
	@@ -2331,12 +2331,12 @@
2331	** --no-prompt This option disables prompting the user for
2332	** input and assumes an answer of 'No' for every
2333	** question.
2334	** --no-warnings Omit all warnings about file contents
2335	** --no-verify Do not run before-commit hooks
2336	** --nosign Do not attempt to sign this commit with gpg
2337	** --nosync Do not auto-sync prior to committing
2338	** --override-lock Allow a check-in even though parent is locked
2339	** --private Do not sync changes and their descendants
2340	** --tag TAG-NAME Assign given tag TAG-NAME to the check-in
2341	** --trace Debug tracing
2342	** --user-override USER USER to use instead of the current default
	@@ -2400,12 +2400,12 @@
2400
2401	memset(&sCiInfo, 0, sizeof(sCiInfo));
2402	url_proxy_options();
2403	/* --sha1sum is an undocumented alias for --hash for backwards compatiblity */
2404	useHash = find_option("hash",0,0)!=0 \|\| find_option("sha1sum",0,0)!=0;
2405	noSign = find_option("nosign",0,0)!=0;
2406	if( find_option("nosync",0,0) ) g.fNoSync = 1;
2407	privateFlag = find_option("private",0,0)!=0;
2408	forceDelta = find_option("delta",0,0)!=0;
2409	forceBaseline = find_option("baseline",0,0)!=0;
2410	db_must_be_within_tree();
2411	if( db_get_boolean("dont-commit",0) ){
2412

	--- src/checkin.c
	+++ src/checkin.c
	@@ -2331,12 +2331,12 @@
2331	** --no-prompt This option disables prompting the user for
2332	** input and assumes an answer of 'No' for every
2333	** question.
2334	** --no-warnings Omit all warnings about file contents
2335	** --no-verify Do not run before-commit hooks
2336	** --no-sign Do not attempt to sign this commit with gpg
2337	** --no-sync Do not auto-sync prior to committing
2338	** --override-lock Allow a check-in even though parent is locked
2339	** --private Do not sync changes and their descendants
2340	** --tag TAG-NAME Assign given tag TAG-NAME to the check-in
2341	** --trace Debug tracing
2342	** --user-override USER USER to use instead of the current default
	@@ -2400,12 +2400,12 @@
2400
2401	memset(&sCiInfo, 0, sizeof(sCiInfo));
2402	url_proxy_options();
2403	/* --sha1sum is an undocumented alias for --hash for backwards compatiblity */
2404	useHash = find_option("hash",0,0)!=0 \|\| find_option("sha1sum",0,0)!=0;
2405	noSign = find_option("no-sign",0,0)!=0 \|\| find_option("nosign",0,0)!=0;
2406	if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
2407	privateFlag = find_option("private",0,0)!=0;
2408	forceDelta = find_option("delta",0,0)!=0;
2409	forceBaseline = find_option("baseline",0,0)!=0;
2410	db_must_be_within_tree();
2411	if( db_get_boolean("dont-commit",0) ){
2412

M src/clone.c

+4 -3

		--- src/clone.c
		+++ src/clone.c
		@@ -125,11 +125,11 @@
125	125	** Options:
126	126	** -A\|--admin-user USERNAME Make USERNAME the administrator
127	127	** -B\|--httpauth USER:PASS Add HTTP Basic Authorization to requests
128	128	** --nested Allow opening a repository inside an opened
129	129	** check-out
130		-** --nocompress Omit extra delta compression
	130	+** --no-compress Omit extra delta compression
131	131	** --no-open Clone only. Do not open a check-out.
132	132	** --once Don't remember the URI.
133	133	** --private Also clone private branches
134	134	** --save-http-password Remember the HTTP password without asking
135	135	** -c\|--ssh-command SSH Use SSH as the "ssh" command
		@@ -147,11 +147,12 @@
147	147	const char zDefaultUser; / Optional name of the default user */
148	148	const char zHttpAuth; / HTTP Authorization user:pass information */
149	149	int nErr = 0;
150	150	int urlFlags = URL_PROMPT_PW \| URL_REMEMBER;
151	151	int syncFlags = SYNC_CLONE;
152		- int noCompress = find_option("nocompress",0,0)!=0;
	152	+ int noCompress = find_option("no-compress",0,0)!=0
	153	+ \|\| find_option("nocompress",0,0)!=0;
153	154	int noOpen = find_option("no-open",0,0)!=0;
154	155	int allowNested = find_option("nested",0,0)!=0; /* Used by open */
155	156	const char zRepo = 0; / Name of the new local repository file */
156	157	const char zWorkDir = 0; / Open in this directory, if not zero */
157	158
		@@ -325,11 +326,11 @@
325	326	zRepo, zWorkDir);
326	327	blob_init(&cmd, 0, 0);
327	328	blob_append_escaped_arg(&cmd, g.nameOfExe, 1);
328	329	blob_append(&cmd, " open ", -1);
329	330	blob_append_escaped_arg(&cmd, zRepo, 1);
330		- blob_append(&cmd, " --nosync --workdir ", -1);
	331	+ blob_append(&cmd, " --no-sync --workdir ", -1);
331	332	blob_append_escaped_arg(&cmd, zWorkDir, 1);
332	333	if( allowNested ){
333	334	blob_append(&cmd, " --nested", -1);
334	335	}
335	336	fossil_system(blob_str(&cmd));
336	337

	--- src/clone.c
	+++ src/clone.c
	@@ -125,11 +125,11 @@
125	** Options:
126	** -A\|--admin-user USERNAME Make USERNAME the administrator
127	** -B\|--httpauth USER:PASS Add HTTP Basic Authorization to requests
128	** --nested Allow opening a repository inside an opened
129	** check-out
130	** --nocompress Omit extra delta compression
131	** --no-open Clone only. Do not open a check-out.
132	** --once Don't remember the URI.
133	** --private Also clone private branches
134	** --save-http-password Remember the HTTP password without asking
135	** -c\|--ssh-command SSH Use SSH as the "ssh" command
	@@ -147,11 +147,12 @@
147	const char zDefaultUser; / Optional name of the default user */
148	const char zHttpAuth; / HTTP Authorization user:pass information */
149	int nErr = 0;
150	int urlFlags = URL_PROMPT_PW \| URL_REMEMBER;
151	int syncFlags = SYNC_CLONE;
152	int noCompress = find_option("nocompress",0,0)!=0;

153	int noOpen = find_option("no-open",0,0)!=0;
154	int allowNested = find_option("nested",0,0)!=0; /* Used by open */
155	const char zRepo = 0; / Name of the new local repository file */
156	const char zWorkDir = 0; / Open in this directory, if not zero */
157
	@@ -325,11 +326,11 @@
325	zRepo, zWorkDir);
326	blob_init(&cmd, 0, 0);
327	blob_append_escaped_arg(&cmd, g.nameOfExe, 1);
328	blob_append(&cmd, " open ", -1);
329	blob_append_escaped_arg(&cmd, zRepo, 1);
330	blob_append(&cmd, " --nosync --workdir ", -1);
331	blob_append_escaped_arg(&cmd, zWorkDir, 1);
332	if( allowNested ){
333	blob_append(&cmd, " --nested", -1);
334	}
335	fossil_system(blob_str(&cmd));
336

	--- src/clone.c
	+++ src/clone.c
	@@ -125,11 +125,11 @@
125	** Options:
126	** -A\|--admin-user USERNAME Make USERNAME the administrator
127	** -B\|--httpauth USER:PASS Add HTTP Basic Authorization to requests
128	** --nested Allow opening a repository inside an opened
129	** check-out
130	** --no-compress Omit extra delta compression
131	** --no-open Clone only. Do not open a check-out.
132	** --once Don't remember the URI.
133	** --private Also clone private branches
134	** --save-http-password Remember the HTTP password without asking
135	** -c\|--ssh-command SSH Use SSH as the "ssh" command
	@@ -147,11 +147,12 @@
147	const char zDefaultUser; / Optional name of the default user */
148	const char zHttpAuth; / HTTP Authorization user:pass information */
149	int nErr = 0;
150	int urlFlags = URL_PROMPT_PW \| URL_REMEMBER;
151	int syncFlags = SYNC_CLONE;
152	int noCompress = find_option("no-compress",0,0)!=0
153	\|\| find_option("nocompress",0,0)!=0;
154	int noOpen = find_option("no-open",0,0)!=0;
155	int allowNested = find_option("nested",0,0)!=0; /* Used by open */
156	const char zRepo = 0; / Name of the new local repository file */
157	const char zWorkDir = 0; / Open in this directory, if not zero */
158
	@@ -325,11 +326,11 @@
326	zRepo, zWorkDir);
327	blob_init(&cmd, 0, 0);
328	blob_append_escaped_arg(&cmd, g.nameOfExe, 1);
329	blob_append(&cmd, " open ", -1);
330	blob_append_escaped_arg(&cmd, zRepo, 1);
331	blob_append(&cmd, " --no-sync --workdir ", -1);
332	blob_append_escaped_arg(&cmd, zWorkDir, 1);
333	if( allowNested ){
334	blob_append(&cmd, " --nested", -1);
335	}
336	fossil_system(blob_str(&cmd));
337

M src/db.c

+2 -2

		--- src/db.c
		+++ src/db.c
		@@ -4104,11 +4104,11 @@
4104	4104	** -f\|--force Continue with the open even if the working directory is
4105	4105	** not empty, or if auto-sync fails.
4106	4106	** --force-missing Force opening a repository with missing content
4107	4107	** -k\|--keep Only modify the manifest file(s)
4108	4108	** --nested Allow opening a repository inside an opened check-out
4109		-** --nosync Do not auto-sync the repository prior to opening even
	4109	+** --no-sync Do not auto-sync the repository prior to opening even
4110	4110	** if the autosync setting is on.
4111	4111	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
4112	4112	** the clone in DIR rather than in "."
4113	4113	** --setmtime Set timestamps of all files to match their SCM-side
4114	4114	** times (the timestamp of the last check-in which modified
		@@ -4143,11 +4143,11 @@
4143	4143	allowNested = find_option("nested",0,0)!=0;
4144	4144	setmtimeFlag = find_option("setmtime",0,0)!=0;
4145	4145	zWorkDir = find_option("workdir",0,1);
4146	4146	zRepoDir = find_option("repodir",0,1);
4147	4147	bForce = find_option("force","f",0)!=0;
4148		- if( find_option("nosync",0,0) ) g.fNoSync = 1;
	4148	+ if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
4149	4149	bVerbose = find_option("verbose",0,0)!=0;
4150	4150	zPwd = file_getcwd(0,0);
4151	4151
4152	4152	/* We should be done with options.. */
4153	4153	verify_all_options();
4154	4154

	--- src/db.c
	+++ src/db.c
	@@ -4104,11 +4104,11 @@
4104	** -f\|--force Continue with the open even if the working directory is
4105	** not empty, or if auto-sync fails.
4106	** --force-missing Force opening a repository with missing content
4107	** -k\|--keep Only modify the manifest file(s)
4108	** --nested Allow opening a repository inside an opened check-out
4109	** --nosync Do not auto-sync the repository prior to opening even
4110	** if the autosync setting is on.
4111	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
4112	** the clone in DIR rather than in "."
4113	** --setmtime Set timestamps of all files to match their SCM-side
4114	** times (the timestamp of the last check-in which modified
	@@ -4143,11 +4143,11 @@
4143	allowNested = find_option("nested",0,0)!=0;
4144	setmtimeFlag = find_option("setmtime",0,0)!=0;
4145	zWorkDir = find_option("workdir",0,1);
4146	zRepoDir = find_option("repodir",0,1);
4147	bForce = find_option("force","f",0)!=0;
4148	if( find_option("nosync",0,0) ) g.fNoSync = 1;
4149	bVerbose = find_option("verbose",0,0)!=0;
4150	zPwd = file_getcwd(0,0);
4151
4152	/* We should be done with options.. */
4153	verify_all_options();
4154

	--- src/db.c
	+++ src/db.c
	@@ -4104,11 +4104,11 @@
4104	** -f\|--force Continue with the open even if the working directory is
4105	** not empty, or if auto-sync fails.
4106	** --force-missing Force opening a repository with missing content
4107	** -k\|--keep Only modify the manifest file(s)
4108	** --nested Allow opening a repository inside an opened check-out
4109	** --no-sync Do not auto-sync the repository prior to opening even
4110	** if the autosync setting is on.
4111	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
4112	** the clone in DIR rather than in "."
4113	** --setmtime Set timestamps of all files to match their SCM-side
4114	** times (the timestamp of the last check-in which modified
	@@ -4143,11 +4143,11 @@
4143	allowNested = find_option("nested",0,0)!=0;
4144	setmtimeFlag = find_option("setmtime",0,0)!=0;
4145	zWorkDir = find_option("workdir",0,1);
4146	zRepoDir = find_option("repodir",0,1);
4147	bForce = find_option("force","f",0)!=0;
4148	if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
4149	bVerbose = find_option("verbose",0,0)!=0;
4150	zPwd = file_getcwd(0,0);
4151
4152	/* We should be done with options.. */
4153	verify_all_options();
4154

M src/diff.c

+4 -2

		--- src/diff.c
		+++ src/diff.c
		@@ -3105,11 +3105,11 @@
3105	3105	** --brief Show filenames only DIFF_BRIEF
3106	3106	** -c\|--context N N lines of context. nContext
3107	3107	** --html Format for HTML DIFF_HTML
3108	3108	** --invert Invert the diff DIFF_INVERT
3109	3109	** -n\|--linenum Show line numbers DIFF_LINENO
3110		-** --noopt Disable optimization DIFF_NOOPT
	3110	+** --no-opt Disable optimization DIFF_NOOPT
3111	3111	** --numstat Show change counts DIFF_NUMSTAT
3112	3112	** --strip-trailing-cr Strip trailing CR DIFF_STRIP_EOLCR
3113	3113	** --unified Unified diff. ~DIFF_SIDEBYSIDE
3114	3114	** -w\|--ignore-all-space Ignore all whitespaces DIFF_IGNORE_ALLWS
3115	3115	** -W\|--width N N character lines. wColumn
		@@ -3170,11 +3170,13 @@
3170	3170	}
3171	3171	if( (z = find_option("width","W",1))!=0 && (f = atoi(z))>0 ){
3172	3172	pCfg->wColumn = f;
3173	3173	}
3174	3174	if( find_option("linenum","n",0)!=0 ) diffFlags \|= DIFF_LINENO;
3175		- if( find_option("noopt",0,0)!=0 ) diffFlags \|= DIFF_NOOPT;
	3175	+ if( find_option("no-opt",0,0)!=0 \|\| find_option("noopt",0,0)!=0 ){
	3176	+ diffFlags \|= DIFF_NOOPT;
	3177	+ }
3176	3178	if( find_option("numstat",0,0)!=0 ) diffFlags \|= DIFF_NUMSTAT;
3177	3179	if( find_option("versions","h",0)!=0 ) diffFlags \|= DIFF_SHOW_VERS;
3178	3180	if( find_option("dark",0,0)!=0 ) diffFlags \|= DIFF_DARKMODE;
3179	3181	if( find_option("invert",0,0)!=0 ) diffFlags \|= DIFF_INVERT;
3180	3182	if( find_option("brief",0,0)!=0 ) diffFlags \|= DIFF_BRIEF;
3181	3183

	--- src/diff.c
	+++ src/diff.c
	@@ -3105,11 +3105,11 @@
3105	** --brief Show filenames only DIFF_BRIEF
3106	** -c\|--context N N lines of context. nContext
3107	** --html Format for HTML DIFF_HTML
3108	** --invert Invert the diff DIFF_INVERT
3109	** -n\|--linenum Show line numbers DIFF_LINENO
3110	** --noopt Disable optimization DIFF_NOOPT
3111	** --numstat Show change counts DIFF_NUMSTAT
3112	** --strip-trailing-cr Strip trailing CR DIFF_STRIP_EOLCR
3113	** --unified Unified diff. ~DIFF_SIDEBYSIDE
3114	** -w\|--ignore-all-space Ignore all whitespaces DIFF_IGNORE_ALLWS
3115	** -W\|--width N N character lines. wColumn
	@@ -3170,11 +3170,13 @@
3170	}
3171	if( (z = find_option("width","W",1))!=0 && (f = atoi(z))>0 ){
3172	pCfg->wColumn = f;
3173	}
3174	if( find_option("linenum","n",0)!=0 ) diffFlags \|= DIFF_LINENO;
3175	if( find_option("noopt",0,0)!=0 ) diffFlags \|= DIFF_NOOPT;


3176	if( find_option("numstat",0,0)!=0 ) diffFlags \|= DIFF_NUMSTAT;
3177	if( find_option("versions","h",0)!=0 ) diffFlags \|= DIFF_SHOW_VERS;
3178	if( find_option("dark",0,0)!=0 ) diffFlags \|= DIFF_DARKMODE;
3179	if( find_option("invert",0,0)!=0 ) diffFlags \|= DIFF_INVERT;
3180	if( find_option("brief",0,0)!=0 ) diffFlags \|= DIFF_BRIEF;
3181

	--- src/diff.c
	+++ src/diff.c
	@@ -3105,11 +3105,11 @@
3105	** --brief Show filenames only DIFF_BRIEF
3106	** -c\|--context N N lines of context. nContext
3107	** --html Format for HTML DIFF_HTML
3108	** --invert Invert the diff DIFF_INVERT
3109	** -n\|--linenum Show line numbers DIFF_LINENO
3110	** --no-opt Disable optimization DIFF_NOOPT
3111	** --numstat Show change counts DIFF_NUMSTAT
3112	** --strip-trailing-cr Strip trailing CR DIFF_STRIP_EOLCR
3113	** --unified Unified diff. ~DIFF_SIDEBYSIDE
3114	** -w\|--ignore-all-space Ignore all whitespaces DIFF_IGNORE_ALLWS
3115	** -W\|--width N N character lines. wColumn
	@@ -3170,11 +3170,13 @@
3170	}
3171	if( (z = find_option("width","W",1))!=0 && (f = atoi(z))>0 ){
3172	pCfg->wColumn = f;
3173	}
3174	if( find_option("linenum","n",0)!=0 ) diffFlags \|= DIFF_LINENO;
3175	if( find_option("no-opt",0,0)!=0 \|\| find_option("noopt",0,0)!=0 ){
3176	diffFlags \|= DIFF_NOOPT;
3177	}
3178	if( find_option("numstat",0,0)!=0 ) diffFlags \|= DIFF_NUMSTAT;
3179	if( find_option("versions","h",0)!=0 ) diffFlags \|= DIFF_SHOW_VERS;
3180	if( find_option("dark",0,0)!=0 ) diffFlags \|= DIFF_DARKMODE;
3181	if( find_option("invert",0,0)!=0 ) diffFlags \|= DIFF_INVERT;
3182	if( find_option("brief",0,0)!=0 ) diffFlags \|= DIFF_BRIEF;
3183

M src/dispatch.c

+1 -1

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -1131,11 +1131,11 @@
1131	1131	@ --comment-format VALUE Alias for --comfmtflags
1132	1132	@ --errorlog FILENAME Log errors to FILENAME
1133	1133	@ --help Show help on the command rather than running it
1134	1134	@ --httptrace Trace outbound HTTP requests
1135	1135	@ --localtime Display times using the local timezone
1136		-@ --nocgi Do not act as CGI
	1136	+@ --no-cgi Do not act as CGI
1137	1137	@ --no-th-hook Do not run TH1 hooks
1138	1138	@ --quiet Reduce the amount of output
1139	1139	@ --sqlstats Show SQL usage statistics when done
1140	1140	@ --sqltrace Trace all SQL commands
1141	1141	@ --sshtrace Trace SSH activity
1142	1142

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -1131,11 +1131,11 @@
1131	@ --comment-format VALUE Alias for --comfmtflags
1132	@ --errorlog FILENAME Log errors to FILENAME
1133	@ --help Show help on the command rather than running it
1134	@ --httptrace Trace outbound HTTP requests
1135	@ --localtime Display times using the local timezone
1136	@ --nocgi Do not act as CGI
1137	@ --no-th-hook Do not run TH1 hooks
1138	@ --quiet Reduce the amount of output
1139	@ --sqlstats Show SQL usage statistics when done
1140	@ --sqltrace Trace all SQL commands
1141	@ --sshtrace Trace SSH activity
1142

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -1131,11 +1131,11 @@
1131	@ --comment-format VALUE Alias for --comfmtflags
1132	@ --errorlog FILENAME Log errors to FILENAME
1133	@ --help Show help on the command rather than running it
1134	@ --httptrace Trace outbound HTTP requests
1135	@ --localtime Display times using the local timezone
1136	@ --no-cgi Do not act as CGI
1137	@ --no-th-hook Do not run TH1 hooks
1138	@ --quiet Reduce the amount of output
1139	@ --sqlstats Show SQL usage statistics when done
1140	@ --sqltrace Trace all SQL commands
1141	@ --sshtrace Trace SSH activity
1142

M src/file.c

+5 -4

		--- src/file.c
		+++ src/file.c
		@@ -2448,23 +2448,24 @@
2448	2448	}
2449	2449
2450	2450	/*
2451	2451	** COMMAND: test-dir-size
2452	2452	**
2453		-** Usage: %fossil test-dir-size NAME [GLOB] [--nodots]
	2453	+** Usage: %fossil test-dir-size NAME [GLOB] [--no-dots]
2454	2454	**
2455	2455	** Return the number of objects in the directory NAME. If GLOB is
2456	2456	** provided, then only count objects that match the GLOB pattern.
2457		-** if --nodots is specified, omit files that begin with ".".
	2457	+** if --no-dots is specified, omit files that begin with ".".
2458	2458	*/
2459	2459	void test_dir_size_cmd(void){
2460		- int omitDotFiles = find_option("nodots",0,0)!=0;
	2460	+ int omitDotFiles = find_option("no-dots",0,0)!=0
	2461	+ \|\| find_option("nodots",0,0)!=0;
2461	2462	const char *zGlob;
2462	2463	const char *zDir;
2463	2464	verify_all_options();
2464	2465	if( g.argc!=3 && g.argc!=4 ){
2465		- usage("NAME [GLOB] [-nodots]");
	2466	+ usage("NAME [GLOB] [--no-dots]");
2466	2467	}
2467	2468	zDir = g.argv[2];
2468	2469	zGlob = g.argc==4 ? g.argv[3] : 0;
2469	2470	fossil_print("%d\n", file_directory_size(zDir, zGlob, omitDotFiles));
2470	2471	}
2471	2472

	--- src/file.c
	+++ src/file.c
	@@ -2448,23 +2448,24 @@
2448	}
2449
2450	/*
2451	** COMMAND: test-dir-size
2452	**
2453	** Usage: %fossil test-dir-size NAME [GLOB] [--nodots]
2454	**
2455	** Return the number of objects in the directory NAME. If GLOB is
2456	** provided, then only count objects that match the GLOB pattern.
2457	** if --nodots is specified, omit files that begin with ".".
2458	*/
2459	void test_dir_size_cmd(void){
2460	int omitDotFiles = find_option("nodots",0,0)!=0;

2461	const char *zGlob;
2462	const char *zDir;
2463	verify_all_options();
2464	if( g.argc!=3 && g.argc!=4 ){
2465	usage("NAME [GLOB] [-nodots]");
2466	}
2467	zDir = g.argv[2];
2468	zGlob = g.argc==4 ? g.argv[3] : 0;
2469	fossil_print("%d\n", file_directory_size(zDir, zGlob, omitDotFiles));
2470	}
2471

	--- src/file.c
	+++ src/file.c
	@@ -2448,23 +2448,24 @@
2448	}
2449
2450	/*
2451	** COMMAND: test-dir-size
2452	**
2453	** Usage: %fossil test-dir-size NAME [GLOB] [--no-dots]
2454	**
2455	** Return the number of objects in the directory NAME. If GLOB is
2456	** provided, then only count objects that match the GLOB pattern.
2457	** if --no-dots is specified, omit files that begin with ".".
2458	*/
2459	void test_dir_size_cmd(void){
2460	int omitDotFiles = find_option("no-dots",0,0)!=0
2461	\|\| find_option("nodots",0,0)!=0;
2462	const char *zGlob;
2463	const char *zDir;
2464	verify_all_options();
2465	if( g.argc!=3 && g.argc!=4 ){
2466	usage("NAME [GLOB] [--no-dots]");
2467	}
2468	zDir = g.argv[2];
2469	zGlob = g.argc==4 ? g.argv[3] : 0;
2470	fossil_print("%d\n", file_directory_size(zDir, zGlob, omitDotFiles));
2471	}
2472

M src/main.c

+29 -20

		--- src/main.c
		+++ src/main.c
		@@ -186,11 +186,11 @@
186	186	int fSshTrace; /* Trace the SSH setup traffic */
187	187	int fSshClient; /* HTTP client flags for SSH client */
188	188	int fNoHttpCompress; /* Do not compress HTTP traffic (for debugging) */
189	189	char zSshCmd; / SSH command string */
190	190	const char zHttpCmd; / External program to do HTTP requests */
191		- int fNoSync; /* Do not do an autosync ever. --nosync */
	191	+ int fNoSync; /* Do not do an autosync ever. --no-sync */
192	192	int fIPv4; /* Use only IPv4, not IPv6. --ipv4 */
193	193	char zPath; / Name of webpage being served (may be NULL) */
194	194	char zExtra; / Extra path information past the webpage name */
195	195	char zBaseURL; / Full text of the URL being served */
196	196	char zHttpsURL; / zBaseURL translated to https: */
		@@ -763,11 +763,12 @@
763	763	sqlite3_vfs_register(pVfs, 1);
764	764	}else{
765	765	fossil_fatal("no such VFS: \"%s\"", g.zVfsName);
766	766	}
767	767	}
768		- if( !find_option("nocgi", 0, 0) && fossil_getenv("GATEWAY_INTERFACE")!=0){
	768	+ if( !find_option("no-cgi", 0, 0) && !find_option("nocgi", 0, 0)
	769	+ && fossil_getenv("GATEWAY_INTERFACE")!=0){
769	770	zCmdName = "cgi";
770	771	g.isHTTP = 1;
771	772	}else if( g.argc<2 && !fossilExeHasAppendedRepo() ){
772	773	fossil_print(
773	774	"Usage: %s COMMAND ...\n"
		@@ -2810,15 +2811,15 @@
2810	2811	** result in fewer HTTP requests than the separate mode.
2811	2812	** --localauth Connections from localhost are given "setup"
2812	2813	** privileges without having to log in
2813	2814	** --mainmenu FILE Override the mainmenu config setting with the contents
2814	2815	** of the given file
2815		-** --nocompress Do not compress HTTP replies
2816		-** --nodelay Omit backoffice processing if it would delay
	2816	+** --no-compress Do not compress HTTP replies
	2817	+** --no-delay Omit backoffice processing if it would delay
2817	2818	** process exit
2818		-** --nojail Drop root privilege but do not enter the chroot jail
2819		-** --nossl Do not do http: to https: redirects, regardless of
	2819	+** --no-jail Drop root privilege but do not enter the chroot jail
	2820	+** --no-ssl Do not do http: to https: redirects, regardless of
2820	2821	** the redirect-to-https setting.
2821	2822	** --notfound URL Use URL as the "HTTP 404, object not found" page
2822	2823	** --out FILE Write the HTTP reply to FILE instead of to
2823	2824	** standard output
2824	2825	** --pkey FILE Read the private key used for TLS from FILE
		@@ -2861,15 +2862,17 @@
2861	2862	zFileGlob = find_option("files",0,1);
2862	2863	}
2863	2864	skin_override();
2864	2865	zNotFound = find_option("notfound", 0, 1);
2865	2866	zChRoot = find_option("chroot",0,1);
2866		- noJail = find_option("nojail",0,0)!=0;
	2867	+ noJail = find_option("no-jail",0,0)!=0 \|\| find_option("nojail",0,0)!=0;
2867	2868	allowRepoList = find_option("repolist",0,0)!=0;
2868	2869	g.useLocalauth = find_option("localauth", 0, 0)!=0;
2869		- g.sslNotAvailable = find_option("nossl", 0, 0)!=0;
2870		- g.fNoHttpCompress = find_option("nocompress",0,0)!=0;
	2870	+ g.sslNotAvailable = find_option("no-ssl", 0, 0)!=0
	2871	+ \|\| find_option("nossl", 0, 0)!=0;
	2872	+ g.fNoHttpCompress = find_option("no-compress",0,0)!=0
	2873	+ \|\| find_option("nocompress",0,0)!=0;
2871	2874	g.zExtRoot = find_option("extroot",0,1);
2872	2875	g.zCkoutAlias = find_option("ckout-alias",0,1);
2873	2876	g.zReqType = "HTTP";
2874	2877	zInFile = find_option("in",0,1);
2875	2878	if( zInFile ){
		@@ -2894,11 +2897,13 @@
2894	2897	}
2895	2898	zIpAddr = find_option("ipaddr",0,1);
2896	2899	useSCGI = find_option("scgi", 0, 0)!=0;
2897	2900	if( useSCGI ) g.zReqType = "SCGI";
2898	2901	zAltBase = find_option("baseurl", 0, 1);
2899		- if( find_option("nodelay",0,0)!=0 ) backoffice_no_delay();
	2902	+ if( find_option("no-delay",0,0)!=0 \|\| find_option("nodelay",0,0)!=0 ){
	2903	+ backoffice_no_delay();
	2904	+ }
2900	2905	if( zAltBase ) set_base_url(zAltBase);
2901	2906	if( find_option("https",0,0)!=0 ){
2902	2907	zIpAddr = fossil_getenv("REMOTE_HOST"); /* From stunnel */
2903	2908	cgi_replace_parameter("HTTPS","on");
2904	2909	}
		@@ -3167,15 +3172,15 @@
3167	3172	** result in fewer HTTP requests than the separate mode.
3168	3173	** --mainmenu FILE Override the mainmenu config setting with the contents
3169	3174	** of the given file
3170	3175	** --max-latency N Do not let any single HTTP request run for more than N
3171	3176	** seconds (only works on unix)
3172		-** -B\|--nobrowser Do not automatically launch a web-browser for the
	3177	+** -B\|--no-browser Do not automatically launch a web-browser for the
3173	3178	** "fossil ui" command
3174		-** --nocompress Do not compress HTTP replies
3175		-** --nojail Drop root privileges but do not enter the chroot jail
3176		-** --nossl Do not force redirects to SSL even if the repository
	3179	+** --no-compress Do not compress HTTP replies
	3180	+** --no-jail Drop root privileges but do not enter the chroot jail
	3181	+** --no-ssl Do not force redirects to SSL even if the repository
3177	3182	** setting "redirect-to-https" requests it. This is set
3178	3183	** by default for the "ui" command.
3179	3184	** --notfound URL Redirect to URL if a page is not found.
3180	3185	** -p\|--page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
3181	3186	** --pkey FILE Read the private key used for TLS from FILE
		@@ -3240,11 +3245,11 @@
3240	3245	zFileGlob = find_option("files",0,1);
3241	3246	}
3242	3247	skin_override();
3243	3248	#if !defined(_WIN32)
3244	3249	zChRoot = find_option("chroot",0,1);
3245		- noJail = find_option("nojail",0,0)!=0;
	3250	+ noJail = find_option("no-jail",0,0)!=0 \|\| find_option("nojail",0,0)!=0;
3246	3251	zTimeout = find_option("max-latency",0,1);
3247	3252	#endif
3248	3253	g.useLocalauth = find_option("localauth", 0, 0)!=0;
3249	3254	Th_InitTraceLog();
3250	3255	zPort = find_option("port", "P", 1);
		@@ -3254,11 +3259,13 @@
3254	3259	if( zInitPage && zInitPage[0]=='/' ) zInitPage++;
3255	3260	zFossilCmd = find_option("fossilcmd", 0, 1);
3256	3261	}
3257	3262	zNotFound = find_option("notfound", 0, 1);
3258	3263	allowRepoList = find_option("repolist",0,0)!=0;
3259		- if( find_option("nocompress",0,0)!=0 ) g.fNoHttpCompress = 1;
	3264	+ if( find_option("no-compress",0,0)!=0 \|\| find_option("nocompress",0,0)!=0 ){
	3265	+ g.fNoHttpCompress = 1;
	3266	+ }
3260	3267	zAltBase = find_option("baseurl", 0, 1);
3261	3268	fCreate = find_option("create",0,0)!=0;
3262	3269	g.zReqType = "HTTP";
3263	3270	if( find_option("scgi", 0, 0)!=0 ){
3264	3271	g.zReqType = "SCGI";
		@@ -3265,12 +3272,14 @@
3265	3272	flags \|= HTTP_SERVER_SCGI;
3266	3273	}
3267	3274	if( zAltBase ){
3268	3275	set_base_url(zAltBase);
3269	3276	}
3270		- g.sslNotAvailable = find_option("nossl", 0, 0)!=0 \|\| isUiCmd;
3271		- fNoBrowser = find_option("nobrowser", "B", 0)!=0;
	3277	+ g.sslNotAvailable = find_option("no-ssl", 0, 0)!=0
	3278	+ \|\| find_option("nossl", 0, 0)!=0 \|\| isUiCmd;
	3279	+ fNoBrowser = find_option("no-browser", "B", 0)!=0
	3280	+ \|\| find_option("nobrowser", "B", 0)!=0;
3272	3281	decode_ssl_options();
3273	3282	if( find_option("https",0,0)!=0 \|\| g.httpUseSSL ){
3274	3283	cgi_replace_parameter("HTTPS","on");
3275	3284	}
3276	3285	if( find_option("localhost", 0, 0)!=0 ){
		@@ -3380,11 +3389,11 @@
3380	3389	zBrowserCmd = mprintf("%s %!$ &", zBrowser, zBrowserArg);
3381	3390	fossil_free(zBrowserArg);
3382	3391	}
3383	3392	if( zRemote ){
3384	3393	/* If a USER@HOST:REPO argument is supplied, then use SSH to run
3385		- ** "fossil ui --nobrowser" on the remote system and to set up a
	3394	+ ** "fossil ui --no-browser" on the remote system and to set up a
3386	3395	** tunnel from the local machine to the remote. */
3387	3396	FILE *sshIn;
3388	3397	Blob ssh;
3389	3398	int bRunning = 0; /* True when fossil starts up on the remote */
3390	3399	int isRetry; /* True if on the second attempt */
		@@ -3404,11 +3413,11 @@
3404	3413	}
3405	3414	blob_append_escaped_arg(&ssh, "fossil", 1);
3406	3415	}else{
3407	3416	blob_appendf(&ssh, " %$", zFossilCmd);
3408	3417	}
3409		- blob_appendf(&ssh, " ui --nobrowser --localauth --port %d", iPort);
	3418	+ blob_appendf(&ssh, " ui --no-browser --localauth --port %d", iPort);
3410	3419	if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound);
3411	3420	if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob);
3412	3421	if( g.zCkoutAlias ) blob_appendf(&ssh," --ckout-alias %!$",g.zCkoutAlias);
3413	3422	if( g.zExtRoot ) blob_appendf(&ssh, " --extroot %$", g.zExtRoot);
3414	3423	if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use());
3415	3424

	--- src/main.c
	+++ src/main.c
	@@ -186,11 +186,11 @@
186	int fSshTrace; /* Trace the SSH setup traffic */
187	int fSshClient; /* HTTP client flags for SSH client */
188	int fNoHttpCompress; /* Do not compress HTTP traffic (for debugging) */
189	char zSshCmd; / SSH command string */
190	const char zHttpCmd; / External program to do HTTP requests */
191	int fNoSync; /* Do not do an autosync ever. --nosync */
192	int fIPv4; /* Use only IPv4, not IPv6. --ipv4 */
193	char zPath; / Name of webpage being served (may be NULL) */
194	char zExtra; / Extra path information past the webpage name */
195	char zBaseURL; / Full text of the URL being served */
196	char zHttpsURL; / zBaseURL translated to https: */
	@@ -763,11 +763,12 @@
763	sqlite3_vfs_register(pVfs, 1);
764	}else{
765	fossil_fatal("no such VFS: \"%s\"", g.zVfsName);
766	}
767	}
768	if( !find_option("nocgi", 0, 0) && fossil_getenv("GATEWAY_INTERFACE")!=0){

769	zCmdName = "cgi";
770	g.isHTTP = 1;
771	}else if( g.argc<2 && !fossilExeHasAppendedRepo() ){
772	fossil_print(
773	"Usage: %s COMMAND ...\n"
	@@ -2810,15 +2811,15 @@
2810	** result in fewer HTTP requests than the separate mode.
2811	** --localauth Connections from localhost are given "setup"
2812	** privileges without having to log in
2813	** --mainmenu FILE Override the mainmenu config setting with the contents
2814	** of the given file
2815	** --nocompress Do not compress HTTP replies
2816	** --nodelay Omit backoffice processing if it would delay
2817	** process exit
2818	** --nojail Drop root privilege but do not enter the chroot jail
2819	** --nossl Do not do http: to https: redirects, regardless of
2820	** the redirect-to-https setting.
2821	** --notfound URL Use URL as the "HTTP 404, object not found" page
2822	** --out FILE Write the HTTP reply to FILE instead of to
2823	** standard output
2824	** --pkey FILE Read the private key used for TLS from FILE
	@@ -2861,15 +2862,17 @@
2861	zFileGlob = find_option("files",0,1);
2862	}
2863	skin_override();
2864	zNotFound = find_option("notfound", 0, 1);
2865	zChRoot = find_option("chroot",0,1);
2866	noJail = find_option("nojail",0,0)!=0;
2867	allowRepoList = find_option("repolist",0,0)!=0;
2868	g.useLocalauth = find_option("localauth", 0, 0)!=0;
2869	g.sslNotAvailable = find_option("nossl", 0, 0)!=0;
2870	g.fNoHttpCompress = find_option("nocompress",0,0)!=0;


2871	g.zExtRoot = find_option("extroot",0,1);
2872	g.zCkoutAlias = find_option("ckout-alias",0,1);
2873	g.zReqType = "HTTP";
2874	zInFile = find_option("in",0,1);
2875	if( zInFile ){
	@@ -2894,11 +2897,13 @@
2894	}
2895	zIpAddr = find_option("ipaddr",0,1);
2896	useSCGI = find_option("scgi", 0, 0)!=0;
2897	if( useSCGI ) g.zReqType = "SCGI";
2898	zAltBase = find_option("baseurl", 0, 1);
2899	if( find_option("nodelay",0,0)!=0 ) backoffice_no_delay();


2900	if( zAltBase ) set_base_url(zAltBase);
2901	if( find_option("https",0,0)!=0 ){
2902	zIpAddr = fossil_getenv("REMOTE_HOST"); /* From stunnel */
2903	cgi_replace_parameter("HTTPS","on");
2904	}
	@@ -3167,15 +3172,15 @@
3167	** result in fewer HTTP requests than the separate mode.
3168	** --mainmenu FILE Override the mainmenu config setting with the contents
3169	** of the given file
3170	** --max-latency N Do not let any single HTTP request run for more than N
3171	** seconds (only works on unix)
3172	** -B\|--nobrowser Do not automatically launch a web-browser for the
3173	** "fossil ui" command
3174	** --nocompress Do not compress HTTP replies
3175	** --nojail Drop root privileges but do not enter the chroot jail
3176	** --nossl Do not force redirects to SSL even if the repository
3177	** setting "redirect-to-https" requests it. This is set
3178	** by default for the "ui" command.
3179	** --notfound URL Redirect to URL if a page is not found.
3180	** -p\|--page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
3181	** --pkey FILE Read the private key used for TLS from FILE
	@@ -3240,11 +3245,11 @@
3240	zFileGlob = find_option("files",0,1);
3241	}
3242	skin_override();
3243	#if !defined(_WIN32)
3244	zChRoot = find_option("chroot",0,1);
3245	noJail = find_option("nojail",0,0)!=0;
3246	zTimeout = find_option("max-latency",0,1);
3247	#endif
3248	g.useLocalauth = find_option("localauth", 0, 0)!=0;
3249	Th_InitTraceLog();
3250	zPort = find_option("port", "P", 1);
	@@ -3254,11 +3259,13 @@
3254	if( zInitPage && zInitPage[0]=='/' ) zInitPage++;
3255	zFossilCmd = find_option("fossilcmd", 0, 1);
3256	}
3257	zNotFound = find_option("notfound", 0, 1);
3258	allowRepoList = find_option("repolist",0,0)!=0;
3259	if( find_option("nocompress",0,0)!=0 ) g.fNoHttpCompress = 1;


3260	zAltBase = find_option("baseurl", 0, 1);
3261	fCreate = find_option("create",0,0)!=0;
3262	g.zReqType = "HTTP";
3263	if( find_option("scgi", 0, 0)!=0 ){
3264	g.zReqType = "SCGI";
	@@ -3265,12 +3272,14 @@
3265	flags \|= HTTP_SERVER_SCGI;
3266	}
3267	if( zAltBase ){
3268	set_base_url(zAltBase);
3269	}
3270	g.sslNotAvailable = find_option("nossl", 0, 0)!=0 \|\| isUiCmd;
3271	fNoBrowser = find_option("nobrowser", "B", 0)!=0;


3272	decode_ssl_options();
3273	if( find_option("https",0,0)!=0 \|\| g.httpUseSSL ){
3274	cgi_replace_parameter("HTTPS","on");
3275	}
3276	if( find_option("localhost", 0, 0)!=0 ){
	@@ -3380,11 +3389,11 @@
3380	zBrowserCmd = mprintf("%s %!$ &", zBrowser, zBrowserArg);
3381	fossil_free(zBrowserArg);
3382	}
3383	if( zRemote ){
3384	/* If a USER@HOST:REPO argument is supplied, then use SSH to run
3385	** "fossil ui --nobrowser" on the remote system and to set up a
3386	** tunnel from the local machine to the remote. */
3387	FILE *sshIn;
3388	Blob ssh;
3389	int bRunning = 0; /* True when fossil starts up on the remote */
3390	int isRetry; /* True if on the second attempt */
	@@ -3404,11 +3413,11 @@
3404	}
3405	blob_append_escaped_arg(&ssh, "fossil", 1);
3406	}else{
3407	blob_appendf(&ssh, " %$", zFossilCmd);
3408	}
3409	blob_appendf(&ssh, " ui --nobrowser --localauth --port %d", iPort);
3410	if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound);
3411	if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob);
3412	if( g.zCkoutAlias ) blob_appendf(&ssh," --ckout-alias %!$",g.zCkoutAlias);
3413	if( g.zExtRoot ) blob_appendf(&ssh, " --extroot %$", g.zExtRoot);
3414	if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use());
3415

	--- src/main.c
	+++ src/main.c
	@@ -186,11 +186,11 @@
186	int fSshTrace; /* Trace the SSH setup traffic */
187	int fSshClient; /* HTTP client flags for SSH client */
188	int fNoHttpCompress; /* Do not compress HTTP traffic (for debugging) */
189	char zSshCmd; / SSH command string */
190	const char zHttpCmd; / External program to do HTTP requests */
191	int fNoSync; /* Do not do an autosync ever. --no-sync */
192	int fIPv4; /* Use only IPv4, not IPv6. --ipv4 */
193	char zPath; / Name of webpage being served (may be NULL) */
194	char zExtra; / Extra path information past the webpage name */
195	char zBaseURL; / Full text of the URL being served */
196	char zHttpsURL; / zBaseURL translated to https: */
	@@ -763,11 +763,12 @@
763	sqlite3_vfs_register(pVfs, 1);
764	}else{
765	fossil_fatal("no such VFS: \"%s\"", g.zVfsName);
766	}
767	}
768	if( !find_option("no-cgi", 0, 0) && !find_option("nocgi", 0, 0)
769	&& fossil_getenv("GATEWAY_INTERFACE")!=0){
770	zCmdName = "cgi";
771	g.isHTTP = 1;
772	}else if( g.argc<2 && !fossilExeHasAppendedRepo() ){
773	fossil_print(
774	"Usage: %s COMMAND ...\n"
	@@ -2810,15 +2811,15 @@
2811	** result in fewer HTTP requests than the separate mode.
2812	** --localauth Connections from localhost are given "setup"
2813	** privileges without having to log in
2814	** --mainmenu FILE Override the mainmenu config setting with the contents
2815	** of the given file
2816	** --no-compress Do not compress HTTP replies
2817	** --no-delay Omit backoffice processing if it would delay
2818	** process exit
2819	** --no-jail Drop root privilege but do not enter the chroot jail
2820	** --no-ssl Do not do http: to https: redirects, regardless of
2821	** the redirect-to-https setting.
2822	** --notfound URL Use URL as the "HTTP 404, object not found" page
2823	** --out FILE Write the HTTP reply to FILE instead of to
2824	** standard output
2825	** --pkey FILE Read the private key used for TLS from FILE
	@@ -2861,15 +2862,17 @@
2862	zFileGlob = find_option("files",0,1);
2863	}
2864	skin_override();
2865	zNotFound = find_option("notfound", 0, 1);
2866	zChRoot = find_option("chroot",0,1);
2867	noJail = find_option("no-jail",0,0)!=0 \|\| find_option("nojail",0,0)!=0;
2868	allowRepoList = find_option("repolist",0,0)!=0;
2869	g.useLocalauth = find_option("localauth", 0, 0)!=0;
2870	g.sslNotAvailable = find_option("no-ssl", 0, 0)!=0
2871	\|\| find_option("nossl", 0, 0)!=0;
2872	g.fNoHttpCompress = find_option("no-compress",0,0)!=0
2873	\|\| find_option("nocompress",0,0)!=0;
2874	g.zExtRoot = find_option("extroot",0,1);
2875	g.zCkoutAlias = find_option("ckout-alias",0,1);
2876	g.zReqType = "HTTP";
2877	zInFile = find_option("in",0,1);
2878	if( zInFile ){
	@@ -2894,11 +2897,13 @@
2897	}
2898	zIpAddr = find_option("ipaddr",0,1);
2899	useSCGI = find_option("scgi", 0, 0)!=0;
2900	if( useSCGI ) g.zReqType = "SCGI";
2901	zAltBase = find_option("baseurl", 0, 1);
2902	if( find_option("no-delay",0,0)!=0 \|\| find_option("nodelay",0,0)!=0 ){
2903	backoffice_no_delay();
2904	}
2905	if( zAltBase ) set_base_url(zAltBase);
2906	if( find_option("https",0,0)!=0 ){
2907	zIpAddr = fossil_getenv("REMOTE_HOST"); /* From stunnel */
2908	cgi_replace_parameter("HTTPS","on");
2909	}
	@@ -3167,15 +3172,15 @@
3172	** result in fewer HTTP requests than the separate mode.
3173	** --mainmenu FILE Override the mainmenu config setting with the contents
3174	** of the given file
3175	** --max-latency N Do not let any single HTTP request run for more than N
3176	** seconds (only works on unix)
3177	** -B\|--no-browser Do not automatically launch a web-browser for the
3178	** "fossil ui" command
3179	** --no-compress Do not compress HTTP replies
3180	** --no-jail Drop root privileges but do not enter the chroot jail
3181	** --no-ssl Do not force redirects to SSL even if the repository
3182	** setting "redirect-to-https" requests it. This is set
3183	** by default for the "ui" command.
3184	** --notfound URL Redirect to URL if a page is not found.
3185	** -p\|--page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
3186	** --pkey FILE Read the private key used for TLS from FILE
	@@ -3240,11 +3245,11 @@
3245	zFileGlob = find_option("files",0,1);
3246	}
3247	skin_override();
3248	#if !defined(_WIN32)
3249	zChRoot = find_option("chroot",0,1);
3250	noJail = find_option("no-jail",0,0)!=0 \|\| find_option("nojail",0,0)!=0;
3251	zTimeout = find_option("max-latency",0,1);
3252	#endif
3253	g.useLocalauth = find_option("localauth", 0, 0)!=0;
3254	Th_InitTraceLog();
3255	zPort = find_option("port", "P", 1);
	@@ -3254,11 +3259,13 @@
3259	if( zInitPage && zInitPage[0]=='/' ) zInitPage++;
3260	zFossilCmd = find_option("fossilcmd", 0, 1);
3261	}
3262	zNotFound = find_option("notfound", 0, 1);
3263	allowRepoList = find_option("repolist",0,0)!=0;
3264	if( find_option("no-compress",0,0)!=0 \|\| find_option("nocompress",0,0)!=0 ){
3265	g.fNoHttpCompress = 1;
3266	}
3267	zAltBase = find_option("baseurl", 0, 1);
3268	fCreate = find_option("create",0,0)!=0;
3269	g.zReqType = "HTTP";
3270	if( find_option("scgi", 0, 0)!=0 ){
3271	g.zReqType = "SCGI";
	@@ -3265,12 +3272,14 @@
3272	flags \|= HTTP_SERVER_SCGI;
3273	}
3274	if( zAltBase ){
3275	set_base_url(zAltBase);
3276	}
3277	g.sslNotAvailable = find_option("no-ssl", 0, 0)!=0
3278	\|\| find_option("nossl", 0, 0)!=0 \|\| isUiCmd;
3279	fNoBrowser = find_option("no-browser", "B", 0)!=0
3280	\|\| find_option("nobrowser", "B", 0)!=0;
3281	decode_ssl_options();
3282	if( find_option("https",0,0)!=0 \|\| g.httpUseSSL ){
3283	cgi_replace_parameter("HTTPS","on");
3284	}
3285	if( find_option("localhost", 0, 0)!=0 ){
	@@ -3380,11 +3389,11 @@
3389	zBrowserCmd = mprintf("%s %!$ &", zBrowser, zBrowserArg);
3390	fossil_free(zBrowserArg);
3391	}
3392	if( zRemote ){
3393	/* If a USER@HOST:REPO argument is supplied, then use SSH to run
3394	** "fossil ui --no-browser" on the remote system and to set up a
3395	** tunnel from the local machine to the remote. */
3396	FILE *sshIn;
3397	Blob ssh;
3398	int bRunning = 0; /* True when fossil starts up on the remote */
3399	int isRetry; /* True if on the second attempt */
	@@ -3404,11 +3413,11 @@
3413	}
3414	blob_append_escaped_arg(&ssh, "fossil", 1);
3415	}else{
3416	blob_appendf(&ssh, " %$", zFossilCmd);
3417	}
3418	blob_appendf(&ssh, " ui --no-browser --localauth --port %d", iPort);
3419	if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound);
3420	if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob);
3421	if( g.zCkoutAlias ) blob_appendf(&ssh," --ckout-alias %!$",g.zCkoutAlias);
3422	if( g.zExtRoot ) blob_appendf(&ssh, " --extroot %$", g.zExtRoot);
3423	if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use());
3424

M src/merge.c

+4 -3

		--- src/merge.c
		+++ src/merge.c
		@@ -321,11 +321,11 @@
321	321	** --integrate Merged branch will be closed when committing
322	322	** -K\|--keep-merge-files On merge conflict, retain the temporary files
323	323	** used for merging, named -baseline, -original,
324	324	** and *-merge.
325	325	** -n\|--dry-run If given, display instead of run actions
326		-** --nosync Do not auto-sync prior to merging
	326	+** --no-sync Do not auto-sync prior to merging
327	327	** -v\|--verbose Show additional details of the merge
328	328	*/
329	329	void merge_cmd(void){
330	330	int vid; /* Current version "V" */
331	331	int mid; /* Version we are merging from "M" */
		@@ -373,13 +373,14 @@
373	373	integrateFlag = find_option("integrate",0,0)!=0;
374	374	backoutFlag = find_option("backout",0,0)!=0;
375	375	zBinGlob = find_option("binary",0,1);
376	376	dryRunFlag = find_option("dry-run","n",0)!=0;
377	377	if( !dryRunFlag ){
378		- dryRunFlag = find_option("nochange",0,0)!=0; /* deprecated */
	378	+ dryRunFlag = find_option("no-change",0,0)!=0
	379	+ \|\| find_option("nochange",0,0)!=0; /* deprecated */
379	380	}
380		- if( find_option("nosync",0,0) ) g.fNoSync = 1;
	381	+ if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
381	382	forceFlag = find_option("force","f",0)!=0;
382	383	zPivot = find_option("baseline",0,1);
383	384	keepMergeFlag = find_option("keep-merge-files", "K",0)!=0;
384	385
385	386	/* Undocumented --debug and --show-vfile options:
386	387

	--- src/merge.c
	+++ src/merge.c
	@@ -321,11 +321,11 @@
321	** --integrate Merged branch will be closed when committing
322	** -K\|--keep-merge-files On merge conflict, retain the temporary files
323	** used for merging, named -baseline, -original,
324	** and *-merge.
325	** -n\|--dry-run If given, display instead of run actions
326	** --nosync Do not auto-sync prior to merging
327	** -v\|--verbose Show additional details of the merge
328	*/
329	void merge_cmd(void){
330	int vid; /* Current version "V" */
331	int mid; /* Version we are merging from "M" */
	@@ -373,13 +373,14 @@
373	integrateFlag = find_option("integrate",0,0)!=0;
374	backoutFlag = find_option("backout",0,0)!=0;
375	zBinGlob = find_option("binary",0,1);
376	dryRunFlag = find_option("dry-run","n",0)!=0;
377	if( !dryRunFlag ){
378	dryRunFlag = find_option("nochange",0,0)!=0; /* deprecated */

379	}
380	if( find_option("nosync",0,0) ) g.fNoSync = 1;
381	forceFlag = find_option("force","f",0)!=0;
382	zPivot = find_option("baseline",0,1);
383	keepMergeFlag = find_option("keep-merge-files", "K",0)!=0;
384
385	/* Undocumented --debug and --show-vfile options:
386

	--- src/merge.c
	+++ src/merge.c
	@@ -321,11 +321,11 @@
321	** --integrate Merged branch will be closed when committing
322	** -K\|--keep-merge-files On merge conflict, retain the temporary files
323	** used for merging, named -baseline, -original,
324	** and *-merge.
325	** -n\|--dry-run If given, display instead of run actions
326	** --no-sync Do not auto-sync prior to merging
327	** -v\|--verbose Show additional details of the merge
328	*/
329	void merge_cmd(void){
330	int vid; /* Current version "V" */
331	int mid; /* Version we are merging from "M" */
	@@ -373,13 +373,14 @@
373	integrateFlag = find_option("integrate",0,0)!=0;
374	backoutFlag = find_option("backout",0,0)!=0;
375	zBinGlob = find_option("binary",0,1);
376	dryRunFlag = find_option("dry-run","n",0)!=0;
377	if( !dryRunFlag ){
378	dryRunFlag = find_option("no-change",0,0)!=0
379	\|\| find_option("nochange",0,0)!=0; /* deprecated */
380	}
381	if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
382	forceFlag = find_option("force","f",0)!=0;
383	zPivot = find_option("baseline",0,1);
384	keepMergeFlag = find_option("keep-merge-files", "K",0)!=0;
385
386	/* Undocumented --debug and --show-vfile options:
387

M src/rebuild.c

+4 -4

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -664,12 +664,12 @@
664	664	** --compress Strive to make the database as small as possible
665	665	** --compress-only Skip the rebuilding step. Do --compress only
666	666	** --force Force the rebuild to complete even if errors are seen
667	667	** --ifneeded Only do the rebuild if it would change the schema version
668	668	** --index Always add in the full-text search index
669		-** --noverify Skip the verification of changes to the BLOB table
670		-** --noindex Always omit the full-text search index
	669	+** --no-verify Skip the verification of changes to the BLOB table
	670	+** --no-index Always omit the full-text search index
671	671	** --pagesize N Set the database pagesize to N (512..65536, power of 2)
672	672	** --quiet Only show output if there are errors
673	673	** --stats Show artifact statistics after rebuilding
674	674	** --vacuum Run VACUUM on the database after rebuilding
675	675	** --wal Set Write-Ahead-Log journalling mode on the database
		@@ -691,21 +691,21 @@
691	691	int optNoIndex;
692	692	int optIndex;
693	693	int optIfNeeded;
694	694	int compressOnlyFlag;
695	695
696		- omitVerify = find_option("noverify",0,0)!=0;
	696	+ omitVerify = find_option("no-verify",0,0)!=0 \|\|find_option("noverify",0,0)!=0;
697	697	forceFlag = find_option("force","f",0)!=0;
698	698	doClustering = find_option("cluster", 0, 0)!=0;
699	699	runVacuum = find_option("vacuum",0,0)!=0;
700	700	runDeanalyze = find_option("deanalyze",0,0)!=0; /* Deprecated */
701	701	runAnalyze = find_option("analyze",0,0)!=0;
702	702	runCompress = find_option("compress",0,0)!=0;
703	703	zPagesize = find_option("pagesize",0,1);
704	704	showStats = find_option("stats",0,0)!=0;
705	705	optIndex = find_option("index",0,0)!=0;
706		- optNoIndex = find_option("noindex",0,0)!=0;
	706	+ optNoIndex = find_option("no-index",0,0)!=0 \|\| find_option("noindex",0,0)!=0;
707	707	optIfNeeded = find_option("ifneeded",0,0)!=0;
708	708	compressOnlyFlag = find_option("compress-only",0,0)!=0;
709	709	if( compressOnlyFlag ) runCompress = 1;
710	710	if( zPagesize ){
711	711	newPagesize = atoi(zPagesize);
712	712

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -664,12 +664,12 @@
664	** --compress Strive to make the database as small as possible
665	** --compress-only Skip the rebuilding step. Do --compress only
666	** --force Force the rebuild to complete even if errors are seen
667	** --ifneeded Only do the rebuild if it would change the schema version
668	** --index Always add in the full-text search index
669	** --noverify Skip the verification of changes to the BLOB table
670	** --noindex Always omit the full-text search index
671	** --pagesize N Set the database pagesize to N (512..65536, power of 2)
672	** --quiet Only show output if there are errors
673	** --stats Show artifact statistics after rebuilding
674	** --vacuum Run VACUUM on the database after rebuilding
675	** --wal Set Write-Ahead-Log journalling mode on the database
	@@ -691,21 +691,21 @@
691	int optNoIndex;
692	int optIndex;
693	int optIfNeeded;
694	int compressOnlyFlag;
695
696	omitVerify = find_option("noverify",0,0)!=0;
697	forceFlag = find_option("force","f",0)!=0;
698	doClustering = find_option("cluster", 0, 0)!=0;
699	runVacuum = find_option("vacuum",0,0)!=0;
700	runDeanalyze = find_option("deanalyze",0,0)!=0; /* Deprecated */
701	runAnalyze = find_option("analyze",0,0)!=0;
702	runCompress = find_option("compress",0,0)!=0;
703	zPagesize = find_option("pagesize",0,1);
704	showStats = find_option("stats",0,0)!=0;
705	optIndex = find_option("index",0,0)!=0;
706	optNoIndex = find_option("noindex",0,0)!=0;
707	optIfNeeded = find_option("ifneeded",0,0)!=0;
708	compressOnlyFlag = find_option("compress-only",0,0)!=0;
709	if( compressOnlyFlag ) runCompress = 1;
710	if( zPagesize ){
711	newPagesize = atoi(zPagesize);
712

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -664,12 +664,12 @@
664	** --compress Strive to make the database as small as possible
665	** --compress-only Skip the rebuilding step. Do --compress only
666	** --force Force the rebuild to complete even if errors are seen
667	** --ifneeded Only do the rebuild if it would change the schema version
668	** --index Always add in the full-text search index
669	** --no-verify Skip the verification of changes to the BLOB table
670	** --no-index Always omit the full-text search index
671	** --pagesize N Set the database pagesize to N (512..65536, power of 2)
672	** --quiet Only show output if there are errors
673	** --stats Show artifact statistics after rebuilding
674	** --vacuum Run VACUUM on the database after rebuilding
675	** --wal Set Write-Ahead-Log journalling mode on the database
	@@ -691,21 +691,21 @@
691	int optNoIndex;
692	int optIndex;
693	int optIfNeeded;
694	int compressOnlyFlag;
695
696	omitVerify = find_option("no-verify",0,0)!=0 \|\|find_option("noverify",0,0)!=0;
697	forceFlag = find_option("force","f",0)!=0;
698	doClustering = find_option("cluster", 0, 0)!=0;
699	runVacuum = find_option("vacuum",0,0)!=0;
700	runDeanalyze = find_option("deanalyze",0,0)!=0; /* Deprecated */
701	runAnalyze = find_option("analyze",0,0)!=0;
702	runCompress = find_option("compress",0,0)!=0;
703	zPagesize = find_option("pagesize",0,1);
704	showStats = find_option("stats",0,0)!=0;
705	optIndex = find_option("index",0,0)!=0;
706	optNoIndex = find_option("no-index",0,0)!=0 \|\| find_option("noindex",0,0)!=0;
707	optIfNeeded = find_option("ifneeded",0,0)!=0;
708	compressOnlyFlag = find_option("compress-only",0,0)!=0;
709	if( compressOnlyFlag ) runCompress = 1;
710	if( zPagesize ){
711	newPagesize = atoi(zPagesize);
712

M src/update.c

+5 -4

		--- src/update.c
		+++ src/update.c
		@@ -100,11 +100,11 @@
100	100	** -K\|--keep-merge-files On merge conflict, retain the temporary files
101	101	** used for merging, named -baseline, -original,
102	102	** and *-merge.
103	103	** --latest Acceptable in place of VERSION, update to
104	104	** latest version
105		-** --nosync Do not auto-sync prior to update
	105	+** --no-sync Do not auto-sync prior to update
106	106	** --setmtime Set timestamps of all files to match their
107	107	** SCM-side times (the timestamp of the last
108	108	** check-in which modified them).
109	109	** -v\|--verbose Print status information about all files
110	110	** -W\|--width WIDTH Width of lines (default is to auto-detect).
		@@ -128,11 +128,11 @@
128	128	int aChng; / Array of file renames */
129	129	int i; /* Loop counter */
130	130	int nConflict = 0; /* Number of merge conflicts */
131	131	int nOverwrite = 0; /* Number of unmanaged files overwritten */
132	132	int nUpdate = 0; /* Number of changes of any kind */
133		- int bNosync = 0; /* --nosync. Omit the auto-sync */
	133	+ int bNosync = 0; /* --no-sync. Omit the auto-sync */
134	134	int width; /* Width of printed comment lines */
135	135	Stmt mtimeXfer; /* Statement to transfer mtimes */
136	136	const char zWidth; / Width option string value */
137	137
138	138	if( !internalUpdate ){
		@@ -149,18 +149,19 @@
149	149	width = -1;
150	150	}
151	151	latestFlag = find_option("latest",0, 0)!=0;
152	152	dryRunFlag = find_option("dry-run","n",0)!=0;
153	153	if( !dryRunFlag ){
154		- dryRunFlag = find_option("nochange",0,0)!=0; /* deprecated */
	154	+ dryRunFlag = find_option("no-change",0,0)!=0
	155	+ \|\| find_option("nochange",0,0)!=0; /* deprecated */
155	156	}
156	157	verboseFlag = find_option("verbose","v",0)!=0;
157	158	forceMissingFlag = find_option("force-missing",0,0)!=0;
158	159	debugFlag = find_option("debug",0,0)!=0;
159	160	setmtimeFlag = find_option("setmtime",0,0)!=0;
160	161	keepMergeFlag = find_option("keep-merge-files", "K",0)!=0;
161		- bNosync = find_option("nosync",0,0)!=0;
	162	+ bNosync = find_option("no-sync",0,0)!=0 \|\| find_option("nosync",0,0)!=0;
162	163
163	164	/* We should be done with options.. */
164	165	verify_all_options();
165	166
166	167	db_must_be_within_tree();
167	168

	--- src/update.c
	+++ src/update.c
	@@ -100,11 +100,11 @@
100	** -K\|--keep-merge-files On merge conflict, retain the temporary files
101	** used for merging, named -baseline, -original,
102	** and *-merge.
103	** --latest Acceptable in place of VERSION, update to
104	** latest version
105	** --nosync Do not auto-sync prior to update
106	** --setmtime Set timestamps of all files to match their
107	** SCM-side times (the timestamp of the last
108	** check-in which modified them).
109	** -v\|--verbose Print status information about all files
110	** -W\|--width WIDTH Width of lines (default is to auto-detect).
	@@ -128,11 +128,11 @@
128	int aChng; / Array of file renames */
129	int i; /* Loop counter */
130	int nConflict = 0; /* Number of merge conflicts */
131	int nOverwrite = 0; /* Number of unmanaged files overwritten */
132	int nUpdate = 0; /* Number of changes of any kind */
133	int bNosync = 0; /* --nosync. Omit the auto-sync */
134	int width; /* Width of printed comment lines */
135	Stmt mtimeXfer; /* Statement to transfer mtimes */
136	const char zWidth; / Width option string value */
137
138	if( !internalUpdate ){
	@@ -149,18 +149,19 @@
149	width = -1;
150	}
151	latestFlag = find_option("latest",0, 0)!=0;
152	dryRunFlag = find_option("dry-run","n",0)!=0;
153	if( !dryRunFlag ){
154	dryRunFlag = find_option("nochange",0,0)!=0; /* deprecated */

155	}
156	verboseFlag = find_option("verbose","v",0)!=0;
157	forceMissingFlag = find_option("force-missing",0,0)!=0;
158	debugFlag = find_option("debug",0,0)!=0;
159	setmtimeFlag = find_option("setmtime",0,0)!=0;
160	keepMergeFlag = find_option("keep-merge-files", "K",0)!=0;
161	bNosync = find_option("nosync",0,0)!=0;
162
163	/* We should be done with options.. */
164	verify_all_options();
165
166	db_must_be_within_tree();
167

	--- src/update.c
	+++ src/update.c
	@@ -100,11 +100,11 @@
100	** -K\|--keep-merge-files On merge conflict, retain the temporary files
101	** used for merging, named -baseline, -original,
102	** and *-merge.
103	** --latest Acceptable in place of VERSION, update to
104	** latest version
105	** --no-sync Do not auto-sync prior to update
106	** --setmtime Set timestamps of all files to match their
107	** SCM-side times (the timestamp of the last
108	** check-in which modified them).
109	** -v\|--verbose Print status information about all files
110	** -W\|--width WIDTH Width of lines (default is to auto-detect).
	@@ -128,11 +128,11 @@
128	int aChng; / Array of file renames */
129	int i; /* Loop counter */
130	int nConflict = 0; /* Number of merge conflicts */
131	int nOverwrite = 0; /* Number of unmanaged files overwritten */
132	int nUpdate = 0; /* Number of changes of any kind */
133	int bNosync = 0; /* --no-sync. Omit the auto-sync */
134	int width; /* Width of printed comment lines */
135	Stmt mtimeXfer; /* Statement to transfer mtimes */
136	const char zWidth; / Width option string value */
137
138	if( !internalUpdate ){
	@@ -149,18 +149,19 @@
149	width = -1;
150	}
151	latestFlag = find_option("latest",0, 0)!=0;
152	dryRunFlag = find_option("dry-run","n",0)!=0;
153	if( !dryRunFlag ){
154	dryRunFlag = find_option("no-change",0,0)!=0
155	\|\| find_option("nochange",0,0)!=0; /* deprecated */
156	}
157	verboseFlag = find_option("verbose","v",0)!=0;
158	forceMissingFlag = find_option("force-missing",0,0)!=0;
159	debugFlag = find_option("debug",0,0)!=0;
160	setmtimeFlag = find_option("setmtime",0,0)!=0;
161	keepMergeFlag = find_option("keep-merge-files", "K",0)!=0;
162	bNosync = find_option("no-sync",0,0)!=0 \|\| find_option("nosync",0,0)!=0;
163
164	/* We should be done with options.. */
165	verify_all_options();
166
167	db_must_be_within_tree();
168

M src/url.c

+2 -2

		--- src/url.c
		+++ src/url.c
		@@ -546,11 +546,11 @@
546	546	**
547	547	** The original purpose of this routine is the above. But this
548	548	** also happens to be a convenient place to look for other
549	549	** network-related options:
550	550	**
551		-** --nosync Temporarily disable "autosync"
	551	+** --no-sync Temporarily disable "autosync"
552	552	**
553	553	** --ipv4 Disallow IPv6. Use only IPv4.
554	554	**
555	555	** --accept-any-cert Disable server SSL cert validation. Accept
556	556	** any SSL cert that the server provides.
		@@ -557,11 +557,11 @@
557	557	** WARNING: this option opens you up to
558	558	** forged-DNS and man-in-the-middle attacks!
559	559	*/
560	560	void url_proxy_options(void){
561	561	zProxyOpt = find_option("proxy", 0, 1);
562		- if( find_option("nosync",0,0) ) g.fNoSync = 1;
	562	+ if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
563	563	if( find_option("ipv4",0,0) ) g.fIPv4 = 1;
564	564	#ifdef FOSSIL_ENABLE_SSL
565	565	if( find_option("accept-any-cert",0,0) ){
566	566	ssl_disable_cert_verification();
567	567	}
568	568

	--- src/url.c
	+++ src/url.c
	@@ -546,11 +546,11 @@
546	**
547	** The original purpose of this routine is the above. But this
548	** also happens to be a convenient place to look for other
549	** network-related options:
550	**
551	** --nosync Temporarily disable "autosync"
552	**
553	** --ipv4 Disallow IPv6. Use only IPv4.
554	**
555	** --accept-any-cert Disable server SSL cert validation. Accept
556	** any SSL cert that the server provides.
	@@ -557,11 +557,11 @@
557	** WARNING: this option opens you up to
558	** forged-DNS and man-in-the-middle attacks!
559	*/
560	void url_proxy_options(void){
561	zProxyOpt = find_option("proxy", 0, 1);
562	if( find_option("nosync",0,0) ) g.fNoSync = 1;
563	if( find_option("ipv4",0,0) ) g.fIPv4 = 1;
564	#ifdef FOSSIL_ENABLE_SSL
565	if( find_option("accept-any-cert",0,0) ){
566	ssl_disable_cert_verification();
567	}
568

	--- src/url.c
	+++ src/url.c
	@@ -546,11 +546,11 @@
546	**
547	** The original purpose of this routine is the above. But this
548	** also happens to be a convenient place to look for other
549	** network-related options:
550	**
551	** --no-sync Temporarily disable "autosync"
552	**
553	** --ipv4 Disallow IPv6. Use only IPv4.
554	**
555	** --accept-any-cert Disable server SSL cert validation. Accept
556	** any SSL cert that the server provides.
	@@ -557,11 +557,11 @@
557	** WARNING: this option opens you up to
558	** forged-DNS and man-in-the-middle attacks!
559	*/
560	void url_proxy_options(void){
561	zProxyOpt = find_option("proxy", 0, 1);
562	if( find_option("no-sync",0,0) \|\| find_option("nosync",0,0) ) g.fNoSync = 1;
563	if( find_option("ipv4",0,0) ) g.fIPv4 = 1;
564	#ifdef FOSSIL_ENABLE_SSL
565	if( find_option("accept-any-cert",0,0) ){
566	ssl_disable_cert_verification();
567	}
568

M src/wikiformat.c

+8 -4

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -1872,24 +1872,28 @@
1872	1872	**
1873	1873	** Options:
1874	1874	** --buttons Set the WIKI_BUTTONS flag
1875	1875	** --htmlonly Set the WIKI_HTMLONLY flag
1876	1876	** --linksonly Set the WIKI_LINKSONLY flag
1877		-** --nobadlinks Set the WIKI_NOBADLINKS flag
	1877	+** --no-badlinks Set the WIKI_NOBADLINKS flag
1878	1878	** --inline Set the WIKI_INLINE flag
1879		-** --noblock Set the WIKI_NOBLOCK flag
	1879	+** --no-block Set the WIKI_NOBLOCK flag
1880	1880	** --dark-pikchr Render pikchrs in dark mode
1881	1881	*/
1882	1882	void test_wiki_render(void){
1883	1883	Blob in, out;
1884	1884	int flags = 0;
1885	1885	if( find_option("buttons",0,0)!=0 ) flags \|= WIKI_BUTTONS;
1886	1886	if( find_option("htmlonly",0,0)!=0 ) flags \|= WIKI_HTMLONLY;
1887	1887	if( find_option("linksonly",0,0)!=0 ) flags \|= WIKI_LINKSONLY;
1888		- if( find_option("nobadlinks",0,0)!=0 ) flags \|= WIKI_NOBADLINKS;
	1888	+ if( find_option("no-badlinks",0,0)!=0 \|\| find_option("nobadlinks",0,0)!=0 ){
	1889	+ flags \|= WIKI_NOBADLINKS;
	1890	+ }
1889	1891	if( find_option("inline",0,0)!=0 ) flags \|= WIKI_INLINE;
1890		- if( find_option("noblock",0,0)!=0 ) flags \|= WIKI_NOBLOCK;
	1892	+ if( find_option("no-block",0,0)!=0 \|\| find_option("noblock",0,0)!=0 ){
	1893	+ flags \|= WIKI_NOBLOCK;
	1894	+ }
1891	1895	if( find_option("dark-pikchr",0,0)!=0 ){
1892	1896	pikchr_to_html_add_flags( PIKCHR_PROCESS_DARK_MODE );
1893	1897	}
1894	1898	db_find_and_open_repository(OPEN_OK_NOT_FOUND\|OPEN_SUBSTITUTE,0);
1895	1899	verify_all_options();
1896	1900

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -1872,24 +1872,28 @@
1872	**
1873	** Options:
1874	** --buttons Set the WIKI_BUTTONS flag
1875	** --htmlonly Set the WIKI_HTMLONLY flag
1876	** --linksonly Set the WIKI_LINKSONLY flag
1877	** --nobadlinks Set the WIKI_NOBADLINKS flag
1878	** --inline Set the WIKI_INLINE flag
1879	** --noblock Set the WIKI_NOBLOCK flag
1880	** --dark-pikchr Render pikchrs in dark mode
1881	*/
1882	void test_wiki_render(void){
1883	Blob in, out;
1884	int flags = 0;
1885	if( find_option("buttons",0,0)!=0 ) flags \|= WIKI_BUTTONS;
1886	if( find_option("htmlonly",0,0)!=0 ) flags \|= WIKI_HTMLONLY;
1887	if( find_option("linksonly",0,0)!=0 ) flags \|= WIKI_LINKSONLY;
1888	if( find_option("nobadlinks",0,0)!=0 ) flags \|= WIKI_NOBADLINKS;


1889	if( find_option("inline",0,0)!=0 ) flags \|= WIKI_INLINE;
1890	if( find_option("noblock",0,0)!=0 ) flags \|= WIKI_NOBLOCK;


1891	if( find_option("dark-pikchr",0,0)!=0 ){
1892	pikchr_to_html_add_flags( PIKCHR_PROCESS_DARK_MODE );
1893	}
1894	db_find_and_open_repository(OPEN_OK_NOT_FOUND\|OPEN_SUBSTITUTE,0);
1895	verify_all_options();
1896

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -1872,24 +1872,28 @@
1872	**
1873	** Options:
1874	** --buttons Set the WIKI_BUTTONS flag
1875	** --htmlonly Set the WIKI_HTMLONLY flag
1876	** --linksonly Set the WIKI_LINKSONLY flag
1877	** --no-badlinks Set the WIKI_NOBADLINKS flag
1878	** --inline Set the WIKI_INLINE flag
1879	** --no-block Set the WIKI_NOBLOCK flag
1880	** --dark-pikchr Render pikchrs in dark mode
1881	*/
1882	void test_wiki_render(void){
1883	Blob in, out;
1884	int flags = 0;
1885	if( find_option("buttons",0,0)!=0 ) flags \|= WIKI_BUTTONS;
1886	if( find_option("htmlonly",0,0)!=0 ) flags \|= WIKI_HTMLONLY;
1887	if( find_option("linksonly",0,0)!=0 ) flags \|= WIKI_LINKSONLY;
1888	if( find_option("no-badlinks",0,0)!=0 \|\| find_option("nobadlinks",0,0)!=0 ){
1889	flags \|= WIKI_NOBADLINKS;
1890	}
1891	if( find_option("inline",0,0)!=0 ) flags \|= WIKI_INLINE;
1892	if( find_option("no-block",0,0)!=0 \|\| find_option("noblock",0,0)!=0 ){
1893	flags \|= WIKI_NOBLOCK;
1894	}
1895	if( find_option("dark-pikchr",0,0)!=0 ){
1896	pikchr_to_html_add_flags( PIKCHR_PROCESS_DARK_MODE );
1897	}
1898	db_find_and_open_repository(OPEN_OK_NOT_FOUND\|OPEN_SUBSTITUTE,0);
1899	verify_all_options();
1900

M src/winhttp.c

+2 -2

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -432,11 +432,11 @@
432	432	fwrite(zCmd, 1, strlen(zCmd), aux);
433	433
434	434	sqlite3_snprintf(sizeof(zCmd), zCmd,
435	435	"\"%s\" http -args \"%s\"%s%s",
436	436	g.nameOfExe, zCmdFName,
437		- g.httpUseSSL ? "" : " --nossl", p->zOptions
	437	+ g.httpUseSSL ? "" : " --no-ssl", p->zOptions
438	438	);
439	439	in = fossil_fopen(zReplyFName, "w+b");
440	440	fflush(out);
441	441	fflush(aux);
442	442	if( g.fHttpTrace ){
		@@ -518,11 +518,11 @@
518	518	}
519	519	assert( g.zRepositoryName && g.zRepositoryName[0] );
520	520	zIp = SocketAddr_toString(&p->addr);
521	521	sqlite3_snprintf(sizeof(zCmd), zCmd,
522	522	"\"%s\" http --in \"%s\" --out \"%s\" --ipaddr %s \"%s\""
523		- " --scgi --nossl%s",
	523	+ " --scgi --no-ssl%s",
524	524	g.nameOfExe, zRequestFName, zReplyFName, zIp,
525	525	g.zRepositoryName, p->zOptions
526	526	);
527	527	fossil_free(zIp);
528	528	in = fossil_fopen(zReplyFName, "w+b");
529	529

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -432,11 +432,11 @@
432	fwrite(zCmd, 1, strlen(zCmd), aux);
433
434	sqlite3_snprintf(sizeof(zCmd), zCmd,
435	"\"%s\" http -args \"%s\"%s%s",
436	g.nameOfExe, zCmdFName,
437	g.httpUseSSL ? "" : " --nossl", p->zOptions
438	);
439	in = fossil_fopen(zReplyFName, "w+b");
440	fflush(out);
441	fflush(aux);
442	if( g.fHttpTrace ){
	@@ -518,11 +518,11 @@
518	}
519	assert( g.zRepositoryName && g.zRepositoryName[0] );
520	zIp = SocketAddr_toString(&p->addr);
521	sqlite3_snprintf(sizeof(zCmd), zCmd,
522	"\"%s\" http --in \"%s\" --out \"%s\" --ipaddr %s \"%s\""
523	" --scgi --nossl%s",
524	g.nameOfExe, zRequestFName, zReplyFName, zIp,
525	g.zRepositoryName, p->zOptions
526	);
527	fossil_free(zIp);
528	in = fossil_fopen(zReplyFName, "w+b");
529

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -432,11 +432,11 @@
432	fwrite(zCmd, 1, strlen(zCmd), aux);
433
434	sqlite3_snprintf(sizeof(zCmd), zCmd,
435	"\"%s\" http -args \"%s\"%s%s",
436	g.nameOfExe, zCmdFName,
437	g.httpUseSSL ? "" : " --no-ssl", p->zOptions
438	);
439	in = fossil_fopen(zReplyFName, "w+b");
440	fflush(out);
441	fflush(aux);
442	if( g.fHttpTrace ){
	@@ -518,11 +518,11 @@
518	}
519	assert( g.zRepositoryName && g.zRepositoryName[0] );
520	zIp = SocketAddr_toString(&p->addr);
521	sqlite3_snprintf(sizeof(zCmd), zCmd,
522	"\"%s\" http --in \"%s\" --out \"%s\" --ipaddr %s \"%s\""
523	" --scgi --no-ssl%s",
524	g.nameOfExe, zRequestFName, zReplyFName, zIp,
525	g.zRepositoryName, p->zOptions
526	);
527	fossil_free(zIp);
528	in = fossil_fopen(zReplyFName, "w+b");
529

Fossil SCM

Keyboard Shortcuts