Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 43905:fff21278554b
rebase: use cmdutil.check_at_most_one_arg() for action
Here we also needed to know what the action was (if any), so I've
updated the helper to return any specified option.
Differential Revision: https://phab.mercurial-scm.org/D7640
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 12 Dec 2019 15:55:33 -0800 |
| parents | c6feee1e4d5b |
| children | daed70e95d60 |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Dec 12 22:30:59 2019 -0800 +++ b/hgext/rebase.py Thu Dec 12 15:55:33 2019 -0800 @@ -1021,12 +1021,7 @@ inmemory = ui.configbool(b'rebase', b'experimental.inmemory') dryrun = opts.get(b'dry_run') confirm = opts.get(b'confirm') - selactions = [k for k in [b'abort', b'stop', b'continue'] if opts.get(k)] - if len(selactions) > 1: - raise error.Abort( - _(b'cannot use --%s with --%s') % tuple(selactions[:2]) - ) - action = selactions[0] if selactions else None + action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') if dryrun and action: raise error.Abort(_(b'cannot specify both --dry-run and --%s') % action) if confirm and action: