Fossil SCM

merge trunk

michai 2015-08-22 12:42 doc-bold-canonical merge
Commit b00e60194e9527bb7da9c1b664ffc7467b3aa66d
Parent 6692087939f3044…
9 files changed +2 +13 -9 +5 -5 -1 -1 -1 -1 +7 +2 -1
~ src/shell.c ~ src/sqlite3.c ~ src/sqlite3.h ~ test/merge5.test ~ test/merge_renames.test ~ test/mv-rm.test ~ test/revert.test ~ www/checkin_names.wiki ~ www/th1.md
M src/shell.c
+2
--- src/shell.c
+++ src/shell.c
@@ -1316,10 +1316,12 @@
13161316
 iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX,bReset);
13171317
 fprintf(pArg->out, "Autoindex Inserts: %d\n", iCur);
13181318
 iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
13191319
 fprintf(pArg->out, "Virtual Machine Steps: %d\n", iCur);
13201320
 }
1321
+
1322
+ /* Do not remove this machine readable comment: extra-stats-output-here */
13211323
13221324
 return 0;
13231325
 }
13241326
13251327
 /*
13261328
--- src/shell.c
+++ src/shell.c
@@ -1316,10 +1316,12 @@
1316 iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX,bReset);
1317 fprintf(pArg->out, "Autoindex Inserts: %d\n", iCur);
1318 iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
1319 fprintf(pArg->out, "Virtual Machine Steps: %d\n", iCur);
1320 }
 
 
1321
1322 return 0;
1323 }
1324
1325 /*
1326
--- src/shell.c
+++ src/shell.c
@@ -1316,10 +1316,12 @@
1316 iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX,bReset);
1317 fprintf(pArg->out, "Autoindex Inserts: %d\n", iCur);
1318 iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
1319 fprintf(pArg->out, "Virtual Machine Steps: %d\n", iCur);
1320 }
1321
1322 /* Do not remove this machine readable comment: extra-stats-output-here */
1323
1324 return 0;
1325 }
1326
1327 /*
1328
M src/sqlite3.c
+13 -9
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1,8 +1,8 @@
11
 /******************************************************************************
22
 ** This file is an amalgamation of many separate C source files from SQLite
3
-** version 3.8.11. By combining all the individual C code files into this
3
+** version 3.8.11.1. By combining all the individual C code files into this
44
 ** single large file, the entire code can be compiled as a single translation
55
 ** unit. This allows many compilers to do optimizations that would not be
66
 ** possible if the files were compiled separately. Performance improvements
77
 ** of 5% or more are commonly seen when SQLite is compiled as a single
88
 ** translation unit.
@@ -323,13 +323,13 @@
323323
 **
324324
 ** See also: [sqlite3_libversion()],
325325
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
326326
 ** [sqlite_version()] and [sqlite_source_id()].
327327
 */
328
-#define SQLITE_VERSION "3.8.11"
328
+#define SQLITE_VERSION "3.8.11.1"
329329
 #define SQLITE_VERSION_NUMBER 3008011
330
-#define SQLITE_SOURCE_ID "2015-07-27 13:49:41 b8e92227a469de677a66da62e4361f099c0b79d0"
330
+#define SQLITE_SOURCE_ID "2015-07-29 20:00:57 cf538e2783e468bbc25e7cb2a9ee64d3e0e80b2f"
331331
332332
 /*
333333
 ** CAPI3REF: Run-Time Library Version Numbers
334334
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
335335
 **
@@ -4747,13 +4747,13 @@
47474747
 ** ^The sqlite3_result_blob() interface sets the result from
47484748
 ** an application-defined function to be the BLOB whose content is pointed
47494749
 ** to by the second parameter and which is N bytes long where N is the
47504750
 ** third parameter.
47514751
 **
4752
-** ^The sqlite3_result_zeroblob() and zeroblob64() interfaces set the result
4753
-** of the application-defined function to be a BLOB containing all zero
4754
-** bytes and N bytes in size, where N is the value of the 2nd parameter.
4752
+** ^The sqlite3_result_zeroblob(C,N) and sqlite3_result_zeroblob64(C,N)
4753
+** interfaces set the result of the application-defined function to be
4754
+** a BLOB containing all zero bytes and N bytes in size.
47554755
 **
47564756
 ** ^The sqlite3_result_double() interface sets the result from
47574757
 ** an application-defined function to be a floating point value specified
47584758
 ** by its 2nd argument.
47594759
 **
@@ -102750,11 +102750,11 @@
102750102750
 }else{
102751102751
 sqlite3TableLock(pParse, iDbDest, pDest->tnum, 1, pDest->zName);
102752102752
 sqlite3TableLock(pParse, iDbSrc, pSrc->tnum, 0, pSrc->zName);
102753102753
 }
102754102754
 for(pDestIdx=pDest->pIndex; pDestIdx; pDestIdx=pDestIdx->pNext){
102755
- u8 useSeekResult = 0;
102755
+ u8 idxInsFlags = 0;
102756102756
 for(pSrcIdx=pSrc->pIndex; ALWAYS(pSrcIdx); pSrcIdx=pSrcIdx->pNext){
102757102757
 if( xferCompatibleIndex(pDestIdx, pSrcIdx) ) break;
102758102758
 }
102759102759
 assert( pSrcIdx );
102760102760
 sqlite3VdbeAddOp3(v, OP_OpenRead, iSrc, pSrcIdx->tnum, iDbSrc);
@@ -102785,16 +102785,19 @@
102785102785
 char *zColl = pSrcIdx->azColl[i];
102786102786
 assert( zColl!=0 );
102787102787
 if( sqlite3_stricmp("BINARY", zColl) ) break;
102788102788
 }
102789102789
 if( i==pSrcIdx->nColumn ){
102790
- useSeekResult = OPFLAG_USESEEKRESULT;
102790
+ idxInsFlags = OPFLAG_USESEEKRESULT;
102791102791
 sqlite3VdbeAddOp3(v, OP_Last, iDest, 0, -1);
102792102792
 }
102793
+ }
102794
+ if( !HasRowid(pSrc) && pDestIdx->idxType==2 ){
102795
+ idxInsFlags |= OPFLAG_NCHANGE;
102793102796
 }
102794102797
 sqlite3VdbeAddOp3(v, OP_IdxInsert, iDest, regData, 1);
102795
- sqlite3VdbeChangeP5(v, useSeekResult);
102798
+ sqlite3VdbeChangeP5(v, idxInsFlags);
102796102799
 sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1+1); VdbeCoverage(v);
102797102800
 sqlite3VdbeJumpHere(v, addr1);
102798102801
 sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0);
102799102802
 sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
102800102803
 }
@@ -105464,10 +105467,11 @@
105464105467
 returnSingleInt(pParse, "cache_size", pDb->pSchema->cache_size);
105465105468
 }else{
105466105469
 int size = sqlite3Atoi(zRight);
105467105470
 pDb->pSchema->cache_size = size;
105468105471
 sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
105472
+ if( sqlite3ReadSchema(pParse) ) goto pragma_out;
105469105473
 }
105470105474
 break;
105471105475
 }
105472105476
105473105477
 /*
105474105478
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1,8 +1,8 @@
1 /******************************************************************************
2 ** This file is an amalgamation of many separate C source files from SQLite
3 ** version 3.8.11. By combining all the individual C code files into this
4 ** single large file, the entire code can be compiled as a single translation
5 ** unit. This allows many compilers to do optimizations that would not be
6 ** possible if the files were compiled separately. Performance improvements
7 ** of 5% or more are commonly seen when SQLite is compiled as a single
8 ** translation unit.
@@ -323,13 +323,13 @@
323 **
324 ** See also: [sqlite3_libversion()],
325 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
326 ** [sqlite_version()] and [sqlite_source_id()].
327 */
328 #define SQLITE_VERSION "3.8.11"
329 #define SQLITE_VERSION_NUMBER 3008011
330 #define SQLITE_SOURCE_ID "2015-07-27 13:49:41 b8e92227a469de677a66da62e4361f099c0b79d0"
331
332 /*
333 ** CAPI3REF: Run-Time Library Version Numbers
334 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
335 **
@@ -4747,13 +4747,13 @@
4747 ** ^The sqlite3_result_blob() interface sets the result from
4748 ** an application-defined function to be the BLOB whose content is pointed
4749 ** to by the second parameter and which is N bytes long where N is the
4750 ** third parameter.
4751 **
4752 ** ^The sqlite3_result_zeroblob() and zeroblob64() interfaces set the result
4753 ** of the application-defined function to be a BLOB containing all zero
4754 ** bytes and N bytes in size, where N is the value of the 2nd parameter.
4755 **
4756 ** ^The sqlite3_result_double() interface sets the result from
4757 ** an application-defined function to be a floating point value specified
4758 ** by its 2nd argument.
4759 **
@@ -102750,11 +102750,11 @@
102750 }else{
102751 sqlite3TableLock(pParse, iDbDest, pDest->tnum, 1, pDest->zName);
102752 sqlite3TableLock(pParse, iDbSrc, pSrc->tnum, 0, pSrc->zName);
102753 }
102754 for(pDestIdx=pDest->pIndex; pDestIdx; pDestIdx=pDestIdx->pNext){
102755 u8 useSeekResult = 0;
102756 for(pSrcIdx=pSrc->pIndex; ALWAYS(pSrcIdx); pSrcIdx=pSrcIdx->pNext){
102757 if( xferCompatibleIndex(pDestIdx, pSrcIdx) ) break;
102758 }
102759 assert( pSrcIdx );
102760 sqlite3VdbeAddOp3(v, OP_OpenRead, iSrc, pSrcIdx->tnum, iDbSrc);
@@ -102785,16 +102785,19 @@
102785 char *zColl = pSrcIdx->azColl[i];
102786 assert( zColl!=0 );
102787 if( sqlite3_stricmp("BINARY", zColl) ) break;
102788 }
102789 if( i==pSrcIdx->nColumn ){
102790 useSeekResult = OPFLAG_USESEEKRESULT;
102791 sqlite3VdbeAddOp3(v, OP_Last, iDest, 0, -1);
102792 }
 
 
 
102793 }
102794 sqlite3VdbeAddOp3(v, OP_IdxInsert, iDest, regData, 1);
102795 sqlite3VdbeChangeP5(v, useSeekResult);
102796 sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1+1); VdbeCoverage(v);
102797 sqlite3VdbeJumpHere(v, addr1);
102798 sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0);
102799 sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
102800 }
@@ -105464,10 +105467,11 @@
105464 returnSingleInt(pParse, "cache_size", pDb->pSchema->cache_size);
105465 }else{
105466 int size = sqlite3Atoi(zRight);
105467 pDb->pSchema->cache_size = size;
105468 sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
 
105469 }
105470 break;
105471 }
105472
105473 /*
105474
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1,8 +1,8 @@
1 /******************************************************************************
2 ** This file is an amalgamation of many separate C source files from SQLite
3 ** version 3.8.11.1. By combining all the individual C code files into this
4 ** single large file, the entire code can be compiled as a single translation
5 ** unit. This allows many compilers to do optimizations that would not be
6 ** possible if the files were compiled separately. Performance improvements
7 ** of 5% or more are commonly seen when SQLite is compiled as a single
8 ** translation unit.
@@ -323,13 +323,13 @@
323 **
324 ** See also: [sqlite3_libversion()],
325 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
326 ** [sqlite_version()] and [sqlite_source_id()].
327 */
328 #define SQLITE_VERSION "3.8.11.1"
329 #define SQLITE_VERSION_NUMBER 3008011
330 #define SQLITE_SOURCE_ID "2015-07-29 20:00:57 cf538e2783e468bbc25e7cb2a9ee64d3e0e80b2f"
331
332 /*
333 ** CAPI3REF: Run-Time Library Version Numbers
334 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
335 **
@@ -4747,13 +4747,13 @@
4747 ** ^The sqlite3_result_blob() interface sets the result from
4748 ** an application-defined function to be the BLOB whose content is pointed
4749 ** to by the second parameter and which is N bytes long where N is the
4750 ** third parameter.
4751 **
4752 ** ^The sqlite3_result_zeroblob(C,N) and sqlite3_result_zeroblob64(C,N)
4753 ** interfaces set the result of the application-defined function to be
4754 ** a BLOB containing all zero bytes and N bytes in size.
4755 **
4756 ** ^The sqlite3_result_double() interface sets the result from
4757 ** an application-defined function to be a floating point value specified
4758 ** by its 2nd argument.
4759 **
@@ -102750,11 +102750,11 @@
102750 }else{
102751 sqlite3TableLock(pParse, iDbDest, pDest->tnum, 1, pDest->zName);
102752 sqlite3TableLock(pParse, iDbSrc, pSrc->tnum, 0, pSrc->zName);
102753 }
102754 for(pDestIdx=pDest->pIndex; pDestIdx; pDestIdx=pDestIdx->pNext){
102755 u8 idxInsFlags = 0;
102756 for(pSrcIdx=pSrc->pIndex; ALWAYS(pSrcIdx); pSrcIdx=pSrcIdx->pNext){
102757 if( xferCompatibleIndex(pDestIdx, pSrcIdx) ) break;
102758 }
102759 assert( pSrcIdx );
102760 sqlite3VdbeAddOp3(v, OP_OpenRead, iSrc, pSrcIdx->tnum, iDbSrc);
@@ -102785,16 +102785,19 @@
102785 char *zColl = pSrcIdx->azColl[i];
102786 assert( zColl!=0 );
102787 if( sqlite3_stricmp("BINARY", zColl) ) break;
102788 }
102789 if( i==pSrcIdx->nColumn ){
102790 idxInsFlags = OPFLAG_USESEEKRESULT;
102791 sqlite3VdbeAddOp3(v, OP_Last, iDest, 0, -1);
102792 }
102793 }
102794 if( !HasRowid(pSrc) && pDestIdx->idxType==2 ){
102795 idxInsFlags |= OPFLAG_NCHANGE;
102796 }
102797 sqlite3VdbeAddOp3(v, OP_IdxInsert, iDest, regData, 1);
102798 sqlite3VdbeChangeP5(v, idxInsFlags);
102799 sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1+1); VdbeCoverage(v);
102800 sqlite3VdbeJumpHere(v, addr1);
102801 sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0);
102802 sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
102803 }
@@ -105464,10 +105467,11 @@
105467 returnSingleInt(pParse, "cache_size", pDb->pSchema->cache_size);
105468 }else{
105469 int size = sqlite3Atoi(zRight);
105470 pDb->pSchema->cache_size = size;
105471 sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
105472 if( sqlite3ReadSchema(pParse) ) goto pragma_out;
105473 }
105474 break;
105475 }
105476
105477 /*
105478
M src/sqlite3.h
+5 -5
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -109,13 +109,13 @@
109109
 **
110110
 ** See also: [sqlite3_libversion()],
111111
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
112112
 ** [sqlite_version()] and [sqlite_source_id()].
113113
 */
114
-#define SQLITE_VERSION "3.8.11"
114
+#define SQLITE_VERSION "3.8.11.1"
115115
 #define SQLITE_VERSION_NUMBER 3008011
116
-#define SQLITE_SOURCE_ID "2015-07-27 13:49:41 b8e92227a469de677a66da62e4361f099c0b79d0"
116
+#define SQLITE_SOURCE_ID "2015-07-29 20:00:57 cf538e2783e468bbc25e7cb2a9ee64d3e0e80b2f"
117117
118118
 /*
119119
 ** CAPI3REF: Run-Time Library Version Numbers
120120
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
121121
 **
@@ -4533,13 +4533,13 @@
45334533
 ** ^The sqlite3_result_blob() interface sets the result from
45344534
 ** an application-defined function to be the BLOB whose content is pointed
45354535
 ** to by the second parameter and which is N bytes long where N is the
45364536
 ** third parameter.
45374537
 **
4538
-** ^The sqlite3_result_zeroblob() and zeroblob64() interfaces set the result
4539
-** of the application-defined function to be a BLOB containing all zero
4540
-** bytes and N bytes in size, where N is the value of the 2nd parameter.
4538
+** ^The sqlite3_result_zeroblob(C,N) and sqlite3_result_zeroblob64(C,N)
4539
+** interfaces set the result of the application-defined function to be
4540
+** a BLOB containing all zero bytes and N bytes in size.
45414541
 **
45424542
 ** ^The sqlite3_result_double() interface sets the result from
45434543
 ** an application-defined function to be a floating point value specified
45444544
 ** by its 2nd argument.
45454545
 **
45464546
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -109,13 +109,13 @@
109 **
110 ** See also: [sqlite3_libversion()],
111 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
112 ** [sqlite_version()] and [sqlite_source_id()].
113 */
114 #define SQLITE_VERSION "3.8.11"
115 #define SQLITE_VERSION_NUMBER 3008011
116 #define SQLITE_SOURCE_ID "2015-07-27 13:49:41 b8e92227a469de677a66da62e4361f099c0b79d0"
117
118 /*
119 ** CAPI3REF: Run-Time Library Version Numbers
120 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
121 **
@@ -4533,13 +4533,13 @@
4533 ** ^The sqlite3_result_blob() interface sets the result from
4534 ** an application-defined function to be the BLOB whose content is pointed
4535 ** to by the second parameter and which is N bytes long where N is the
4536 ** third parameter.
4537 **
4538 ** ^The sqlite3_result_zeroblob() and zeroblob64() interfaces set the result
4539 ** of the application-defined function to be a BLOB containing all zero
4540 ** bytes and N bytes in size, where N is the value of the 2nd parameter.
4541 **
4542 ** ^The sqlite3_result_double() interface sets the result from
4543 ** an application-defined function to be a floating point value specified
4544 ** by its 2nd argument.
4545 **
4546
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -109,13 +109,13 @@
109 **
110 ** See also: [sqlite3_libversion()],
111 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
112 ** [sqlite_version()] and [sqlite_source_id()].
113 */
114 #define SQLITE_VERSION "3.8.11.1"
115 #define SQLITE_VERSION_NUMBER 3008011
116 #define SQLITE_SOURCE_ID "2015-07-29 20:00:57 cf538e2783e468bbc25e7cb2a9ee64d3e0e80b2f"
117
118 /*
119 ** CAPI3REF: Run-Time Library Version Numbers
120 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
121 **
@@ -4533,13 +4533,13 @@
4533 ** ^The sqlite3_result_blob() interface sets the result from
4534 ** an application-defined function to be the BLOB whose content is pointed
4535 ** to by the second parameter and which is N bytes long where N is the
4536 ** third parameter.
4537 **
4538 ** ^The sqlite3_result_zeroblob(C,N) and sqlite3_result_zeroblob64(C,N)
4539 ** interfaces set the result of the application-defined function to be
4540 ** a BLOB containing all zero bytes and N bytes in size.
4541 **
4542 ** ^The sqlite3_result_double() interface sets the result from
4543 ** an application-defined function to be a floating point value specified
4544 ** by its 2nd argument.
4545 **
4546
M test/merge5.test
-1
--- test/merge5.test
+++ test/merge5.test
@@ -37,11 +37,10 @@
3737
 test merge5-$testid 1
3838
 }
3939
 }
4040
4141
 catch {exec $::fossilexe info} res
42
-puts res=$res
4342
 if {![regexp {use --repository} $res]} {
4443
 puts stderr "Cannot run this test within an open checkout"
4544
 return
4645
 }
4746
 #
4847
--- test/merge5.test
+++ test/merge5.test
@@ -37,11 +37,10 @@
37 test merge5-$testid 1
38 }
39 }
40
41 catch {exec $::fossilexe info} res
42 puts res=$res
43 if {![regexp {use --repository} $res]} {
44 puts stderr "Cannot run this test within an open checkout"
45 return
46 }
47 #
48
--- test/merge5.test
+++ test/merge5.test
@@ -37,11 +37,10 @@
37 test merge5-$testid 1
38 }
39 }
40
41 catch {exec $::fossilexe info} res
 
42 if {![regexp {use --repository} $res]} {
43 puts stderr "Cannot run this test within an open checkout"
44 return
45 }
46 #
47
M test/merge_renames.test
-1
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -2,11 +2,10 @@
22
 # Tests for merging with renames
33
 #
44
 #
55
66
 catch {exec $::fossilexe info} res
7
-puts res=$res
87
 if {![regexp {use --repository} $res]} {
98
 puts stderr "Cannot run this test within an open checkout"
109
 return
1110
 }
1211
1312
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -2,11 +2,10 @@
2 # Tests for merging with renames
3 #
4 #
5
6 catch {exec $::fossilexe info} res
7 puts res=$res
8 if {![regexp {use --repository} $res]} {
9 puts stderr "Cannot run this test within an open checkout"
10 return
11 }
12
13
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -2,11 +2,10 @@
2 # Tests for merging with renames
3 #
4 #
5
6 catch {exec $::fossilexe info} res
 
7 if {![regexp {use --repository} $res]} {
8 puts stderr "Cannot run this test within an open checkout"
9 return
10 }
11
12
M test/mv-rm.test
-1
--- test/mv-rm.test
+++ test/mv-rm.test
@@ -17,11 +17,10 @@
1717
 #
1818
 # MV / RM Commands
1919
 #
2020
2121
 catch {exec $::fossilexe info} res
22
-puts res=$res
2322
 if {![regexp {use --repository} $res]} {
2423
 puts stderr "Cannot run this test within an open checkout"
2524
 return
2625
 }
2726
2827
--- test/mv-rm.test
+++ test/mv-rm.test
@@ -17,11 +17,10 @@
17 #
18 # MV / RM Commands
19 #
20
21 catch {exec $::fossilexe info} res
22 puts res=$res
23 if {![regexp {use --repository} $res]} {
24 puts stderr "Cannot run this test within an open checkout"
25 return
26 }
27
28
--- test/mv-rm.test
+++ test/mv-rm.test
@@ -17,11 +17,10 @@
17 #
18 # MV / RM Commands
19 #
20
21 catch {exec $::fossilexe info} res
 
22 if {![regexp {use --repository} $res]} {
23 puts stderr "Cannot run this test within an open checkout"
24 return
25 }
26
27
M test/revert.test
-1
--- test/revert.test
+++ test/revert.test
@@ -38,11 +38,10 @@
3838
3939
 fossil undo
4040
 }
4141
4242
 catch {exec $::fossilexe info} res
43
-puts res=$res
4443
 if {![regexp {use --repository} $res]} {
4544
 puts stderr "Cannot run this test within an open checkout"
4645
 return
4746
 }
4847
4948
--- test/revert.test
+++ test/revert.test
@@ -38,11 +38,10 @@
38
39 fossil undo
40 }
41
42 catch {exec $::fossilexe info} res
43 puts res=$res
44 if {![regexp {use --repository} $res]} {
45 puts stderr "Cannot run this test within an open checkout"
46 return
47 }
48
49
--- test/revert.test
+++ test/revert.test
@@ -38,11 +38,10 @@
38
39 fossil undo
40 }
41
42 catch {exec $::fossilexe info} res
 
43 if {![regexp {use --repository} $res]} {
44 puts stderr "Cannot run this test within an open checkout"
45 return
46 }
47
48
M www/checkin_names.wiki
+7
--- www/checkin_names.wiki
+++ www/checkin_names.wiki
@@ -15,10 +15,11 @@
1515
 <ul>
1616
 <li> <b>tip</b>
1717
 <li> <b>current</b>
1818
 <li> <b>next</b>
1919
 <li> <b>previous</b> or <b>prev</b>
20
+<li> <b>ckout</b> for embedded docs
2021
 </ul>
2122
 </ul>
2223
 </td></tr>
2324
 </table>
2425
 Many Fossil [/help|commands] and [./webui.wiki | web-interface] URLs accept
@@ -216,10 +217,16 @@
216217
 If the command is being run from a working check-out (not against a bare
217218
 repository) then a few extra tags apply. The "current" tag means the
218219
 current check-out. The "next" tag means the youngest child of the
219220
 current check-out. And the "previous" or "prev" tag means the primary
220221
 (non-merge) parent of the current check-out.
222
+
223
+For embedded documentation, the tag "ckout" means the version as present in
224
+the local source tree on disk, provided that the web server is started using
225
+"fossil ui" or "fossil server" from within the source tree. This tag can be
226
+used to preview local changes to documentation before committing them. It does
227
+not apply to CLI commands.
221228
222229
 <h2>Additional Examples</h2>
223230
224231
 To view the changes in the most recent check-in prior to the version currently
225232
 checked out:
226233
--- www/checkin_names.wiki
+++ www/checkin_names.wiki
@@ -15,10 +15,11 @@
15 <ul>
16 <li> <b>tip</b>
17 <li> <b>current</b>
18 <li> <b>next</b>
19 <li> <b>previous</b> or <b>prev</b>
 
20 </ul>
21 </ul>
22 </td></tr>
23 </table>
24 Many Fossil [/help|commands] and [./webui.wiki | web-interface] URLs accept
@@ -216,10 +217,16 @@
216 If the command is being run from a working check-out (not against a bare
217 repository) then a few extra tags apply. The "current" tag means the
218 current check-out. The "next" tag means the youngest child of the
219 current check-out. And the "previous" or "prev" tag means the primary
220 (non-merge) parent of the current check-out.
 
 
 
 
 
 
221
222 <h2>Additional Examples</h2>
223
224 To view the changes in the most recent check-in prior to the version currently
225 checked out:
226
--- www/checkin_names.wiki
+++ www/checkin_names.wiki
@@ -15,10 +15,11 @@
15 <ul>
16 <li> <b>tip</b>
17 <li> <b>current</b>
18 <li> <b>next</b>
19 <li> <b>previous</b> or <b>prev</b>
20 <li> <b>ckout</b> for embedded docs
21 </ul>
22 </ul>
23 </td></tr>
24 </table>
25 Many Fossil [/help|commands] and [./webui.wiki | web-interface] URLs accept
@@ -216,10 +217,16 @@
217 If the command is being run from a working check-out (not against a bare
218 repository) then a few extra tags apply. The "current" tag means the
219 current check-out. The "next" tag means the youngest child of the
220 current check-out. And the "previous" or "prev" tag means the primary
221 (non-merge) parent of the current check-out.
222
223 For embedded documentation, the tag "ckout" means the version as present in
224 the local source tree on disk, provided that the web server is started using
225 "fossil ui" or "fossil server" from within the source tree. This tag can be
226 used to preview local changes to documentation before committing them. It does
227 not apply to CLI commands.
228
229 <h2>Additional Examples</h2>
230
231 To view the changes in the most recent check-in prior to the version currently
232 checked out:
233
M www/th1.md
+2 -1
--- www/th1.md
+++ www/th1.md
@@ -113,11 +113,12 @@
113113
 * unset VARNAME
114114
 * uplevel ?LEVEL? SCRIPT
115115
 * upvar ?FRAME? OTHERVAR MYVAR ?OTHERVAR MYVAR?
116116
117117
 All of the above commands works as in the original Tcl. Refer to the
118
-Tcl documentation for details.
118
+<a href="https://www.tcl.tk/man/tcl/contents.htm">Tcl documentation</a>
119
+for details.
119120
120121
 TH1 Extended Commands
121122
 ---------------------
122123
123124
 There are many new commands added to TH1 and used to access the special
124125
--- www/th1.md
+++ www/th1.md
@@ -113,11 +113,12 @@
113 * unset VARNAME
114 * uplevel ?LEVEL? SCRIPT
115 * upvar ?FRAME? OTHERVAR MYVAR ?OTHERVAR MYVAR?
116
117 All of the above commands works as in the original Tcl. Refer to the
118 Tcl documentation for details.
 
119
120 TH1 Extended Commands
121 ---------------------
122
123 There are many new commands added to TH1 and used to access the special
124
--- www/th1.md
+++ www/th1.md
@@ -113,11 +113,12 @@
113 * unset VARNAME
114 * uplevel ?LEVEL? SCRIPT
115 * upvar ?FRAME? OTHERVAR MYVAR ?OTHERVAR MYVAR?
116
117 All of the above commands works as in the original Tcl. Refer to the
118 <a href="https://www.tcl.tk/man/tcl/contents.htm">Tcl documentation</a>
119 for details.
120
121 TH1 Extended Commands
122 ---------------------
123
124 There are many new commands added to TH1 and used to access the special
125

Keyboard Shortcuts

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