Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-parameters.t @ 45827:8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
This patch introduces a `InputError` class and replaces many uses of
`error.Abort` by it in `commands` and `cmdutil`. This is a part of
https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan. There will
later be a different class for state errors (to raise e.g. when
there's an unfinished operation). It's not always clear when one
should report an input error and when it should be a state error. We
can always adjust later if I got something wrong in this patch (but
feel free to point out any you notice now).
Differential Revision: https://phab.mercurial-scm.org/D9167
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 06 Oct 2020 22:36:15 -0700 |
| parents | 21733e8c924f |
| children | 527ce85c2e60 |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t Wed Oct 21 19:00:16 2020 -0700 +++ b/tests/test-rebase-parameters.t Tue Oct 06 22:36:15 2020 -0700 @@ -62,7 +62,7 @@ $ hg rebase --continue --abort abort: cannot specify both --abort and --continue - [255] + [10] $ hg rebase --continue --collapse abort: cannot use collapse with continue or abort @@ -70,18 +70,18 @@ $ hg rebase --continue --dest 4 abort: cannot specify both --continue and --dest - [255] + [10] $ hg rebase --base 5 --source 4 abort: cannot specify both --source and --base - [255] + [10] $ hg rebase --rev 5 --source 4 abort: cannot specify both --rev and --source - [255] + [10] $ hg rebase --base 5 --rev 4 abort: cannot specify both --rev and --base - [255] + [10] $ hg rebase --base 6 abort: branch 'default' has 3 heads - please rebase to an explicit rev