This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7699

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

Authored by martinvonz on Dec 18 2019, 2:38 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6c8108274dc5: cmdutil: allow native string as input to check_at_most_one_arg()
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().

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 18 2019, 2:38 PM
pulkit accepted this revision.Dec 19 2019, 12:12 PM
pulkit added a subscriber: pulkit.

I hope one day we have a clear understanding of what is bytes and what is not in core.

This revision is now accepted and ready to land.Dec 19 2019, 12:12 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 18884

mercurial/cmdutil.py

def check_at_most_one_arg(opts, *args): def check_at_most_one_arg(opts, *args):
"""abort if more than one of the arguments are in opts """abort if more than one of the arguments are in opts
Returns the unique argument or None if none of them were specified. Returns the unique argument or None if none of them were specified.
""" """
def to_display(name): def to_display(name):
return name.replace(b'_', b'-') return pycompat.sysbytes(name).replace(b'_', b'-')
previous = None previous = None
for x in args: for x in args:
if opts.get(x): if opts.get(x):
if previous: if previous:
raise error.Abort( raise error.Abort(
_(b'cannot specify both --%s and --%s') _(b'cannot specify both --%s and --%s')
% (to_display(previous), to_display(x)) % (to_display(previous), to_display(x))