Fossil SCM

An alternative to removing FOSSIL_ENABLE_LEGACY_MV_RM that just makes it the default.

mistachkin 2018-07-13 05:46 trunk merge
Commit 9951fd7b40f314d2e12d7582d02b8a84e05f2f16017fe7cb4abda07458967535
Parent d0ae0898ded03e0…
13 files changed +3 +1 -1 +1 +1 -1 +1 -1 +39 -6 +2 +2 -2 +2 -2 +1 -1 +1 -1 +1 -1 +1 -1
~ Makefile.classic ~ Makefile.in ~ Makefile.osx-jaguar ~ auto.def ~ auto.def ~ src/add.c ~ src/db.c ~ src/makemake.tcl ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.msc ~ win/Makefile.msc
M Makefile.classic
+3
--- Makefile.classic
+++ Makefile.classic
@@ -42,10 +42,13 @@
4242
 # TCC += -DFOSSIL_ENABLE_MINIZ
4343
4444
 # To add support for HTTPS
4545
 TCC += -DFOSSIL_ENABLE_SSL
4646
47
+# To enable legacy mv/rm support
48
+TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
49
+
4750
 #### We sometimes add the -static option here so that we can build a
4851
 # static executable that will run in a chroot jail.
4952
 #LIB = -static
5053
 TCC += -DFOSSIL_DYNAMIC_BUILD=1
5154
5255
--- Makefile.classic
+++ Makefile.classic
@@ -42,10 +42,13 @@
42 # TCC += -DFOSSIL_ENABLE_MINIZ
43
44 # To add support for HTTPS
45 TCC += -DFOSSIL_ENABLE_SSL
46
 
 
 
47 #### We sometimes add the -static option here so that we can build a
48 # static executable that will run in a chroot jail.
49 #LIB = -static
50 TCC += -DFOSSIL_DYNAMIC_BUILD=1
51
52
--- Makefile.classic
+++ Makefile.classic
@@ -42,10 +42,13 @@
42 # TCC += -DFOSSIL_ENABLE_MINIZ
43
44 # To add support for HTTPS
45 TCC += -DFOSSIL_ENABLE_SSL
46
47 # To enable legacy mv/rm support
48 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
49
50 #### We sometimes add the -static option here so that we can build a
51 # static executable that will run in a chroot jail.
52 #LIB = -static
53 TCC += -DFOSSIL_DYNAMIC_BUILD=1
54
55
M Makefile.in
+1 -1
--- Makefile.in
+++ Makefile.in
@@ -39,11 +39,11 @@
3939
 TCLSH = tclsh
4040
4141
 CFLAGS = @CFLAGS@
4242
 LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
4343
 BCCFLAGS = @CPPFLAGS@ @CFLAGS@
44
-TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
44
+TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H -DFOSSIL_ENABLE_LEGACY_MV_RM=1
4545
 INSTALLDIR = $(DESTDIR)@prefix@/bin
4646
 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
4747
 USE_LINENOISE = @USE_LINENOISE@
4848
 USE_MMAN_H = @USE_MMAN_H@
4949
 USE_SEE = @USE_SEE@
5050
--- Makefile.in
+++ Makefile.in
@@ -39,11 +39,11 @@
39 TCLSH = tclsh
40
41 CFLAGS = @CFLAGS@
42 LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
43 BCCFLAGS = @CPPFLAGS@ @CFLAGS@
44 TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
45 INSTALLDIR = $(DESTDIR)@prefix@/bin
46 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
47 USE_LINENOISE = @USE_LINENOISE@
48 USE_MMAN_H = @USE_MMAN_H@
49 USE_SEE = @USE_SEE@
50
--- Makefile.in
+++ Makefile.in
@@ -39,11 +39,11 @@
39 TCLSH = tclsh
40
41 CFLAGS = @CFLAGS@
42 LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
43 BCCFLAGS = @CPPFLAGS@ @CFLAGS@
44 TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H -DFOSSIL_ENABLE_LEGACY_MV_RM=1
45 INSTALLDIR = $(DESTDIR)@prefix@/bin
46 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
47 USE_LINENOISE = @USE_LINENOISE@
48 USE_MMAN_H = @USE_MMAN_H@
49 USE_SEE = @USE_SEE@
50
M Makefile.osx-jaguar
+1
--- Makefile.osx-jaguar
+++ Makefile.osx-jaguar
@@ -55,10 +55,11 @@
5555
 TCC += -DSQLITE_WITHOUT_ZONEMALLOC
5656
 TCC += -D_BSD_SOURCE=1
5757
 TCC += -DWITHOUT_ICONV
5858
 TCC += -Dsocklen_t=int
5959
 TCC += -DSQLITE_MAX_MMAP_SIZE=0
60
+TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
6061
 INSTALLDIR = $(DESTDIR)/usr/local/bin
6162
 USE_SYSTEM_SQLITE =
6263
 USE_LINENOISE = 1
6364
 # FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
6465
 FOSSIL_ENABLE_TCL = 0
6566
--- Makefile.osx-jaguar
+++ Makefile.osx-jaguar
@@ -55,10 +55,11 @@
55 TCC += -DSQLITE_WITHOUT_ZONEMALLOC
56 TCC += -D_BSD_SOURCE=1
57 TCC += -DWITHOUT_ICONV
58 TCC += -Dsocklen_t=int
59 TCC += -DSQLITE_MAX_MMAP_SIZE=0
 
60 INSTALLDIR = $(DESTDIR)/usr/local/bin
61 USE_SYSTEM_SQLITE =
62 USE_LINENOISE = 1
63 # FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
64 FOSSIL_ENABLE_TCL = 0
65
--- Makefile.osx-jaguar
+++ Makefile.osx-jaguar
@@ -55,10 +55,11 @@
55 TCC += -DSQLITE_WITHOUT_ZONEMALLOC
56 TCC += -D_BSD_SOURCE=1
57 TCC += -DWITHOUT_ICONV
58 TCC += -Dsocklen_t=int
59 TCC += -DSQLITE_MAX_MMAP_SIZE=0
60 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
61 INSTALLDIR = $(DESTDIR)/usr/local/bin
62 USE_SYSTEM_SQLITE =
63 USE_LINENOISE = 1
64 # FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
65 FOSSIL_ENABLE_TCL = 0
66
M auto.def
+1 -1
--- auto.def
+++ auto.def
@@ -8,11 +8,11 @@
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=0 => {Enable legacy behavior for mv/rm (skip checkout files)}
13
+ with-legacy-mv-rm=1 => {Enable legacy behavior for mv/rm (skip checkout files)}
1414
 with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
1515
 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
1616
 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
1717
 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
1818
 with-tcl-private-stubs=0
1919
--- auto.def
+++ auto.def
@@ -8,11 +8,11 @@
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=0 => {Enable legacy behavior for mv/rm (skip checkout files)}
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}
18 with-tcl-private-stubs=0
19
--- auto.def
+++ auto.def
@@ -8,11 +8,11 @@
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-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}
18 with-tcl-private-stubs=0
19
M auto.def
+1 -1
--- auto.def
+++ auto.def
@@ -8,11 +8,11 @@
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=0 => {Enable legacy behavior for mv/rm (skip checkout files)}
13
+ with-legacy-mv-rm=1 => {Enable legacy behavior for mv/rm (skip checkout files)}
1414
 with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
1515
 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
1616
 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
1717
 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
1818
 with-tcl-private-stubs=0
1919
--- auto.def
+++ auto.def
@@ -8,11 +8,11 @@
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=0 => {Enable legacy behavior for mv/rm (skip checkout files)}
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}
18 with-tcl-private-stubs=0
19
--- auto.def
+++ auto.def
@@ -8,11 +8,11 @@
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-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}
18 with-tcl-private-stubs=0
19
M src/add.c
+39 -6
--- src/add.c
+++ src/add.c
@@ -22,10 +22,28 @@
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
+
2745
 /*
2846
 ** This routine returns the names of files in a working checkout that
2947
 ** are created by Fossil itself, and hence should not be added, deleted,
3048
 ** or merge, and should be omitted from "clean" and "extras" lists.
3149
 **
@@ -406,17 +424,20 @@
406424
 ** Remove one or more files or directories from the repository.
407425
 **
408426
 ** The 'rm' and 'delete' commands do NOT normally remove the files from
409427
 ** disk. They just mark the files as no longer being part of the project.
410428
 ** In other words, future changes to the named files will not be versioned.
411
-** However, the default behavior of this command may be overridden using
412
-** the --hard or --soft command line options or by changing the
413
-** 'mv-rm-files' setting.
429
+** However, the default behavior of this command may be overridden via the
430
+** command line options listed below and/or the 'mv-rm-files' setting.
414431
 **
415432
 ** The 'forget' command never removes files from disk, even when the command
416433
 ** line options and/or the 'mv-rm-files' setting would otherwise require it
417434
 ** to do so.
435
+**
436
+** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
437
+** setting is non-zero, files WILL BE removed from disk as well.
438
+** This does NOT apply to the 'forget' command.
418439
 **
419440
 ** Options:
420441
 ** --soft Skip removing files from the checkout.
421442
 ** This supersedes the --hard option.
422443
 ** --hard Remove files from the checkout.
@@ -447,11 +468,15 @@
447468
 }else if( softFlag ){
448469
 removeFiles = 0;
449470
 }else if( hardFlag ){
450471
 removeFiles = 1;
451472
 }else{
473
+#if FOSSIL_ENABLE_LEGACY_MV_RM
452474
 removeFiles = db_get_boolean("mv-rm-files",0);
475
+#else
476
+ removeFiles = FOSSIL_MV_RM_FILE;
477
+#endif
453478
 }
454479
 db_multi_exec("CREATE TEMP TABLE sfile(pathname TEXT PRIMARY KEY %s)",
455480
 filename_collation());
456481
 for(i=2; i<g.argc; i++){
457482
 Blob treeName;
@@ -806,17 +831,21 @@
806831
 ** Move or rename one or more files or directories within the repository tree.
807832
 ** You can either rename a file or directory or move it to another subdirectory.
808833
 **
809834
 ** The 'mv' command does NOT normally rename or move the files on disk.
810835
 ** This command merely records the fact that file names have changed so
811
-** that appropriate notations can be made at the next commit/check-in.
812
-** This behavior can be changed using the --hard or --soft command-line
813
-** options or by changing the 'mv-rm-files' setting.
836
+** that appropriate notations can be made at the next commit/check-in.
837
+** However, the default behavior of this command may be overridden via
838
+** command line options listed below and/or the 'mv-rm-files' setting.
814839
 **
815840
 ** The 'rename' command never renames or moves files on disk, even when the
816841
 ** command line options and/or the 'mv-rm-files' setting would otherwise
817842
 ** require it to do so.
843
+**
844
+** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
845
+** setting is non-zero, files WILL BE renamed or moved on disk
846
+** as well. This does NOT apply to the 'rename' command.
818847
 **
819848
 ** Options:
820849
 ** --soft Skip moving files within the checkout.
821850
 ** This supersedes the --hard option.
822851
 ** --hard Move files within the checkout.
@@ -860,11 +889,15 @@
860889
 }else if( softFlag ){
861890
 moveFiles = 0;
862891
 }else if( hardFlag ){
863892
 moveFiles = 1;
864893
 }else{
894
+#if FOSSIL_ENABLE_LEGACY_MV_RM
865895
 moveFiles = db_get_boolean("mv-rm-files",0);
896
+#else
897
+ moveFiles = FOSSIL_MV_RM_FILE;
898
+#endif
866899
 }
867900
 file_tree_name(zDest, &dest, 0, 1);
868901
 db_multi_exec(
869902
 "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
870903
 );
871904
--- src/add.c
+++ src/add.c
@@ -22,10 +22,28 @@
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 **
@@ -406,17 +424,20 @@
406 ** Remove one or more files or directories from the repository.
407 **
408 ** The 'rm' and 'delete' commands do NOT normally remove the files from
409 ** disk. They just mark the files as no longer being part of the project.
410 ** In other words, future changes to the named files will not be versioned.
411 ** However, the default behavior of this command may be overridden using
412 ** the --hard or --soft command line options or by changing the
413 ** 'mv-rm-files' setting.
414 **
415 ** The 'forget' command never removes files from disk, even when the command
416 ** line options and/or the 'mv-rm-files' setting would otherwise require it
417 ** to do so.
 
 
 
 
418 **
419 ** Options:
420 ** --soft Skip removing files from the checkout.
421 ** This supersedes the --hard option.
422 ** --hard Remove files from the checkout.
@@ -447,11 +468,15 @@
447 }else if( softFlag ){
448 removeFiles = 0;
449 }else if( hardFlag ){
450 removeFiles = 1;
451 }else{
 
452 removeFiles = db_get_boolean("mv-rm-files",0);
 
 
 
453 }
454 db_multi_exec("CREATE TEMP TABLE sfile(pathname TEXT PRIMARY KEY %s)",
455 filename_collation());
456 for(i=2; i<g.argc; i++){
457 Blob treeName;
@@ -806,17 +831,21 @@
806 ** Move or rename one or more files or directories within the repository tree.
807 ** You can either rename a file or directory or move it to another subdirectory.
808 **
809 ** The 'mv' command does NOT normally rename or move the files on disk.
810 ** This command merely records the fact that file names have changed so
811 ** that appropriate notations can be made at the next commit/check-in.
812 ** This behavior can be changed using the --hard or --soft command-line
813 ** options or by changing the 'mv-rm-files' setting.
814 **
815 ** The 'rename' command never renames or moves files on disk, even when the
816 ** command line options and/or the 'mv-rm-files' setting would otherwise
817 ** require it to do so.
 
 
 
 
818 **
819 ** Options:
820 ** --soft Skip moving files within the checkout.
821 ** This supersedes the --hard option.
822 ** --hard Move files within the checkout.
@@ -860,11 +889,15 @@
860 }else if( softFlag ){
861 moveFiles = 0;
862 }else if( hardFlag ){
863 moveFiles = 1;
864 }else{
 
865 moveFiles = db_get_boolean("mv-rm-files",0);
 
 
 
866 }
867 file_tree_name(zDest, &dest, 0, 1);
868 db_multi_exec(
869 "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
870 );
871
--- src/add.c
+++ src/add.c
@@ -22,10 +22,28 @@
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 **
@@ -406,17 +424,20 @@
424 ** Remove one or more files or directories from the repository.
425 **
426 ** The 'rm' and 'delete' commands do NOT normally remove the files from
427 ** disk. They just mark the files as no longer being part of the project.
428 ** In other words, future changes to the named files will not be versioned.
429 ** However, the default behavior of this command may be overridden via the
430 ** command line options listed below and/or the 'mv-rm-files' setting.
 
431 **
432 ** The 'forget' command never removes files from disk, even when the command
433 ** line options and/or the 'mv-rm-files' setting would otherwise require it
434 ** to do so.
435 **
436 ** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
437 ** setting is non-zero, files WILL BE removed from disk as well.
438 ** This does NOT apply to the 'forget' command.
439 **
440 ** Options:
441 ** --soft Skip removing files from the checkout.
442 ** This supersedes the --hard option.
443 ** --hard Remove files from the checkout.
@@ -447,11 +468,15 @@
468 }else if( softFlag ){
469 removeFiles = 0;
470 }else if( hardFlag ){
471 removeFiles = 1;
472 }else{
473 #if FOSSIL_ENABLE_LEGACY_MV_RM
474 removeFiles = db_get_boolean("mv-rm-files",0);
475 #else
476 removeFiles = FOSSIL_MV_RM_FILE;
477 #endif
478 }
479 db_multi_exec("CREATE TEMP TABLE sfile(pathname TEXT PRIMARY KEY %s)",
480 filename_collation());
481 for(i=2; i<g.argc; i++){
482 Blob treeName;
@@ -806,17 +831,21 @@
831 ** Move or rename one or more files or directories within the repository tree.
832 ** You can either rename a file or directory or move it to another subdirectory.
833 **
834 ** The 'mv' command does NOT normally rename or move the files on disk.
835 ** This command merely records the fact that file names have changed so
836 ** that appropriate notations can be made at the next commit/check-in.
837 ** However, the default behavior of this command may be overridden via
838 ** command line options listed below and/or the 'mv-rm-files' setting.
839 **
840 ** The 'rename' command never renames or moves files on disk, even when the
841 ** command line options and/or the 'mv-rm-files' setting would otherwise
842 ** require it to do so.
843 **
844 ** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
845 ** setting is non-zero, files WILL BE renamed or moved on disk
846 ** as well. This does NOT apply to the 'rename' command.
847 **
848 ** Options:
849 ** --soft Skip moving files within the checkout.
850 ** This supersedes the --hard option.
851 ** --hard Move files within the checkout.
@@ -860,11 +889,15 @@
889 }else if( softFlag ){
890 moveFiles = 0;
891 }else if( hardFlag ){
892 moveFiles = 1;
893 }else{
894 #if FOSSIL_ENABLE_LEGACY_MV_RM
895 moveFiles = db_get_boolean("mv-rm-files",0);
896 #else
897 moveFiles = FOSSIL_MV_RM_FILE;
898 #endif
899 }
900 file_tree_name(zDest, &dest, 0, 1);
901 db_multi_exec(
902 "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
903 );
904
M src/db.c
+2
--- src/db.c
+++ src/db.c
@@ -3133,17 +3133,19 @@
31333133
 ** Use file modification times (mtimes) to detect when
31343134
 ** files have been modified. If disabled, all managed files
31353135
 ** are hashed to detect changes, which can be slow for large
31363136
 ** projects.
31373137
 */
3138
+#if FOSSIL_ENABLE_LEGACY_MV_RM
31383139
 /*
31393140
 ** SETTING: mv-rm-files boolean default=off
31403141
 ** If enabled, the "mv" and "rename" commands will also move
31413142
 ** the associated files within the checkout -AND- the "rm"
31423143
 ** and "delete" commands will also remove the associated
31433144
 ** files from within the checkout.
31443145
 */
3146
+#endif
31453147
 /*
31463148
 ** SETTING: pgp-command width=40
31473149
 ** Command used to clear-sign manifests at check-in.
31483150
 ** Default value is "gpg --clearsign -o"
31493151
 */
31503152
--- src/db.c
+++ src/db.c
@@ -3133,17 +3133,19 @@
3133 ** Use file modification times (mtimes) to detect when
3134 ** files have been modified. If disabled, all managed files
3135 ** are hashed to detect changes, which can be slow for large
3136 ** projects.
3137 */
 
3138 /*
3139 ** SETTING: mv-rm-files boolean default=off
3140 ** If enabled, the "mv" and "rename" commands will also move
3141 ** the associated files within the checkout -AND- the "rm"
3142 ** and "delete" commands will also remove the associated
3143 ** files from within the checkout.
3144 */
 
3145 /*
3146 ** SETTING: pgp-command width=40
3147 ** Command used to clear-sign manifests at check-in.
3148 ** Default value is "gpg --clearsign -o"
3149 */
3150
--- src/db.c
+++ src/db.c
@@ -3133,17 +3133,19 @@
3133 ** Use file modification times (mtimes) to detect when
3134 ** files have been modified. If disabled, all managed files
3135 ** are hashed to detect changes, which can be slow for large
3136 ** projects.
3137 */
3138 #if FOSSIL_ENABLE_LEGACY_MV_RM
3139 /*
3140 ** SETTING: mv-rm-files boolean default=off
3141 ** If enabled, the "mv" and "rename" commands will also move
3142 ** the associated files within the checkout -AND- the "rm"
3143 ** and "delete" commands will also remove the associated
3144 ** files from within the checkout.
3145 */
3146 #endif
3147 /*
3148 ** SETTING: pgp-command width=40
3149 ** Command used to clear-sign manifests at check-in.
3150 ** Default value is "gpg --clearsign -o"
3151 */
3152
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -603,11 +603,11 @@
603603
 #
604604
 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
605605
606606
 #### Enable legacy treatment of mv/rm (skip checkout files)
607607
 #
608
-# FOSSIL_ENABLE_LEGACY_MV_RM = 1
608
+FOSSIL_ENABLE_LEGACY_MV_RM = 1
609609
610610
 #### Enable TH1 scripts in embedded documentation files
611611
 #
612612
 # FOSSIL_ENABLE_TH1_DOCS = 1
613613
@@ -1523,11 +1523,11 @@
15231523
 FOSSIL_ENABLE_JSON = 0
15241524
 !endif
15251525
15261526
 # Enable legacy treatment of the mv/rm commands?
15271527
 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
1528
-FOSSIL_ENABLE_LEGACY_MV_RM = 0
1528
+FOSSIL_ENABLE_LEGACY_MV_RM = 1
15291529
 !endif
15301530
15311531
 # Enable use of miniz instead of zlib?
15321532
 !ifndef FOSSIL_ENABLE_MINIZ
15331533
 FOSSIL_ENABLE_MINIZ = 0
15341534
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -603,11 +603,11 @@
603 #
604 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
605
606 #### Enable legacy treatment of mv/rm (skip checkout files)
607 #
608 # FOSSIL_ENABLE_LEGACY_MV_RM = 1
609
610 #### Enable TH1 scripts in embedded documentation files
611 #
612 # FOSSIL_ENABLE_TH1_DOCS = 1
613
@@ -1523,11 +1523,11 @@
1523 FOSSIL_ENABLE_JSON = 0
1524 !endif
1525
1526 # Enable legacy treatment of the mv/rm commands?
1527 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
1528 FOSSIL_ENABLE_LEGACY_MV_RM = 0
1529 !endif
1530
1531 # Enable use of miniz instead of zlib?
1532 !ifndef FOSSIL_ENABLE_MINIZ
1533 FOSSIL_ENABLE_MINIZ = 0
1534
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -603,11 +603,11 @@
603 #
604 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
605
606 #### Enable legacy treatment of mv/rm (skip checkout files)
607 #
608 FOSSIL_ENABLE_LEGACY_MV_RM = 1
609
610 #### Enable TH1 scripts in embedded documentation files
611 #
612 # FOSSIL_ENABLE_TH1_DOCS = 1
613
@@ -1523,11 +1523,11 @@
1523 FOSSIL_ENABLE_JSON = 0
1524 !endif
1525
1526 # Enable legacy treatment of the mv/rm commands?
1527 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
1528 FOSSIL_ENABLE_LEGACY_MV_RM = 1
1529 !endif
1530
1531 # Enable use of miniz instead of zlib?
1532 !ifndef FOSSIL_ENABLE_MINIZ
1533 FOSSIL_ENABLE_MINIZ = 0
1534
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -603,11 +603,11 @@
603603
 #
604604
 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
605605
606606
 #### Enable legacy treatment of mv/rm (skip checkout files)
607607
 #
608
-# FOSSIL_ENABLE_LEGACY_MV_RM = 1
608
+FOSSIL_ENABLE_LEGACY_MV_RM = 1
609609
610610
 #### Enable TH1 scripts in embedded documentation files
611611
 #
612612
 # FOSSIL_ENABLE_TH1_DOCS = 1
613613
@@ -1523,11 +1523,11 @@
15231523
 FOSSIL_ENABLE_JSON = 0
15241524
 !endif
15251525
15261526
 # Enable legacy treatment of the mv/rm commands?
15271527
 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
1528
-FOSSIL_ENABLE_LEGACY_MV_RM = 0
1528
+FOSSIL_ENABLE_LEGACY_MV_RM = 1
15291529
 !endif
15301530
15311531
 # Enable use of miniz instead of zlib?
15321532
 !ifndef FOSSIL_ENABLE_MINIZ
15331533
 FOSSIL_ENABLE_MINIZ = 0
15341534
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -603,11 +603,11 @@
603 #
604 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
605
606 #### Enable legacy treatment of mv/rm (skip checkout files)
607 #
608 # FOSSIL_ENABLE_LEGACY_MV_RM = 1
609
610 #### Enable TH1 scripts in embedded documentation files
611 #
612 # FOSSIL_ENABLE_TH1_DOCS = 1
613
@@ -1523,11 +1523,11 @@
1523 FOSSIL_ENABLE_JSON = 0
1524 !endif
1525
1526 # Enable legacy treatment of the mv/rm commands?
1527 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
1528 FOSSIL_ENABLE_LEGACY_MV_RM = 0
1529 !endif
1530
1531 # Enable use of miniz instead of zlib?
1532 !ifndef FOSSIL_ENABLE_MINIZ
1533 FOSSIL_ENABLE_MINIZ = 0
1534
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -603,11 +603,11 @@
603 #
604 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
605
606 #### Enable legacy treatment of mv/rm (skip checkout files)
607 #
608 FOSSIL_ENABLE_LEGACY_MV_RM = 1
609
610 #### Enable TH1 scripts in embedded documentation files
611 #
612 # FOSSIL_ENABLE_TH1_DOCS = 1
613
@@ -1523,11 +1523,11 @@
1523 FOSSIL_ENABLE_JSON = 0
1524 !endif
1525
1526 # Enable legacy treatment of the mv/rm commands?
1527 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
1528 FOSSIL_ENABLE_LEGACY_MV_RM = 1
1529 !endif
1530
1531 # Enable use of miniz instead of zlib?
1532 !ifndef FOSSIL_ENABLE_MINIZ
1533 FOSSIL_ENABLE_MINIZ = 0
1534
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -71,11 +71,11 @@
7171
 #
7272
 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
7373
7474
 #### Enable legacy treatment of mv/rm (skip checkout files)
7575
 #
76
-# FOSSIL_ENABLE_LEGACY_MV_RM = 1
76
+FOSSIL_ENABLE_LEGACY_MV_RM = 1
7777
7878
 #### Enable TH1 scripts in embedded documentation files
7979
 #
8080
 # FOSSIL_ENABLE_TH1_DOCS = 1
8181
8282
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -71,11 +71,11 @@
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
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -71,11 +71,11 @@
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
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -71,11 +71,11 @@
7171
 #
7272
 # FOSSIL_ENABLE_EXEC_REL_PATHS = 1
7373
7474
 #### Enable legacy treatment of mv/rm (skip checkout files)
7575
 #
76
-# FOSSIL_ENABLE_LEGACY_MV_RM = 1
76
+FOSSIL_ENABLE_LEGACY_MV_RM = 1
7777
7878
 #### Enable TH1 scripts in embedded documentation files
7979
 #
8080
 # FOSSIL_ENABLE_TH1_DOCS = 1
8181
8282
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -71,11 +71,11 @@
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
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -71,11 +71,11 @@
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
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -59,11 +59,11 @@
5959
 FOSSIL_ENABLE_JSON = 0
6060
 !endif
6161
6262
 # Enable legacy treatment of the mv/rm commands?
6363
 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
64
-FOSSIL_ENABLE_LEGACY_MV_RM = 0
64
+FOSSIL_ENABLE_LEGACY_MV_RM = 1
6565
 !endif
6666
6767
 # Enable use of miniz instead of zlib?
6868
 !ifndef FOSSIL_ENABLE_MINIZ
6969
 FOSSIL_ENABLE_MINIZ = 0
7070
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -59,11 +59,11 @@
59 FOSSIL_ENABLE_JSON = 0
60 !endif
61
62 # Enable legacy treatment of the mv/rm commands?
63 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
64 FOSSIL_ENABLE_LEGACY_MV_RM = 0
65 !endif
66
67 # Enable use of miniz instead of zlib?
68 !ifndef FOSSIL_ENABLE_MINIZ
69 FOSSIL_ENABLE_MINIZ = 0
70
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -59,11 +59,11 @@
59 FOSSIL_ENABLE_JSON = 0
60 !endif
61
62 # Enable legacy treatment of the mv/rm commands?
63 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
64 FOSSIL_ENABLE_LEGACY_MV_RM = 1
65 !endif
66
67 # Enable use of miniz instead of zlib?
68 !ifndef FOSSIL_ENABLE_MINIZ
69 FOSSIL_ENABLE_MINIZ = 0
70
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -59,11 +59,11 @@
5959
 FOSSIL_ENABLE_JSON = 0
6060
 !endif
6161
6262
 # Enable legacy treatment of the mv/rm commands?
6363
 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
64
-FOSSIL_ENABLE_LEGACY_MV_RM = 0
64
+FOSSIL_ENABLE_LEGACY_MV_RM = 1
6565
 !endif
6666
6767
 # Enable use of miniz instead of zlib?
6868
 !ifndef FOSSIL_ENABLE_MINIZ
6969
 FOSSIL_ENABLE_MINIZ = 0
7070
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -59,11 +59,11 @@
59 FOSSIL_ENABLE_JSON = 0
60 !endif
61
62 # Enable legacy treatment of the mv/rm commands?
63 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
64 FOSSIL_ENABLE_LEGACY_MV_RM = 0
65 !endif
66
67 # Enable use of miniz instead of zlib?
68 !ifndef FOSSIL_ENABLE_MINIZ
69 FOSSIL_ENABLE_MINIZ = 0
70
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -59,11 +59,11 @@
59 FOSSIL_ENABLE_JSON = 0
60 !endif
61
62 # Enable legacy treatment of the mv/rm commands?
63 !ifndef FOSSIL_ENABLE_LEGACY_MV_RM
64 FOSSIL_ENABLE_LEGACY_MV_RM = 1
65 !endif
66
67 # Enable use of miniz instead of zlib?
68 !ifndef FOSSIL_ENABLE_MINIZ
69 FOSSIL_ENABLE_MINIZ = 0
70

Keyboard Shortcuts

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