Fossil SCM

Merge updates from trunk.

mistachkin 2014-06-12 18:36 UTC th1Cmds merge
Commit b3f9ce63ecf684bd7ef409348476a5951b8f3708
Parent 617eeaecf844b83…
3 files changed +16 -6 +16 -6 +1 -1
~ src/th_main.c ~ src/th_main.c ~ www/changes.wiki
M src/th_main.c
+16 -6
--- src/th_main.c
+++ src/th_main.c
@@ -1134,10 +1134,23 @@
11341134
 "synchronous requests are not yet implemented", 0, 0);
11351135
 blob_reset(&payload);
11361136
 return TH_ERROR;
11371137
 }
11381138
 }
1139
+
1140
+/*
1141
+** Attempts to open the configuration ("user") database. Optionally, also
1142
+** attempts to try to find the repository and open it.
1143
+*/
1144
+void Th_OpenConfig(
1145
+ int openRepository
1146
+){
1147
+ if( openRepository ){
1148
+ db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1149
+ }
1150
+ db_open_config(0);
1151
+}
11391152
11401153
 /*
11411154
 ** Make sure the interpreter has been initialized. Initialize it if
11421155
 ** it has not been already.
11431156
 **
@@ -1191,12 +1204,11 @@
11911204
 ** This function uses several settings which may be defined in the
11921205
 ** repository and/or the global configuration. Since the caller
11931206
 ** passed a non-zero value for the needConfig parameter, make sure
11941207
 ** the necessary database connections are open prior to continuing.
11951208
 */
1196
- db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1197
- db_open_config(0);
1209
+ Th_OpenConfig(1);
11981210
 }
11991211
 if( forceReset || forceTcl || g.interp==0 ){
12001212
 int created = 0;
12011213
 int i;
12021214
 if( g.interp==0 ){
@@ -1420,12 +1432,11 @@
14201432
 */
14211433
 void test_th_render(void){
14221434
 Blob in;
14231435
 Th_InitTraceLog();
14241436
 if( find_option("th-open-config", 0, 0)!=0 ){
1425
- db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1426
- db_open_config(0);
1437
+ Th_OpenConfig(1);
14271438
 }
14281439
 if( g.argc<3 ){
14291440
 usage("FILE");
14301441
 }
14311442
 blob_zero(&in);
@@ -1440,12 +1451,11 @@
14401451
 void test_th_eval(void){
14411452
 int rc;
14421453
 const char *zRc;
14431454
 Th_InitTraceLog();
14441455
 if( find_option("th-open-config", 0, 0)!=0 ){
1445
- db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1446
- db_open_config(0);
1456
+ Th_OpenConfig(1);
14471457
 }
14481458
 if( g.argc!=3 ){
14491459
 usage("script");
14501460
 }
14511461
 Th_FossilInit(TH_INIT_DEFAULT);
14521462
--- src/th_main.c
+++ src/th_main.c
@@ -1134,10 +1134,23 @@
1134 "synchronous requests are not yet implemented", 0, 0);
1135 blob_reset(&payload);
1136 return TH_ERROR;
1137 }
1138 }
 
 
 
 
 
 
 
 
 
 
 
 
 
1139
1140 /*
1141 ** Make sure the interpreter has been initialized. Initialize it if
1142 ** it has not been already.
1143 **
@@ -1191,12 +1204,11 @@
1191 ** This function uses several settings which may be defined in the
1192 ** repository and/or the global configuration. Since the caller
1193 ** passed a non-zero value for the needConfig parameter, make sure
1194 ** the necessary database connections are open prior to continuing.
1195 */
1196 db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1197 db_open_config(0);
1198 }
1199 if( forceReset || forceTcl || g.interp==0 ){
1200 int created = 0;
1201 int i;
1202 if( g.interp==0 ){
@@ -1420,12 +1432,11 @@
1420 */
1421 void test_th_render(void){
1422 Blob in;
1423 Th_InitTraceLog();
1424 if( find_option("th-open-config", 0, 0)!=0 ){
1425 db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1426 db_open_config(0);
1427 }
1428 if( g.argc<3 ){
1429 usage("FILE");
1430 }
1431 blob_zero(&in);
@@ -1440,12 +1451,11 @@
1440 void test_th_eval(void){
1441 int rc;
1442 const char *zRc;
1443 Th_InitTraceLog();
1444 if( find_option("th-open-config", 0, 0)!=0 ){
1445 db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1446 db_open_config(0);
1447 }
1448 if( g.argc!=3 ){
1449 usage("script");
1450 }
1451 Th_FossilInit(TH_INIT_DEFAULT);
1452
--- src/th_main.c
+++ src/th_main.c
@@ -1134,10 +1134,23 @@
1134 "synchronous requests are not yet implemented", 0, 0);
1135 blob_reset(&payload);
1136 return TH_ERROR;
1137 }
1138 }
1139
1140 /*
1141 ** Attempts to open the configuration ("user") database. Optionally, also
1142 ** attempts to try to find the repository and open it.
1143 */
1144 void Th_OpenConfig(
1145 int openRepository
1146 ){
1147 if( openRepository ){
1148 db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1149 }
1150 db_open_config(0);
1151 }
1152
1153 /*
1154 ** Make sure the interpreter has been initialized. Initialize it if
1155 ** it has not been already.
1156 **
@@ -1191,12 +1204,11 @@
1204 ** This function uses several settings which may be defined in the
1205 ** repository and/or the global configuration. Since the caller
1206 ** passed a non-zero value for the needConfig parameter, make sure
1207 ** the necessary database connections are open prior to continuing.
1208 */
1209 Th_OpenConfig(1);
 
1210 }
1211 if( forceReset || forceTcl || g.interp==0 ){
1212 int created = 0;
1213 int i;
1214 if( g.interp==0 ){
@@ -1420,12 +1432,11 @@
1432 */
1433 void test_th_render(void){
1434 Blob in;
1435 Th_InitTraceLog();
1436 if( find_option("th-open-config", 0, 0)!=0 ){
1437 Th_OpenConfig(1);
 
1438 }
1439 if( g.argc<3 ){
1440 usage("FILE");
1441 }
1442 blob_zero(&in);
@@ -1440,12 +1451,11 @@
1451 void test_th_eval(void){
1452 int rc;
1453 const char *zRc;
1454 Th_InitTraceLog();
1455 if( find_option("th-open-config", 0, 0)!=0 ){
1456 Th_OpenConfig(1);
 
1457 }
1458 if( g.argc!=3 ){
1459 usage("script");
1460 }
1461 Th_FossilInit(TH_INIT_DEFAULT);
1462
M src/th_main.c
+16 -6
--- src/th_main.c
+++ src/th_main.c
@@ -1134,10 +1134,23 @@
11341134
 "synchronous requests are not yet implemented", 0, 0);
11351135
 blob_reset(&payload);
11361136
 return TH_ERROR;
11371137
 }
11381138
 }
1139
+
1140
+/*
1141
+** Attempts to open the configuration ("user") database. Optionally, also
1142
+** attempts to try to find the repository and open it.
1143
+*/
1144
+void Th_OpenConfig(
1145
+ int openRepository
1146
+){
1147
+ if( openRepository ){
1148
+ db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1149
+ }
1150
+ db_open_config(0);
1151
+}
11391152
11401153
 /*
11411154
 ** Make sure the interpreter has been initialized. Initialize it if
11421155
 ** it has not been already.
11431156
 **
@@ -1191,12 +1204,11 @@
11911204
 ** This function uses several settings which may be defined in the
11921205
 ** repository and/or the global configuration. Since the caller
11931206
 ** passed a non-zero value for the needConfig parameter, make sure
11941207
 ** the necessary database connections are open prior to continuing.
11951208
 */
1196
- db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1197
- db_open_config(0);
1209
+ Th_OpenConfig(1);
11981210
 }
11991211
 if( forceReset || forceTcl || g.interp==0 ){
12001212
 int created = 0;
12011213
 int i;
12021214
 if( g.interp==0 ){
@@ -1420,12 +1432,11 @@
14201432
 */
14211433
 void test_th_render(void){
14221434
 Blob in;
14231435
 Th_InitTraceLog();
14241436
 if( find_option("th-open-config", 0, 0)!=0 ){
1425
- db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1426
- db_open_config(0);
1437
+ Th_OpenConfig(1);
14271438
 }
14281439
 if( g.argc<3 ){
14291440
 usage("FILE");
14301441
 }
14311442
 blob_zero(&in);
@@ -1440,12 +1451,11 @@
14401451
 void test_th_eval(void){
14411452
 int rc;
14421453
 const char *zRc;
14431454
 Th_InitTraceLog();
14441455
 if( find_option("th-open-config", 0, 0)!=0 ){
1445
- db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1446
- db_open_config(0);
1456
+ Th_OpenConfig(1);
14471457
 }
14481458
 if( g.argc!=3 ){
14491459
 usage("script");
14501460
 }
14511461
 Th_FossilInit(TH_INIT_DEFAULT);
14521462
--- src/th_main.c
+++ src/th_main.c
@@ -1134,10 +1134,23 @@
1134 "synchronous requests are not yet implemented", 0, 0);
1135 blob_reset(&payload);
1136 return TH_ERROR;
1137 }
1138 }
 
 
 
 
 
 
 
 
 
 
 
 
 
1139
1140 /*
1141 ** Make sure the interpreter has been initialized. Initialize it if
1142 ** it has not been already.
1143 **
@@ -1191,12 +1204,11 @@
1191 ** This function uses several settings which may be defined in the
1192 ** repository and/or the global configuration. Since the caller
1193 ** passed a non-zero value for the needConfig parameter, make sure
1194 ** the necessary database connections are open prior to continuing.
1195 */
1196 db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1197 db_open_config(0);
1198 }
1199 if( forceReset || forceTcl || g.interp==0 ){
1200 int created = 0;
1201 int i;
1202 if( g.interp==0 ){
@@ -1420,12 +1432,11 @@
1420 */
1421 void test_th_render(void){
1422 Blob in;
1423 Th_InitTraceLog();
1424 if( find_option("th-open-config", 0, 0)!=0 ){
1425 db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1426 db_open_config(0);
1427 }
1428 if( g.argc<3 ){
1429 usage("FILE");
1430 }
1431 blob_zero(&in);
@@ -1440,12 +1451,11 @@
1440 void test_th_eval(void){
1441 int rc;
1442 const char *zRc;
1443 Th_InitTraceLog();
1444 if( find_option("th-open-config", 0, 0)!=0 ){
1445 db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1446 db_open_config(0);
1447 }
1448 if( g.argc!=3 ){
1449 usage("script");
1450 }
1451 Th_FossilInit(TH_INIT_DEFAULT);
1452
--- src/th_main.c
+++ src/th_main.c
@@ -1134,10 +1134,23 @@
1134 "synchronous requests are not yet implemented", 0, 0);
1135 blob_reset(&payload);
1136 return TH_ERROR;
1137 }
1138 }
1139
1140 /*
1141 ** Attempts to open the configuration ("user") database. Optionally, also
1142 ** attempts to try to find the repository and open it.
1143 */
1144 void Th_OpenConfig(
1145 int openRepository
1146 ){
1147 if( openRepository ){
1148 db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0);
1149 }
1150 db_open_config(0);
1151 }
1152
1153 /*
1154 ** Make sure the interpreter has been initialized. Initialize it if
1155 ** it has not been already.
1156 **
@@ -1191,12 +1204,11 @@
1204 ** This function uses several settings which may be defined in the
1205 ** repository and/or the global configuration. Since the caller
1206 ** passed a non-zero value for the needConfig parameter, make sure
1207 ** the necessary database connections are open prior to continuing.
1208 */
1209 Th_OpenConfig(1);
 
1210 }
1211 if( forceReset || forceTcl || g.interp==0 ){
1212 int created = 0;
1213 int i;
1214 if( g.interp==0 ){
@@ -1420,12 +1432,11 @@
1432 */
1433 void test_th_render(void){
1434 Blob in;
1435 Th_InitTraceLog();
1436 if( find_option("th-open-config", 0, 0)!=0 ){
1437 Th_OpenConfig(1);
 
1438 }
1439 if( g.argc<3 ){
1440 usage("FILE");
1441 }
1442 blob_zero(&in);
@@ -1440,12 +1451,11 @@
1451 void test_th_eval(void){
1452 int rc;
1453 const char *zRc;
1454 Th_InitTraceLog();
1455 if( find_option("th-open-config", 0, 0)!=0 ){
1456 Th_OpenConfig(1);
 
1457 }
1458 if( g.argc!=3 ){
1459 usage("script");
1460 }
1461 Th_FossilInit(TH_INIT_DEFAULT);
1462
M www/changes.wiki
+1 -1
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,8 +1,8 @@
11
 <title>Change Log</title>
22
3
-<h2>Changes For Version 1.29 (as yet unreleased)</h2>
3
+<h2>Changes For Version 1.29 (2014-06-12)</h2>
44
 * Add the ability to display content, diffs and annotations for UTF16
55
 text files in the web interface.
66
 * Add the "SaveAs..." and "Invert" buttons
77
 to the graphical diff display that results
88
 from using the --tk option with the [/help/diff | fossil diff] command.
99
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,8 +1,8 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.29 (as yet unreleased)</h2>
4 * Add the ability to display content, diffs and annotations for UTF16
5 text files in the web interface.
6 * Add the "SaveAs..." and "Invert" buttons
7 to the graphical diff display that results
8 from using the --tk option with the [/help/diff | fossil diff] command.
9
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,8 +1,8 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.29 (2014-06-12)</h2>
4 * Add the ability to display content, diffs and annotations for UTF16
5 text files in the web interface.
6 * Add the "SaveAs..." and "Invert" buttons
7 to the graphical diff display that results
8 from using the --tk option with the [/help/diff | fossil diff] command.
9

Keyboard Shortcuts

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