Fossil SCM

Display Pikchr version in the output of 'dbstat' and /stat.

danield 2026-04-13 12:12 UTC trunk
Commit cca8cc15f2331578c8667460696d6a042894c7b771c4303a7c1c3c11f247a80e
Parent 3361df86b3ba753…
1 file changed +6 -2
~ src/stat.c
M src/stat.c
+6 -2
--- src/stat.c
+++ src/stat.c
@@ -295,10 +295,11 @@
295295
 @ (%h(RELEASE_VERSION)) <a href='version?verbose'>(details)</a>
296296
 @ </td></tr>
297297
 @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(sqlite3_sourceid())
298298
 @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion()))
299299
 @ <a href='version?verbose'>(details)</a></td></tr>
300
+ @ <tr><th>Pikchr&nbsp;Version:</th><td>%s(pikchr_version())</td></tr>
300301
 if( g.perm.Admin ){
301302
 const char *zCgi = P("SERVER_SOFTWARE");
302303
 @ <tr><th>OpenSSL&nbsp;Version:</th>
303304
 @ <td>%z(fossil_openssl_version())</td></tr>
304305
 if( zCgi ){
@@ -353,18 +354,18 @@
353354
 ** -b|--brief Only show essential elements
354355
 ** --db-check Run "PRAGMA quick_check" on the repository database
355356
 ** --db-verify Run a full verification of the repository integrity.
356357
 ** This involves decoding and reparsing all artifacts
357358
 ** and can take significant time.
358
-** --omit-version-info Omit the SQLite and Fossil version information
359
+** --omit-version-info Omit the SQLite, Fossil, Pikchr version information
359360
 */
360361
 void dbstat_cmd(void){
361362
 i64 t, fsize;
362363
 int n, m;
363364
 int szMax, szAvg;
364365
 int brief;
365
- int omitVers; /* Omit Fossil and SQLite version information */
366
+ int omitVers; /* Omit Fossil, SQLite, Pikchr version information */
366367
 int dbCheck; /* True for the --db-check option */
367368
 const int colWidth = -19 /* printf alignment/width for left column */;
368369
 const char *p, *z;
369370
370371
 brief = find_option("brief", "b",0)!=0;
@@ -469,10 +470,13 @@
469470
 COMPILER_NAME);
470471
 fossil_print("%*s%.19s [%.10s] (%s)\n",
471472
 colWidth, "sqlite-version:",
472473
 sqlite3_sourceid(), &sqlite3_sourceid()[20],
473474
 sqlite3_libversion());
475
+ fossil_print("%*s%s\n",
476
+ colWidth, "pikchr-version:",
477
+ pikchr_version());
474478
 }
475479
 fossil_print("%*s%,d pages, %d bytes/pg, %,d free pages, "
476480
 "%s, %s mode\n",
477481
 colWidth, "database-stats:",
478482
 db_int(0, "PRAGMA repository.page_count"),
479483
--- src/stat.c
+++ src/stat.c
@@ -295,10 +295,11 @@
295 @ (%h(RELEASE_VERSION)) <a href='version?verbose'>(details)</a>
296 @ </td></tr>
297 @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(sqlite3_sourceid())
298 @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion()))
299 @ <a href='version?verbose'>(details)</a></td></tr>
 
300 if( g.perm.Admin ){
301 const char *zCgi = P("SERVER_SOFTWARE");
302 @ <tr><th>OpenSSL&nbsp;Version:</th>
303 @ <td>%z(fossil_openssl_version())</td></tr>
304 if( zCgi ){
@@ -353,18 +354,18 @@
353 ** -b|--brief Only show essential elements
354 ** --db-check Run "PRAGMA quick_check" on the repository database
355 ** --db-verify Run a full verification of the repository integrity.
356 ** This involves decoding and reparsing all artifacts
357 ** and can take significant time.
358 ** --omit-version-info Omit the SQLite and Fossil version information
359 */
360 void dbstat_cmd(void){
361 i64 t, fsize;
362 int n, m;
363 int szMax, szAvg;
364 int brief;
365 int omitVers; /* Omit Fossil and SQLite version information */
366 int dbCheck; /* True for the --db-check option */
367 const int colWidth = -19 /* printf alignment/width for left column */;
368 const char *p, *z;
369
370 brief = find_option("brief", "b",0)!=0;
@@ -469,10 +470,13 @@
469 COMPILER_NAME);
470 fossil_print("%*s%.19s [%.10s] (%s)\n",
471 colWidth, "sqlite-version:",
472 sqlite3_sourceid(), &sqlite3_sourceid()[20],
473 sqlite3_libversion());
 
 
 
474 }
475 fossil_print("%*s%,d pages, %d bytes/pg, %,d free pages, "
476 "%s, %s mode\n",
477 colWidth, "database-stats:",
478 db_int(0, "PRAGMA repository.page_count"),
479
--- src/stat.c
+++ src/stat.c
@@ -295,10 +295,11 @@
295 @ (%h(RELEASE_VERSION)) <a href='version?verbose'>(details)</a>
296 @ </td></tr>
297 @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(sqlite3_sourceid())
298 @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion()))
299 @ <a href='version?verbose'>(details)</a></td></tr>
300 @ <tr><th>Pikchr&nbsp;Version:</th><td>%s(pikchr_version())</td></tr>
301 if( g.perm.Admin ){
302 const char *zCgi = P("SERVER_SOFTWARE");
303 @ <tr><th>OpenSSL&nbsp;Version:</th>
304 @ <td>%z(fossil_openssl_version())</td></tr>
305 if( zCgi ){
@@ -353,18 +354,18 @@
354 ** -b|--brief Only show essential elements
355 ** --db-check Run "PRAGMA quick_check" on the repository database
356 ** --db-verify Run a full verification of the repository integrity.
357 ** This involves decoding and reparsing all artifacts
358 ** and can take significant time.
359 ** --omit-version-info Omit the SQLite, Fossil, Pikchr version information
360 */
361 void dbstat_cmd(void){
362 i64 t, fsize;
363 int n, m;
364 int szMax, szAvg;
365 int brief;
366 int omitVers; /* Omit Fossil, SQLite, Pikchr version information */
367 int dbCheck; /* True for the --db-check option */
368 const int colWidth = -19 /* printf alignment/width for left column */;
369 const char *p, *z;
370
371 brief = find_option("brief", "b",0)!=0;
@@ -469,10 +470,13 @@
470 COMPILER_NAME);
471 fossil_print("%*s%.19s [%.10s] (%s)\n",
472 colWidth, "sqlite-version:",
473 sqlite3_sourceid(), &sqlite3_sourceid()[20],
474 sqlite3_libversion());
475 fossil_print("%*s%s\n",
476 colWidth, "pikchr-version:",
477 pikchr_version());
478 }
479 fossil_print("%*s%,d pages, %d bytes/pg, %,d free pages, "
480 "%s, %s mode\n",
481 colWidth, "database-stats:",
482 db_int(0, "PRAGMA repository.page_count"),
483

Keyboard Shortcuts

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