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
--- a/mercurial/debugcommands.py Wed Mar 07 11:00:17 2018 -0800
+++ b/mercurial/debugcommands.py Sun Mar 04 16:20:24 2018 -0500
@@ -1770,15 +1770,15 @@
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)