diff tests/test-rebase-inmemory.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-inmemory.t	Wed Oct 21 19:00:16 2020 -0700
+++ b/tests/test-rebase-inmemory.t	Tue Oct 06 22:36:15 2020 -0700
@@ -333,10 +333,10 @@
 Make sure it throws error while passing --continue or --abort with --dry-run
   $ hg rebase -s 2 -d 6 -n --continue
   abort: cannot specify both --continue and --dry-run
-  [255]
+  [10]
   $ hg rebase -s 2 -d 6 -n --abort
   abort: cannot specify both --abort and --dry-run
-  [255]
+  [10]
 
 Check dryrun gives correct results when there is no conflict in rebasing
   $ hg rebase -s 2 -d 6 -n
@@ -539,13 +539,13 @@
 Check it gives error when both --dryrun and --confirm is used:
   $ hg rebase -s 2 -d . --confirm --dry-run
   abort: cannot specify both --confirm and --dry-run
-  [255]
+  [10]
   $ hg rebase -s 2 -d . --confirm --abort
   abort: cannot specify both --abort and --confirm
-  [255]
+  [10]
   $ hg rebase -s 2 -d . --confirm --continue
   abort: cannot specify both --continue and --confirm
-  [255]
+  [10]
 
 Test --confirm option when there are no conflicts:
   $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF