This is an archive of the discontinued Mercurial Phabricator instance.

merge: use check_incompatible_arguments() for --abort
ClosedPublic

Authored by martinvonz on Jan 24 2020, 7:16 PM.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 24 2020, 7:16 PM
pulkit accepted this revision.Jan 24 2020, 8:24 PM
This revision is now accepted and ready to land.Jan 24 2020, 8:24 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jan 27 2020, 5:32 AM

+ 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 explicit.

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 since b'abort' isn't the same kind of arguments as the others.
I think (opts, b'abort', [b'rev', b'preview']) is more explicit.

Good point. I've sent D8018.