pull: Also append bytes written

This is very useful information that we get from the transaction
stats.  Append it to the final display if we're not inheriting
the transaction.

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 5a276e62c7ba033e45f378379ad99cb323a2c727..6d35be265ad768368287e3a55841ac2be821728d 100644 (file)
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -3358,6 +3358,7 @@ ostree_repo_pull_with_options (OstreeRepo             *self,
    * value, otherwise NULL. Used for logging.
    */
   const char *the_ref_to_fetch = NULL;
+  OstreeRepoTransactionStats tstats = { 0, };
 
   /* Default */
   pull_data->max_metadata_size = OSTREE_MAX_METADATA_SIZE;
@@ -4444,7 +4445,7 @@ ostree_repo_pull_with_options (OstreeRepo             *self,
     }
 
   if (!inherit_transaction &&
-      !ostree_repo_commit_transaction (pull_data->repo, NULL, cancellable, error))
+      !ostree_repo_commit_transaction (pull_data->repo, &tstats, cancellable, error))
     goto out;
 
   end_time = g_get_monotonic_time ();
@@ -4486,6 +4487,11 @@ ostree_repo_pull_with_options (OstreeRepo             *self,
                                   shift == 1 ? "B" : "KiB",
                                   (guint) ((end_time - pull_data->start_time) / G_USEC_PER_SEC));
         }
+      if (!inherit_transaction)
+        {
+          g_autofree char *bytes_written = g_format_size (tstats.content_bytes_written);
+          g_string_append_printf (buf, "; %s content written", bytes_written);
+        }
 
       ostree_async_progress_set_status (pull_data->progress, buf->str);
     }

diff --git a/tests/pull-test.sh b/tests/pull-test.sh
index 92bcf112c6f8647241e375cd49269dcb85fd813f..07851a2c552aac7794600a278b9cec9ff073606a 100644 (file)
--- a/tests/pull-test.sh
+++ b/tests/pull-test.sh
@@ -64,7 +64,7 @@ fi
 # Try both syntaxes
 repo_init --no-sign-verify
 ${CMD_PREFIX} ostree --repo=repo pull origin main >out.txt
-assert_file_has_content out.txt "[1-9][0-9]* metadata, [1-9][0-9]* content objects fetched"
+assert_file_has_content out.txt "[1-9][0-9]* metadata, [1-9][0-9]* content objects fetched; [1-9][0-9]*.*written"
 ${CMD_PREFIX} ostree --repo=repo pull origin:main > out.txt
 assert_not_file_has_content out.txt "[1-9][0-9]* content objects fetched"
 ${CMD_PREFIX} ostree --repo=repo fsck