equal
deleted
inserted
replaced
4031 b'meaning as the corresponding patch option' |
4031 b'meaning as the corresponding patch option' |
4032 ), |
4032 ), |
4033 _(b'NUM'), |
4033 _(b'NUM'), |
4034 ), |
4034 ), |
4035 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')), |
4035 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')), |
|
4036 (b'', b'secret', None, _(b'use the secret phase for committing')), |
4036 (b'e', b'edit', False, _(b'invoke editor on commit messages')), |
4037 (b'e', b'edit', False, _(b'invoke editor on commit messages')), |
4037 ( |
4038 ( |
4038 b'f', |
4039 b'f', |
4039 b'force', |
4040 b'force', |
4040 None, |
4041 None, |
4179 |
4180 |
4180 exact = opts.get(b'exact') |
4181 exact = opts.get(b'exact') |
4181 update = not opts.get(b'bypass') |
4182 update = not opts.get(b'bypass') |
4182 if not update and opts.get(b'no_commit'): |
4183 if not update and opts.get(b'no_commit'): |
4183 raise error.Abort(_(b'cannot use --no-commit with --bypass')) |
4184 raise error.Abort(_(b'cannot use --no-commit with --bypass')) |
|
4185 if opts.get(b'secret') and opts.get(b'no_commit'): |
|
4186 raise error.Abort(_(b'cannot use --no-commit with --secret')) |
4184 try: |
4187 try: |
4185 sim = float(opts.get(b'similarity') or 0) |
4188 sim = float(opts.get(b'similarity') or 0) |
4186 except ValueError: |
4189 except ValueError: |
4187 raise error.Abort(_(b'similarity must be a number')) |
4190 raise error.Abort(_(b'similarity must be a number')) |
4188 if sim < 0 or sim > 100: |
4191 if sim < 0 or sim > 100: |