commit e9774fb85e3e17b22a7e65cfa147cc7b3dc3579b
author Elliott Hughes <enh@google.com> Thu Jan 30 16:01:01 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 30 16:01:01 2020 +0000
tree e93a9fc52e15e2364436b511a6819e06e9887e99
parent d345b883bcf4dd2e675b0c7e8227e6514c25f481
parent e0945d4c0dad01f465a44a1b4a5571095944e742

Merge "adb: make the push summary fit in 80 columns."

adb/client/file_sync_client.cpp

diff --git a/adb/client/file_sync_client.cpp b/adb/client/file_sync_client.cpp
index fbfeb53..922f2ba 100644
--- a/adb/client/file_sync_client.cpp
+++ b/adb/client/file_sync_client.cpp
@@ -187,14 +187,13 @@
         const char* direction_str = (direction == TransferDirection::push) ? "pushed" : "pulled";
         std::stringstream ss;
         if (!name.empty()) {
-            ss << name << ": ";
+            std::string_view display_name(name);
+            char* out = getenv("ANDROID_PRODUCT_OUT");
+            if (out) android::base::ConsumePrefix(&display_name, out);
+            ss << display_name << ": ";
         }
         ss << files_transferred << " file" << ((files_transferred == 1) ? "" : "s") << " "
-           << direction_str << ".";
-        if (files_skipped > 0) {
-            ss << " " << files_skipped << " file" << ((files_skipped == 1) ? "" : "s")
-               << " skipped.";
-        }
+           << direction_str << ", " << files_skipped << " skipped.";
         ss << TransferRate();
 
         lp.Print(ss.str(), LinePrinter::LineType::INFO);