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

login
register
mail settings
Submitter phabricator
Date Dec. 19, 2019, 5:57 p.m.
Message ID <41a66648fa3a42519231a37e149c70ea@localhost.localdomain>
Download mbox | patch
Permalink /patch/43997/
State Not Applicable
Headers show

Comments

phabricator - Dec. 19, 2019, 5:57 p.m.
Closed by commit rHG6c8108274dc5: cmdutil: allow native string as input to check_at_most_one_arg() (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7699?vs=18866&id=18884

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

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

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




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

Patch

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: