Merge sqlite3-rsync branch into sqlite3-rsync-consio branch.

FossilOrigin-Name: c9bdbe21feb924bde033e44b6d3c6c5fd81842d440dbd79c0a55a5650b7397e1

diff --cc Makefile.in
index b5b0c744bc9e8836b43e6f19f2cb7de33aaed3af,c9e27a4cc1a73f02bbaf39f48eff12585d8069b6..4f3df3bf6dbe7aec043ba0710bd171a8706158b8
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -702,8 -702,6 +702,7 @@@ dbhash$(TEXE):     $(TOP)/tool/dbhash.c sql
  
  RSYNC_SRC = \
    $(TOP)/tool/sqlite3-rsync.c \
-   $(TOP)/ext/misc/sha1.c \
 +  $(TOP)/ext/consio/console_io.c \
    sqlite3.c
  
  RSYNC_OPT = \

diff --cc manifest
index 9a66b1cdf5881967ca2c9a3c8e13e8576296f75a,d2e70dbbfc2a8ea3ef07574efc2ebb5f4d57a985..395015b57e2010e1cf074ba5eeaa47018b346d54
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
 -C Improved\sinformational\soutput\sfrom\ssqlite3-rsync.
 -D 2024-09-13T13:53:20.033
 +C Merge\ssqlite3-rsync\sbranch\sinto\ssqlite3-rsync-consio\sbranch.
- D 2024-09-13T12:01:57.181
++D 2024-09-13T14:40:50.662
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in b81b311f1bd172ed879024f93aefa0bb4e0b9e62ff9b4947dafa28076a67490d
 -F Makefile.in 31368ad3e1800bb5f311adede543ee456ca7d2595403c7f131797ae65a7d415c
++F Makefile.in 0c578a08b584c6524e175c545a6c4fa840764e902b3b27bccea48c1009adf286
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
- F Makefile.msc f25c476f22a25f23af8dc7260e9f95896250e7fceb621388ca8ae4f096bd3fda
+ F Makefile.msc 62ace0005c53b52f189c20c1d6d8fa4dbd2a37c90d9c1362b60f4fb4c841fa15
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -2174,7 -2174,7 +2174,7 @@@ F tool/speedtest8inst1.c 7ce07da76b5e74
  F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d40618 x
  F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60
  F tool/sqldiff.c 847fc8fcfddf5ce4797b7394cad6372f2f5dc17d8186e2ef8fb44d50fae4f44a
- F tool/sqlite3-rsync.c cb4b3ada10a19abbabd26ba98cd6bdcbc982bd20600bcc9997fc36d58aacb03e
 -F tool/sqlite3-rsync.c 12b5d0f062496451c9e2a9c9d898ccb04fd90f3c2d309ebdd4e183bc516ad4c6
++F tool/sqlite3-rsync.c 3a11b7113061148cb6c6ba7b9a806086de1cfd1dc8cd738708dc218fc9c58ea1
  F tool/sqlite3_analyzer.c.in 8da2b08f56eeac331a715036cf707cc20f879f231362be0c22efd682e2b89b4f
  F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
  F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
@@@ -2213,8 -2213,8 +2213,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 6ffb392f922ba848329f24f474ac56aa6afbf12836af9f738c539399a97264c4 75d5a8eb3d4ece06900109ad4022ba2a3e82de2f0acb012e3a02bfb4326bfa6d
- R 8967a210194a5efbccf7de8ff5e809e0
 -P 3c36f5814f25483586c4fd49ef2fe5c7c0ff8c59672b1622c92061ec0ba8547a
 -R 8cd1f423985f9cdd2c7d3914f9dc50f0
 -U drh
 -Z 1cb8b10009d5db561201d72aab0227e3
++P 983979cc780e58205ebc922c7bcc65faad8be3b98349ff2032f0d45157828624 e55e3e8ec2fe3a9190872d999cee55c85bde92667040cc166233faaa2fa34266
++R b7cb254601d1740b74475b830fe215c7
 +U stephan
- Z e8ac465c9fdf91143389b5b4321d574f
++Z a2e807bb501a3a07d004993aa52c8c92
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 0be5900407cbf08f183e92a7293ed1b71f952f01,3ce2c13b08e940af61fab870061268ed4ee1b93f..8237595c85e06f24961e2d70e3fd81a5a4a78765
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 983979cc780e58205ebc922c7bcc65faad8be3b98349ff2032f0d45157828624
 -e55e3e8ec2fe3a9190872d999cee55c85bde92667040cc166233faaa2fa34266
++c9bdbe21feb924bde033e44b6d3c6c5fd81842d440dbd79c0a55a5650b7397e1

diff --cc tool/sqlite3-rsync.c
index e58a816c8750d905cd3b3e1cfa38098259d770fd,3b52da01e316a0ce9a574ab573a22907e34aca56..c4c8014fb99b8d33729335f72fc42e68428c49a1
--- 1/tool/sqlite3-rsync.c
--- 2/tool/sqlite3-rsync.c
+++ b/tool/sqlite3-rsync.c
@@@ -1435,13 -1697,20 +1726,20 @@@ int main(int argc, char const * const *
      }
      originSide(&ctx);
    }
-   if( ctx.eVerbose ){
+   if( ctx.nErr ){
+     printf("Databases where not synced due to errors\n");
+   }
+   if( ctx.eVerbose==1 ){
+     printf("Network traffic is %.1f%% of database size\n",
+            (100.0*(double)(ctx.nIn+ctx.nOut))/(ctx.szPage*(double)ctx.nPage));
+   }
+   if( ctx.eVerbose>=2 ){
 -    if( ctx.nErr ) printf("%d errors, ", ctx.nErr);
 -    printf("%lld bytes sent, %lld bytes received\n", ctx.nOut, ctx.nIn);
 +    if( ctx.nErr ) oputf("%d errors, ", ctx.nErr);
 +    oputf("%lld bytes sent, %lld bytes received\n", ctx.nOut, ctx.nIn);
      if( ctx.eVerbose>=2 ){
 -      printf("Database is %u pages of %u bytes each.\n",
 +      oputf("Database is %u pages of %u bytes each.\n",
               ctx.nPage, ctx.szPage);
 -      printf("Sent %u hashes, %u page contents\n",
 +      oputf("Sent %u hashes, %u page contents\n",
               ctx.nHashSent, ctx.nPageSent);
      }
    }