#
#
# patch "cmd_db.cc"
#  from [e8cc81b07b7ab99d465fa066f57ce5ae66ae45f1]
#    to [2d1510b878cf4ae05f3474e5f3352583169a6474]
# 
# patch "cmd_merging.cc"
#  from [63404ef7c5cf5a56fa77c5f934213f239c3e4dce]
#    to [93d91c1d4bb32544d0f3bd24d1423b51116a54a3]
# 
# patch "cmd_ws_commit.cc"
#  from [bbfd63b3e1e3c4d59df1ec26450ee20203f24caa]
#    to [7027f90134dc5dbc27c71bf328e3295d1c15a333]
# 
# patch "database.cc"
#  from [c2748fab3d23cb3e0eb69e76fdd3529b38f28cfa]
#    to [0cc2f1d01d5c2cf845bca7e98ba9e9aade305097]
# 
# patch "database_check.cc"
#  from [bdf59737a174db2419ffb1ea5b21c69651f4edc5]
#    to [3f76fca0830a924db4ff1d07ee116996f16275d9]
# 
# patch "revision.cc"
#  from [d3b8f3b1001ba1b477ecb66f4e99b8d699f47313]
#    to [8270e56fc8774e829e52141e4c2676c9bd79431e]
# 
# patch "work_migration.cc"
#  from [39215330e16b8265ff0e3a918a8e60edc34edef9]
#    to [649da47d7b879f1f2814100fdb831b1de7ecaeca]
#
============================================================
--- cmd_db.cc	e8cc81b07b7ab99d465fa066f57ce5ae66ae45f1
+++ cmd_db.cc	2d1510b878cf4ae05f3474e5f3352583169a6474
@@ -22,6 +22,7 @@
 #include "key_store.hh"
 #include "work.hh"
 #include "rev_height.hh"
+#include "transforms.hh"
 
 using std::cin;
 using std::cout;
@@ -144,7 +145,8 @@ CMD(db_kill_rev_locally, "kill_rev_local
   std::set<revision_id> children;
   db.get_revision_children(revid, children);
   N(!children.size(),
-    F("revision %s already has children. We cannot kill it.") % revid);
+    F("revision %s already has children. We cannot kill it.")
+      % encode_hexenc(revid.inner()()));
 
   // If we're executing this in a workspace, check if the workspace parent
   // revision is the one to kill. If so, write out the changes made in this
@@ -176,10 +178,11 @@ CMD(db_kill_rev_locally, "kill_rev_local
               "state, from which monotone cannot recover automatically since\n"
               "the workspace contains uncommitted changes.\n"
               "Consider updating your workspace to another revision first,\n"
-              "before you try to kill this revision again.") % revid);
+              "before you try to kill this revision again.")
+              % encode_hexenc(revid.inner()()));
 
           P(F("applying changes from %s on the current workspace")
-            % revid);
+            % encode_hexenc(revid.inner()()));
 
           revision_t new_work_rev;
           db.get_revision(revid, new_work_rev);
@@ -380,7 +383,7 @@ CMD(complete, "complete", "", CMD_REF(in
       for (set<revision_id>::const_iterator i = completions.begin();
            i != completions.end(); ++i)
         {
-          if (!verbose) cout << i->inner()() << '\n';
+          if (!verbose) cout << encode_hexenc(i->inner()()) << '\n';
           else cout << describe_revision(project, *i) << '\n';
         }
     }
@@ -390,7 +393,7 @@ CMD(complete, "complete", "", CMD_REF(in
       db.complete(idx(args, 1)(), completions);
       for (set<file_id>::const_iterator i = completions.begin();
            i != completions.end(); ++i)
-        cout << i->inner()() << '\n';
+        cout << encode_hexenc(i->inner()()) << '\n';
     }
   else if (idx(args, 0)() == "key")
     {
@@ -400,7 +403,7 @@ CMD(complete, "complete", "", CMD_REF(in
       for (completions_t::const_iterator i = completions.begin();
            i != completions.end(); ++i)
         {
-          cout << i->first.inner()();
+          cout << encode_hexenc(i->first.inner()());
           if (verbose) cout << ' ' << i->second();
           cout << '\n';
         }
============================================================
--- cmd_merging.cc	63404ef7c5cf5a56fa77c5f934213f239c3e4dce
+++ cmd_merging.cc	93d91c1d4bb32544d0f3bd24d1423b51116a54a3
@@ -350,12 +350,12 @@ merge_two(options & opts, lua_hooks & lu
   // Now it's time for the real work.
   if (automate)
     {
-      output << left_hid << " " << right_hid << " ";
+      output << left_hid() << " " << right_hid() << " ";
     }
   else
     {
-      P(F("[left]  %s") % left_hid);
-      P(F("[right] %s") % right_hid);
+      P(F("[left]  %s") % left_hid());
+      P(F("[right] %s") % right_hid());
     }
 
   revision_id merged;
============================================================
--- cmd_ws_commit.cc	bbfd63b3e1e3c4d59df1ec26450ee20203f24caa
+++ cmd_ws_commit.cc	7027f90134dc5dbc27c71bf328e3295d1c15a333
@@ -1197,7 +1197,8 @@ CMD(commit, "commit", "ci", CMD_REF(work
     transaction_guard guard(db);
 
     if (db.revision_exists(restricted_rev_id))
-      W(F("revision %s already in database") % restricted_rev_id);
+      W(F("revision %s already in database")
+        % encode_hexenc(restricted_rev_id.inner()()));
     else
       {
         if (global_sanity.debug_p())
============================================================
--- database.cc	c2748fab3d23cb3e0eb69e76fdd3529b38f28cfa
+++ database.cc	0cc2f1d01d5c2cf845bca7e98ba9e9aade305097
@@ -2411,7 +2411,8 @@ database::put_revision(revision_id const
     }
   else
     {
-      L(FL("roster for revision '%s' already exists in db") % new_id);
+      L(FL("roster for revision '%s' already exists in db")
+        % encode_hexenc(new_id.inner()()));
     }
 
   // Phase 4: rewrite any files that need deltas added
@@ -2535,7 +2536,8 @@ database::delete_existing_rev_and_certs(
   I(children.empty());
 
 
-  L(FL("Killing revision %s locally") % rid);
+  L(FL("Killing revision %s locally")
+    % encode_hexenc(rid.inner()()));
 
   // Kill the certs, ancestry, and revision.
   imp->execute(query("DELETE from revision_certs WHERE id = ?")
@@ -2961,14 +2963,14 @@ database::put_revision_cert(revision<cer
   if (revision_cert_exists(cert))
     {
       L(FL("revision cert on '%s' already exists in db")
-        % cert.inner().ident);
+        % encode_hexenc(cert.inner().ident.inner()()));
       return false;
     }
 
   if (!revision_exists(revision_id(cert.inner().ident)))
     {
       W(F("cert revision '%s' does not exist in db")
-        % cert.inner().ident);
+        % encode_hexenc(cert.inner().ident.inner()()));
       W(F("dropping cert"));
       return false;
     }
============================================================
--- database_check.cc	bdf59737a174db2419ffb1ea5b21c69651f4edc5
+++ database_check.cc	3f76fca0830a924db4ff1d07ee116996f16275d9
@@ -156,7 +156,7 @@ check_files(database & db, map<file_id, 
   for (set<file_id>::const_iterator i = files.begin();
        i != files.end(); ++i)
     {
-      L(FL("checking file %s") % *i);
+      L(FL("checking file %s") % encode_hexenc(i->inner()()));
       file_data data;
       db.get_file_version(*i, data);
       checked_files[*i].found = true;
@@ -185,7 +185,7 @@ check_rosters_manifest(database & db,
   for (set<revision_id>::const_iterator i = rosters.begin();
        i != rosters.end(); ++i)
     {
-      L(FL("checking roster %s") % *i);
+      L(FL("checking roster %s") % encode_hexenc(i->inner()()));
 
       roster_t ros;
       marking_map mm;
@@ -199,7 +199,8 @@ check_rosters_manifest(database & db,
       // logic_error's.
       catch (std::exception & e)
         {
-          L(FL("error loading roster %s: %s") % *i % e.what());
+          L(FL("error loading roster %s: %s")
+            % encode_hexenc(i->inner()()) % e.what());
           checked_rosters[*i].found = false;
           continue;
         }
@@ -244,7 +245,7 @@ check_rosters_marking(database & db,
        = checked_rosters.begin(); i != checked_rosters.end(); i++)
     {
       revision_id ros_id = i->first;
-      L(FL("checking roster %s") % i->first);
+      L(FL("checking roster %s") % encode_hexenc(i->first.inner()()));
       if (!i->second.found)
           continue;
 
@@ -314,7 +315,7 @@ check_revisions(database & db,
   for (set<revision_id>::const_iterator i = revisions.begin();
        i != revisions.end(); ++i)
     {
-      L(FL("checking revision %s") % *i);
+      L(FL("checking revision %s") % encode_hexenc(i->inner()()));
       revision_data data;
       db.get_revision(*i, data);
       checked_revisions[*i].found = true;
@@ -326,7 +327,8 @@ check_revisions(database & db,
         }
       catch (logic_error & e)
         {
-          L(FL("error parsing revision %s: %s") % *i % e.what());
+          L(FL("error parsing revision %s: %s")
+            % encode_hexenc(i->inner()()) % e.what());
           checked_revisions[*i].parseable = false;
           continue;
         }
@@ -606,13 +608,13 @@ report_files(map<file_id, checked_file> 
         {
           missing_files++;
           P(F("file %s missing (%d manifest references)")
-            % i->first % file.roster_refs);
+            % encode_hexenc(i->first.inner()()) % file.roster_refs);
         }
 
       if (file.roster_refs == 0)
         {
           unreferenced_files++;
-          P(F("file %s unreferenced") % i->first);
+          P(F("file %s unreferenced") % encode_hexenc(i->first.inner()()));
         }
 
     }
@@ -631,21 +633,22 @@ report_rosters(map<revision_id, checked_
       if (roster.revision_refs == 0)
         {
           unreferenced_rosters++;
-          P(F("roster %s unreferenced") % i->first);
+          P(F("roster %s unreferenced")
+            % encode_hexenc(i->first.inner()()));
         }
 
       if (roster.missing_files > 0)
         {
           incomplete_rosters++;
           P(F("roster %s incomplete (%d missing files)")
-            % i->first % roster.missing_files);
+            % encode_hexenc(i->first.inner()()) % roster.missing_files);
         }
 
       if (roster.missing_mark_revs > 0)
         {
           incomplete_rosters++;
           P(F("roster %s incomplete (%d missing revisions)")
-            % i->first % roster.missing_mark_revs);
+            % encode_hexenc(i->first.inner()()) % roster.missing_mark_revs);
         }
     }
 }
@@ -670,47 +673,56 @@ report_revisions(map<revision_id, checke
         {
           missing_revisions++;
           P(F("revision %s missing (%d revision references; %d cert references; %d parent references; %d child references; %d roster references)")
-            % i->first % revision.revision_refs % revision.cert_refs % revision.ancestry_parent_refs
-            % revision.ancestry_child_refs % revision.marking_refs);
+            % encode_hexenc(i->first.inner()())
+            % revision.revision_refs
+            % revision.cert_refs
+            % revision.ancestry_parent_refs
+            % revision.ancestry_child_refs
+            % revision.marking_refs);
         }
 
       if (revision.missing_manifests > 0)
         {
           incomplete_revisions++;
           P(F("revision %s incomplete (%d missing manifests)")
-            % i->first % revision.missing_manifests);
+            % encode_hexenc(i->first.inner()())
+            % revision.missing_manifests);
         }
 
       if (revision.missing_revisions > 0)
         {
           incomplete_revisions++;
           P(F("revision %s incomplete (%d missing revisions)")
-            % i->first % revision.missing_revisions);
+            % encode_hexenc(i->first.inner()())
+            % revision.missing_revisions);
         }
 
       if (!revision.found_roster)
         {
           incomplete_revisions++;
-          P(F("revision %s incomplete (missing roster)") % i->first);
+          P(F("revision %s incomplete (missing roster)")
+            % encode_hexenc(i->first.inner()()));
         }
 
       if (revision.manifest_mismatch)
         {
           manifest_mismatch++;
-          P(F("revision %s mismatched roster and manifest") % i->first);
+          P(F("revision %s mismatched roster and manifest")
+            % encode_hexenc(i->first.inner()()));
         }
 
       if (revision.incomplete_roster)
         {
           incomplete_revisions++;
-          P(F("revision %s incomplete (incomplete roster)") % i->first);
+          P(F("revision %s incomplete (incomplete roster)")
+            % encode_hexenc(i->first.inner()()));
         }
 
       if (revision.ancestry_parent_refs != revision.revision_refs)
         {
           mismatched_parents++;
           P(F("revision %s mismatched parents (%d ancestry parents; %d revision refs)")
-            % i->first
+            % encode_hexenc(i->first.inner()())
             % revision.ancestry_parent_refs
             % revision.revision_refs );
         }
@@ -719,7 +731,7 @@ report_revisions(map<revision_id, checke
         {
           mismatched_children++;
           P(F("revision %s mismatched children (%d ancestry children; %d parents)")
-            % i->first
+            % encode_hexenc(i->first.inner()())
             % revision.ancestry_child_refs
             % revision.parents.size() );
         }
@@ -731,21 +743,21 @@ report_revisions(map<revision_id, checke
           if (tmp[tmp.length() - 1] == '\n')
             tmp.erase(tmp.length() - 1);
           P(F("revision %s has bad history (%s)")
-            % i->first % tmp);
+            % encode_hexenc(i->first.inner()()) % tmp);
         }
 
       if (!revision.parseable)
         {
           non_parseable_revisions++;
           P(F("revision %s is not parseable (perhaps with unnormalized paths?)")
-            % i->first);
+            % encode_hexenc(i->first.inner()()));
         }
 
       if (revision.parseable && !revision.normalized)
         {
           non_normalized_revisions++;
           P(F("revision %s is not in normalized form")
-            % i->first);
+            % encode_hexenc(i->first.inner()()));
         }
     }
 }
@@ -802,7 +814,7 @@ report_certs(map<revision_id, checked_re
             {
               unchecked_sigs++;
               P(F("revision %s unchecked signature in %s cert from missing key %s")
-                % i->first
+                % encode_hexenc(i->first.inner()())
                 % checked->rcert.inner().name
                 % checked->rcert.inner().key);
             }
@@ -810,7 +822,7 @@ report_certs(map<revision_id, checked_re
             {
               bad_sigs++;
               P(F("revision %s bad signature in %s cert from key %s")
-                % i->first
+                % encode_hexenc(i->first.inner()())
                 % checked->rcert.inner().name
                 % checked->rcert.inner().key);
             }
@@ -824,7 +836,8 @@ report_certs(map<revision_id, checked_re
           if (revision.found && cert_counts[*n] == 0)
             {
               missing_certs++;
-              P(F("revision %s missing %s cert") % i->first % *n);
+              P(F("revision %s missing %s cert")
+                % encode_hexenc(i->first.inner()()) % *n);
             }
         }
 
@@ -834,7 +847,7 @@ report_certs(map<revision_id, checked_re
         {
           mismatched_certs++;
           P(F("revision %s mismatched certs (%d authors %d dates %d changelogs)")
-            % i->first
+            % encode_hexenc(i->first.inner()())
             % cert_counts[cert_name(author_cert_name)]
             % cert_counts[cert_name(date_cert_name)]
             % cert_counts[cert_name(changelog_cert_name)]);
@@ -857,20 +870,23 @@ report_heights(map<revision_id, checked_
       if (!height.found)
         {
           missing_heights++;
-          P(F("height missing for revision %s") % i->first);
+          P(F("height missing for revision %s")
+            % encode_hexenc(i->first.inner()()));
           continue;
         }
 
       if (!height.unique)
         {
           duplicate_heights++;
-          P(F("duplicate height for revision %s") % i->first);
+          P(F("duplicate height for revision %s")
+            % encode_hexenc(i->first.inner()()));
         }
 
       if (!height.sensible)
         {
           incorrect_heights++;
-          P(F("height of revision %s not greater than that of parent") % i->first);
+          P(F("height of revision %s not greater than that of parent")
+            % encode_hexenc(i->first.inner()()));
         }
     }
 }
============================================================
--- revision.cc	d3b8f3b1001ba1b477ecb66f4e99b8d699f47313
+++ revision.cc	8270e56fc8774e829e52141e4c2676c9bd79431e
@@ -1012,7 +1012,7 @@ anc_graph::kluge_for_bogus_merge_edges()
           if (j->first == i->first)
             {
               L(FL("considering old merge edge %s") %
-                safe_get(node_to_old_rev, i->first));
+                encode_hexenc(safe_get(node_to_old_rev, i->first).inner()()));
               u64 parent1 = i->second;
               u64 parent2 = j->second;
               if (is_ancestor (parent1, parent2, parent_to_child_map))
@@ -1076,7 +1076,8 @@ anc_graph::add_node_for_old_manifest(man
     {
       node = max_node++;
       ++n_nodes;
-      L(FL("node %d = manifest %s") % node % man);
+      L(FL("node %d = manifest %s")
+        % node % encode_hexenc(man.inner()()));
       old_man_to_node.insert(make_pair(man, node));
       node_to_old_man.insert(make_pair(node, man));
 
@@ -1114,7 +1115,10 @@ u64 anc_graph::add_node_for_oldstyle_rev
       legacy::renames_map renames;
       legacy::get_manifest_and_renames_for_rev(db, rev, man, renames);
 
-      L(FL("node %d = revision %s = manifest %s") % node % rev % man);
+      L(FL("node %d = revision %s = manifest %s")
+        % node
+        % encode_hexenc(rev.inner()())
+        % encode_hexenc(man.inner()()));
       old_rev_to_node.insert(make_pair(rev, node));
       node_to_old_rev.insert(make_pair(node, rev));
       node_to_old_man.insert(make_pair(node, man));
============================================================
--- work_migration.cc	39215330e16b8265ff0e3a918a8e60edc34edef9
+++ work_migration.cc	649da47d7b879f1f2814100fdb831b1de7ecaeca
@@ -15,6 +15,7 @@
 #include "revision.hh"
 #include "file_io.hh"
 #include "work.hh"
+#include "transforms.hh"
 
 #include "lexical_cast.hh"
 #include <exception>
@@ -195,7 +196,7 @@ migrate_1_to_2()
       E(false, F("workspace is corrupt: reading %s: %s")
         % rev_path % e.what());
     }
-  revision_id base_rid(remove_ws(base_rev_data())); 
+  revision_id base_rid(decode_hexenc(remove_ws(base_rev_data())));
   MM(base_rid);
 
   cset workcs;