D7699: cmdutil: allow native string as input to check_at_most_one_arg()

[martinvonz (Martin von Zweigbergk)]

martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  We seem to always convert **opts args to use bytes as keys early on in
  Mercurial core, but I'm not sure we have good reason to do that, and
  not all extensions do that. It's therefore helpful to be able to pass
  in a native string to check_at_most_one_arg().

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -267,7 +267,7 @@
     """
 
     def to_display(name):
-        return name.replace(b'_', b'-')
+        return pycompat.sysbytes(name).replace(b'_', b'-')
 
     previous = None
     for x in args:



To: martinvonz, #hg-reviewers
Cc: mercurial-devel