# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2017-04-27 19:19:30 # Node ID 964c6be36590fc582c9b9caf27bf46853b22b5a0 # Parent d90ffee93df60e5c485a2f849aaa85283c110244 py3: make sure opts are passed and used correctly in help command opts are converted back to bytes in help.help_() where they are used. Before that it's ensured that we have a bytes value for keep variable. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2759,7 +2759,7 @@ def help_(ui, name=None, **opts): Returns 0 if successful. """ - keep = opts.get('system') or [] + keep = opts.get(r'system') or [] if len(keep) == 0: if pycompat.sysplatform.startswith('win'): keep.append('windows') diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -23,6 +23,7 @@ from . import ( filemerge, fileset, minirst, + pycompat, revset, templatefilters, templatekw, @@ -304,6 +305,7 @@ def help_(ui, name, unknowncmd=False, fu ''' from . import commands # avoid cycle + opts = pycompat.byteskwargs(opts) def helpcmd(name, subtopic=None): try: