Fossil SCM

Update to the latest SQLite. Fix a bug in the "diff" and "gdiff" commands. Fix a bug that prevented "fossil config pull" from working.

drh 2009-09-11 15:06 trunk
Commit 129edda98e4b96263793ce2859ce59f4b43d0fda
Parent aeaee1f38512181…
4 files changed +4 -3 +4 -3 +1 -1 +2 -1
~ src/diffcmd.c ~ src/sqlite3.c ~ src/sqlite3.h ~ src/xfer.c
M src/diffcmd.c
+4 -3
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -169,14 +169,15 @@
169169
 }else{
170170
 zExternalCommand = db_get("gdiff-command", 0);
171171
 }
172172
 if( zExternalCommand==0 ){
173173
 internalDiff=1;
174
+ }else{
175
+ blob_zero(&cmd);
176
+ shell_escape(&cmd, zExternalCommand);
177
+ blob_append(&cmd, " ", 1);
174178
 }
175
- blob_zero(&cmd);
176
- shell_escape(&cmd, zExternalCommand);
177
- blob_append(&cmd, " ", 1);
178179
 }
179180
 zFile = g.argv[g.argc-1];
180181
 file_tree_name(zFile, &fname, 1);
181182
182183
 blob_zero(&vname);
183184
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -169,14 +169,15 @@
169 }else{
170 zExternalCommand = db_get("gdiff-command", 0);
171 }
172 if( zExternalCommand==0 ){
173 internalDiff=1;
 
 
 
 
174 }
175 blob_zero(&cmd);
176 shell_escape(&cmd, zExternalCommand);
177 blob_append(&cmd, " ", 1);
178 }
179 zFile = g.argv[g.argc-1];
180 file_tree_name(zFile, &fname, 1);
181
182 blob_zero(&vname);
183
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -169,14 +169,15 @@
169 }else{
170 zExternalCommand = db_get("gdiff-command", 0);
171 }
172 if( zExternalCommand==0 ){
173 internalDiff=1;
174 }else{
175 blob_zero(&cmd);
176 shell_escape(&cmd, zExternalCommand);
177 blob_append(&cmd, " ", 1);
178 }
 
 
 
179 }
180 zFile = g.argv[g.argc-1];
181 file_tree_name(zFile, &fname, 1);
182
183 blob_zero(&vname);
184
M src/sqlite3.c
+4 -3
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -15,11 +15,11 @@
1515
 ** of the embedded sqlite3.h header file.) Additional code files may be needed
1616
 ** if you want a wrapper to interface SQLite with your choice of programming
1717
 ** language. The code for the "sqlite3" command-line shell is also in a
1818
 ** separate file. This file contains only code for the core SQLite library.
1919
 **
20
-** This amalgamation was generated on 2009-09-10 22:23:14 UTC.
20
+** This amalgamation was generated on 2009-09-11 14:16:13 UTC.
2121
 */
2222
 #define SQLITE_CORE 1
2323
 #define SQLITE_AMALGAMATION 1
2424
 #ifndef SQLITE_PRIVATE
2525
 # define SQLITE_PRIVATE static
@@ -647,11 +647,11 @@
647647
 **
648648
 ** Requirements: [H10011] [H10014]
649649
 */
650650
 #define SQLITE_VERSION "3.6.18"
651651
 #define SQLITE_VERSION_NUMBER 3006018
652
-#define SQLITE_SOURCE_ID "2009-09-10 20:23:30 f42ec993ac9d42ca31305f26b09924108c36d9f4"
652
+#define SQLITE_SOURCE_ID "2009-09-11 14:05:07 b084828a771ec40be85f07c590ca99de4f6c24ee"
653653
654654
 /*
655655
 ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
656656
 ** KEYWORDS: sqlite3_version
657657
 **
@@ -65697,12 +65697,13 @@
6569765697
 /*
6569865698
 ** Reclaim the memory used by an index
6569965699
 */
6570065700
 static void freeIndex(Index *p){
6570165701
 sqlite3 *db = p->pTable->dbMem;
65702
- /* testcase( db==0 ); */
65702
+#ifndef SQLITE_OMIT_ANALYZE
6570365703
 sqlite3DeleteIndexSamples(p);
65704
+#endif
6570465705
 sqlite3DbFree(db, p->zColAff);
6570565706
 sqlite3DbFree(db, p);
6570665707
 }
6570765708
6570865709
 /*
6570965710
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -15,11 +15,11 @@
15 ** of the embedded sqlite3.h header file.) Additional code files may be needed
16 ** if you want a wrapper to interface SQLite with your choice of programming
17 ** language. The code for the "sqlite3" command-line shell is also in a
18 ** separate file. This file contains only code for the core SQLite library.
19 **
20 ** This amalgamation was generated on 2009-09-10 22:23:14 UTC.
21 */
22 #define SQLITE_CORE 1
23 #define SQLITE_AMALGAMATION 1
24 #ifndef SQLITE_PRIVATE
25 # define SQLITE_PRIVATE static
@@ -647,11 +647,11 @@
647 **
648 ** Requirements: [H10011] [H10014]
649 */
650 #define SQLITE_VERSION "3.6.18"
651 #define SQLITE_VERSION_NUMBER 3006018
652 #define SQLITE_SOURCE_ID "2009-09-10 20:23:30 f42ec993ac9d42ca31305f26b09924108c36d9f4"
653
654 /*
655 ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
656 ** KEYWORDS: sqlite3_version
657 **
@@ -65697,12 +65697,13 @@
65697 /*
65698 ** Reclaim the memory used by an index
65699 */
65700 static void freeIndex(Index *p){
65701 sqlite3 *db = p->pTable->dbMem;
65702 /* testcase( db==0 ); */
65703 sqlite3DeleteIndexSamples(p);
 
65704 sqlite3DbFree(db, p->zColAff);
65705 sqlite3DbFree(db, p);
65706 }
65707
65708 /*
65709
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -15,11 +15,11 @@
15 ** of the embedded sqlite3.h header file.) Additional code files may be needed
16 ** if you want a wrapper to interface SQLite with your choice of programming
17 ** language. The code for the "sqlite3" command-line shell is also in a
18 ** separate file. This file contains only code for the core SQLite library.
19 **
20 ** This amalgamation was generated on 2009-09-11 14:16:13 UTC.
21 */
22 #define SQLITE_CORE 1
23 #define SQLITE_AMALGAMATION 1
24 #ifndef SQLITE_PRIVATE
25 # define SQLITE_PRIVATE static
@@ -647,11 +647,11 @@
647 **
648 ** Requirements: [H10011] [H10014]
649 */
650 #define SQLITE_VERSION "3.6.18"
651 #define SQLITE_VERSION_NUMBER 3006018
652 #define SQLITE_SOURCE_ID "2009-09-11 14:05:07 b084828a771ec40be85f07c590ca99de4f6c24ee"
653
654 /*
655 ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
656 ** KEYWORDS: sqlite3_version
657 **
@@ -65697,12 +65697,13 @@
65697 /*
65698 ** Reclaim the memory used by an index
65699 */
65700 static void freeIndex(Index *p){
65701 sqlite3 *db = p->pTable->dbMem;
65702 #ifndef SQLITE_OMIT_ANALYZE
65703 sqlite3DeleteIndexSamples(p);
65704 #endif
65705 sqlite3DbFree(db, p->zColAff);
65706 sqlite3DbFree(db, p);
65707 }
65708
65709 /*
65710
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -119,11 +119,11 @@
119119
 **
120120
 ** Requirements: [H10011] [H10014]
121121
 */
122122
 #define SQLITE_VERSION "3.6.18"
123123
 #define SQLITE_VERSION_NUMBER 3006018
124
-#define SQLITE_SOURCE_ID "2009-09-10 19:20:03 e9d064bd9318c2bc9248df948f71fd30f24525eb"
124
+#define SQLITE_SOURCE_ID "2009-09-11 14:05:07 b084828a771ec40be85f07c590ca99de4f6c24ee"
125125
126126
 /*
127127
 ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
128128
 ** KEYWORDS: sqlite3_version
129129
 **
130130
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -119,11 +119,11 @@
119 **
120 ** Requirements: [H10011] [H10014]
121 */
122 #define SQLITE_VERSION "3.6.18"
123 #define SQLITE_VERSION_NUMBER 3006018
124 #define SQLITE_SOURCE_ID "2009-09-10 19:20:03 e9d064bd9318c2bc9248df948f71fd30f24525eb"
125
126 /*
127 ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
128 ** KEYWORDS: sqlite3_version
129 **
130
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -119,11 +119,11 @@
119 **
120 ** Requirements: [H10011] [H10014]
121 */
122 #define SQLITE_VERSION "3.6.18"
123 #define SQLITE_VERSION_NUMBER 3006018
124 #define SQLITE_SOURCE_ID "2009-09-11 14:05:07 b084828a771ec40be85f07c590ca99de4f6c24ee"
125
126 /*
127 ** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
128 ** KEYWORDS: sqlite3_version
129 **
130
M src/xfer.c
+2 -1
--- src/xfer.c
+++ src/xfer.c
@@ -896,11 +896,12 @@
896896
 Xfer xfer; /* Transfer data */
897897
 const char *zSCode = db_get("server-code", "x");
898898
 const char *zPCode = db_get("project-code", 0);
899899
900900
 if( db_get_boolean("dont-push", 0) ) pushFlag = 0;
901
- if( pushFlag + pullFlag + cloneFlag == 0 ) return;
901
+ if( pushFlag + pullFlag + cloneFlag == 0
902
+ && configRcvMask==0 && configSendMask==0 ) return;
902903
903904
 transport_stats(0, 0, 1);
904905
 socket_global_init();
905906
 memset(&xfer, 0, sizeof(xfer));
906907
 xfer.pIn = &recv;
907908
--- src/xfer.c
+++ src/xfer.c
@@ -896,11 +896,12 @@
896 Xfer xfer; /* Transfer data */
897 const char *zSCode = db_get("server-code", "x");
898 const char *zPCode = db_get("project-code", 0);
899
900 if( db_get_boolean("dont-push", 0) ) pushFlag = 0;
901 if( pushFlag + pullFlag + cloneFlag == 0 ) return;
 
902
903 transport_stats(0, 0, 1);
904 socket_global_init();
905 memset(&xfer, 0, sizeof(xfer));
906 xfer.pIn = &recv;
907
--- src/xfer.c
+++ src/xfer.c
@@ -896,11 +896,12 @@
896 Xfer xfer; /* Transfer data */
897 const char *zSCode = db_get("server-code", "x");
898 const char *zPCode = db_get("project-code", 0);
899
900 if( db_get_boolean("dont-push", 0) ) pushFlag = 0;
901 if( pushFlag + pullFlag + cloneFlag == 0
902 && configRcvMask==0 && configSendMask==0 ) return;
903
904 transport_stats(0, 0, 1);
905 socket_global_init();
906 memset(&xfer, 0, sizeof(xfer));
907 xfer.pIn = &recv;
908

Keyboard Shortcuts

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