diff -r d155bf11cf22 -r 71dbd6f6fcb8 mercurial/commands.py --- a/mercurial/commands.py Fri Nov 15 15:58:56 2019 -0500 +++ b/mercurial/commands.py Thu Nov 21 09:25:50 2019 +0100 @@ -4033,6 +4033,7 @@ _(b'NUM'), ), (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')), + (b'', b'secret', None, _(b'use the secret phase for committing')), (b'e', b'edit', False, _(b'invoke editor on commit messages')), ( b'f', @@ -4181,6 +4182,8 @@ update = not opts.get(b'bypass') if not update and opts.get(b'no_commit'): raise error.Abort(_(b'cannot use --no-commit with --bypass')) + if opts.get(b'secret') and opts.get(b'no_commit'): + raise error.Abort(_(b'cannot use --no-commit with --secret')) try: sim = float(opts.get(b'similarity') or 0) except ValueError: