monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] net.venge.monotone.colored-diff: 8320c869d8acba


From: code
Subject: [Monotone-commits-diffs] net.venge.monotone.colored-diff: 8320c869d8acba68acd2bbfda575dfd98bf09500
Date: Wed, 17 Aug 2011 11:42:45 +0200 (CEST)

revision:            8320c869d8acba68acd2bbfda575dfd98bf09500
date:                2011-04-14T22:55:42
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone.colored-diff
changelog:
"mtn status" now uses colorizer::output for all output

manifest:
format_version "1"

new_manifest [fead48cc5a0d394862d92a8bfdb586618f1a6dee]

old_revision [504f186a6e19165de67508dfd5dbae074a59ad3f]

patch "src/cmd_ws_commit.cc"
 from [f8b592860057fff1de774c493dc5205569c9e6a4]
   to [d6f1581c8cd23daabcac893c4066551ca90119e7]
============================================================
--- src/cmd_ws_commit.cc	f8b592860057fff1de774c493dc5205569c9e6a4
+++ src/cmd_ws_commit.cc	d6f1581c8cd23daabcac893c4066551ca90119e7
@@ -983,27 +983,26 @@ CMD(status, "status", "", CMD_REF(inform
   if (!old_branches.empty() &&
       old_branches.find(app.opts.branch) == old_branches.end())
     {
-      cout << string(70, '-') << '\n'
-           << color.colorize(_("*** THIS REVISION WILL CREATE A NEW BRANCH ***"),
-                             colorizer::important)
-           << "\n\n";
+      colorizer::output(cout, string(70, '-') + "\n" +
+                        color.colorize(_("*** THIS REVISION WILL CREATE A NEW BRANCH ***"),
+                                       colorizer::important) + "\n\n");
       for (set<branch_name>::const_iterator i = old_branches.begin();
            i != old_branches.end(); ++i)
         {
           std::ostringstream old_name;
           old_name << *i;
 
-          cout << color.colorize(_("Old Branch: "), colorizer::remove)
-               << color.colorize(old_name.str(), colorizer::remove)
-               << '\n';
+          colorizer::output(cout, color.colorize(_("Old Branch: "),
+                                                 colorizer::remove) +
+                            color.colorize(old_name.str(),
+                                           colorizer::remove) + "\n");
         }
 
       std::ostringstream new_name;
       new_name << app.opts.branch;
 
-      cout << color.colorize(_("New Branch: "), colorizer::add)
-           << color.colorize(new_name.str(), colorizer::add)
-           << "\n\n";
+      colorizer::output(cout, color.colorize(_("New Branch: "), colorizer::add) +
+                        color.colorize(new_name.str(), colorizer::add) + "\n\n");
     }
   set<revision_id> heads;
   project.get_branch_heads(app.opts.branch, heads, false);
@@ -1014,9 +1013,8 @@ CMD(status, "status", "", CMD_REF(inform
         {
           if (heads.find(edge_old_revision(e)) == heads.end())
             {
-              cout << color.colorize(_("*** THIS REVISION WILL CREATE DIVERGENCE ***"),
-                                     colorizer::important)
-                   << "\n\n";
+              colorizer::output(cout, color.colorize(_("*** THIS REVISION WILL CREATE DIVERGENCE ***"),
+                                                     colorizer::important) + "\n\n");
               break;
             }
         }

reply via email to

[Prev in Thread] Current Thread [Next in Thread]