Fossil SCM

Follow-up to previous check-in: avoid breaking external feature detection for 'mv-rm-files'.

mistachkin 2020-07-08 15:23 trunk
Commit 4a880a166ae0bb7301b51b5b667a023267b6edc608ae478381b970c3890864f2
Parent 918bcfcf77b419c…
3 files changed +1 +4 +1
~ src/main.c ~ src/th_main.c ~ win/fossil.rc
M src/main.c
+1
--- src/main.c
+++ src/main.c
@@ -1186,10 +1186,11 @@
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
+ blob_append(pOut, "FOSSIL_ENABLE_LEGACY_MV_RM\n", -1);
11911192
 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
11921193
 blob_append(pOut, "FOSSIL_ENABLE_EXEC_REL_PATHS\n", -1);
11931194
 #endif
11941195
 #if defined(FOSSIL_ENABLE_TH1_DOCS)
11951196
 blob_append(pOut, "FOSSIL_ENABLE_TH1_DOCS\n", -1);
11961197
--- src/main.c
+++ src/main.c
@@ -1186,10 +1186,11 @@
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
--- src/main.c
+++ src/main.c
@@ -1186,10 +1186,11 @@
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 blob_append(pOut, "FOSSIL_ENABLE_LEGACY_MV_RM\n", -1);
1192 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
1193 blob_append(pOut, "FOSSIL_ENABLE_EXEC_REL_PATHS\n", -1);
1194 #endif
1195 #if defined(FOSSIL_ENABLE_TH1_DOCS)
1196 blob_append(pOut, "FOSSIL_ENABLE_TH1_DOCS\n", -1);
1197
M src/th_main.c
+4
--- src/th_main.c
+++ src/th_main.c
@@ -786,10 +786,11 @@
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
791792
 ** "execRelPaths" = FOSSIL_ENABLE_EXEC_REL_PATHS
792793
 ** "th1Docs" = FOSSIL_ENABLE_TH1_DOCS
793794
 ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS
794795
 ** "tcl" = FOSSIL_ENABLE_TCL
795796
 ** "useTclStubs" = USE_TCL_STUBS
@@ -824,10 +825,13 @@
824825
 #if defined(FOSSIL_ENABLE_SSL)
825826
 else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){
826827
 rc = 1;
827828
 }
828829
 #endif
830
+ else if( 0 == fossil_strnicmp( zArg, "legacyMvRm\0", 11 ) ){
831
+ rc = 1;
832
+ }
829833
 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
830834
 else if( 0 == fossil_strnicmp( zArg, "execRelPaths\0", 13 ) ){
831835
 rc = 1;
832836
 }
833837
 #endif
834838
--- src/th_main.c
+++ src/th_main.c
@@ -786,10 +786,11 @@
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,10 +825,13 @@
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 #endif
834
--- src/th_main.c
+++ src/th_main.c
@@ -786,10 +786,11 @@
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,10 +825,13 @@
825 #if defined(FOSSIL_ENABLE_SSL)
826 else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){
827 rc = 1;
828 }
829 #endif
830 else if( 0 == fossil_strnicmp( zArg, "legacyMvRm\0", 11 ) ){
831 rc = 1;
832 }
833 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
834 else if( 0 == fossil_strnicmp( zArg, "execRelPaths\0", 13 ) ){
835 rc = 1;
836 }
837 #endif
838
M win/fossil.rc
+1
--- win/fossil.rc
+++ win/fossil.rc
@@ -120,10 +120,11 @@
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
+ VALUE "LegacyMvRm", "Yes\0"
125126
 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
126127
 VALUE "ExecRelPaths", "Yes\0"
127128
 #else
128129
 VALUE "ExecRelPaths", "No\0"
129130
 #endif /* defined(FOSSIL_ENABLE_EXEC_REL_PATHS) */
130131
--- win/fossil.rc
+++ win/fossil.rc
@@ -120,10 +120,11 @@
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
--- win/fossil.rc
+++ win/fossil.rc
@@ -120,10 +120,11 @@
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 VALUE "LegacyMvRm", "Yes\0"
126 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
127 VALUE "ExecRelPaths", "Yes\0"
128 #else
129 VALUE "ExecRelPaths", "No\0"
130 #endif /* defined(FOSSIL_ENABLE_EXEC_REL_PATHS) */
131

Keyboard Shortcuts

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