From patchwork Wed Mar 4 19:22:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D8222: commands: switch one call of check_at_most_one_arg to strings From: phabricator X-Patchwork-Id: 45481 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Wed, 4 Mar 2020 19:22:39 +0000 durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 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. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8222 AFFECTED FILES mercurial/commands.py CHANGE DETAILS To: durin42, #hg-reviewers Cc: mercurial-devel diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -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')