[PATCH 4 of 4] mq/qqueue: --list does not print (active) when plain=D=A is in effect

[Yann E. MORIN]

# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998 at anciens.enib.fr>
# Date 1281301877 -7200
# Node ID e34d9648a393c416802a71f1d082612d77437521
# Parent  6eb73272c58a1028471daeec9eb8fa4ac2a0ba78
mq/qqueue: --list does not print (active) when plain is in effect

Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at anciens.enib.fr>

diff --git a/contrib/bash_completion b/contrib/bash_completion
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -468,7 +468,7 @@
     local queues
     local opts="--list --create --delete"
 
-    queues=$( _hg_cmd qqueue --quiet )
+    queues=$( _hg_cmd qqueue )
 
     COMPREPLY=( $( compgen -W "${opts} ${queues}" "${cur}" ) )
 }
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -2667,7 +2667,7 @@
         current = _getcurrent()
         for queue in _getqueues():
             ui.write('%s' % (queue,))
-            if queue == current and not ui.quiet:
+            if queue == current and not (ui.quiet or ui.plain()):
                 ui.write(_(' (active)\n'))
             else:
                 ui.write('\n')
diff --git a/tests/test-mq-qqueue b/tests/test-mq-qqueue
--- a/tests/test-mq-qqueue
+++ b/tests/test-mq-qqueue
@@ -37,6 +37,9 @@
 echo %% list queues, quiet
 hg qqueue --quiet
 
+echo %% list queues, plain
+HGPLAIN=1 hg qqueue
+
 echo %% fail creating queue with already existing name
 hg qqueue --create foo
 hg qqueue
diff --git a/tests/test-mq-qqueue.out b/tests/test-mq-qqueue.out
--- a/tests/test-mq-qqueue.out
+++ b/tests/test-mq-qqueue.out
@@ -19,6 +19,9 @@
 %% list queues, quiet
 foo
 patches
+%% list queues, plain
+foo
+patches
 %% fail creating queue with already existing name
 abort: queue "foo" already exists
 foo (active)