[PATCH in crew] mq: improve qqueue message with patches applied (issue3036)

Bryan O'Sullivan bos at serpentine.com
Thu Oct 4 17:02:01 CDT 2012


# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1349388032 18000
# Node ID 4f2f0f367ef64a979c68002e8689e28f579c7d07
# Parent  35674bd95200867b6356e8aac4689093aae465e5
mq: improve qqueue message with patches applied (issue3036)

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -3262,7 +3262,8 @@
 
     def _setactive(name):
         if q.applied:
-            raise util.Abort(_('patches applied - cannot set new queue active'))
+            raise util.Abort(_('new queue created, but cannot make active '
+                               'as patches are applied'))
         _setactivenocheck(name)
 
     def _setactivenocheck(name):
diff --git a/tests/test-mq-qqueue.t b/tests/test-mq-qqueue.t
--- a/tests/test-mq-qqueue.t
+++ b/tests/test-mq-qqueue.t
@@ -22,7 +22,7 @@
 Try to change patch (create succeeds, switch fails):
 
   $ hg qqueue foo --create
-  abort: patches applied - cannot set new queue active
+  abort: new queue created, but cannot make active as patches are applied
   [255]
 
   $ hg qqueue
@@ -137,7 +137,7 @@
 Fail switching back:
 
   $ hg qqueue patches
-  abort: patches applied - cannot set new queue active
+  abort: new queue created, but cannot make active as patches are applied
   [255]
 
 Fail deleting current:


More information about the Mercurial-devel mailing list