diff -r 4145fd3569c3 -r 08dd462ea782 mercurial/commands.py --- a/mercurial/commands.py Thu Jan 10 21:32:37 2019 +0900 +++ b/mercurial/commands.py Thu Jan 10 21:57:21 2019 +0900 @@ -2393,6 +2393,10 @@ # list of new nodes created by ongoing graft statedata['newnodes'] = [] + if opts.get('user') and opts.get('currentuser'): + raise error.Abort(_('--user and --currentuser are mutually exclusive')) + if opts.get('date') and opts.get('currentdate'): + raise error.Abort(_('--date and --currentdate are mutually exclusive')) if not opts.get('user') and opts.get('currentuser'): opts['user'] = ui.username() if not opts.get('date') and opts.get('currentdate'):