# # # patch "cmd_files.cc" # from [0de622dfecb26c9e4dbaebffb846a797b1e00c38] # to [b10aef51c669d7d51136c0a95f340b5fe4df3820] # # patch "cmd_netsync.cc" # from [3fc803802fa21cc1e8e35faa705c749fa284c841] # to [004a3475a3161f6fad476930d6e4f707e61ac6aa] # ============================================================ --- cmd_files.cc 0de622dfecb26c9e4dbaebffb846a797b1e00c38 +++ cmd_files.cc b10aef51c669d7d51136c0a95f340b5fe4df3820 @@ -180,10 +180,12 @@ CMD(annotate, "annotate", "", CMD_REF(in // find the version of the file requested N(roster.has_node(file), - F("no such file '%s' in revision '%s'") % file % rid); + F("no such file '%s' in revision '%s'") + % file % encode_hexenc(rid.inner()())); node_t node = roster.get_node(file); N(is_file_t(node), - F("'%s' in revision '%s' is not a file") % file % rid); + F("'%s' in revision '%s' is not a file") + % file % encode_hexenc(rid.inner()())); file_t file_node = downcast_to_file_t(node); L(FL("annotate for file_id %s") % file_node->self); ============================================================ --- cmd_netsync.cc 3fc803802fa21cc1e8e35faa705c749fa284c841 +++ cmd_netsync.cc 004a3475a3161f6fad476930d6e4f707e61ac6aa @@ -396,12 +396,15 @@ CMD(clone, "clone", "", CMD_REF(network) N(project.revision_is_in_branch(ident, app.opts.branchname), F("revision %s is not a member of branch %s") - % ident % app.opts.branchname); + % encode_hexenc(ident.inner()()) + % app.opts.branchname); } roster_t empty_roster, current_roster; - L(FL("checking out revision %s to directory %s") % ident % workspace_dir); + L(FL("checking out revision %s to directory %s") + % encode_hexenc(ident.inner()()) + % workspace_dir); db.get_roster(ident, current_roster); workspace work(app);