Fossil SCM

Since FOSSIL_ENABLE_LEGACY_MV_RM is enabled by default (it really only does something when the "mv-rm-files" setting is set anyway), and there is no reason to ever disable it, just clean up the related #ifdef's.

jan.nijtmans 2020-07-08 13:53 trunk
Commit 918bcfcf77b419cc04ca609d0e74185ace996ccd170847f06b6f9fa4f6e91c51
Parent c48ef7254dd5edc…
13 files changed -3 -1 +1 -8 -26 -4 +9 -11 -3 -20 -6 -10 -10 -10 -5
~ Makefile.classic ~ Makefile.osx-jaguar ~ auto.def ~ src/add.c ~ src/configure.c ~ src/db.c ~ src/main.c ~ src/makemake.tcl ~ src/th_main.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ win/fossil.rc
M Makefile.classic
-3
--- Makefile.classic
+++ Makefile.classic
@@ -43,13 +43,10 @@
4343
 # TCC += -DFOSSIL_ENABLE_MINIZ
4444
4545
 # To add support for HTTPS
4646
 TCC += -DFOSSIL_ENABLE_SSL
4747
48
-# To enable legacy mv/rm support
49
-TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
50
-
5148
 #### We sometimes add the -static option here so that we can build a
5249
 # static executable that will run in a chroot jail.
5350
 #LIB = -static
5451
 TCC += -DFOSSIL_DYNAMIC_BUILD=1
5552
5653
--- Makefile.classic
+++ Makefile.classic
@@ -43,13 +43,10 @@
43 # TCC += -DFOSSIL_ENABLE_MINIZ
44
45 # To add support for HTTPS
46 TCC += -DFOSSIL_ENABLE_SSL
47
48 # To enable legacy mv/rm support
49 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
50
51 #### We sometimes add the -static option here so that we can build a
52 # static executable that will run in a chroot jail.
53 #LIB = -static
54 TCC += -DFOSSIL_DYNAMIC_BUILD=1
55
56
--- Makefile.classic
+++ Makefile.classic
@@ -43,13 +43,10 @@
43 # TCC += -DFOSSIL_ENABLE_MINIZ
44
45 # To add support for HTTPS
46 TCC += -DFOSSIL_ENABLE_SSL
47
 
 
 
48 #### We sometimes add the -static option here so that we can build a
49 # static executable that will run in a chroot jail.
50 #LIB = -static
51 TCC += -DFOSSIL_DYNAMIC_BUILD=1
52
53
M Makefile.osx-jaguar
-1
--- Makefile.osx-jaguar
+++ Makefile.osx-jaguar
@@ -57,11 +57,10 @@
5757
 TCC += -DSQLITE_WITHOUT_ZONEMALLOC
5858
 TCC += -D_BSD_SOURCE=1
5959
 TCC += -DWITHOUT_ICONV
6060
 TCC += -Dsocklen_t=int
6161
 TCC += -DSQLITE_MAX_MMAP_SIZE=0
62
-TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
6362
 INSTALLDIR = $(DESTDIR)/usr/local/bin
6463
 USE_SYSTEM_SQLITE =
6564
 USE_LINENOISE = 1
6665
 # FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
6766
 FOSSIL_ENABLE_TCL = 0
6867
--- Makefile.osx-jaguar
+++ Makefile.osx-jaguar
@@ -57,11 +57,10 @@
57 TCC += -DSQLITE_WITHOUT_ZONEMALLOC
58 TCC += -D_BSD_SOURCE=1
59 TCC += -DWITHOUT_ICONV
60 TCC += -Dsocklen_t=int
61 TCC += -DSQLITE_MAX_MMAP_SIZE=0
62 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
63 INSTALLDIR = $(DESTDIR)/usr/local/bin
64 USE_SYSTEM_SQLITE =
65 USE_LINENOISE = 1
66 # FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
67 FOSSIL_ENABLE_TCL = 0
68
--- Makefile.osx-jaguar
+++ Makefile.osx-jaguar
@@ -57,11 +57,10 @@
57 TCC += -DSQLITE_WITHOUT_ZONEMALLOC
58 TCC += -D_BSD_SOURCE=1
59 TCC += -DWITHOUT_ICONV
60 TCC += -Dsocklen_t=int
61 TCC += -DSQLITE_MAX_MMAP_SIZE=0
 
62 INSTALLDIR = $(DESTDIR)/usr/local/bin
63 USE_SYSTEM_SQLITE =
64 USE_LINENOISE = 1
65 # FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
66 FOSSIL_ENABLE_TCL = 0
67
M auto.def
+1 -8
--- auto.def
+++ auto.def
@@ -8,11 +8,10 @@
88
 with-miniz=0 => {Use miniz from the source tree}
99
 with-zlib:path|auto|tree
1010
 => {Look for zlib in the given path, automatically, or in the source tree}
1111
 with-exec-rel-paths=0
1212
 => {Enable relative paths for external diff/gdiff}
13
- with-legacy-mv-rm=1 => {Enable legacy behavior for mv/rm (skip checkout files)}
1413
 with-sanitizer: => {Build with C compiler's -fsanitize=LIST; e.g. address,enum,null,undefined}
1514
 with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
1615
 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
1716
 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
1817
 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
@@ -183,11 +182,11 @@
183182
 user-error $result
184183
 }
185184
 file delete ./conftest__
186185
 }
187186
 test_system_sqlite
188
-
187
+
189188
 }
190189
191190
 proc is_mingw {} {
192191
 return [string match *mingw* [get-define host]]
193192
 }
@@ -238,16 +237,10 @@
238237
 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
239238
 define FOSSIL_ENABLE_JSON
240239
 msg-result "JSON support enabled"
241240
 }
242241
243
-if {[opt-bool with-legacy-mv-rm]} {
244
- define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_LEGACY_MV_RM=1
245
- define FOSSIL_ENABLE_LEGACY_MV_RM
246
- msg-result "Legacy mv/rm support enabled"
247
-}
248
-
249242
 if {[opt-bool with-exec-rel-paths]} {
250243
 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_EXEC_REL_PATHS
251244
 define FOSSIL_ENABLE_EXEC_REL_PATHS
252245
 msg-result "Relative paths in external diff/gdiff enabled"
253246
 }
254247
--- auto.def
+++ auto.def
@@ -8,11 +8,10 @@
8 with-miniz=0 => {Use miniz from the source tree}
9 with-zlib:path|auto|tree
10 => {Look for zlib in the given path, automatically, or in the source tree}
11 with-exec-rel-paths=0
12 => {Enable relative paths for external diff/gdiff}
13 with-legacy-mv-rm=1 => {Enable legacy behavior for mv/rm (skip checkout files)}
14 with-sanitizer: => {Build with C compiler's -fsanitize=LIST; e.g. address,enum,null,undefined}
15 with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
16 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
17 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
18 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
@@ -183,11 +182,11 @@
183 user-error $result
184 }
185 file delete ./conftest__
186 }
187 test_system_sqlite
188
189 }
190
191 proc is_mingw {} {
192 return [string match *mingw* [get-define host]]
193 }
@@ -238,16 +237,10 @@
238 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
239 define FOSSIL_ENABLE_JSON
240 msg-result "JSON support enabled"
241 }
242
243 if {[opt-bool with-legacy-mv-rm]} {
244 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_LEGACY_MV_RM=1
245 define FOSSIL_ENABLE_LEGACY_MV_RM
246 msg-result "Legacy mv/rm support enabled"
247 }
248
249 if {[opt-bool with-exec-rel-paths]} {
250 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_EXEC_REL_PATHS
251 define FOSSIL_ENABLE_EXEC_REL_PATHS
252 msg-result "Relative paths in external diff/gdiff enabled"
253 }
254
--- auto.def
+++ auto.def
@@ -8,11 +8,10 @@
8 with-miniz=0 => {Use miniz from the source tree}
9 with-zlib:path|auto|tree
10 => {Look for zlib in the given path, automatically, or in the source tree}
11 with-exec-rel-paths=0
12 => {Enable relative paths for external diff/gdiff}
 
13 with-sanitizer: => {Build with C compiler's -fsanitize=LIST; e.g. address,enum,null,undefined}
14 with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
15 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
16 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
17 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
@@ -183,11 +182,11 @@
182 user-error $result
183 }
184 file delete ./conftest__
185 }
186 test_system_sqlite
187
188 }
189
190 proc is_mingw {} {
191 return [string match *mingw* [get-define host]]
192 }
@@ -238,16 +237,10 @@
237 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
238 define FOSSIL_ENABLE_JSON
239 msg-result "JSON support enabled"
240 }
241
 
 
 
 
 
 
242 if {[opt-bool with-exec-rel-paths]} {
243 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_EXEC_REL_PATHS
244 define FOSSIL_ENABLE_EXEC_REL_PATHS
245 msg-result "Relative paths in external diff/gdiff enabled"
246 }
247
M src/add.c
-26
--- src/add.c
+++ src/add.c
@@ -22,28 +22,10 @@
2222
 #include "add.h"
2323
 #include <assert.h>
2424
 #include <dirent.h>
2525
 #include "cygsup.h"
2626
27
-/*
28
-** WARNING: For Fossil version x.x this value was always zero. For Fossil-NG
29
-** 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 2.x behavior when using Fossil-NG
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
-
4527
 /*
4628
 ** This routine returns the names of files in a working checkout that
4729
 ** are created by Fossil itself, and hence should not be added, deleted,
4830
 ** or merge, and should be omitted from "clean" and "extras" lists.
4931
 **
@@ -592,15 +574,11 @@
592574
 }else if( softFlag ){
593575
 removeFiles = 0;
594576
 }else if( hardFlag ){
595577
 removeFiles = 1;
596578
 }else{
597
-#if FOSSIL_ENABLE_LEGACY_MV_RM
598579
 removeFiles = db_get_boolean("mv-rm-files",0);
599
-#else
600
- removeFiles = FOSSIL_MV_RM_FILE;
601
-#endif
602580
 }
603581
 db_multi_exec("CREATE TEMP TABLE sfile(pathname TEXT PRIMARY KEY %s)",
604582
 filename_collation());
605583
 for(i=2; i<g.argc; i++){
606584
 Blob treeName;
@@ -1033,15 +1011,11 @@
10331011
 }else if( softFlag ){
10341012
 moveFiles = 0;
10351013
 }else if( hardFlag ){
10361014
 moveFiles = 1;
10371015
 }else{
1038
-#if FOSSIL_ENABLE_LEGACY_MV_RM
10391016
 moveFiles = db_get_boolean("mv-rm-files",0);
1040
-#else
1041
- moveFiles = FOSSIL_MV_RM_FILE;
1042
-#endif
10431017
 }
10441018
 file_tree_name(zDest, &dest, 0, 1);
10451019
 db_multi_exec(
10461020
 "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
10471021
 );
10481022
--- src/add.c
+++ src/add.c
@@ -22,28 +22,10 @@
22 #include "add.h"
23 #include <assert.h>
24 #include <dirent.h>
25 #include "cygsup.h"
26
27 /*
28 ** WARNING: For Fossil version x.x this value was always zero. For Fossil-NG
29 ** 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 2.x behavior when using Fossil-NG
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,
48 ** or merge, and should be omitted from "clean" and "extras" lists.
49 **
@@ -592,15 +574,11 @@
592 }else if( softFlag ){
593 removeFiles = 0;
594 }else if( hardFlag ){
595 removeFiles = 1;
596 }else{
597 #if FOSSIL_ENABLE_LEGACY_MV_RM
598 removeFiles = db_get_boolean("mv-rm-files",0);
599 #else
600 removeFiles = FOSSIL_MV_RM_FILE;
601 #endif
602 }
603 db_multi_exec("CREATE TEMP TABLE sfile(pathname TEXT PRIMARY KEY %s)",
604 filename_collation());
605 for(i=2; i<g.argc; i++){
606 Blob treeName;
@@ -1033,15 +1011,11 @@
1033 }else if( softFlag ){
1034 moveFiles = 0;
1035 }else if( hardFlag ){
1036 moveFiles = 1;
1037 }else{
1038 #if FOSSIL_ENABLE_LEGACY_MV_RM
1039 moveFiles = db_get_boolean("mv-rm-files",0);
1040 #else
1041 moveFiles = FOSSIL_MV_RM_FILE;
1042 #endif
1043 }
1044 file_tree_name(zDest, &dest, 0, 1);
1045 db_multi_exec(
1046 "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
1047 );
1048
--- src/add.c
+++ src/add.c
@@ -22,28 +22,10 @@
22 #include "add.h"
23 #include <assert.h>
24 #include <dirent.h>
25 #include "cygsup.h"
26
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
27 /*
28 ** This routine returns the names of files in a working checkout that
29 ** are created by Fossil itself, and hence should not be added, deleted,
30 ** or merge, and should be omitted from "clean" and "extras" lists.
31 **
@@ -592,15 +574,11 @@
574 }else if( softFlag ){
575 removeFiles = 0;
576 }else if( hardFlag ){
577 removeFiles = 1;
578 }else{
 
579 removeFiles = db_get_boolean("mv-rm-files",0);
 
 
 
580 }
581 db_multi_exec("CREATE TEMP TABLE sfile(pathname TEXT PRIMARY KEY %s)",
582 filename_collation());
583 for(i=2; i<g.argc; i++){
584 Blob treeName;
@@ -1033,15 +1011,11 @@
1011 }else if( softFlag ){
1012 moveFiles = 0;
1013 }else if( hardFlag ){
1014 moveFiles = 1;
1015 }else{
 
1016 moveFiles = db_get_boolean("mv-rm-files",0);
 
 
 
1017 }
1018 file_tree_name(zDest, &dest, 0, 1);
1019 db_multi_exec(
1020 "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
1021 );
1022
M src/configure.c
-4
--- src/configure.c
+++ src/configure.c
@@ -148,15 +148,11 @@
148148
 { "parent-project-name", CONFIGSET_PROJ },
149149
 { "hash-policy", CONFIGSET_PROJ },
150150
 { "comment-format", CONFIGSET_PROJ },
151151
 { "mimetypes", CONFIGSET_PROJ },
152152
 { "forbid-delta-manifests", CONFIGSET_PROJ },
153
-
154
-#ifdef FOSSIL_ENABLE_LEGACY_MV_RM
155153
 { "mv-rm-files", CONFIGSET_PROJ },
156
-#endif
157
-
158154
 { "ticket-table", CONFIGSET_TKT },
159155
 { "ticket-common", CONFIGSET_TKT },
160156
 { "ticket-change", CONFIGSET_TKT },
161157
 { "ticket-newpage", CONFIGSET_TKT },
162158
 { "ticket-viewpage", CONFIGSET_TKT },
163159
--- src/configure.c
+++ src/configure.c
@@ -148,15 +148,11 @@
148 { "parent-project-name", CONFIGSET_PROJ },
149 { "hash-policy", CONFIGSET_PROJ },
150 { "comment-format", CONFIGSET_PROJ },
151 { "mimetypes", CONFIGSET_PROJ },
152 { "forbid-delta-manifests", CONFIGSET_PROJ },
153
154 #ifdef FOSSIL_ENABLE_LEGACY_MV_RM
155 { "mv-rm-files", CONFIGSET_PROJ },
156 #endif
157
158 { "ticket-table", CONFIGSET_TKT },
159 { "ticket-common", CONFIGSET_TKT },
160 { "ticket-change", CONFIGSET_TKT },
161 { "ticket-newpage", CONFIGSET_TKT },
162 { "ticket-viewpage", CONFIGSET_TKT },
163
--- src/configure.c
+++ src/configure.c
@@ -148,15 +148,11 @@
148 { "parent-project-name", CONFIGSET_PROJ },
149 { "hash-policy", CONFIGSET_PROJ },
150 { "comment-format", CONFIGSET_PROJ },
151 { "mimetypes", CONFIGSET_PROJ },
152 { "forbid-delta-manifests", CONFIGSET_PROJ },
 
 
153 { "mv-rm-files", CONFIGSET_PROJ },
 
 
154 { "ticket-table", CONFIGSET_TKT },
155 { "ticket-common", CONFIGSET_TKT },
156 { "ticket-change", CONFIGSET_TKT },
157 { "ticket-newpage", CONFIGSET_TKT },
158 { "ticket-viewpage", CONFIGSET_TKT },
159
M src/db.c
+9 -11
--- src/db.c
+++ src/db.c
@@ -1657,11 +1657,11 @@
16571657
 db_open_or_attach(zDbName, "localdb");
16581658
16591659
 /* Check to see if the checkout database has the lastest schema changes.
16601660
 ** The most recent schema change (2019-01-19) is the addition of the
16611661
 ** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash
1662
- ** column, assume everything else is up-to-date.
1662
+ ** column, assume everything else is up-to-date.
16631663
 */
16641664
 if( db_table_has_column("localdb","vmerge","mhash") ){
16651665
 return 1; /* This is a checkout database with the latest schema */
16661666
 }
16671667
@@ -1888,11 +1888,11 @@
18881888
 "Bisect history and undo have been lost.\n"
18891889
 );
18901890
 }
18911891
 }
18921892
1893
- /* Make sure the checkout database schema migration of 2019-01-20
1893
+ /* Make sure the checkout database schema migration of 2019-01-20
18941894
 ** has occurred.
18951895
 **
18961896
 ** The 2019-01-19 migration is the addition of the vmerge.mhash and
18971897
 ** vfile.mhash columns and making the vmerge.mhash column part of the
18981898
 ** PRIMARY KEY for vmerge.
@@ -1905,11 +1905,11 @@
19051905
 " WHERE mrid!=rid;"
19061906
 );
19071907
 if( !db_table_has_column("localdb", "vmerge", "mhash") ){
19081908
 db_exec_sql("ALTER TABLE vmerge RENAME TO old_vmerge;");
19091909
 db_exec_sql(zLocalSchemaVmerge);
1910
- db_exec_sql(
1910
+ db_exec_sql(
19111911
 "INSERT OR IGNORE INTO vmerge(id,merge,mhash)"
19121912
 " SELECT id, merge, blob.uuid FROM old_vmerge, blob"
19131913
 " WHERE old_vmerge.merge=blob.rid;"
19141914
 "DROP TABLE old_vmerge;"
19151915
 );
@@ -1928,11 +1928,11 @@
19281928
 */
19291929
 int db_repository_has_changed(void){
19301930
 unsigned int v;
19311931
 if( !g.repositoryOpen ) return 0;
19321932
 sqlite3_file_control(g.db, "repository", SQLITE_FCNTL_DATA_VERSION, &v);
1933
- return g.iRepoDataVers != v;
1933
+ return g.iRepoDataVers != v;
19341934
 }
19351935
19361936
 /*
19371937
 ** Flags for the db_find_and_open_repository() function.
19381938
 */
@@ -3571,11 +3571,11 @@
35713571
 ** (c) "fossil http" with the --localauth option
35723572
 ** (d) CGI with the "localauth" setting in the cgi script.
35733573
 **
35743574
 ** For maximum security, set "localauth" to 1. However, because
35753575
 ** of the other restrictions (2) through (4), it should be safe
3576
-** to leave "localauth" set to 0 in most installations, and
3576
+** to leave "localauth" set to 0 in most installations, and
35773577
 ** especially on cloned repositories on workstations. Leaving
35783578
 ** "localauth" at 0 makes the "fossil ui" command more convenient
35793579
 ** to use.
35803580
 */
35813581
 /*
@@ -3634,19 +3634,17 @@
36343634
 ** Use file modification times (mtimes) to detect when
36353635
 ** files have been modified. If disabled, all managed files
36363636
 ** are hashed to detect changes, which can be slow for large
36373637
 ** projects.
36383638
 */
3639
-#if FOSSIL_ENABLE_LEGACY_MV_RM
36403639
 /*
36413640
 ** SETTING: mv-rm-files boolean default=off
36423641
 ** If enabled, the "mv" and "rename" commands will also move
36433642
 ** the associated files within the checkout -AND- the "rm"
36443643
 ** and "delete" commands will also remove the associated
36453644
 ** files from within the checkout.
36463645
 */
3647
-#endif
36483646
 /*
36493647
 ** SETTING: pgp-command width=40
36503648
 ** Command used to clear-sign manifests at check-in.
36513649
 ** Default value is "gpg --clearsign -o"
36523650
 */
@@ -4154,11 +4152,11 @@
41544152
 ** the remaining fields of the RCVFROM table entry. MD5 is used for this
41554153
 ** because it is 4x faster than SHA3 and 5x faster than SHA1, and there
41564154
 ** are no security concerns - this is just a checksum, not a security
41574155
 ** token.
41584156
 */
4159
-char *db_fingerprint(int rcvid, int iVersion){
4157
+char *db_fingerprint(int rcvid, int iVersion){
41604158
 char *z = 0;
41614159
 Blob sql = BLOB_INITIALIZER;
41624160
 Stmt q;
41634161
 if( iVersion==0 ){
41644162
 /* The original fingerprint algorithm used "quote(mtime)". But this
@@ -4210,18 +4208,18 @@
42104208
 db_find_and_open_repository(OPEN_ANY_SCHEMA,0);
42114209
 if( g.argc==3 ){
42124210
 rcvid = atoi(g.argv[2]);
42134211
 }else if( g.argc!=2 ){
42144212
 fossil_fatal("wrong number of arguments");
4215
- }
4213
+ }
42164214
 fossil_print("legacy: %z\n", db_fingerprint(rcvid, 0));
42174215
 fossil_print("version-1: %z\n", db_fingerprint(rcvid, 1));
42184216
 if( g.localOpen ){
42194217
 fossil_print("localdb: %z\n", db_lget("fingerprint","(none)"));
42204218
 fossil_print("db_fingerprint_ok(): %d\n", db_fingerprint_ok());
42214219
 }
4222
- fossil_print("Fossil version: %s - %.10s %.19s\n",
4220
+ fossil_print("Fossil version: %s - %.10s %.19s\n",
42234221
 RELEASE_VERSION, MANIFEST_DATE, MANIFEST_UUID);
42244222
 }
42254223
42264224
 /*
42274225
 ** Set the value of the "checkout" entry in the VVAR table.
@@ -4269,9 +4267,9 @@
42694267
 ** algorithm */
42704268
 if( !rc ){
42714269
 zRepo = db_fingerprint(atoi(zCkout), 0);
42724270
 rc = fossil_strcmp(zCkout,zRepo)==0;
42734271
 fossil_free(zRepo);
4274
- }
4272
+ }
42754273
 fossil_free(zCkout);
42764274
 return rc;
42774275
 }
42784276
--- src/db.c
+++ src/db.c
@@ -1657,11 +1657,11 @@
1657 db_open_or_attach(zDbName, "localdb");
1658
1659 /* Check to see if the checkout database has the lastest schema changes.
1660 ** The most recent schema change (2019-01-19) is the addition of the
1661 ** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash
1662 ** column, assume everything else is up-to-date.
1663 */
1664 if( db_table_has_column("localdb","vmerge","mhash") ){
1665 return 1; /* This is a checkout database with the latest schema */
1666 }
1667
@@ -1888,11 +1888,11 @@
1888 "Bisect history and undo have been lost.\n"
1889 );
1890 }
1891 }
1892
1893 /* Make sure the checkout database schema migration of 2019-01-20
1894 ** has occurred.
1895 **
1896 ** The 2019-01-19 migration is the addition of the vmerge.mhash and
1897 ** vfile.mhash columns and making the vmerge.mhash column part of the
1898 ** PRIMARY KEY for vmerge.
@@ -1905,11 +1905,11 @@
1905 " WHERE mrid!=rid;"
1906 );
1907 if( !db_table_has_column("localdb", "vmerge", "mhash") ){
1908 db_exec_sql("ALTER TABLE vmerge RENAME TO old_vmerge;");
1909 db_exec_sql(zLocalSchemaVmerge);
1910 db_exec_sql(
1911 "INSERT OR IGNORE INTO vmerge(id,merge,mhash)"
1912 " SELECT id, merge, blob.uuid FROM old_vmerge, blob"
1913 " WHERE old_vmerge.merge=blob.rid;"
1914 "DROP TABLE old_vmerge;"
1915 );
@@ -1928,11 +1928,11 @@
1928 */
1929 int db_repository_has_changed(void){
1930 unsigned int v;
1931 if( !g.repositoryOpen ) return 0;
1932 sqlite3_file_control(g.db, "repository", SQLITE_FCNTL_DATA_VERSION, &v);
1933 return g.iRepoDataVers != v;
1934 }
1935
1936 /*
1937 ** Flags for the db_find_and_open_repository() function.
1938 */
@@ -3571,11 +3571,11 @@
3571 ** (c) "fossil http" with the --localauth option
3572 ** (d) CGI with the "localauth" setting in the cgi script.
3573 **
3574 ** For maximum security, set "localauth" to 1. However, because
3575 ** of the other restrictions (2) through (4), it should be safe
3576 ** to leave "localauth" set to 0 in most installations, and
3577 ** especially on cloned repositories on workstations. Leaving
3578 ** "localauth" at 0 makes the "fossil ui" command more convenient
3579 ** to use.
3580 */
3581 /*
@@ -3634,19 +3634,17 @@
3634 ** Use file modification times (mtimes) to detect when
3635 ** files have been modified. If disabled, all managed files
3636 ** are hashed to detect changes, which can be slow for large
3637 ** projects.
3638 */
3639 #if FOSSIL_ENABLE_LEGACY_MV_RM
3640 /*
3641 ** SETTING: mv-rm-files boolean default=off
3642 ** If enabled, the "mv" and "rename" commands will also move
3643 ** the associated files within the checkout -AND- the "rm"
3644 ** and "delete" commands will also remove the associated
3645 ** files from within the checkout.
3646 */
3647 #endif
3648 /*
3649 ** SETTING: pgp-command width=40
3650 ** Command used to clear-sign manifests at check-in.
3651 ** Default value is "gpg --clearsign -o"
3652 */
@@ -4154,11 +4152,11 @@
4154 ** the remaining fields of the RCVFROM table entry. MD5 is used for this
4155 ** because it is 4x faster than SHA3 and 5x faster than SHA1, and there
4156 ** are no security concerns - this is just a checksum, not a security
4157 ** token.
4158 */
4159 char *db_fingerprint(int rcvid, int iVersion){
4160 char *z = 0;
4161 Blob sql = BLOB_INITIALIZER;
4162 Stmt q;
4163 if( iVersion==0 ){
4164 /* The original fingerprint algorithm used "quote(mtime)". But this
@@ -4210,18 +4208,18 @@
4210 db_find_and_open_repository(OPEN_ANY_SCHEMA,0);
4211 if( g.argc==3 ){
4212 rcvid = atoi(g.argv[2]);
4213 }else if( g.argc!=2 ){
4214 fossil_fatal("wrong number of arguments");
4215 }
4216 fossil_print("legacy: %z\n", db_fingerprint(rcvid, 0));
4217 fossil_print("version-1: %z\n", db_fingerprint(rcvid, 1));
4218 if( g.localOpen ){
4219 fossil_print("localdb: %z\n", db_lget("fingerprint","(none)"));
4220 fossil_print("db_fingerprint_ok(): %d\n", db_fingerprint_ok());
4221 }
4222 fossil_print("Fossil version: %s - %.10s %.19s\n",
4223 RELEASE_VERSION, MANIFEST_DATE, MANIFEST_UUID);
4224 }
4225
4226 /*
4227 ** Set the value of the "checkout" entry in the VVAR table.
@@ -4269,9 +4267,9 @@
4269 ** algorithm */
4270 if( !rc ){
4271 zRepo = db_fingerprint(atoi(zCkout), 0);
4272 rc = fossil_strcmp(zCkout,zRepo)==0;
4273 fossil_free(zRepo);
4274 }
4275 fossil_free(zCkout);
4276 return rc;
4277 }
4278
--- src/db.c
+++ src/db.c
@@ -1657,11 +1657,11 @@
1657 db_open_or_attach(zDbName, "localdb");
1658
1659 /* Check to see if the checkout database has the lastest schema changes.
1660 ** The most recent schema change (2019-01-19) is the addition of the
1661 ** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash
1662 ** column, assume everything else is up-to-date.
1663 */
1664 if( db_table_has_column("localdb","vmerge","mhash") ){
1665 return 1; /* This is a checkout database with the latest schema */
1666 }
1667
@@ -1888,11 +1888,11 @@
1888 "Bisect history and undo have been lost.\n"
1889 );
1890 }
1891 }
1892
1893 /* Make sure the checkout database schema migration of 2019-01-20
1894 ** has occurred.
1895 **
1896 ** The 2019-01-19 migration is the addition of the vmerge.mhash and
1897 ** vfile.mhash columns and making the vmerge.mhash column part of the
1898 ** PRIMARY KEY for vmerge.
@@ -1905,11 +1905,11 @@
1905 " WHERE mrid!=rid;"
1906 );
1907 if( !db_table_has_column("localdb", "vmerge", "mhash") ){
1908 db_exec_sql("ALTER TABLE vmerge RENAME TO old_vmerge;");
1909 db_exec_sql(zLocalSchemaVmerge);
1910 db_exec_sql(
1911 "INSERT OR IGNORE INTO vmerge(id,merge,mhash)"
1912 " SELECT id, merge, blob.uuid FROM old_vmerge, blob"
1913 " WHERE old_vmerge.merge=blob.rid;"
1914 "DROP TABLE old_vmerge;"
1915 );
@@ -1928,11 +1928,11 @@
1928 */
1929 int db_repository_has_changed(void){
1930 unsigned int v;
1931 if( !g.repositoryOpen ) return 0;
1932 sqlite3_file_control(g.db, "repository", SQLITE_FCNTL_DATA_VERSION, &v);
1933 return g.iRepoDataVers != v;
1934 }
1935
1936 /*
1937 ** Flags for the db_find_and_open_repository() function.
1938 */
@@ -3571,11 +3571,11 @@
3571 ** (c) "fossil http" with the --localauth option
3572 ** (d) CGI with the "localauth" setting in the cgi script.
3573 **
3574 ** For maximum security, set "localauth" to 1. However, because
3575 ** of the other restrictions (2) through (4), it should be safe
3576 ** to leave "localauth" set to 0 in most installations, and
3577 ** especially on cloned repositories on workstations. Leaving
3578 ** "localauth" at 0 makes the "fossil ui" command more convenient
3579 ** to use.
3580 */
3581 /*
@@ -3634,19 +3634,17 @@
3634 ** Use file modification times (mtimes) to detect when
3635 ** files have been modified. If disabled, all managed files
3636 ** are hashed to detect changes, which can be slow for large
3637 ** projects.
3638 */
 
3639 /*
3640 ** SETTING: mv-rm-files boolean default=off
3641 ** If enabled, the "mv" and "rename" commands will also move
3642 ** the associated files within the checkout -AND- the "rm"
3643 ** and "delete" commands will also remove the associated
3644 ** files from within the checkout.
3645 */
 
3646 /*
3647 ** SETTING: pgp-command width=40
3648 ** Command used to clear-sign manifests at check-in.
3649 ** Default value is "gpg --clearsign -o"
3650 */
@@ -4154,11 +4152,11 @@
4152 ** the remaining fields of the RCVFROM table entry. MD5 is used for this
4153 ** because it is 4x faster than SHA3 and 5x faster than SHA1, and there
4154 ** are no security concerns - this is just a checksum, not a security
4155 ** token.
4156 */
4157 char *db_fingerprint(int rcvid, int iVersion){
4158 char *z = 0;
4159 Blob sql = BLOB_INITIALIZER;
4160 Stmt q;
4161 if( iVersion==0 ){
4162 /* The original fingerprint algorithm used "quote(mtime)". But this
@@ -4210,18 +4208,18 @@
4208 db_find_and_open_repository(OPEN_ANY_SCHEMA,0);
4209 if( g.argc==3 ){
4210 rcvid = atoi(g.argv[2]);
4211 }else if( g.argc!=2 ){
4212 fossil_fatal("wrong number of arguments");
4213 }
4214 fossil_print("legacy: %z\n", db_fingerprint(rcvid, 0));
4215 fossil_print("version-1: %z\n", db_fingerprint(rcvid, 1));
4216 if( g.localOpen ){
4217 fossil_print("localdb: %z\n", db_lget("fingerprint","(none)"));
4218 fossil_print("db_fingerprint_ok(): %d\n", db_fingerprint_ok());
4219 }
4220 fossil_print("Fossil version: %s - %.10s %.19s\n",
4221 RELEASE_VERSION, MANIFEST_DATE, MANIFEST_UUID);
4222 }
4223
4224 /*
4225 ** Set the value of the "checkout" entry in the VVAR table.
@@ -4269,9 +4267,9 @@
4267 ** algorithm */
4268 if( !rc ){
4269 zRepo = db_fingerprint(atoi(zCkout), 0);
4270 rc = fossil_strcmp(zCkout,zRepo)==0;
4271 fossil_free(zRepo);
4272 }
4273 fossil_free(zCkout);
4274 return rc;
4275 }
4276
M src/main.c
-3
--- src/main.c
+++ src/main.c
@@ -1186,13 +1186,10 @@
11861186
 blob_append(pOut, "FOSSIL_DEBUG\n", -1);
11871187
 #endif
11881188
 #if defined(FOSSIL_ENABLE_DELTA_CKSUM_TEST)
11891189
 blob_append(pOut, "FOSSIL_ENABLE_DELTA_CKSUM_TEST\n", -1);
11901190
 #endif
1191
-#if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
1192
- blob_append(pOut, "FOSSIL_ENABLE_LEGACY_MV_RM\n", -1);
1193
-#endif
11941191
 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
11951192
 blob_append(pOut, "FOSSIL_ENABLE_EXEC_REL_PATHS\n", -1);
11961193
 #endif
11971194
 #if defined(FOSSIL_ENABLE_TH1_DOCS)
11981195
 blob_append(pOut, "FOSSIL_ENABLE_TH1_DOCS\n", -1);
11991196
--- src/main.c
+++ src/main.c
@@ -1186,13 +1186,10 @@
1186 blob_append(pOut, "FOSSIL_DEBUG\n", -1);
1187 #endif
1188 #if defined(FOSSIL_ENABLE_DELTA_CKSUM_TEST)
1189 blob_append(pOut, "FOSSIL_ENABLE_DELTA_CKSUM_TEST\n", -1);
1190 #endif
1191 #if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
1192 blob_append(pOut, "FOSSIL_ENABLE_LEGACY_MV_RM\n", -1);
1193 #endif
1194 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
1195 blob_append(pOut, "FOSSIL_ENABLE_EXEC_REL_PATHS\n", -1);
1196 #endif
1197 #if defined(FOSSIL_ENABLE_TH1_DOCS)
1198 blob_append(pOut, "FOSSIL_ENABLE_TH1_DOCS\n", -1);
1199
--- src/main.c
+++ src/main.c
@@ -1186,13 +1186,10 @@
1186 blob_append(pOut, "FOSSIL_DEBUG\n", -1);
1187 #endif
1188 #if defined(FOSSIL_ENABLE_DELTA_CKSUM_TEST)
1189 blob_append(pOut, "FOSSIL_ENABLE_DELTA_CKSUM_TEST\n", -1);
1190 #endif
 
 
 
1191 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
1192 blob_append(pOut, "FOSSIL_ENABLE_EXEC_REL_PATHS\n", -1);
1193 #endif
1194 #if defined(FOSSIL_ENABLE_TH1_DOCS)
1195 blob_append(pOut, "FOSSIL_ENABLE_TH1_DOCS\n", -1);
1196
M src/makemake.tcl
-20
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -607,14 +607,10 @@
607607
608608
 #### Enable relative paths in external diff/gdiff
609609
 #
610610
 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
611611
612
-#### Enable legacy treatment of mv/rm (skip checkout files)
613
-#
614
-FOSSIL_ENABLE_LEGACY_MV_RM = 1
615
-
616612
 #### Enable TH1 scripts in embedded documentation files
617613
 #
618614
 # FOSSIL_ENABLE_TH1_DOCS = 1
619615
620616
 #### Enable hooks for commands and web pages via TH1
@@ -834,16 +830,10 @@
834830
 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
835831
 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
836832
 RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
837833
 endif
838834
839
-# With legacy treatment of mv/rm
840
-ifdef FOSSIL_ENABLE_LEGACY_MV_RM
841
-TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
842
-RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
843
-endif
844
-
845835
 # With TH1 embedded docs support
846836
 ifdef FOSSIL_ENABLE_TH1_DOCS
847837
 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
848838
 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
849839
 endif
@@ -1525,15 +1515,10 @@
15251515
 # Enable the JSON API?
15261516
 !ifndef FOSSIL_ENABLE_JSON
15271517
 FOSSIL_ENABLE_JSON = 0
15281518
 !endif
15291519
1530
-# Enable legacy treatment of the mv/rm commands?
1531
-!ifndef FOSSIL_ENABLE_LEGACY_MV_RM
1532
-FOSSIL_ENABLE_LEGACY_MV_RM = 1
1533
-!endif
1534
-
15351520
 # Enable use of miniz instead of zlib?
15361521
 !ifndef FOSSIL_ENABLE_MINIZ
15371522
 FOSSIL_ENABLE_MINIZ = 0
15381523
 !endif
15391524
@@ -1715,15 +1700,10 @@
17151700
 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
17161701
 TCC = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
17171702
 RCC = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
17181703
 !endif
17191704
1720
-!if $(FOSSIL_ENABLE_LEGACY_MV_RM)!=0
1721
-TCC = $(TCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
1722
-RCC = $(RCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
1723
-!endif
1724
-
17251705
 !if $(FOSSIL_ENABLE_TH1_DOCS)!=0
17261706
 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
17271707
 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
17281708
 !endif
17291709
17301710
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -607,14 +607,10 @@
607
608 #### Enable relative paths in external diff/gdiff
609 #
610 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
611
612 #### Enable legacy treatment of mv/rm (skip checkout files)
613 #
614 FOSSIL_ENABLE_LEGACY_MV_RM = 1
615
616 #### Enable TH1 scripts in embedded documentation files
617 #
618 # FOSSIL_ENABLE_TH1_DOCS = 1
619
620 #### Enable hooks for commands and web pages via TH1
@@ -834,16 +830,10 @@
834 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
835 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
836 RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
837 endif
838
839 # With legacy treatment of mv/rm
840 ifdef FOSSIL_ENABLE_LEGACY_MV_RM
841 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
842 RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
843 endif
844
845 # With TH1 embedded docs support
846 ifdef FOSSIL_ENABLE_TH1_DOCS
847 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
848 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
849 endif
@@ -1525,15 +1515,10 @@
1525 # Enable the JSON API?
1526 !ifndef FOSSIL_ENABLE_JSON
1527 FOSSIL_ENABLE_JSON = 0
1528 !endif
1529
1530 # Enable legacy treatment of the mv/rm commands?
1531 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
1532 FOSSIL_ENABLE_LEGACY_MV_RM = 1
1533 !endif
1534
1535 # Enable use of miniz instead of zlib?
1536 !ifndef FOSSIL_ENABLE_MINIZ
1537 FOSSIL_ENABLE_MINIZ = 0
1538 !endif
1539
@@ -1715,15 +1700,10 @@
1715 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
1716 TCC = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
1717 RCC = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
1718 !endif
1719
1720 !if $(FOSSIL_ENABLE_LEGACY_MV_RM)!=0
1721 TCC = $(TCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
1722 RCC = $(RCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
1723 !endif
1724
1725 !if $(FOSSIL_ENABLE_TH1_DOCS)!=0
1726 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
1727 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
1728 !endif
1729
1730
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -607,14 +607,10 @@
607
608 #### Enable relative paths in external diff/gdiff
609 #
610 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
611
 
 
 
 
612 #### Enable TH1 scripts in embedded documentation files
613 #
614 # FOSSIL_ENABLE_TH1_DOCS = 1
615
616 #### Enable hooks for commands and web pages via TH1
@@ -834,16 +830,10 @@
830 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
831 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
832 RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
833 endif
834
 
 
 
 
 
 
835 # With TH1 embedded docs support
836 ifdef FOSSIL_ENABLE_TH1_DOCS
837 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
838 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
839 endif
@@ -1525,15 +1515,10 @@
1515 # Enable the JSON API?
1516 !ifndef FOSSIL_ENABLE_JSON
1517 FOSSIL_ENABLE_JSON = 0
1518 !endif
1519
 
 
 
 
 
1520 # Enable use of miniz instead of zlib?
1521 !ifndef FOSSIL_ENABLE_MINIZ
1522 FOSSIL_ENABLE_MINIZ = 0
1523 !endif
1524
@@ -1715,15 +1700,10 @@
1700 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
1701 TCC = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
1702 RCC = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
1703 !endif
1704
 
 
 
 
 
1705 !if $(FOSSIL_ENABLE_TH1_DOCS)!=0
1706 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
1707 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
1708 !endif
1709
1710
M src/th_main.c
-6
--- src/th_main.c
+++ src/th_main.c
@@ -786,11 +786,10 @@
786786
 **
787787
 ** Return true if the fossil binary has the given compile-time feature
788788
 ** enabled. The set of features includes:
789789
 **
790790
 ** "ssl" = FOSSIL_ENABLE_SSL
791
-** "legacyMvRm" = FOSSIL_ENABLE_LEGACY_MV_RM
792791
 ** "execRelPaths" = FOSSIL_ENABLE_EXEC_REL_PATHS
793792
 ** "th1Docs" = FOSSIL_ENABLE_TH1_DOCS
794793
 ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS
795794
 ** "tcl" = FOSSIL_ENABLE_TCL
796795
 ** "useTclStubs" = USE_TCL_STUBS
@@ -824,15 +823,10 @@
824823
 }
825824
 #if defined(FOSSIL_ENABLE_SSL)
826825
 else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){
827826
 rc = 1;
828827
 }
829
-#endif
830
-#if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
831
- else if( 0 == fossil_strnicmp( zArg, "legacyMvRm\0", 11 ) ){
832
- rc = 1;
833
- }
834828
 #endif
835829
 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
836830
 else if( 0 == fossil_strnicmp( zArg, "execRelPaths\0", 13 ) ){
837831
 rc = 1;
838832
 }
839833
--- src/th_main.c
+++ src/th_main.c
@@ -786,11 +786,10 @@
786 **
787 ** Return true if the fossil binary has the given compile-time feature
788 ** enabled. The set of features includes:
789 **
790 ** "ssl" = FOSSIL_ENABLE_SSL
791 ** "legacyMvRm" = FOSSIL_ENABLE_LEGACY_MV_RM
792 ** "execRelPaths" = FOSSIL_ENABLE_EXEC_REL_PATHS
793 ** "th1Docs" = FOSSIL_ENABLE_TH1_DOCS
794 ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS
795 ** "tcl" = FOSSIL_ENABLE_TCL
796 ** "useTclStubs" = USE_TCL_STUBS
@@ -824,15 +823,10 @@
824 }
825 #if defined(FOSSIL_ENABLE_SSL)
826 else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){
827 rc = 1;
828 }
829 #endif
830 #if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
831 else if( 0 == fossil_strnicmp( zArg, "legacyMvRm\0", 11 ) ){
832 rc = 1;
833 }
834 #endif
835 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
836 else if( 0 == fossil_strnicmp( zArg, "execRelPaths\0", 13 ) ){
837 rc = 1;
838 }
839
--- src/th_main.c
+++ src/th_main.c
@@ -786,11 +786,10 @@
786 **
787 ** Return true if the fossil binary has the given compile-time feature
788 ** enabled. The set of features includes:
789 **
790 ** "ssl" = FOSSIL_ENABLE_SSL
 
791 ** "execRelPaths" = FOSSIL_ENABLE_EXEC_REL_PATHS
792 ** "th1Docs" = FOSSIL_ENABLE_TH1_DOCS
793 ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS
794 ** "tcl" = FOSSIL_ENABLE_TCL
795 ** "useTclStubs" = USE_TCL_STUBS
@@ -824,15 +823,10 @@
823 }
824 #if defined(FOSSIL_ENABLE_SSL)
825 else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){
826 rc = 1;
827 }
 
 
 
 
 
828 #endif
829 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
830 else if( 0 == fossil_strnicmp( zArg, "execRelPaths\0", 13 ) ){
831 rc = 1;
832 }
833
M win/Makefile.mingw
-10
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -69,14 +69,10 @@
6969
7070
 #### Enable relative paths in external diff/gdiff
7171
 #
7272
 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
7373
74
-#### Enable legacy treatment of mv/rm (skip checkout files)
75
-#
76
-FOSSIL_ENABLE_LEGACY_MV_RM = 1
77
-
7874
 #### Enable TH1 scripts in embedded documentation files
7975
 #
8076
 # FOSSIL_ENABLE_TH1_DOCS = 1
8177
8278
 #### Enable hooks for commands and web pages via TH1
@@ -296,16 +292,10 @@
296292
 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297293
 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298294
 RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
299295
 endif
300296
301
-# With legacy treatment of mv/rm
302
-ifdef FOSSIL_ENABLE_LEGACY_MV_RM
303
-TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
304
-RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
305
-endif
306
-
307297
 # With TH1 embedded docs support
308298
 ifdef FOSSIL_ENABLE_TH1_DOCS
309299
 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
310300
 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
311301
 endif
312302
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -69,14 +69,10 @@
69
70 #### Enable relative paths in external diff/gdiff
71 #
72 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
73
74 #### Enable legacy treatment of mv/rm (skip checkout files)
75 #
76 FOSSIL_ENABLE_LEGACY_MV_RM = 1
77
78 #### Enable TH1 scripts in embedded documentation files
79 #
80 # FOSSIL_ENABLE_TH1_DOCS = 1
81
82 #### Enable hooks for commands and web pages via TH1
@@ -296,16 +292,10 @@
296 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298 RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
299 endif
300
301 # With legacy treatment of mv/rm
302 ifdef FOSSIL_ENABLE_LEGACY_MV_RM
303 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
304 RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
305 endif
306
307 # With TH1 embedded docs support
308 ifdef FOSSIL_ENABLE_TH1_DOCS
309 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
310 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
311 endif
312
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -69,14 +69,10 @@
69
70 #### Enable relative paths in external diff/gdiff
71 #
72 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
73
 
 
 
 
74 #### Enable TH1 scripts in embedded documentation files
75 #
76 # FOSSIL_ENABLE_TH1_DOCS = 1
77
78 #### Enable hooks for commands and web pages via TH1
@@ -296,16 +292,10 @@
292 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
293 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
294 RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
295 endif
296
 
 
 
 
 
 
297 # With TH1 embedded docs support
298 ifdef FOSSIL_ENABLE_TH1_DOCS
299 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
300 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
301 endif
302
M win/Makefile.mingw.mistachkin
-10
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -69,14 +69,10 @@
6969
7070
 #### Enable relative paths in external diff/gdiff
7171
 #
7272
 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
7373
74
-#### Enable legacy treatment of mv/rm (skip checkout files)
75
-#
76
-FOSSIL_ENABLE_LEGACY_MV_RM = 1
77
-
7874
 #### Enable TH1 scripts in embedded documentation files
7975
 #
8076
 FOSSIL_ENABLE_TH1_DOCS = 1
8177
8278
 #### Enable hooks for commands and web pages via TH1
@@ -296,16 +292,10 @@
296292
 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297293
 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298294
 RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
299295
 endif
300296
301
-# With legacy treatment of mv/rm
302
-ifdef FOSSIL_ENABLE_LEGACY_MV_RM
303
-TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
304
-RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
305
-endif
306
-
307297
 # With TH1 embedded docs support
308298
 ifdef FOSSIL_ENABLE_TH1_DOCS
309299
 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
310300
 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
311301
 endif
312302
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -69,14 +69,10 @@
69
70 #### Enable relative paths in external diff/gdiff
71 #
72 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
73
74 #### Enable legacy treatment of mv/rm (skip checkout files)
75 #
76 FOSSIL_ENABLE_LEGACY_MV_RM = 1
77
78 #### Enable TH1 scripts in embedded documentation files
79 #
80 FOSSIL_ENABLE_TH1_DOCS = 1
81
82 #### Enable hooks for commands and web pages via TH1
@@ -296,16 +292,10 @@
296 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298 RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
299 endif
300
301 # With legacy treatment of mv/rm
302 ifdef FOSSIL_ENABLE_LEGACY_MV_RM
303 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
304 RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
305 endif
306
307 # With TH1 embedded docs support
308 ifdef FOSSIL_ENABLE_TH1_DOCS
309 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
310 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
311 endif
312
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -69,14 +69,10 @@
69
70 #### Enable relative paths in external diff/gdiff
71 #
72 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
73
 
 
 
 
74 #### Enable TH1 scripts in embedded documentation files
75 #
76 FOSSIL_ENABLE_TH1_DOCS = 1
77
78 #### Enable hooks for commands and web pages via TH1
@@ -296,16 +292,10 @@
292 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
293 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
294 RCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
295 endif
296
 
 
 
 
 
 
297 # With TH1 embedded docs support
298 ifdef FOSSIL_ENABLE_TH1_DOCS
299 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
300 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
301 endif
302
M win/Makefile.msc
-10
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -70,15 +70,10 @@
7070
 # Enable the JSON API?
7171
 !ifndef FOSSIL_ENABLE_JSON
7272
 FOSSIL_ENABLE_JSON = 0
7373
 !endif
7474
75
-# Enable legacy treatment of the mv/rm commands?
76
-!ifndef FOSSIL_ENABLE_LEGACY_MV_RM
77
-FOSSIL_ENABLE_LEGACY_MV_RM = 1
78
-!endif
79
-
8075
 # Enable use of miniz instead of zlib?
8176
 !ifndef FOSSIL_ENABLE_MINIZ
8277
 FOSSIL_ENABLE_MINIZ = 0
8378
 !endif
8479
@@ -260,15 +255,10 @@
260255
 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
261256
 TCC = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
262257
 RCC = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
263258
 !endif
264259
265
-!if $(FOSSIL_ENABLE_LEGACY_MV_RM)!=0
266
-TCC = $(TCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
267
-RCC = $(RCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
268
-!endif
269
-
270260
 !if $(FOSSIL_ENABLE_TH1_DOCS)!=0
271261
 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
272262
 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
273263
 !endif
274264
275265
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -70,15 +70,10 @@
70 # Enable the JSON API?
71 !ifndef FOSSIL_ENABLE_JSON
72 FOSSIL_ENABLE_JSON = 0
73 !endif
74
75 # Enable legacy treatment of the mv/rm commands?
76 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
77 FOSSIL_ENABLE_LEGACY_MV_RM = 1
78 !endif
79
80 # Enable use of miniz instead of zlib?
81 !ifndef FOSSIL_ENABLE_MINIZ
82 FOSSIL_ENABLE_MINIZ = 0
83 !endif
84
@@ -260,15 +255,10 @@
260 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
261 TCC = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
262 RCC = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
263 !endif
264
265 !if $(FOSSIL_ENABLE_LEGACY_MV_RM)!=0
266 TCC = $(TCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
267 RCC = $(RCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
268 !endif
269
270 !if $(FOSSIL_ENABLE_TH1_DOCS)!=0
271 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
272 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
273 !endif
274
275
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -70,15 +70,10 @@
70 # Enable the JSON API?
71 !ifndef FOSSIL_ENABLE_JSON
72 FOSSIL_ENABLE_JSON = 0
73 !endif
74
 
 
 
 
 
75 # Enable use of miniz instead of zlib?
76 !ifndef FOSSIL_ENABLE_MINIZ
77 FOSSIL_ENABLE_MINIZ = 0
78 !endif
79
@@ -260,15 +255,10 @@
255 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
256 TCC = $(TCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
257 RCC = $(RCC) /DFOSSIL_ENABLE_EXEC_REL_PATHS=1
258 !endif
259
 
 
 
 
 
260 !if $(FOSSIL_ENABLE_TH1_DOCS)!=0
261 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
262 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
263 !endif
264
265
M win/fossil.rc
-5
--- win/fossil.rc
+++ win/fossil.rc
@@ -120,15 +120,10 @@
120120
 VALUE "CommandLineIsUnicode", "Yes\0"
121121
 #endif /* defined(BROKEN_MINGW_CMDLINE) */
122122
 #if defined(FOSSIL_ENABLE_SSL)
123123
 VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0"
124124
 #endif /* defined(FOSSIL_ENABLE_SSL) */
125
-#if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
126
- VALUE "LegacyMvRm", "Yes\0"
127
-#else
128
- VALUE "LegacyMvRm", "No\0"
129
-#endif /* defined(FOSSIL_ENABLE_LEGACY_MV_RM) */
130125
 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
131126
 VALUE "ExecRelPaths", "Yes\0"
132127
 #else
133128
 VALUE "ExecRelPaths", "No\0"
134129
 #endif /* defined(FOSSIL_ENABLE_EXEC_REL_PATHS) */
135130
--- win/fossil.rc
+++ win/fossil.rc
@@ -120,15 +120,10 @@
120 VALUE "CommandLineIsUnicode", "Yes\0"
121 #endif /* defined(BROKEN_MINGW_CMDLINE) */
122 #if defined(FOSSIL_ENABLE_SSL)
123 VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0"
124 #endif /* defined(FOSSIL_ENABLE_SSL) */
125 #if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
126 VALUE "LegacyMvRm", "Yes\0"
127 #else
128 VALUE "LegacyMvRm", "No\0"
129 #endif /* defined(FOSSIL_ENABLE_LEGACY_MV_RM) */
130 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
131 VALUE "ExecRelPaths", "Yes\0"
132 #else
133 VALUE "ExecRelPaths", "No\0"
134 #endif /* defined(FOSSIL_ENABLE_EXEC_REL_PATHS) */
135
--- win/fossil.rc
+++ win/fossil.rc
@@ -120,15 +120,10 @@
120 VALUE "CommandLineIsUnicode", "Yes\0"
121 #endif /* defined(BROKEN_MINGW_CMDLINE) */
122 #if defined(FOSSIL_ENABLE_SSL)
123 VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0"
124 #endif /* defined(FOSSIL_ENABLE_SSL) */
 
 
 
 
 
125 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
126 VALUE "ExecRelPaths", "Yes\0"
127 #else
128 VALUE "ExecRelPaths", "No\0"
129 #endif /* defined(FOSSIL_ENABLE_EXEC_REL_PATHS) */
130

Keyboard Shortcuts

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