Mercurial > hg
comparison tests/test-merge2.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 | 1850066f9e36 |
children |
comparison
equal
deleted
inserted
replaced
45826:21733e8c924f | 45827:8d72e29ad1e0 |
---|---|
50 adding b | 50 adding b |
51 created new head | 51 created new head |
52 | 52 |
53 $ hg merge 'wdir()' | 53 $ hg merge 'wdir()' |
54 abort: merging with the working copy has no effect | 54 abort: merging with the working copy has no effect |
55 [255] | 55 [10] |
56 | 56 |
57 $ cd .. | 57 $ cd .. |