commands: switch one call of check_at_most_one_arg to strings
authorAugie Fackler <augie@google.com>
Wed, 04 Mar 2020 14:21:23 -0500
changeset 44439 5a5aee8ba980
parent 44438 f0021fbedea9
child 44440 d543ef183eb8
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
mercurial/commands.py
--- a/mercurial/commands.py	Fri Feb 28 11:32:27 2020 -0800
+++ b/mercurial/commands.py	Wed Mar 04 14:21:23 2020 -0500
@@ -7665,7 +7665,7 @@
 
     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')