#
#
# patch "annotate.cc"
#  from [8ab0402a05361ecc7bc9484514d11fef6f7997e3]
#    to [ccae92035e27a840d3c4275a2121b44bce023458]
# 
# patch "cmd_diff_log.cc"
#  from [af229d50cc17127fcfef8d03ba87c50306e6d27b]
#    to [200a3f78f7d7d68f2918740d45a5b1daa2e37d16]
# 
# patch "cmd_ws_commit.cc"
#  from [7027f90134dc5dbc27c71bf328e3295d1c15a333]
#    to [0c50b024f936be945248c44d63c9ff0c7bed6581]
# 
# patch "merkle_tree.cc"
#  from [d72fe6c6455467112af82ad961abe1b916df86a2]
#    to [8dbfd8363164b2ed5046419012ca689a4e51c6c2]
# 
# patch "merkle_tree.hh"
#  from [88d7a2e577684e0a283f4fd0cc2d634f8c2479b8]
#    to [451dc43a85454c689e15636f4387c7dcee2b4428]
# 
# patch "netsync.cc"
#  from [7c85e5a05af09ec2f32e8cf441dd8c2549128dc6]
#    to [8c01df0a8772cb5ddea060a6a3f286a6b8ad42d9]
# 
# patch "revision.cc"
#  from [8270e56fc8774e829e52141e4c2676c9bd79431e]
#    to [b3d3647f4673ae7eb89ae2367057fa6aee0e719a]
# 
# patch "work.cc"
#  from [90076a9e07cff1ce0d559544d9ab10d08d039cfc]
#    to [2d74fc849524df7602470b108d06649977780062]
#
============================================================
--- annotate.cc	8ab0402a05361ecc7bc9484514d11fef6f7997e3
+++ annotate.cc	ccae92035e27a840d3c4275a2121b44bce023458
@@ -402,7 +402,8 @@ annotate_context::build_revisions_to_ann
                                     true, false, "T"));
 
       string result;
-      result.append(encode_hexenc(i->inner()()).substr(0, 8));
+      string hex_rev_str(encode_hexenc(i->inner()()));
+      result.append(hex_rev_str.substr(0, 8));
       result.append(".. by ");
       result.append(author);
       result.append(" ");
@@ -563,7 +564,8 @@ annotate_lineage_mapping::build_parent_l
       //if (verbose)
       if (file_interned[i] == 14)
         L(FL("%s file_interned[%d]: %ld\tlcs[%d]: %ld\tmapping[%d]: %ld")
-          % parent_rev % i % file_interned[i] % j % lcs[j] % i % mapping[i]);
+          % encode_hexenc(parent_rev.inner()())
+          % i % file_interned[i] % j % lcs[j] % i % mapping[i]);
 
       if (file_interned[i] == lcs[j])
         {
@@ -593,7 +595,8 @@ annotate_lineage_mapping::build_parent_l
   // determine the mapping for parent lineage
   if (verbose)
     L(FL("build_parent_lineage: building mapping now "
-         "for parent_rev %s\n") % parent_rev);
+         "for parent_rev %s\n")
+      % encode_hexenc(parent_rev.inner()()));
 
   i = j = 0;
 
============================================================
--- cmd_diff_log.cc	af229d50cc17127fcfef8d03ba87c50306e6d27b
+++ cmd_diff_log.cc	200a3f78f7d7d68f2918740d45a5b1daa2e37d16
@@ -873,7 +873,7 @@ CMD(log, "log", "", CMD_REF(informative)
           ostringstream out;
           if (app.opts.brief)
             {
-              out << rid;
+              out << encode_hexenc(rid.inner()());
               log_certs(project, out, rid, author_name);
               if (app.opts.no_graph)
                 log_certs(project, out, rid, date_name);
============================================================
--- cmd_ws_commit.cc	7027f90134dc5dbc27c71bf328e3295d1c15a333
+++ cmd_ws_commit.cc	0c50b024f936be945248c44d63c9ff0c7bed6581
@@ -1136,11 +1136,10 @@ CMD(commit, "commit", "ci", CMD_REF(work
 
   if (global_sanity.debug_p())
     {
-      hexenc<id> mid(encode_hexenc(restricted_rev.new_manifest.inner()()));
-      hexenc<id> rid(encode_hexenc(restricted_rev_id.inner()()));
-
       L(FL("new manifest '%s'\n"
-           "new revision '%s'\n") % mid % rid);
+           "new revision '%s'\n")
+        % encode_hexenc(restricted_rev.new_manifest.inner()())
+        % encode_hexenc(restricted_rev_id.inner()()));
     }
 
   process_commit_message_args(app.opts, log_message_given, log_message);
============================================================
--- merkle_tree.cc	d72fe6c6455467112af82ad961abe1b916df86a2
+++ merkle_tree.cc	8dbfd8363164b2ed5046419012ca689a4e51c6c2
@@ -134,14 +134,6 @@ void
 }
 
 void
-merkle_node::get_hex_slot(size_t slot, hexenc<id> & val) const
-{
-  id i;
-  get_raw_slot(slot, i);
-  encode_hexenc(i, val);
-}
-
-void
 merkle_node::set_raw_slot(size_t slot, id const & val)
 {
   check_invariants();
@@ -149,14 +141,6 @@ void
 }
 
 void
-merkle_node::set_hex_slot(size_t slot, hexenc<id> const & val)
-{
-  id i;
-  decode_hexenc(val, i);
-  set_raw_slot(slot, i);
-}
-
-void
 merkle_node::extended_prefix(size_t slot,
                              dynamic_bitset<unsigned char> & extended) const
 {
============================================================
--- merkle_tree.hh	88d7a2e577684e0a283f4fd0cc2d634f8c2479b8
+++ merkle_tree.hh	451dc43a85454c689e15636f4387c7dcee2b4428
@@ -75,10 +75,7 @@ struct merkle_node
   void get_hex_prefix(hexenc<prefix> & hpref) const;
 
   void get_raw_slot(size_t slot, id & val) const;
-  void get_hex_slot(size_t slot, hexenc<id> & val) const;
-
   void set_raw_slot(size_t slot, id const & val);
-  void set_hex_slot(size_t slot, hexenc<id> const & val);
 
   void extended_prefix(size_t slot, boost::dynamic_bitset<unsigned char> & extended) const;
   void extended_raw_prefix(size_t slot, prefix & extended) const;
============================================================
--- netsync.cc	7c85e5a05af09ec2f32e8cf441dd8c2549128dc6
+++ netsync.cc	8c01df0a8772cb5ddea060a6a3f286a6b8ad42d9
@@ -1186,7 +1186,7 @@ session::queue_refine_cmd(refinement_typ
   netcmd_item_type_to_string(node.type, typestr);
   L(FL("queueing refinement %s of %s node '%s', level %d")
     % (ty == refinement_query ? "query" : "response")
-    % typestr % hpref % static_cast<int>(node.level));
+    % typestr % hpref() % static_cast<int>(node.level));
   netcmd cmd;
   cmd.write_refine_cmd(ty, node);
   write_netcmd_and_try_flush(cmd);
@@ -1200,17 +1200,19 @@ session::queue_data_cmd(netcmd_item_type
   string typestr;
   netcmd_item_type_to_string(type, typestr);
   hexenc<id> hid;
-  encode_hexenc(item, hid);
 
+  if (global_sanity.debug_p())
+    encode_hexenc(item, hid);
+
   if (role == sink_role)
     {
       L(FL("not queueing %s data for '%s' as we are in pure sink role")
-        % typestr % hid);
+        % typestr % hid());
       return;
     }
 
   L(FL("queueing %d bytes of data for %s item '%s'")
-    % dat.size() % typestr % hid);
+    % dat.size() % typestr % hid());
 
   netcmd cmd;
   // TODO: This pair of functions will make two copies of a large
@@ -1235,20 +1237,24 @@ session::queue_delta_cmd(netcmd_item_typ
   I(type == file_item);
   string typestr;
   netcmd_item_type_to_string(type, typestr);
-  hexenc<id> base_hid;
-  encode_hexenc(base, base_hid);
-  hexenc<id> ident_hid;
-  encode_hexenc(ident, ident_hid);
+  hexenc<id> base_hid,
+             ident_hid;
 
+  if (global_sanity.debug_p())
+    {
+      encode_hexenc(base, base_hid);
+      encode_hexenc(ident, ident_hid);
+    }
+
   if (role == sink_role)
     {
       L(FL("not queueing %s delta '%s' -> '%s' as we are in pure sink role")
-        % typestr % base_hid % ident_hid);
+        % typestr % base_hid() % ident_hid());
       return;
     }
 
   L(FL("queueing %s delta '%s' -> '%s'")
-    % typestr % base_hid % ident_hid);
+    % typestr % base_hid() % ident_hid());
   netcmd cmd;
   cmd.write_delta_cmd(type, base, ident, del);
   write_netcmd_and_try_flush(cmd);
@@ -1840,7 +1846,7 @@ session::load_data(netcmd_item_type type
 
   if (!data_exists(type, item))
     throw bad_decode(F("%s with hash '%s' does not exist in our database")
-                     % typestr % hitem);
+                     % typestr % hitem());
 
   switch (type)
     {
@@ -1857,7 +1863,7 @@ session::load_data(netcmd_item_type type
         rsa_keypair_id keyid;
         rsa_pub_key pub;
         project.db.get_pubkey(item, keyid, pub);
-        L(FL("public key '%s' is also called '%s'") % hitem % keyid);
+        L(FL("public key '%s' is also called '%s'") % hitem() % keyid);
         write_pubkey(keyid, pub, out);
       }
       break;
@@ -1905,7 +1911,7 @@ session::process_data_cmd(netcmd_item_ty
   note_item_arrived(type, item);
   if (data_exists(type, item))
     {
-      L(FL("%s '%s' already exists in our database") % typestr % hitem);
+      L(FL("%s '%s' already exists in our database") % typestr % hitem());
       if (type == epoch_item)
         maybe_note_epochs_finished();
       return true;
@@ -1962,11 +1968,10 @@ session::process_data_cmd(netcmd_item_ty
         key_hash_code(keyid, pub, tmp);
         if (! (tmp == item))
           {
-            string htmp(encode_hexenc(tmp())),
-                   hitem(encode_hexenc(item()));
             throw bad_decode(F("hash check failed for public key '%s' (%s);"
                                " wanted '%s' got '%s'")
-                             % hitem % keyid % hitem % htmp);
+                               % hitem() % keyid % hitem()
+                               % encode_hexenc(tmp()));
           }
         if (project.db.put_key(keyid, pub))
           written_keys.push_back(keyid);
@@ -1983,7 +1988,7 @@ session::process_data_cmd(netcmd_item_ty
         id tmp;
         cert_hash_code(c, tmp);
         if (! (tmp == item))
-          throw bad_decode(F("hash check failed for revision cert '%s'") % hitem);
+          throw bad_decode(F("hash check failed for revision cert '%s'") % hitem());
         if (project.db.put_revision_cert(revision<cert>(c)))
           written_certs.push_back(c);
       }
@@ -1991,7 +1996,7 @@ session::process_data_cmd(netcmd_item_ty
 
     case revision_item:
       {
-        L(FL("received revision '%s'") % hitem);
+        L(FL("received revision '%s'") % hitem());
         if (project.db.put_revision(revision_id(item), revision_data(dat)))
           written_revisions.push_back(revision_id(item));
       }
@@ -1999,7 +2004,7 @@ session::process_data_cmd(netcmd_item_ty
 
     case file_item:
       {
-        L(FL("received file '%s'") % hitem);
+        L(FL("received file '%s'") % hitem());
         project.db.put_file(file_id(item), file_data(dat));
       }
       break;
@@ -2066,9 +2071,6 @@ session::send_all_data(netcmd_item_type 
   for (set<id>::const_iterator i = tmp.begin();
        i != tmp.end(); ++i)
     {
-      hexenc<id> hitem;
-      encode_hexenc(*i, hitem);
-
       if (data_exists(ty, *i))
         {
           string out;
@@ -3260,9 +3262,12 @@ session::rebuild_merkle_trees(set<branch
           project.db.get_key(*key, pub);
           id keyhash;
           key_hash_code(*key, pub, keyhash);
-          // FIXME: conditional encode_hexenc
-          hexenc<id> hkeyhash(encode_hexenc(keyhash()));
-          L(FL("noting key '%s' = '%s' to send") % *key % hkeyhash);
+
+          if (global_sanity.debug_p())
+            L(FL("noting key '%s' = '%s' to send")
+              % *key
+              % encode_hexenc(keyhash()));
+
           key_refiner.note_local_item(keyhash);
           ++keys_ticker;
         }
============================================================
--- revision.cc	8270e56fc8774e829e52141e4c2676c9bd79431e
+++ revision.cc	b3d3647f4673ae7eb89ae2367057fa6aee0e719a
@@ -639,10 +639,8 @@ make_revision(revision_id const & old_re
   calculate_ident(new_roster, rev.new_manifest);
 
   if (global_sanity.debug_p())
-    {
-      hexenc<id> mid(encode_hexenc(rev.new_manifest.inner()()));
-      L(FL("new manifest_id is %s") % mid);
-    }
+    L(FL("new manifest_id is %s")
+      % encode_hexenc(rev.new_manifest.inner()()));
 
   safe_insert(rev.edges, make_pair(old_rev_id, cs));
   rev.made_for = made_for_database;
@@ -667,10 +665,8 @@ make_revision(revision_id const & old_re
   calculate_ident(new_roster, rev.new_manifest);
 
   if (global_sanity.debug_p())
-    {
-      hexenc<id> mid(encode_hexenc(rev.new_manifest.inner()()));
-      L(FL("new manifest_id is %s") % mid);
-    }
+    L(FL("new manifest_id is %s")
+      % encode_hexenc(rev.new_manifest.inner()()));
 
   safe_insert(rev.edges, make_pair(old_rev_id, cs));
   rev.made_for = made_for_database;
@@ -695,10 +691,8 @@ make_revision(parent_map const & old_ros
   calculate_ident(new_roster, rev.new_manifest);
 
   if (global_sanity.debug_p())
-    {
-      hexenc<id> mid(encode_hexenc(rev.new_manifest.inner()()));
-      L(FL("new manifest_id is %s") % mid);
-    }
+    L(FL("new manifest_id is %s")
+      % encode_hexenc(rev.new_manifest.inner()()));
 }
 
 static void
@@ -721,10 +715,8 @@ recalculate_manifest_id_for_restricted_r
   rev.edges = edges;
 
   if (global_sanity.debug_p())
-    {
-      hexenc<id> mid(encode_hexenc(rev.new_manifest.inner()()));
-      L(FL("new manifest_id is %s") % mid);
-    }
+    L(FL("new manifest_id is %s")
+      % encode_hexenc(rev.new_manifest.inner()()));
 }
 
 void
============================================================
--- work.cc	90076a9e07cff1ce0d559544d9ab10d08d039cfc
+++ work.cc	2d74fc849524df7602470b108d06649977780062
@@ -33,6 +33,7 @@
 #include "app_state.hh"
 #include "database.hh"
 #include "roster.hh"
+#include "transforms.hh"
 
 using std::deque;
 using std::exception;
@@ -239,7 +240,8 @@ get_roster_for_rid(database & db,
   else
     {
       N(db.revision_exists(rid),
-        F("base revision %s does not exist in database") % rid);
+        F("base revision %s does not exist in database")
+          % encode_hexenc(rid.inner()()));
       db.get_roster(rid, cr);
     }
   L(FL("base roster has %d entries") % cr.first->all_nodes().size());