Mercurial > hg-stable
changeset 17708:4f2f0f367ef6
mq: improve qqueue message with patches applied (issue3036)
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Thu, 04 Oct 2012 17:00:32 -0500 |
| parents | 35674bd95200 |
| children | b7fff47bb128 |
| files | hgext/mq.py tests/test-mq-qqueue.t |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Thu Oct 04 16:52:20 2012 +0200 +++ b/hgext/mq.py Thu Oct 04 17:00:32 2012 -0500 @@ -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):
--- a/tests/test-mq-qqueue.t Thu Oct 04 16:52:20 2012 +0200 +++ b/tests/test-mq-qqueue.t Thu Oct 04 17:00:32 2012 -0500 @@ -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: