Mercurial > hg
changeset 44439:5a5aee8ba980
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
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 04 Mar 2020 14:21:23 -0500 |
parents | f0021fbedea9 |
children | d543ef183eb8 |
files | mercurial/commands.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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')