This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2675

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

Authored by durin42 on Mar 4 2018, 4:50 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG7aae39d03139: debugcommands: fix some %r output with bytestr() wrappers
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Mar 4 2018, 4:50 PM
indygreg accepted this revision.Mar 8 2018, 1:29 AM
This revision is now accepted and ready to land.Mar 8 2018, 1:29 AM
Closed by commit rHG7aae39d03139: debugcommands: fix some %r output with bytestr() wrappers (authored by durin42). · Explain WhyMar 8 2018, 1:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (6 lines)

Diff 6725

mercurial/debugcommands.py

``merge-patterns``, this command can't show any helpful ``merge-patterns``, this command can't show any helpful
information, even with --debug. In such case, information above is information, even with --debug. In such case, information above is
useful to know why a merge tool is chosen. useful to know why a merge tool is chosen.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
overrides = {} overrides = {}
if opts['tool']: if opts['tool']:
overrides[('ui', 'forcemerge')] = 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'): with ui.configoverride(overrides, 'debugmergepatterns'):
hgmerge = encoding.environ.get("HGMERGE") hgmerge = encoding.environ.get("HGMERGE")
if hgmerge is not None: 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") uimerge = ui.config("ui", "merge")
if uimerge: 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')) ctx = scmutil.revsingle(repo, opts.get('rev'))
m = scmutil.match(ctx, pats, opts) m = scmutil.match(ctx, pats, opts)
changedelete = opts['changedelete'] changedelete = opts['changedelete']
for path in ctx.walk(m): for path in ctx.walk(m):
fctx = ctx[path] fctx = ctx[path]
try: try:
if not ui.debugflag: if not ui.debugflag: