# HG changeset patch # User Augie Fackler # Date 2020-03-04 19:21:23 # Node ID 5a5aee8ba980ceecedc31a03dc5ae4e78b6341f0 # Parent f0021fbedea91a23fef640ffe311656fda403d45 commands: switch one call of check_at_most_one_arg to strings This opts hasn't been through the byteskwargs mulcher, so we can just use strings here instead of bytes. Fixes the test changes from D8204 on Python 3, which was the only place this was a problem. Differential Revision: https://phab.mercurial-scm.org/D8222 diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -7665,7 +7665,7 @@ def update(ui, repo, node=None, **opts): Returns 0 on success, 1 if there are unresolved files. """ - cmdutil.check_at_most_one_arg(opts, b'clean', b'check', b'merge') + cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge') rev = opts.get('rev') date = opts.get('date') clean = opts.get('clean')