Mercurial > public > mercurial-scm > hg
diff tests/test-resolve.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-resolve.t Wed Oct 21 19:00:16 2020 -0700 +++ b/tests/test-resolve.t Tue Oct 06 22:36:15 2020 -0700 @@ -191,7 +191,7 @@ $ hg resolve abort: no files or directories specified (use --all to re-merge all unresolved files) - [255] + [10] resolve --all should re-merge all unresolved files $ hg resolve --all @@ -406,7 +406,7 @@ R file2 $ hg resolve --mark --re-merge abort: too many actions specified - [255] + [10] $ hg resolve --re-merge --all merging file1 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') @@ -416,7 +416,7 @@ $ hg resolve --config commands.resolve.explicit-re-merge=1 --all abort: no action specified (use --mark, --unmark, --list or --re-merge) - [255] + [10] $ hg resolve --config commands.resolve.explicit-re-merge=1 --re-merge --all merging file1 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') @@ -489,7 +489,7 @@ $ hg resolve abort: no files or directories specified (use --all to re-merge all unresolved files) - [255] + [10] $ hg resolve --all << EOF > n > EOF