# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2018-03-04 21:20:24
# Node ID 7aae39d03139936ef15ff8ba12fee07ee9d87da2
# Parent  66c569e57c70e9269b93c6d78fc3bff74cf9ec46

debugcommands: fix some %r output with bytestr() wrappers

Almost fixes test-merge-tools.t. I think the remaining failure there
is due to some overspecified tempfile names.

Differential Revision: https://phab.mercurial-scm.org/D2675

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -1770,15 +1770,15 @@ def debugpickmergetool(ui, repo, *pats, 
     overrides = {}
     if opts['tool']:
         overrides[('ui', 'forcemerge')] = opts['tool']
-        ui.note(('with --tool %r\n') % (opts['tool']))
+        ui.note(('with --tool %r\n') % (pycompat.bytestr(opts['tool'])))
 
     with ui.configoverride(overrides, 'debugmergepatterns'):
         hgmerge = encoding.environ.get("HGMERGE")
         if hgmerge is not None:
-            ui.note(('with HGMERGE=%r\n') % (hgmerge))
+            ui.note(('with HGMERGE=%r\n') % (pycompat.bytestr(hgmerge)))
         uimerge = ui.config("ui", "merge")
         if uimerge:
-            ui.note(('with ui.merge=%r\n') % (uimerge))
+            ui.note(('with ui.merge=%r\n') % (pycompat.bytestr(uimerge)))
 
         ctx = scmutil.revsingle(repo, opts.get('rev'))
         m = scmutil.match(ctx, pats, opts)