diff tests/test-merge-default.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 8caec25f5d8f
children 55c6ebd11cb9
line wrap: on
line diff
--- a/tests/test-merge-default.t	Wed Oct 21 19:00:16 2020 -0700
+++ b/tests/test-merge-default.t	Tue Oct 06 22:36:15 2020 -0700
@@ -69,7 +69,7 @@
 
   $ hg merge --config commands.merge.require-rev=True
   abort: configuration requires specifying revision to merge with
-  [255]
+  [10]
 
 Should succeed - 2 heads:
 
@@ -101,7 +101,7 @@
 
   $ hg merge --config commands.merge.require-rev=True
   abort: configuration requires specifying revision to merge with
-  [255]
+  [10]
 
 Should fail because at tip: