Fossil SCM
Move the display of hash-policy to the Schema Version line of the /stat page, and only show the hash-policy name if it is something other than "auto".
Commit
def29c31c20445a6883ae9ec8a72d303a033a696
Parent
2ca8bc8baacdcc5…
1 file changed
+7
-3
+7
-3
| --- src/stat.c | ||
| +++ src/stat.c | ||
| @@ -183,21 +183,25 @@ | ||
| 183 | 183 | @ (%h(RELEASE_VERSION)) <a href='version?verbose=1'>(details)</a> |
| 184 | 184 | @ </td></tr> |
| 185 | 185 | @ <tr><th>SQLite Version:</th><td>%.19s(sqlite3_sourceid()) |
| 186 | 186 | @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion())) |
| 187 | 187 | @ <a href='version?verbose=2'>(details)</a></td></tr> |
| 188 | - @ <tr><th>Schema Version:</th><td>%h(g.zAuxSchema)</td></tr> | |
| 188 | + if( g.eHashPolicy!=HPOLICY_AUTO ){ | |
| 189 | + @ <tr><th>Schema Version:</th><td>%h(g.zAuxSchema), | |
| 190 | + @ %s(hpolicy_name())</td></tr> | |
| 191 | + }else{ | |
| 192 | + @ <tr><th>Schema Version:</th><td>%h(g.zAuxSchema)</td></tr> | |
| 193 | + } | |
| 189 | 194 | @ <tr><th>Repository Rebuilt:</th><td> |
| 190 | 195 | @ %h(db_get_mtime("rebuilt","%Y-%m-%d %H:%M:%S","Never")) |
| 191 | 196 | @ By Fossil %h(db_get("rebuilt","Unknown"))</td></tr> |
| 192 | 197 | @ <tr><th>Database Stats:</th><td> |
| 193 | 198 | @ %d(db_int(0, "PRAGMA repository.page_count")) pages, |
| 194 | 199 | @ %d(db_int(0, "PRAGMA repository.page_size")) bytes/page, |
| 195 | 200 | @ %d(db_int(0, "PRAGMA repository.freelist_count")) free pages, |
| 196 | 201 | @ %s(db_text(0, "PRAGMA repository.encoding")), |
| 197 | - @ %s(db_text(0, "PRAGMA repository.journal_mode")) mode, | |
| 198 | - @ hash %s(hpolicy_name()) | |
| 202 | + @ %s(db_text(0, "PRAGMA repository.journal_mode")) mode | |
| 199 | 203 | @ </td></tr> |
| 200 | 204 | |
| 201 | 205 | @ </table> |
| 202 | 206 | style_footer(); |
| 203 | 207 | } |
| 204 | 208 |
| --- src/stat.c | |
| +++ src/stat.c | |
| @@ -183,21 +183,25 @@ | |
| 183 | @ (%h(RELEASE_VERSION)) <a href='version?verbose=1'>(details)</a> |
| 184 | @ </td></tr> |
| 185 | @ <tr><th>SQLite Version:</th><td>%.19s(sqlite3_sourceid()) |
| 186 | @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion())) |
| 187 | @ <a href='version?verbose=2'>(details)</a></td></tr> |
| 188 | @ <tr><th>Schema Version:</th><td>%h(g.zAuxSchema)</td></tr> |
| 189 | @ <tr><th>Repository Rebuilt:</th><td> |
| 190 | @ %h(db_get_mtime("rebuilt","%Y-%m-%d %H:%M:%S","Never")) |
| 191 | @ By Fossil %h(db_get("rebuilt","Unknown"))</td></tr> |
| 192 | @ <tr><th>Database Stats:</th><td> |
| 193 | @ %d(db_int(0, "PRAGMA repository.page_count")) pages, |
| 194 | @ %d(db_int(0, "PRAGMA repository.page_size")) bytes/page, |
| 195 | @ %d(db_int(0, "PRAGMA repository.freelist_count")) free pages, |
| 196 | @ %s(db_text(0, "PRAGMA repository.encoding")), |
| 197 | @ %s(db_text(0, "PRAGMA repository.journal_mode")) mode, |
| 198 | @ hash %s(hpolicy_name()) |
| 199 | @ </td></tr> |
| 200 | |
| 201 | @ </table> |
| 202 | style_footer(); |
| 203 | } |
| 204 |
| --- src/stat.c | |
| +++ src/stat.c | |
| @@ -183,21 +183,25 @@ | |
| 183 | @ (%h(RELEASE_VERSION)) <a href='version?verbose=1'>(details)</a> |
| 184 | @ </td></tr> |
| 185 | @ <tr><th>SQLite Version:</th><td>%.19s(sqlite3_sourceid()) |
| 186 | @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion())) |
| 187 | @ <a href='version?verbose=2'>(details)</a></td></tr> |
| 188 | if( g.eHashPolicy!=HPOLICY_AUTO ){ |
| 189 | @ <tr><th>Schema Version:</th><td>%h(g.zAuxSchema), |
| 190 | @ %s(hpolicy_name())</td></tr> |
| 191 | }else{ |
| 192 | @ <tr><th>Schema Version:</th><td>%h(g.zAuxSchema)</td></tr> |
| 193 | } |
| 194 | @ <tr><th>Repository Rebuilt:</th><td> |
| 195 | @ %h(db_get_mtime("rebuilt","%Y-%m-%d %H:%M:%S","Never")) |
| 196 | @ By Fossil %h(db_get("rebuilt","Unknown"))</td></tr> |
| 197 | @ <tr><th>Database Stats:</th><td> |
| 198 | @ %d(db_int(0, "PRAGMA repository.page_count")) pages, |
| 199 | @ %d(db_int(0, "PRAGMA repository.page_size")) bytes/page, |
| 200 | @ %d(db_int(0, "PRAGMA repository.freelist_count")) free pages, |
| 201 | @ %s(db_text(0, "PRAGMA repository.encoding")), |
| 202 | @ %s(db_text(0, "PRAGMA repository.journal_mode")) mode |
| 203 | @ </td></tr> |
| 204 | |
| 205 | @ </table> |
| 206 | style_footer(); |
| 207 | } |
| 208 |