Fossil SCM

Use one setting instead of two. Using one default fallback constant instead of two. Remove the '--metadata-only' option entirely.

mistachkin 2015-04-10 00:18 UTC mvAndRmFiles

Commit d981fe2c5e5582ed741d9dc6d40fc816efbbed00

Parent 90ee7bcb765375e…

3 files changed +27 -75 +1 -2 +8 -14

~ src/add.c ~ src/configure.c ~ src/db.c

M src/add.c

+27 -75

		--- src/add.c
		+++ src/add.c
		@@ -25,39 +25,23 @@
25	25	#include "cygsup.h"
26	26
27	27	/*
28	28	** WARNING: For Fossil version 1.x this value was always zero. For Fossil
29	29	** 2.x, it will probably always be one. When this value is zero,
30		-** files in the checkout will not be moved by the "mv" command.
31		-**
32		-** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
33		-** the "move-files" setting will be consulted instead of using
34		-** this value.
35		-**
36		-** To retain the Fossil version 1.x behavior when using Fossil 2.x,
37		-** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
38		-** -AND- the "move-files" setting must be set to zero.
39		-*/
40		-#ifndef FOSSIL_MV_CHECKOUT_FILE_ON_MV
41		-#define FOSSIL_MV_CHECKOUT_FILE_ON_MV (0)
42		-#endif
43		-
44		-/*
45		-** WARNING: For Fossil version 1.x this value was always zero. For Fossil
46		-** 2.x, it will probably always be one. When this value is zero,
47		-** files in the checkout will not be removed by the "rm" command.
48		-**
49		-** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
50		-** the "remove-files" setting will be consulted instead of using
51		-** this value.
52		-**
53		-** To retain the Fossil version 1.x behavior when using Fossil 2.x,
54		-** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
55		-** -AND- the "remove-files" setting must be set to zero.
56		-*/
57		-#ifndef FOSSIL_RM_CHECKOUT_FILE_ON_RM
58		-#define FOSSIL_RM_CHECKOUT_FILE_ON_RM (0)
	30	+** files in the checkout will not be moved by the "mv" command and
	31	+** files in the checkout will not be removed by the "rm" command.
	32	+**
	33	+** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
	34	+** the "mv-rm-files" setting will be consulted instead of using
	35	+** this value.
	36	+**
	37	+** To retain the Fossil version 1.x behavior when using Fossil 2.x,
	38	+** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
	39	+** -AND- the "mv-rm-files" setting must be set to zero.
	40	+*/
	41	+#ifndef FOSSIL_MV_RM_FILE
	42	+#define FOSSIL_MV_RM_FILE (0)
59	43	#endif
60	44
61	45	/*
62	46	** This routine returns the names of files in a working checkout that
63	47	** are created by Fossil itself, and hence should not be added, deleted,
		@@ -414,26 +398,10 @@
414	398	}
415	399	db_finalize(&remove);
416	400	db_multi_exec("DROP TABLE fremove;");
417	401	}
418	402
419		-/*
420		-** Capture the command-line --metadata-only option.
421		-*/
422		-static const char *zMetadataOnly = 0;
423		-void capture_metadata_only_option(void){
424		- if( zMetadataOnly==0 ){
425		- zMetadataOnly = find_option("metadata-only",0,1);
426		- if( find_option("soft",0,0) && zMetadataOnly==0 ){
427		- zMetadataOnly = "1";
428		- }
429		- if( find_option("hard",0,0) && zMetadataOnly==0 ){
430		- zMetadataOnly = "0";
431		- }
432		- }
433		-}
434		-
435	403	/*
436	404	** COMMAND: rm
437	405	** COMMAND: delete
438	406	** COMMAND: forget*
439	407	**
		@@ -443,25 +411,21 @@
443	411	**
444	412	** The 'rm' and 'delete' commands do NOT normally remove the files from
445	413	** disk. They just mark the files as no longer being part of the project.
446	414	** In other words, future changes to the named files will not be versioned.
447	415	** However, the default behavior of this command may be overridden via the
448		-** command line options listed below and/or the 'remove-files' setting.
	416	+** command line options listed below and/or the 'mv-rm-files' setting.
449	417	**
450	418	** The 'forget' command never removes files from disk, even when the command
451		-** line options and/or the 'remove-files' setting would otherwise require it
	419	+** line options and/or the 'mv-rm-files' setting would otherwise require it
452	420	** to do so.
453	421	**
454		-** WARNING: If either the "--metadata-only 0" or "--hard" option is
455		-** specified -OR- the "remove-files" setting is non-zero,
456		-** files WILL BE removed from disk as well. This does NOT
457		-** apply to the 'forget' command.
	422	+** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
	423	+** setting is non-zero, files WILL BE removed from disk as well.
	424	+** This does NOT apply to the 'forget' command.
458	425	**
459	426	** Options:
460		-** --metadata-only <BOOL> Non-zero to skip removing files from the
461		-** checkout. Supersedes both the --soft and
462		-** --hard options.
463	427	** --soft Skip removing files from the checkout.
464	428	** This supersedes the --hard option.
465	429	** --hard Remove files from the checkout.
466	430	** --case-sensitive <BOOL> Override the case-sensitive setting.
467	431	** -n\|--dry-run If given, display instead of run actions.
		@@ -474,26 +438,22 @@
474	438	int dryRunFlag;
475	439	Stmt loop;
476	440
477	441	dryRunFlag = find_option("dry-run","n",0)!=0;
478	442
479		- capture_metadata_only_option();
480		-
481	443	/* We should be done with options.. */
482	444	verify_all_options();
483	445
484	446	db_must_be_within_tree();
485	447	db_begin_transaction();
486	448	if( g.argv[1][0]=='f' ){ /* i.e. "forget" */
487	449	removeFiles = 0;
488		- }else if( zMetadataOnly ){
489		- removeFiles = is_false(zMetadataOnly);
490	450	}else{
491	451	#if FOSSIL_ENABLE_LEGACY_MV_RM
492		- removeFiles = db_get_boolean("remove-files",0);
	452	+ removeFiles = db_get_boolean("mv-rm-files",0);
493	453	#else
494		- removeFiles = FOSSIL_RM_CHECKOUT_FILE_ON_RM;
	454	+ removeFiles = FOSSIL_MV_RM_FILE;
495	455	#endif
496	456	}
497	457	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
498	458	filename_collation());
499	459	for(i=2; i<g.argc; i++){
		@@ -826,25 +786,21 @@
826	786	**
827	787	** The 'mv' command does NOT normally rename or move the files on disk.
828	788	** This command merely records the fact that file names have changed so
829	789	** that appropriate notations can be made at the next commit/check-in.
830	790	** However, the default behavior of this command may be overridden via
831		-** command line options listed below and/or the 'move-files' setting.
	791	+** command line options listed below and/or the 'mv-rm-files' setting.
832	792	**
833	793	** The 'rename' command never renames or moves files on disk, even when the
834		-** command line options and/or the 'move-files' setting would otherwise
	794	+** command line options and/or the 'mv-rm-files' setting would otherwise
835	795	** require it to do so.
836	796	**
837		-** WARNING: If either the "--metadata-only 0" or "--hard" option is
838		-** specified -OR- the "move-files" setting is non-zero,
839		-** files WILL BE renamed or moved on disk as well. This does
840		-** NOT apply to the 'rename' command.
	797	+** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
	798	+** setting is non-zero, files WILL BE renamed or moved on disk
	799	+** as well. This does NOT apply to the 'rename' command.
841	800	**
842	801	** Options:
843		-** --metadata-only <BOOL> Non-zero to skip moving files within the
844		-** checkout. Supersedes both the --soft and
845		-** --hard options.
846	802	** --soft Skip moving files within the checkout.
847	803	** This supersedes the --hard option.
848	804	** --hard Move files within the checkout.
849	805	** --case-sensitive <BOOL> Override the case-sensitive setting.
850	806	** -n\|--dry-run If given, display instead of run actions.
		@@ -861,12 +817,10 @@
861	817	Stmt q;
862	818
863	819	db_must_be_within_tree();
864	820	dryRunFlag = find_option("dry-run","n",0)!=0;
865	821
866		- capture_metadata_only_option();
867		-
868	822	/* We should be done with options.. */
869	823	verify_all_options();
870	824
871	825	vid = db_lget_int("checkout", 0);
872	826	if( vid==0 ){
		@@ -877,17 +831,15 @@
877	831	}
878	832	zDest = g.argv[g.argc-1];
879	833	db_begin_transaction();
880	834	if( g.argv[1][0]=='r' ){ /* i.e. "rename" */
881	835	moveFiles = 0;
882		- }else if( zMetadataOnly ){
883		- moveFiles = is_false(zMetadataOnly);
884	836	}else{
885	837	#if FOSSIL_ENABLE_LEGACY_MV_RM
886		- moveFiles = db_get_boolean("move-files",0);
	838	+ moveFiles = db_get_boolean("mv-rm-files",0);
887	839	#else
888		- moveFiles = FOSSIL_MV_CHECKOUT_FILE_ON_MV;
	840	+ moveFiles = FOSSIL_MV_RM_FILE;
889	841	#endif
890	842	}
891	843	file_tree_name(zDest, &dest, 1);
892	844	db_multi_exec(
893	845	"UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
894	846

	--- src/add.c
	+++ src/add.c
	@@ -25,39 +25,23 @@
25	#include "cygsup.h"
26
27	/*
28	** WARNING: For Fossil version 1.x this value was always zero. For Fossil
29	** 2.x, it will probably always be one. When this value is zero,
30	** files in the checkout will not be moved by the "mv" command.
31	**
32	** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
33	** the "move-files" setting will be consulted instead of using
34	** this value.
35	**
36	** To retain the Fossil version 1.x behavior when using Fossil 2.x,
37	** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
38	** -AND- the "move-files" setting must be set to zero.
39	*/
40	#ifndef FOSSIL_MV_CHECKOUT_FILE_ON_MV
41	#define FOSSIL_MV_CHECKOUT_FILE_ON_MV (0)
42	#endif
43
44	/*
45	** WARNING: For Fossil version 1.x this value was always zero. For Fossil
46	** 2.x, it will probably always be one. When this value is zero,
47	** files in the checkout will not be removed by the "rm" command.
48	**
49	** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
50	** the "remove-files" setting will be consulted instead of using
51	** this value.
52	**
53	** To retain the Fossil version 1.x behavior when using Fossil 2.x,
54	** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
55	** -AND- the "remove-files" setting must be set to zero.
56	*/
57	#ifndef FOSSIL_RM_CHECKOUT_FILE_ON_RM
58	#define FOSSIL_RM_CHECKOUT_FILE_ON_RM (0)
59	#endif
60
61	/*
62	** This routine returns the names of files in a working checkout that
63	** are created by Fossil itself, and hence should not be added, deleted,
	@@ -414,26 +398,10 @@
414	}
415	db_finalize(&remove);
416	db_multi_exec("DROP TABLE fremove;");
417	}
418
419	/*
420	** Capture the command-line --metadata-only option.
421	*/
422	static const char *zMetadataOnly = 0;
423	void capture_metadata_only_option(void){
424	if( zMetadataOnly==0 ){
425	zMetadataOnly = find_option("metadata-only",0,1);
426	if( find_option("soft",0,0) && zMetadataOnly==0 ){
427	zMetadataOnly = "1";
428	}
429	if( find_option("hard",0,0) && zMetadataOnly==0 ){
430	zMetadataOnly = "0";
431	}
432	}
433	}
434
435	/*
436	** COMMAND: rm
437	** COMMAND: delete
438	** COMMAND: forget*
439	**
	@@ -443,25 +411,21 @@
443	**
444	** The 'rm' and 'delete' commands do NOT normally remove the files from
445	** disk. They just mark the files as no longer being part of the project.
446	** In other words, future changes to the named files will not be versioned.
447	** However, the default behavior of this command may be overridden via the
448	** command line options listed below and/or the 'remove-files' setting.
449	**
450	** The 'forget' command never removes files from disk, even when the command
451	** line options and/or the 'remove-files' setting would otherwise require it
452	** to do so.
453	**
454	** WARNING: If either the "--metadata-only 0" or "--hard" option is
455	** specified -OR- the "remove-files" setting is non-zero,
456	** files WILL BE removed from disk as well. This does NOT
457	** apply to the 'forget' command.
458	**
459	** Options:
460	** --metadata-only <BOOL> Non-zero to skip removing files from the
461	** checkout. Supersedes both the --soft and
462	** --hard options.
463	** --soft Skip removing files from the checkout.
464	** This supersedes the --hard option.
465	** --hard Remove files from the checkout.
466	** --case-sensitive <BOOL> Override the case-sensitive setting.
467	** -n\|--dry-run If given, display instead of run actions.
	@@ -474,26 +438,22 @@
474	int dryRunFlag;
475	Stmt loop;
476
477	dryRunFlag = find_option("dry-run","n",0)!=0;
478
479	capture_metadata_only_option();
480
481	/* We should be done with options.. */
482	verify_all_options();
483
484	db_must_be_within_tree();
485	db_begin_transaction();
486	if( g.argv[1][0]=='f' ){ /* i.e. "forget" */
487	removeFiles = 0;
488	}else if( zMetadataOnly ){
489	removeFiles = is_false(zMetadataOnly);
490	}else{
491	#if FOSSIL_ENABLE_LEGACY_MV_RM
492	removeFiles = db_get_boolean("remove-files",0);
493	#else
494	removeFiles = FOSSIL_RM_CHECKOUT_FILE_ON_RM;
495	#endif
496	}
497	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
498	filename_collation());
499	for(i=2; i<g.argc; i++){
	@@ -826,25 +786,21 @@
826	**
827	** The 'mv' command does NOT normally rename or move the files on disk.
828	** This command merely records the fact that file names have changed so
829	** that appropriate notations can be made at the next commit/check-in.
830	** However, the default behavior of this command may be overridden via
831	** command line options listed below and/or the 'move-files' setting.
832	**
833	** The 'rename' command never renames or moves files on disk, even when the
834	** command line options and/or the 'move-files' setting would otherwise
835	** require it to do so.
836	**
837	** WARNING: If either the "--metadata-only 0" or "--hard" option is
838	** specified -OR- the "move-files" setting is non-zero,
839	** files WILL BE renamed or moved on disk as well. This does
840	** NOT apply to the 'rename' command.
841	**
842	** Options:
843	** --metadata-only <BOOL> Non-zero to skip moving files within the
844	** checkout. Supersedes both the --soft and
845	** --hard options.
846	** --soft Skip moving files within the checkout.
847	** This supersedes the --hard option.
848	** --hard Move files within the checkout.
849	** --case-sensitive <BOOL> Override the case-sensitive setting.
850	** -n\|--dry-run If given, display instead of run actions.
	@@ -861,12 +817,10 @@
861	Stmt q;
862
863	db_must_be_within_tree();
864	dryRunFlag = find_option("dry-run","n",0)!=0;
865
866	capture_metadata_only_option();
867
868	/* We should be done with options.. */
869	verify_all_options();
870
871	vid = db_lget_int("checkout", 0);
872	if( vid==0 ){
	@@ -877,17 +831,15 @@
877	}
878	zDest = g.argv[g.argc-1];
879	db_begin_transaction();
880	if( g.argv[1][0]=='r' ){ /* i.e. "rename" */
881	moveFiles = 0;
882	}else if( zMetadataOnly ){
883	moveFiles = is_false(zMetadataOnly);
884	}else{
885	#if FOSSIL_ENABLE_LEGACY_MV_RM
886	moveFiles = db_get_boolean("move-files",0);
887	#else
888	moveFiles = FOSSIL_MV_CHECKOUT_FILE_ON_MV;
889	#endif
890	}
891	file_tree_name(zDest, &dest, 1);
892	db_multi_exec(
893	"UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
894

	--- src/add.c
	+++ src/add.c
	@@ -25,39 +25,23 @@
25	#include "cygsup.h"
26
27	/*
28	** WARNING: For Fossil version 1.x this value was always zero. For Fossil
29	** 2.x, it will probably always be one. When this value is zero,
30	** files in the checkout will not be moved by the "mv" command and
31	** files in the checkout will not be removed by the "rm" command.
32	**
33	** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
34	** the "mv-rm-files" setting will be consulted instead of using
35	** this value.
36	**
37	** To retain the Fossil version 1.x behavior when using Fossil 2.x,
38	** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
39	** -AND- the "mv-rm-files" setting must be set to zero.
40	*/
41	#ifndef FOSSIL_MV_RM_FILE
42	#define FOSSIL_MV_RM_FILE (0)
















43	#endif
44
45	/*
46	** This routine returns the names of files in a working checkout that
47	** are created by Fossil itself, and hence should not be added, deleted,
	@@ -414,26 +398,10 @@
398	}
399	db_finalize(&remove);
400	db_multi_exec("DROP TABLE fremove;");
401	}
402
















403	/*
404	** COMMAND: rm
405	** COMMAND: delete
406	** COMMAND: forget*
407	**
	@@ -443,25 +411,21 @@
411	**
412	** The 'rm' and 'delete' commands do NOT normally remove the files from
413	** disk. They just mark the files as no longer being part of the project.
414	** In other words, future changes to the named files will not be versioned.
415	** However, the default behavior of this command may be overridden via the
416	** command line options listed below and/or the 'mv-rm-files' setting.
417	**
418	** The 'forget' command never removes files from disk, even when the command
419	** line options and/or the 'mv-rm-files' setting would otherwise require it
420	** to do so.
421	**
422	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
423	** setting is non-zero, files WILL BE removed from disk as well.
424	** This does NOT apply to the 'forget' command.

425	**
426	** Options:



427	** --soft Skip removing files from the checkout.
428	** This supersedes the --hard option.
429	** --hard Remove files from the checkout.
430	** --case-sensitive <BOOL> Override the case-sensitive setting.
431	** -n\|--dry-run If given, display instead of run actions.
	@@ -474,26 +438,22 @@
438	int dryRunFlag;
439	Stmt loop;
440
441	dryRunFlag = find_option("dry-run","n",0)!=0;
442


443	/* We should be done with options.. */
444	verify_all_options();
445
446	db_must_be_within_tree();
447	db_begin_transaction();
448	if( g.argv[1][0]=='f' ){ /* i.e. "forget" */
449	removeFiles = 0;


450	}else{
451	#if FOSSIL_ENABLE_LEGACY_MV_RM
452	removeFiles = db_get_boolean("mv-rm-files",0);
453	#else
454	removeFiles = FOSSIL_MV_RM_FILE;
455	#endif
456	}
457	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
458	filename_collation());
459	for(i=2; i<g.argc; i++){
	@@ -826,25 +786,21 @@
786	**
787	** The 'mv' command does NOT normally rename or move the files on disk.
788	** This command merely records the fact that file names have changed so
789	** that appropriate notations can be made at the next commit/check-in.
790	** However, the default behavior of this command may be overridden via
791	** command line options listed below and/or the 'mv-rm-files' setting.
792	**
793	** The 'rename' command never renames or moves files on disk, even when the
794	** command line options and/or the 'mv-rm-files' setting would otherwise
795	** require it to do so.
796	**
797	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
798	** setting is non-zero, files WILL BE renamed or moved on disk
799	** as well. This does NOT apply to the 'rename' command.

800	**
801	** Options:



802	** --soft Skip moving files within the checkout.
803	** This supersedes the --hard option.
804	** --hard Move files within the checkout.
805	** --case-sensitive <BOOL> Override the case-sensitive setting.
806	** -n\|--dry-run If given, display instead of run actions.
	@@ -861,12 +817,10 @@
817	Stmt q;
818
819	db_must_be_within_tree();
820	dryRunFlag = find_option("dry-run","n",0)!=0;
821


822	/* We should be done with options.. */
823	verify_all_options();
824
825	vid = db_lget_int("checkout", 0);
826	if( vid==0 ){
	@@ -877,17 +831,15 @@
831	}
832	zDest = g.argv[g.argc-1];
833	db_begin_transaction();
834	if( g.argv[1][0]=='r' ){ /* i.e. "rename" */
835	moveFiles = 0;


836	}else{
837	#if FOSSIL_ENABLE_LEGACY_MV_RM
838	moveFiles = db_get_boolean("mv-rm-files",0);
839	#else
840	moveFiles = FOSSIL_MV_RM_FILE;
841	#endif
842	}
843	file_tree_name(zDest, &dest, 1);
844	db_multi_exec(
845	"UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
846

M src/configure.c

+1 -2

		--- src/configure.c
		+++ src/configure.c
		@@ -128,12 +128,11 @@
128	128	{ "empty-dirs", CONFIGSET_PROJ },
129	129	{ "allow-symlinks", CONFIGSET_PROJ },
130	130	{ "dotfiles", CONFIGSET_PROJ },
131	131
132	132	#ifdef FOSSIL_ENABLE_LEGACY_MV_RM
133		- { "move-files", CONFIGSET_PROJ },
134		- { "remove-files", CONFIGSET_PROJ },
	133	+ { "mv-rm-files", CONFIGSET_PROJ },
135	134	#endif
136	135
137	136	{ "ticket-table", CONFIGSET_TKT },
138	137	{ "ticket-common", CONFIGSET_TKT },
139	138	{ "ticket-change", CONFIGSET_TKT },
140	139

	--- src/configure.c
	+++ src/configure.c
	@@ -128,12 +128,11 @@
128	{ "empty-dirs", CONFIGSET_PROJ },
129	{ "allow-symlinks", CONFIGSET_PROJ },
130	{ "dotfiles", CONFIGSET_PROJ },
131
132	#ifdef FOSSIL_ENABLE_LEGACY_MV_RM
133	{ "move-files", CONFIGSET_PROJ },
134	{ "remove-files", CONFIGSET_PROJ },
135	#endif
136
137	{ "ticket-table", CONFIGSET_TKT },
138	{ "ticket-common", CONFIGSET_TKT },
139	{ "ticket-change", CONFIGSET_TKT },
140

	--- src/configure.c
	+++ src/configure.c
	@@ -128,12 +128,11 @@
128	{ "empty-dirs", CONFIGSET_PROJ },
129	{ "allow-symlinks", CONFIGSET_PROJ },
130	{ "dotfiles", CONFIGSET_PROJ },
131
132	#ifdef FOSSIL_ENABLE_LEGACY_MV_RM
133	{ "mv-rm-files", CONFIGSET_PROJ },

134	#endif
135
136	{ "ticket-table", CONFIGSET_TKT },
137	{ "ticket-common", CONFIGSET_TKT },
138	{ "ticket-change", CONFIGSET_TKT },
139

M src/db.c

+8 -14

		--- src/db.c
		+++ src/db.c
		@@ -2361,20 +2361,17 @@
2361	2361	{ "localauth", 0, 0, 0, 0, "off" },
2362	2362	{ "main-branch", 0, 40, 0, 0, "trunk" },
2363	2363	{ "manifest", 0, 0, 1, 0, "off" },
2364	2364	{ "max-loadavg", 0, 25, 0, 0, "0.0" },
2365	2365	{ "max-upload", 0, 25, 0, 0, "250000" },
	2366	+ { "mtime-changes", 0, 0, 0, 0, "on" },
2366	2367	#if FOSSIL_ENABLE_LEGACY_MV_RM
2367		- { "move-files", 0, 0, 0, 0, "off" },
	2368	+ { "mv-rm-files", 0, 0, 0, 0, "off" },
2368	2369	#endif
2369		- { "mtime-changes", 0, 0, 0, 0, "on" },
2370	2370	{ "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2371	2371	{ "proxy", 0, 32, 0, 0, "off" },
2372	2372	{ "relative-paths", 0, 0, 0, 0, "on" },
2373		-#if FOSSIL_ENABLE_LEGACY_MV_RM
2374		- { "remove-files", 0, 0, 0, 0, "off" },
2375		-#endif
2376	2373	{ "repo-cksum", 0, 0, 0, 0, "on" },
2377	2374	{ "self-register", 0, 0, 0, 0, "off" },
2378	2375	{ "ssh-command", 0, 40, 0, 0, "" },
2379	2376	{ "ssl-ca-location", 0, 40, 0, 0, "" },
2380	2377	{ "ssl-identity", 0, 40, 0, 0, "" },
		@@ -2576,16 +2573,18 @@
2576	2573	** global configuration database.
2577	2574	**
2578	2575	** max-upload A limit on the size of uplink HTTP requests. The
2579	2576	** default is 250000 bytes.
2580	2577	**
2581		-** move-files If enabled (and Fossil was compiled with legacy "mv"
2582		-** support), the "mv" and "rename" commands will also move
2583		-** the associated files within the checkout. Default: off.
2584		-**
2585	2578	** mtime-changes Use file modification times (mtimes) to detect when
2586	2579	** files have been modified. (Default "on".)
	2580	+**
	2581	+** mv-rm-files If enabled (and Fossil was compiled with legacy "mv/rm"
	2582	+** support), the "mv" and "rename" commands will also move
	2583	+** the associated files within the checkout -AND- the "rm"
	2584	+** and "delete" commands will also remove the associated
	2585	+** files from within the checkout. Default: off.
2587	2586	**
2588	2587	** pgp-command Command used to clear-sign manifests at check-in.
2589	2588	** The default is "gpg --clearsign -o ".
2590	2589	**
2591	2590	** proxy URL of the HTTP proxy. If undefined or "off" then
		@@ -2594,15 +2593,10 @@
2594	2593	** then a direct HTTP connection is used.
2595	2594	**
2596	2595	** relative-paths When showing changes and extras, report paths relative
2597	2596	** to the current working directory. Default: "on"
2598	2597	**
2599		-** remove-files If enabled (and Fossil was compiled with legacy "rm"
2600		-** support), the "rm" and "delete" commands will also
2601		-** remove the associated files from within the checkout.
2602		-** Default: off.
2603		-**
2604	2598	** repo-cksum Compute checksums over all files in each checkout
2605	2599	** as a double-check of correctness. Defaults to "on".
2606	2600	** Disable on large repositories for a performance
2607	2601	** improvement.
2608	2602	**
2609	2603

	--- src/db.c
	+++ src/db.c
	@@ -2361,20 +2361,17 @@
2361	{ "localauth", 0, 0, 0, 0, "off" },
2362	{ "main-branch", 0, 40, 0, 0, "trunk" },
2363	{ "manifest", 0, 0, 1, 0, "off" },
2364	{ "max-loadavg", 0, 25, 0, 0, "0.0" },
2365	{ "max-upload", 0, 25, 0, 0, "250000" },

2366	#if FOSSIL_ENABLE_LEGACY_MV_RM
2367	{ "move-files", 0, 0, 0, 0, "off" },
2368	#endif
2369	{ "mtime-changes", 0, 0, 0, 0, "on" },
2370	{ "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2371	{ "proxy", 0, 32, 0, 0, "off" },
2372	{ "relative-paths", 0, 0, 0, 0, "on" },
2373	#if FOSSIL_ENABLE_LEGACY_MV_RM
2374	{ "remove-files", 0, 0, 0, 0, "off" },
2375	#endif
2376	{ "repo-cksum", 0, 0, 0, 0, "on" },
2377	{ "self-register", 0, 0, 0, 0, "off" },
2378	{ "ssh-command", 0, 40, 0, 0, "" },
2379	{ "ssl-ca-location", 0, 40, 0, 0, "" },
2380	{ "ssl-identity", 0, 40, 0, 0, "" },
	@@ -2576,16 +2573,18 @@
2576	** global configuration database.
2577	**
2578	** max-upload A limit on the size of uplink HTTP requests. The
2579	** default is 250000 bytes.
2580	**
2581	** move-files If enabled (and Fossil was compiled with legacy "mv"
2582	** support), the "mv" and "rename" commands will also move
2583	** the associated files within the checkout. Default: off.
2584	**
2585	** mtime-changes Use file modification times (mtimes) to detect when
2586	** files have been modified. (Default "on".)






2587	**
2588	** pgp-command Command used to clear-sign manifests at check-in.
2589	** The default is "gpg --clearsign -o ".
2590	**
2591	** proxy URL of the HTTP proxy. If undefined or "off" then
	@@ -2594,15 +2593,10 @@
2594	** then a direct HTTP connection is used.
2595	**
2596	** relative-paths When showing changes and extras, report paths relative
2597	** to the current working directory. Default: "on"
2598	**
2599	** remove-files If enabled (and Fossil was compiled with legacy "rm"
2600	** support), the "rm" and "delete" commands will also
2601	** remove the associated files from within the checkout.
2602	** Default: off.
2603	**
2604	** repo-cksum Compute checksums over all files in each checkout
2605	** as a double-check of correctness. Defaults to "on".
2606	** Disable on large repositories for a performance
2607	** improvement.
2608	**
2609

	--- src/db.c
	+++ src/db.c
	@@ -2361,20 +2361,17 @@
2361	{ "localauth", 0, 0, 0, 0, "off" },
2362	{ "main-branch", 0, 40, 0, 0, "trunk" },
2363	{ "manifest", 0, 0, 1, 0, "off" },
2364	{ "max-loadavg", 0, 25, 0, 0, "0.0" },
2365	{ "max-upload", 0, 25, 0, 0, "250000" },
2366	{ "mtime-changes", 0, 0, 0, 0, "on" },
2367	#if FOSSIL_ENABLE_LEGACY_MV_RM
2368	{ "mv-rm-files", 0, 0, 0, 0, "off" },
2369	#endif

2370	{ "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2371	{ "proxy", 0, 32, 0, 0, "off" },
2372	{ "relative-paths", 0, 0, 0, 0, "on" },



2373	{ "repo-cksum", 0, 0, 0, 0, "on" },
2374	{ "self-register", 0, 0, 0, 0, "off" },
2375	{ "ssh-command", 0, 40, 0, 0, "" },
2376	{ "ssl-ca-location", 0, 40, 0, 0, "" },
2377	{ "ssl-identity", 0, 40, 0, 0, "" },
	@@ -2576,16 +2573,18 @@
2573	** global configuration database.
2574	**
2575	** max-upload A limit on the size of uplink HTTP requests. The
2576	** default is 250000 bytes.
2577	**




2578	** mtime-changes Use file modification times (mtimes) to detect when
2579	** files have been modified. (Default "on".)
2580	**
2581	** mv-rm-files If enabled (and Fossil was compiled with legacy "mv/rm"
2582	** support), the "mv" and "rename" commands will also move
2583	** the associated files within the checkout -AND- the "rm"
2584	** and "delete" commands will also remove the associated
2585	** files from within the checkout. Default: off.
2586	**
2587	** pgp-command Command used to clear-sign manifests at check-in.
2588	** The default is "gpg --clearsign -o ".
2589	**
2590	** proxy URL of the HTTP proxy. If undefined or "off" then
	@@ -2594,15 +2593,10 @@
2593	** then a direct HTTP connection is used.
2594	**
2595	** relative-paths When showing changes and extras, report paths relative
2596	** to the current working directory. Default: "on"
2597	**





2598	** repo-cksum Compute checksums over all files in each checkout
2599	** as a double-check of correctness. Defaults to "on".
2600	** Disable on large repositories for a performance
2601	** improvement.
2602	**
2603

Fossil SCM

Keyboard Shortcuts