D7993: merge: use check_incompatible_arguments() for --abort

2020-01-27 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In D7993#118162 , @yuja wrote: >> +cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview') > > It's a bit late, but I feel the arguments of `check_incompatible_arguments()` > is confusing

D7993: merge: use check_incompatible_arguments() for --abort

2020-01-27 Thread yuja (Yuya Nishihara)
yuja added a comment. > +cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview') It's a bit late, but I feel the arguments of `check_incompatible_arguments()` is confusing since `b'abort'` isn't the same kind of arguments as the others. I think `(opts, b'abort',

Re: D7993: merge: use check_incompatible_arguments() for --abort

2020-01-27 Thread Yuya Nishihara
> +cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview') It's a bit late, but I feel the arguments of `check_incompatible_arguments()` is confusing since `b'abort'` isn't the same kind of arguments as the others. I think `(opts, b'abort', [b'rev', b'preview'])` is more

D7993: merge: use check_incompatible_arguments() for --abort

2020-01-25 Thread martinvonz (Martin von Zweigbergk)
Closed by commit rHG75c2ca094d3a: merge: use check_incompatible_arguments() for --abort (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7993?vs=19584=19612

D7993: merge: use check_incompatible_arguments() for --abort

2020-01-24 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D7993 AFFECTED FILES mercurial/commands.py tests/test-commit-unresolved.t