Patchwork [1,of,5] error: introduce new InterventionRequired exception

login
register
mail settings
Submitter Augie Fackler
Date Feb. 8, 2013, 10:49 p.m.
Message ID <4d997c5075c446963b6a.1360363790@augie-macbookair>
Download mbox | patch
Permalink /patch/846/
State Accepted
Commit 3c224e0949de4743b4b5accce713dd93ab6cfc88
Headers show

Comments

Augie Fackler - Feb. 8, 2013, 10:49 p.m.
# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1360355163 21600
# Node ID 4d997c5075c446963b6ac65155f2129c73257b6f
# Parent  4db9e31ae6055cc5ee01a50e6466dd94b436b412
error: introduce new InterventionRequired exception

Future changes will use this type instead of util.Abort for signalling
the user that intervention is required, as in some rebase and histedit
aborts.
Matt Mackall - April 12, 2013, 11:25 p.m.
On Fri, 2013-02-08 at 16:49 -0600, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <raf@durin42.com>
> # Date 1360355163 21600
> # Node ID 4d997c5075c446963b6ac65155f2129c73257b6f
> # Parent  4db9e31ae6055cc5ee01a50e6466dd94b436b412
> error: introduce new InterventionRequired exception

Finally queued these, thanks.

Patch

diff --git a/mercurial/error.py b/mercurial/error.py
--- a/mercurial/error.py
+++ b/mercurial/error.py
@@ -30,6 +30,9 @@ 
 class CommandError(Exception):
     """Exception raised on errors in parsing the command line."""
 
+class InterventionRequired(Exception):
+    """Exception raised when a command requires human intervention."""
+
 class Abort(Exception):
     """Raised if a command needs to print an error and exit."""
     def __init__(self, *args, **kw):