Patchwork D8222: commands: switch one call of check_at_most_one_arg to strings

login
register
mail settings
Submitter phabricator
Date March 4, 2020, 7:22 p.m.
Message ID <differential-rev-PHID-DREV-mxez63j6f7imkmqphs7h-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45481/
State Superseded
Headers show

Comments

phabricator - March 4, 2020, 7:22 p.m.
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 <https://phab.mercurial-scm.org/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
phabricator - March 4, 2020, 7:40 p.m.
marmoute added a comment.
marmoute accepted this revision.


  If the test are happy. I am happy with.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8222/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8222

To: durin42, #hg-reviewers, marmoute
Cc: marmoute, mercurial-devel

Patch

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')