Mercurial > hg
diff mercurial/commands.py @ 45014:6118ad07b98d
graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop
Differential Revision: https://phab.mercurial-scm.org/D8669
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 25 Jun 2020 13:37:56 -0700 |
parents | c63a297fb964 |
children | 44d5233e66a9 |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Jun 25 13:29:05 2020 -0700 +++ b/mercurial/commands.py Thu Jun 25 13:37:56 2020 -0700 @@ -2995,35 +2995,34 @@ graftstate = statemod.cmdstate(repo, b'graftstate') if opts.get(b'stop'): - if any( - ( - opts.get(b'edit'), - opts.get(b'log'), - opts.get(b'user'), - opts.get(b'date'), - opts.get(b'currentdate'), - opts.get(b'currentuser'), - opts.get(b'rev'), - ) - ): - raise error.Abort(_(b"cannot specify any other flag with '--stop'")) + cmdutil.check_incompatible_arguments( + opts, + b'stop', + [ + b'edit', + b'log', + b'user', + b'date', + b'currentdate', + b'currentuser', + b'rev', + ], + ) return _stopgraft(ui, repo, graftstate) elif opts.get(b'abort'): - if any( - ( - opts.get(b'edit'), - opts.get(b'log'), - opts.get(b'user'), - opts.get(b'date'), - opts.get(b'currentdate'), - opts.get(b'currentuser'), - opts.get(b'rev'), - ) - ): - raise error.Abort( - _(b"cannot specify any other flag with '--abort'") - ) - + cmdutil.check_incompatible_arguments( + opts, + b'abort', + [ + b'edit', + b'log', + b'user', + b'date', + b'currentdate', + b'currentuser', + b'rev', + ], + ) return cmdutil.abortgraft(ui, repo, graftstate) elif opts.get(b'continue'): cont = True