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

2018-03-07 Thread durin42 (Augie Fackler) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7aae39d03139: debugcommands: fix some %r output with 
bytestr() wrappers (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2675?vs=6627&id=6725

REVISION DETAIL
  https://phab.mercurial-scm.org/D2675

AFFECTED FILES
  mercurial/debugcommands.py

CHANGE DETAILS

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -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)



To: durin42, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

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

2018-03-04 Thread durin42 (Augie Fackler) 
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2675

AFFECTED FILES
  mercurial/debugcommands.py

CHANGE DETAILS

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -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)



To: durin42, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel