| hg-reviewers |
This makes it clearer on the call-sites that the first argument is
special. Thanks to Yuya for the suggestion.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (6 lines) | |||
| M | hgext/releasenotes.py (2 lines) | |||
| M | hgext/transplant.py (4 lines) | |||
| M | mercurial/cmdutil.py (4 lines) | |||
| M | mercurial/commands.py (8 lines) | |||
| M | relnotes/next (3 lines) |
| unresolved conflicts. | unresolved conflicts. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| inmemory = ui.configbool(b'rebase', b'experimental.inmemory') | inmemory = ui.configbool(b'rebase', b'experimental.inmemory') | ||||
| action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') | action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') | ||||
| if action: | if action: | ||||
| cmdutil.check_incompatible_arguments( | cmdutil.check_incompatible_arguments( | ||||
| opts, action, b'confirm', b'dry_run' | opts, action, [b'confirm', b'dry_run'] | ||||
| ) | ) | ||||
| cmdutil.check_incompatible_arguments( | cmdutil.check_incompatible_arguments( | ||||
| opts, action, b'rev', b'source', b'base', b'dest' | opts, action, [b'rev', b'source', b'base', b'dest'] | ||||
| ) | ) | ||||
| cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') | cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') | ||||
| cmdutil.check_at_most_one_arg(opts, b'rev', b'source', b'base') | cmdutil.check_at_most_one_arg(opts, b'rev', b'source', b'base') | ||||
| if action or repo.currenttransaction() is not None: | if action or repo.currenttransaction() is not None: | ||||
| # in-memory rebase is not compatible with resuming rebases. | # in-memory rebase is not compatible with resuming rebases. | ||||
| # (Or if it is run within a transaction, since the restart logic can | # (Or if it is run within a transaction, since the restart logic can | ||||
| # fail the entire transaction.) | # fail the entire transaction.) | ||||
| inmemory = False | inmemory = False | ||||
| if opts.get(b'auto_orphans'): | if opts.get(b'auto_orphans'): | ||||
| disallowed_opts = set(opts) - {b'auto_orphans'} | disallowed_opts = set(opts) - {b'auto_orphans'} | ||||
| cmdutil.check_incompatible_arguments( | cmdutil.check_incompatible_arguments( | ||||
| opts, b'auto_orphans', *disallowed_opts | opts, b'auto_orphans', disallowed_opts | ||||
| ) | ) | ||||
| userrevs = list(repo.revs(opts.get(b'auto_orphans'))) | userrevs = list(repo.revs(opts.get(b'auto_orphans'))) | ||||
| opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)] | opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)] | ||||
| opts[b'dest'] = b'_destautoorphanrebase(SRC)' | opts[b'dest'] = b'_destautoorphanrebase(SRC)' | ||||
| if opts.get(b'dry_run') or opts.get(b'confirm'): | if opts.get(b'dry_run') or opts.get(b'confirm'): | ||||
| return _dryrunrebase(ui, repo, action, opts) | return _dryrunrebase(ui, repo, action, opts) | ||||
| The -l/--list option, presents the user with a list of existing available | The -l/--list option, presents the user with a list of existing available | ||||
| admonitions along with their title. This also includes the custom | admonitions along with their title. This also includes the custom | ||||
| admonitions (if any). | admonitions (if any). | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| sections = releasenotessections(ui, repo) | sections = releasenotessections(ui, repo) | ||||
| cmdutil.check_incompatible_arguments(opts, b'list', b'rev', b'check') | cmdutil.check_incompatible_arguments(opts, b'list', [b'rev', b'check']) | ||||
| if opts.get(b'list'): | if opts.get(b'list'): | ||||
| return _getadmonitionlist(ui, sections) | return _getadmonitionlist(ui, sections) | ||||
| rev = opts.get(b'rev') | rev = opts.get(b'rev') | ||||
| revs = scmutil.revrange(repo, [rev or b'not public()']) | revs = scmutil.revrange(repo, [rev or b'not public()']) | ||||
| if opts.get(b'check'): | if opts.get(b'check'): | ||||
| return checkadmonitions(ui, repo, sections.names(), revs) | return checkadmonitions(ui, repo, sections.names(), revs) | ||||
| ancestors.append(ctx.ancestor(repo[head]).node()) | ancestors.append(ctx.ancestor(repo[head]).node()) | ||||
| for node in repo.changelog.nodesbetween(ancestors, heads)[0]: | for node in repo.changelog.nodesbetween(ancestors, heads)[0]: | ||||
| if match(node): | if match(node): | ||||
| yield node | yield node | ||||
| def checkopts(opts, revs): | def checkopts(opts, revs): | ||||
| if opts.get(b'continue'): | if opts.get(b'continue'): | ||||
| cmdutil.check_incompatible_arguments( | cmdutil.check_incompatible_arguments( | ||||
| opts, b'continue', b'branch', b'all', b'merge' | opts, b'continue', [b'branch', b'all', b'merge'] | ||||
| ) | ) | ||||
| return | return | ||||
| if opts.get(b'stop'): | if opts.get(b'stop'): | ||||
| cmdutil.check_incompatible_arguments( | cmdutil.check_incompatible_arguments( | ||||
| opts, b'stop', b'branch', b'all', b'merge' | opts, b'stop', [b'branch', b'all', b'merge'] | ||||
| ) | ) | ||||
| return | return | ||||
| if not ( | if not ( | ||||
| opts.get(b'source') | opts.get(b'source') | ||||
| or revs | or revs | ||||
| or opts.get(b'merge') | or opts.get(b'merge') | ||||
| or opts.get(b'branch') | or opts.get(b'branch') | ||||
| ): | ): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'cannot specify both --%s and --%s') | _(b'cannot specify both --%s and --%s') | ||||
| % (to_display(previous), to_display(x)) | % (to_display(previous), to_display(x)) | ||||
| ) | ) | ||||
| previous = x | previous = x | ||||
| return previous | return previous | ||||
| def check_incompatible_arguments(opts, first, *others): | def check_incompatible_arguments(opts, first, others): | ||||
| """abort if the first argument is given along with any of the others | """abort if the first argument is given along with any of the others | ||||
| Unlike check_at_most_one_arg(), `others` are not mutually exclusive | Unlike check_at_most_one_arg(), `others` are not mutually exclusive | ||||
| among themselves. | among themselves, and they're passed as a single collection. | ||||
| """ | """ | ||||
| for other in others: | for other in others: | ||||
| check_at_most_one_arg(opts, first, other) | check_at_most_one_arg(opts, first, other) | ||||
| def resolvecommitoptions(ui, opts): | def resolvecommitoptions(ui, opts): | ||||
| """modify commit options dict to handle related options | """modify commit options dict to handle related options | ||||
| ''' | ''' | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| force = opts.get(b'force') | force = opts.get(b'force') | ||||
| rev = opts.get(b'rev') | rev = opts.get(b'rev') | ||||
| inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark | inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark | ||||
| action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list') | action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list') | ||||
| if action: | if action: | ||||
| cmdutil.check_incompatible_arguments(opts, action, b'rev') | cmdutil.check_incompatible_arguments(opts, action, [b'rev']) | ||||
| elif names or rev: | elif names or rev: | ||||
| action = b'add' | action = b'add' | ||||
| elif inactive: | elif inactive: | ||||
| action = b'inactive' # meaning deactivate | action = b'inactive' # meaning deactivate | ||||
| else: | else: | ||||
| action = b'list' | action = b'list' | ||||
| cmdutil.check_incompatible_arguments(opts, b'inactive', b'delete', b'list') | cmdutil.check_incompatible_arguments( | ||||
| opts, b'inactive', [b'delete', b'list'] | |||||
| ) | |||||
| if not names and action in {b'add', b'delete'}: | if not names and action in {b'add', b'delete'}: | ||||
| raise error.Abort(_(b"bookmark name required")) | raise error.Abort(_(b"bookmark name required")) | ||||
| if action in {b'add', b'delete', b'rename', b'inactive'}: | if action in {b'add', b'delete', b'rename', b'inactive'}: | ||||
| with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr: | with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr: | ||||
| if action == b'delete': | if action == b'delete': | ||||
| names = pycompat.maplist(repo._bookmarks.expandname, names) | names = pycompat.maplist(repo._bookmarks.expandname, names) | ||||
| bookmarks.delete(repo, tr, names) | bookmarks.delete(repo, tr, names) | ||||
| Returns 0 on success, 1 if there are unresolved files. | Returns 0 on success, 1 if there are unresolved files. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| abort = opts.get(b'abort') | abort = opts.get(b'abort') | ||||
| if abort and repo.dirstate.p2() == nullid: | if abort and repo.dirstate.p2() == nullid: | ||||
| cmdutil.wrongtooltocontinue(repo, _(b'merge')) | cmdutil.wrongtooltocontinue(repo, _(b'merge')) | ||||
| cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview') | cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview']) | ||||
| if abort: | if abort: | ||||
| state = cmdutil.getunfinishedstate(repo) | state = cmdutil.getunfinishedstate(repo) | ||||
| if state and state._opname != b'merge': | if state and state._opname != b'merge': | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'cannot abort merge with %s in progress') % (state._opname), | _(b'cannot abort merge with %s in progress') % (state._opname), | ||||
| hint=state.hint(), | hint=state.hint(), | ||||
| ) | ) | ||||
| if node: | if node: | ||||
| == Internal API Changes == | == Internal API Changes == | ||||
| * The deprecated `ui.progress()` has now been deleted. Please use | * The deprecated `ui.progress()` has now been deleted. Please use | ||||
| `ui.makeprogress()` instead. | `ui.makeprogress()` instead. | ||||
| * `hg.merge()` has lost its `abort` argument. Please call | * `hg.merge()` has lost its `abort` argument. Please call | ||||
| `hg.abortmerge()` directly instead. | `hg.abortmerge()` directly instead. | ||||
| * The `*others` argument of `cmdutil.check_incompatible_arguments()` | |||||
| changed from being varargs argument to being a single collection. | |||||