Fossil SCM

The "fossil version -v" command and the /version?verbose webpage show the same output. Update the change log for the 1.37 release.

drh 2017-01-16 20:35 trunk
Commit 9c97d23d36d05705e51dd181f0602474671d6cce
Parent df91c2277f680ba…
2 files changed +18 -24 +3 -1
~ src/main.c ~ www/changes.wiki
M src/main.c
+18 -24
--- src/main.c
+++ src/main.c
@@ -916,17 +916,16 @@
916916
 ){
917917
 #if defined(FOSSIL_ENABLE_TCL)
918918
 int rc;
919919
 const char *zRc;
920920
 #endif
921
+ Stmt q;
921922
 blob_zero(pOut);
922923
 blob_appendf(pOut, "This is fossil version %s\n", get_version());
923924
 if( !bVerbose ) return;
924925
 blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n",
925926
 __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
926
- blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(),
927
- sqlite3_sourceid());
928927
 blob_appendf(pOut, "Schema version %s\n", AUX_SCHEMA_MAX);
929928
 #if defined(FOSSIL_ENABLE_MINIZ)
930929
 blob_appendf(pOut, "miniz %s, loaded %s\n", MZ_VERSION, mz_version());
931930
 #else
932931
 blob_appendf(pOut, "zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
@@ -977,10 +976,20 @@
977976
 blob_append(pOut, "STATIC_BUILD\n", -1);
978977
 #endif
979978
 #if defined(USE_SEE)
980979
 blob_append(pOut, "USE_SEE\n", -1);
981980
 #endif
981
+ blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(),
982
+ sqlite3_sourceid());
983
+ if( g.db==0 ) sqlite3_open(":memory:", &g.db);
984
+ db_prepare(&q,
985
+ "SELECT compile_options FROM pragma_compile_options"
986
+ " WHERE compile_options NOT LIKE 'COMPILER=%%'");
987
+ while( db_step(&q)==SQLITE_ROW ){
988
+ blob_appendf(pOut, "SQLITE_%s\n", db_column_text(&q, 0));
989
+ }
990
+ db_finalize(&q);
982991
 }
983992
984993
 /*
985994
 ** This function returns the user-agent string for Fossil, for
986995
 ** use in HTTP(S) requests.
@@ -1018,40 +1027,25 @@
10181027
 **
10191028
 ** Show the version information for Fossil.
10201029
 **
10211030
 ** Query parameters:
10221031
 **
1023
-** verbose Show all available details.
1032
+** verbose Show details
10241033
 */
10251034
 void test_version_page(void){
10261035
 Blob versionInfo;
1027
- const char *verboseFlag;
1036
+ int verboseFlag;
10281037
10291038
 login_check_credentials();
10301039
 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
1031
- verboseFlag = P("verbose");
1040
+ verboseFlag = atoi(PD("verbose","0"));
10321041
 style_header("Version Information");
10331042
 style_submenu_element("Stat", "stat");
1034
- if( verboseFlag != 0 && !strcmp(verboseFlag, "2") ){
1035
- Stmt loop;
1036
- style_submenu_element("Fossil version", "version?verbose=1");
1037
- blob_zero(&versionInfo);
1038
- blob_appendf(&versionInfo, "SQLite %s %.30s\n",
1039
- sqlite3_libversion(), sqlite3_sourceid());
1040
- db_prepare(&loop, "pragma compile_options;");
1041
- while( db_step(&loop)==SQLITE_ROW ){
1042
- blob_appendf(&versionInfo, "%s\n", db_column_text(&loop, 0));
1043
- }
1044
- db_finalize(&loop);
1045
-
1046
- }else{
1047
- style_submenu_element("SQLite version", "version?verbose=2");
1048
- get_version_blob(&versionInfo, verboseFlag != 0);
1049
- }
1050
- cgi_printf("<blockquote><pre>\n"
1051
- "%h\n"
1052
- "</pre></blockquote>\n",(blob_str(&versionInfo)));
1043
+ get_version_blob(&versionInfo, verboseFlag);
1044
+ @ <pre>
1045
+ @ %h(blob_str(&versionInfo))
1046
+ @ </pre>
10531047
 style_footer();
10541048
 }
10551049
10561050
10571051
 /*
10581052
--- src/main.c
+++ src/main.c
@@ -916,17 +916,16 @@
916 ){
917 #if defined(FOSSIL_ENABLE_TCL)
918 int rc;
919 const char *zRc;
920 #endif
 
921 blob_zero(pOut);
922 blob_appendf(pOut, "This is fossil version %s\n", get_version());
923 if( !bVerbose ) return;
924 blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n",
925 __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
926 blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(),
927 sqlite3_sourceid());
928 blob_appendf(pOut, "Schema version %s\n", AUX_SCHEMA_MAX);
929 #if defined(FOSSIL_ENABLE_MINIZ)
930 blob_appendf(pOut, "miniz %s, loaded %s\n", MZ_VERSION, mz_version());
931 #else
932 blob_appendf(pOut, "zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
@@ -977,10 +976,20 @@
977 blob_append(pOut, "STATIC_BUILD\n", -1);
978 #endif
979 #if defined(USE_SEE)
980 blob_append(pOut, "USE_SEE\n", -1);
981 #endif
 
 
 
 
 
 
 
 
 
 
982 }
983
984 /*
985 ** This function returns the user-agent string for Fossil, for
986 ** use in HTTP(S) requests.
@@ -1018,40 +1027,25 @@
1018 **
1019 ** Show the version information for Fossil.
1020 **
1021 ** Query parameters:
1022 **
1023 ** verbose Show all available details.
1024 */
1025 void test_version_page(void){
1026 Blob versionInfo;
1027 const char *verboseFlag;
1028
1029 login_check_credentials();
1030 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
1031 verboseFlag = P("verbose");
1032 style_header("Version Information");
1033 style_submenu_element("Stat", "stat");
1034 if( verboseFlag != 0 && !strcmp(verboseFlag, "2") ){
1035 Stmt loop;
1036 style_submenu_element("Fossil version", "version?verbose=1");
1037 blob_zero(&versionInfo);
1038 blob_appendf(&versionInfo, "SQLite %s %.30s\n",
1039 sqlite3_libversion(), sqlite3_sourceid());
1040 db_prepare(&loop, "pragma compile_options;");
1041 while( db_step(&loop)==SQLITE_ROW ){
1042 blob_appendf(&versionInfo, "%s\n", db_column_text(&loop, 0));
1043 }
1044 db_finalize(&loop);
1045
1046 }else{
1047 style_submenu_element("SQLite version", "version?verbose=2");
1048 get_version_blob(&versionInfo, verboseFlag != 0);
1049 }
1050 cgi_printf("<blockquote><pre>\n"
1051 "%h\n"
1052 "</pre></blockquote>\n",(blob_str(&versionInfo)));
1053 style_footer();
1054 }
1055
1056
1057 /*
1058
--- src/main.c
+++ src/main.c
@@ -916,17 +916,16 @@
916 ){
917 #if defined(FOSSIL_ENABLE_TCL)
918 int rc;
919 const char *zRc;
920 #endif
921 Stmt q;
922 blob_zero(pOut);
923 blob_appendf(pOut, "This is fossil version %s\n", get_version());
924 if( !bVerbose ) return;
925 blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n",
926 __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
 
 
927 blob_appendf(pOut, "Schema version %s\n", AUX_SCHEMA_MAX);
928 #if defined(FOSSIL_ENABLE_MINIZ)
929 blob_appendf(pOut, "miniz %s, loaded %s\n", MZ_VERSION, mz_version());
930 #else
931 blob_appendf(pOut, "zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
@@ -977,10 +976,20 @@
976 blob_append(pOut, "STATIC_BUILD\n", -1);
977 #endif
978 #if defined(USE_SEE)
979 blob_append(pOut, "USE_SEE\n", -1);
980 #endif
981 blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(),
982 sqlite3_sourceid());
983 if( g.db==0 ) sqlite3_open(":memory:", &g.db);
984 db_prepare(&q,
985 "SELECT compile_options FROM pragma_compile_options"
986 " WHERE compile_options NOT LIKE 'COMPILER=%%'");
987 while( db_step(&q)==SQLITE_ROW ){
988 blob_appendf(pOut, "SQLITE_%s\n", db_column_text(&q, 0));
989 }
990 db_finalize(&q);
991 }
992
993 /*
994 ** This function returns the user-agent string for Fossil, for
995 ** use in HTTP(S) requests.
@@ -1018,40 +1027,25 @@
1027 **
1028 ** Show the version information for Fossil.
1029 **
1030 ** Query parameters:
1031 **
1032 ** verbose Show details
1033 */
1034 void test_version_page(void){
1035 Blob versionInfo;
1036 int verboseFlag;
1037
1038 login_check_credentials();
1039 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
1040 verboseFlag = atoi(PD("verbose","0"));
1041 style_header("Version Information");
1042 style_submenu_element("Stat", "stat");
1043 get_version_blob(&versionInfo, verboseFlag);
1044 @ <pre>
1045 @ %h(blob_str(&versionInfo))
1046 @ </pre>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1047 style_footer();
1048 }
1049
1050
1051 /*
1052
M www/changes.wiki
+3 -1
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,9 +1,9 @@
11
 <title>Change Log</title>
22
33
 <a name='v1_37'></a>
4
-<h2>Changes for Version 1.37 (2017-XX-YY)</h2>
4
+<h2>Changes for Version 1.37 (2017-01-16)</h2>
55
66
 * Add checkbox widgets to various web pages. See [/technote/8d18bf27e9|
77
 this technote] for more information. To get the checkboxes to look as
88
 intended, you must update the CSS in your repository and all clones.
99
 * Add the [/help/all|fossil all ui] command
@@ -23,10 +23,11 @@
2323
 <li>Add <nowiki>[unversioned list]</nowiki> command.</li>
2424
 <li>Add project_description variable.</li>
2525
 </ul>
2626
 * Rename crnl-glob [/help/settings|setting] to crlf-glob, but keep
2727
 crnl-glob as a compatibility alias.
28
+ * Added the --command option to the [/help/diff|diff] command.
2829
 * Fix a C99-ism that prevents the 1.36 release from building with MSVC.
2930
 * Fix [/help?cmd=ticket|ticket set] when using the "+" prefix with fields
3031
 from the "ticketchng" table.
3132
 * Remove the "fusefs" command from builds that do not have the underlying
3233
 support enabled.
@@ -33,10 +34,11 @@
3334
 * Fixes for incremental git import/export.
3435
 * Minor security enhancements to
3536
 [./encryptedrepos.wiki|encrypted repositories].
3637
 * Update the built-in SQLite to version 3.16.2.
3738
 * Update the built-in Zlib to version 1.2.11.
39
+
3840
3941
 <a name='v1_36'></a>
4042
 <h2>Changes for Version 1.36 (2016-10-24)</h2>
4143
4244
 * Add support for [./unvers.wiki|unversioned content],
4345
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,9 +1,9 @@
1 <title>Change Log</title>
2
3 <a name='v1_37'></a>
4 <h2>Changes for Version 1.37 (2017-XX-YY)</h2>
5
6 * Add checkbox widgets to various web pages. See [/technote/8d18bf27e9|
7 this technote] for more information. To get the checkboxes to look as
8 intended, you must update the CSS in your repository and all clones.
9 * Add the [/help/all|fossil all ui] command
@@ -23,10 +23,11 @@
23 <li>Add <nowiki>[unversioned list]</nowiki> command.</li>
24 <li>Add project_description variable.</li>
25 </ul>
26 * Rename crnl-glob [/help/settings|setting] to crlf-glob, but keep
27 crnl-glob as a compatibility alias.
 
28 * Fix a C99-ism that prevents the 1.36 release from building with MSVC.
29 * Fix [/help?cmd=ticket|ticket set] when using the "+" prefix with fields
30 from the "ticketchng" table.
31 * Remove the "fusefs" command from builds that do not have the underlying
32 support enabled.
@@ -33,10 +34,11 @@
33 * Fixes for incremental git import/export.
34 * Minor security enhancements to
35 [./encryptedrepos.wiki|encrypted repositories].
36 * Update the built-in SQLite to version 3.16.2.
37 * Update the built-in Zlib to version 1.2.11.
 
38
39 <a name='v1_36'></a>
40 <h2>Changes for Version 1.36 (2016-10-24)</h2>
41
42 * Add support for [./unvers.wiki|unversioned content],
43
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,9 +1,9 @@
1 <title>Change Log</title>
2
3 <a name='v1_37'></a>
4 <h2>Changes for Version 1.37 (2017-01-16)</h2>
5
6 * Add checkbox widgets to various web pages. See [/technote/8d18bf27e9|
7 this technote] for more information. To get the checkboxes to look as
8 intended, you must update the CSS in your repository and all clones.
9 * Add the [/help/all|fossil all ui] command
@@ -23,10 +23,11 @@
23 <li>Add <nowiki>[unversioned list]</nowiki> command.</li>
24 <li>Add project_description variable.</li>
25 </ul>
26 * Rename crnl-glob [/help/settings|setting] to crlf-glob, but keep
27 crnl-glob as a compatibility alias.
28 * Added the --command option to the [/help/diff|diff] command.
29 * Fix a C99-ism that prevents the 1.36 release from building with MSVC.
30 * Fix [/help?cmd=ticket|ticket set] when using the "+" prefix with fields
31 from the "ticketchng" table.
32 * Remove the "fusefs" command from builds that do not have the underlying
33 support enabled.
@@ -33,10 +34,11 @@
34 * Fixes for incremental git import/export.
35 * Minor security enhancements to
36 [./encryptedrepos.wiki|encrypted repositories].
37 * Update the built-in SQLite to version 3.16.2.
38 * Update the built-in Zlib to version 1.2.11.
39
40
41 <a name='v1_36'></a>
42 <h2>Changes for Version 1.36 (2016-10-24)</h2>
43
44 * Add support for [./unvers.wiki|unversioned content],
45

Keyboard Shortcuts

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