Mercurial > public > mercurial-scm > hg
diff tests/test-bookmarks-pushpull.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 | 49535e56fab8 |
| children | 95c4cca641f6 |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Wed Oct 21 19:00:16 2020 -0700 +++ b/tests/test-bookmarks-pushpull.t Tue Oct 06 22:36:15 2020 -0700 @@ -386,7 +386,7 @@ $ hg pull -B anotherbadname ../a pulling from ../a abort: remote bookmark anotherbadname not found! - [255] + [10] divergent bookmarks @@ -1382,10 +1382,10 @@ [1] $ hg push --all-bookmarks -r 1 ../ab2 abort: cannot specify both --all-bookmarks and --rev - [255] + [10] $ hg push --all-bookmarks -B A ../ab2 abort: cannot specify both --all-bookmarks and --bookmark - [255] + [10] $ hg push --all-bookmarks ../ab2 pushing to ../ab2 searching for changes