From 4e8c11d66d01617626de96e6b441a9568a0b86a2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 29 Mar 2018 12:43:29 +0200
Subject: Update diagnostics

---
 bdep/bdep.cli   | 4 ++--
 bdep/init.cxx   | 5 ++---
 bdep/status.cxx | 2 +-
 bdep/sync.cxx   | 8 ++------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/bdep/bdep.cli b/bdep/bdep.cli
index f6e2b1d..7001219 100644
--- a/bdep/bdep.cli
+++ b/bdep/bdep.cli
@@ -88,10 +88,10 @@ namespace bdep
 
          \
          $ bdep status -a
-         status in configuration @gcc
+         in configuration @gcc:
          hello configured 0.1.0-a.0.19700101000000
 
-         status in configuration @clang
+         in configuration @clang:
          hello configured 0.1.0-a.0.19700101000000
          \
 
diff --git a/bdep/init.cxx b/bdep/init.cxx
index 6fda0a2..8f6a855 100644
--- a/bdep/init.cxx
+++ b/bdep/init.cxx
@@ -74,7 +74,7 @@ namespace bdep
       if (verb && cfgs.size () > 1)
       {
         text << (first ? "" : "\n")
-             << "initializing in configuration " << *c;
+             << "in configuration " << *c << ":";
 
         first = false;
       }
@@ -100,8 +100,7 @@ namespace bdep
                      }) != c->packages.end ())
         {
           if (verb)
-            info << "package " << p.name << " is already initialized "
-                 << "in configuration " << *c;
+            info << "package " << p.name << " is already initialized";
 
           continue;
         }
diff --git a/bdep/status.cxx b/bdep/status.cxx
index beb8e4f..4aa3fe6 100644
--- a/bdep/status.cxx
+++ b/bdep/status.cxx
@@ -130,7 +130,7 @@ namespace bdep
       if (verb && cfgs.size () > 1)
       {
         text << (first ? "" : "\n")
-             << "status in configuration " << *c;
+             << "in configuration " << *c << ':';
 
         first = false;
       }
diff --git a/bdep/sync.cxx b/bdep/sync.cxx
index 526ac4a..4bf190c 100644
--- a/bdep/sync.cxx
+++ b/bdep/sync.cxx
@@ -110,17 +110,13 @@ namespace bdep
       }
     }
 
-    // @@ TODO: right now it is silent. Can we print a plan without the
-    //    prompts? Probably also a good idea even if from build system
-    //    hook... Issue: drop dependents has no "drop " prefix. Also indented
-    //    stuff out of nowhere will look odd. --  Need custom prompt.
-    //
     run_bpkg (co,
               "build",
               "-d", c->path,
               "--no-fetch",
               "--configure-only",
               "--keep-out",
+              "--plan", "synchronizing:",
               (yes ? "--yes" : nullptr),
               args);
   }
@@ -212,7 +208,7 @@ namespace bdep
       if (verb && cfgs.size () > 1)
       {
         text << (first ? "" : "\n")
-             << "synchronizing with configuration " << *c;
+             << "in configuration " << *c << ':';
 
         first = false;
       }
-- 
cgit v1.1