#
#
# patch "database.cc"
#  from [6cba21739e7949790b992932cca313d37799703e]
#    to [15e18738c0cd4d35f955d9079eed9282ee28ab05]
# 
# patch "key_store.cc"
#  from [fbc289e876ae93a038bd9c188db1dc9b8ee4ce37]
#    to [53b8d27ecccd04e80f1041825a7519e21ad2c698]
# 
# patch "netcmd.cc"
#  from [a64b988db860126ce1f292f32110b743fd403fdf]
#    to [b5942a3a7709a3058ab3c39b2c45edabb4bfad11]
# 
# patch "netsync.cc"
#  from [8a22a378766bf1a545f734810b0d828a93f2f651]
#    to [e549bac580f407665575fb8cd40178f0b3c3acf5]
# 
# patch "revision.cc"
#  from [6ec54f14d2ec5ea1badb490d8d746871dfd63d7e]
#    to [4c80573a3753b5de56d7dcba27161d9b391a35cf]
# 
# patch "roster_merge.cc"
#  from [59b94631c0931f3ddc7566259e7734ec71bc71d9]
#    to [48329b05521b778cfb6af538cc9905d4c65bc2dd]
#
============================================================
--- database.cc	6cba21739e7949790b992932cca313d37799703e
+++ database.cc	15e18738c0cd4d35f955d9079eed9282ee28ab05
@@ -3223,7 +3223,7 @@ database_impl::add_prefix_matching_const
           // 0xffffff...
           if (global_sanity.debug_p())
             L(FL("prefix_matcher: only lower bound ('%s')")
-              % encode_hexenc(lower_bound));
+              % lower_bound);
 
           q.sql_cmd += colname + " > ?";
           q.args.push_back(blob(lower_bound));
@@ -3232,8 +3232,8 @@ database_impl::add_prefix_matching_const
         {
           if (global_sanity.debug_p())
             L(FL("prefix_matcher: lower bound ('%s') and upper bound ('%s')")
-              % encode_hexenc(lower_bound)
-              % encode_hexenc(upper_bound));
+              % lower_bound
+              % upper_bound);
 
           q.sql_cmd += colname + " BETWEEN ? AND ?";
           q.args.push_back(blob(lower_bound));
============================================================
--- key_store.cc	fbc289e876ae93a038bd9c188db1dc9b8ee4ce37
+++ key_store.cc	53b8d27ecccd04e80f1041825a7519e21ad2c698
@@ -670,8 +670,8 @@ key_store::make_signature(database & db,
           "monotone signature: %s")
         % ssh_sig.length()
         % sig_string.length()
-        % encode_hexenc(ssh_sig)
-        % encode_hexenc(sig_string));
+        % ssh_sig
+        % sig_string);
       L(FL("make_signature: signatures from ssh-agent and monotone"
            " are the same"));
     }
============================================================
--- netcmd.cc	a64b988db860126ce1f292f32110b743fd403fdf
+++ netcmd.cc	b5942a3a7709a3058ab3c39b2c45edabb4bfad11
@@ -176,8 +176,8 @@ netcmd::read(string_queue & inbuf, chain
     {
       throw bad_decode(F("bad HMAC checksum (got %s, wanted %s)\n"
 			 "this suggests data was corrupted in transit")
-		       % encode_hexenc(cmd_digest)
-		       % encode_hexenc(digest));
+		       % cmd_digest
+		       % digest);
     }
 
   return true;
============================================================
--- netsync.cc	8a22a378766bf1a545f734810b0d828a93f2f651
+++ netsync.cc	e549bac580f407665575fb8cd40178f0b3c3acf5
@@ -1807,7 +1807,7 @@ session::process_auth_cmd(protocol_role 
                                       their_exclude_pattern);
           error(unknown_key,
                 (F("remote public key hash '%s' is unknown")
-                 % encode_hexenc(client())).str());
+                 % client).str());
           */
         }
     }
@@ -2196,7 +2196,7 @@ session::process_data_cmd(netcmd_item_ty
         epoch_data epoch;
         read_epoch(dat, branch, epoch);
         L(FL("received epoch %s for branch %s")
-          % encode_hexenc(epoch.inner()()) % branch);
+          % epoch % branch);
         map<branch_name, epoch_data> epochs;
         project.db.get_epochs(epochs);
         map<branch_name, epoch_data>::const_iterator i;
@@ -2204,7 +2204,7 @@ session::process_data_cmd(netcmd_item_ty
         if (i == epochs.end())
           {
             L(FL("branch %s has no epoch; setting epoch to %s")
-              % branch % encode_hexenc(epoch.inner()()));
+              % branch % epoch);
             project.db.set_epoch(branch, epoch);
           }
         else
@@ -2225,10 +2225,8 @@ session::process_data_cmd(netcmd_item_ty
                   (F("Mismatched epoch on branch %s."
                      " Server has '%s', client has '%s'.")
                    % branch
-                   % encode_hexenc((voice == server_voice
-                                    ? i->second: epoch).inner()())
-                   % encode_hexenc((voice == server_voice
-                                    ? epoch : i->second).inner()())).str());
+                   % (voice == server_voice ? i->second : epoch)
+                   % (voice == server_voice ? epoch : i->second)).str());
           }
       }
       maybe_note_epochs_finished();
@@ -2246,7 +2244,7 @@ session::process_data_cmd(netcmd_item_ty
             throw bad_decode(F("hash check failed for public key '%s' (%s);"
                                " wanted '%s' got '%s'")
                                % hitem() % keyid % hitem()
-                               % encode_hexenc(tmp()));
+                               % tmp);
           }
         if (project.db.put_key(keyid, pub))
           written_keys.push_back(keyid);
@@ -3403,7 +3401,7 @@ session::rebuild_merkle_trees(set<branch
           if (global_sanity.debug_p())
             L(FL("noting key '%s' = '%s' to send")
               % *key
-              % encode_hexenc(keyhash()));
+              % keyhash);
 
           key_refiner.note_local_item(keyhash);
           ++keys_ticker;
============================================================
--- revision.cc	6ec54f14d2ec5ea1badb490d8d746871dfd63d7e
+++ revision.cc	4c80573a3753b5de56d7dcba27161d9b391a35cf
@@ -642,7 +642,7 @@ make_revision(revision_id const & old_re
 
   if (global_sanity.debug_p())
     L(FL("new manifest_id is %s")
-      % encode_hexenc(rev.new_manifest.inner()()));
+      % rev.new_manifest);
 
   safe_insert(rev.edges, make_pair(old_rev_id, cs));
   rev.made_for = made_for_database;
@@ -668,7 +668,7 @@ make_revision(revision_id const & old_re
 
   if (global_sanity.debug_p())
     L(FL("new manifest_id is %s")
-      % encode_hexenc(rev.new_manifest.inner()()));
+      % rev.new_manifest);
 
   safe_insert(rev.edges, make_pair(old_rev_id, cs));
   rev.made_for = made_for_database;
@@ -694,7 +694,7 @@ make_revision(parent_map const & old_ros
 
   if (global_sanity.debug_p())
     L(FL("new manifest_id is %s")
-      % encode_hexenc(rev.new_manifest.inner()()));
+      % rev.new_manifest);
 }
 
 static void
@@ -718,7 +718,7 @@ recalculate_manifest_id_for_restricted_r
 
   if (global_sanity.debug_p())
     L(FL("new manifest_id is %s")
-      % encode_hexenc(rev.new_manifest.inner()()));
+      % rev.new_manifest);
 }
 
 void
============================================================
--- roster_merge.cc	59b94631c0931f3ddc7566259e7734ec71bc71d9
+++ roster_merge.cc	48329b05521b778cfb6af538cc9905d4c65bc2dd
@@ -2700,7 +2700,7 @@ namespace
                         "removed on one side of the merge.  Affected revisions include:") % fp);
                   }
                 found_one_ignored_content = true;
-                W(F("Revision: %s") % encode_hexenc(it->inner()()));
+                W(F("Revision: %s") % (*it));
               }
           }
       }