Mercurial > hg
diff hgext/rebase.py @ 43927:905b21783968
rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
Differential Revision: https://phab.mercurial-scm.org/D7661
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 13 Dec 2019 14:50:42 -0800 |
parents | daed70e95d60 |
children | 0b769e1cbe89 |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Dec 13 14:49:48 2019 -0800 +++ b/hgext/rebase.py Fri Dec 13 14:50:42 2019 -0800 @@ -1022,10 +1022,10 @@ dryrun = opts.get(b'dry_run') confirm = opts.get(b'confirm') 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: - raise error.Abort(_(b'cannot specify both --confirm and --%s') % action) + if action: + cmdutil.check_incompatible_arguments( + opts, action, b'confirm', b'dry_run' + ) cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') if action or repo.currenttransaction() is not None: