[Monotone-commits-diffs] net.venge.monotone.issue-120: 7c57048c60f3f68c977af98fed1454b63d7f4423

[code]

revision:            7c57048c60f3f68c977af98fed1454b63d7f4423
date:                2011-02-24T13:53:27
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone.issue-120
changelog:
friendly_node_summary now no longer returns strings ending with a newline

This is because it's upto the caller of how to format the node summary with
regards to the other nodes, and also as it helps to mirror the original
code where 

out << (F(...)) << '\n';
is now
out << node_summary_fn(...) << '\n';

manifest:
format_version "1"

new_manifest [7d6822027165e25ccc42221fe9889bfa34117807]

old_revision [fd13237b918b576b21ff9757969796c923a9dc8f]

patch "src/rev_output.cc"
 from [935354bc3540215807d5ff4bf697afd2f0705bd6]
   to [26d81fbb1a78bfa09ec43a5396c58e75b2a07d66]
============================================================
--- src/rev_output.cc	935354bc3540215807d5ff4bf697afd2f0705bd6
+++ src/rev_output.cc	26d81fbb1a78bfa09ec43a5396c58e75b2a07d66
@@ -154,7 +154,7 @@ friendly_node_summary(node_status const 
 
       case attr_unset:
         out << (F("  attr on  %s\n"
-                  "    unset  %s") % fp_first % key) << '\n';
+                  "    unset  %s") % fp_first % key);
         break;
 
       default:
@@ -162,7 +162,6 @@ friendly_node_summary(node_status const 
         break;
     }
 
-  out << '\n';
   return out.str();
 }
 
@@ -205,33 +204,33 @@ revision_summary(revision_t const & rev,
       for (set<file_path>::const_iterator i = cs.nodes_deleted.begin();
             i != cs.nodes_deleted.end(); ++i)
         out << node_summary_fn(dropped, *i, dummy_file, dummy_key,
-                               dummy_value);
+                               dummy_value) << '\n';
 
       for (map<file_path, file_path>::const_iterator
             i = cs.nodes_renamed.begin();
             i != cs.nodes_renamed.end(); ++i)
         out << node_summary_fn(renamed, i->first, i->second,
-                               dummy_key, dummy_value);
+                               dummy_key, dummy_value) << '\n';
 
       for (set<file_path>::const_iterator i = cs.dirs_added.begin();
             i != cs.dirs_added.end(); ++i)
         out << node_summary_fn(added, *i, dummy_file, dummy_key,
-                               dummy_value);
+                               dummy_value) << '\n';
 
       for (map<file_path, file_id>::const_iterator i = cs.files_added.begin();
             i != cs.files_added.end(); ++i)
         out << node_summary_fn(added, i->first, dummy_file,
-                               dummy_key, dummy_value);
+                               dummy_key, dummy_value) << '\n';
 
       for (map<file_path, pair<file_id, file_id> >::const_iterator
               i = cs.deltas_applied.begin(); i != cs.deltas_applied.end(); ++i)
         out << node_summary_fn(patched, i->first, dummy_file,
-                               dummy_key, dummy_value);
+                               dummy_key, dummy_value) << '\n';
 
       for (map<pair<file_path, attr_key>, attr_value >::const_iterator
              i = cs.attrs_set.begin(); i != cs.attrs_set.end(); ++i)
         out << node_summary_fn(attr_set, i->first.first, dummy_file,
-                               i->first.second, i->second);
+                               i->first.second, i->second) << '\n';
 
       // FIXME: naming here could not be more inconsistent
       // the cset calls it attrs_cleared
@@ -242,7 +241,7 @@ revision_summary(revision_t const & rev,
       for (set<pair<file_path, attr_key> >::const_iterator
              i = cs.attrs_cleared.begin(); i != cs.attrs_cleared.end(); ++i)
         out << node_summary_fn(attr_unset, i->first, dummy_file,
-                               i->second, dummy_value);
+                               i->second, dummy_value) << '\n';
 
       out << '\n';
     }