# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2007-03-17 17:46:52
# Node ID ce6c364ebb2a0160ea95b6d3b0d6369d3c92de89
# Parent  83153299aab5648c7fc8e8f99c6ad2e2739e2cad

Fix issue443: inconsistent output of "hg qunapplied -v"
1. Don't skip over unpushable (guarded) unapplied patches.
2. Don't display unpushable patches, unless -v is given, otherwise
   guarded and unguarded patches can't be distinguished.

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -1142,6 +1142,8 @@ class queue:
                     else:
                         stat = 'G'
                     pfx = '%d %s ' % (i, stat)
+                elif status == 'U' and not self.pushable(i)[0]:
+                    continue
                 self.ui.write('%s%s\n' % (pfx, displayname(patch)))
         else:
             msng_list = []
@@ -1438,8 +1440,8 @@ def unapplied(ui, repo, patch=None, **op
             raise util.Abort(_("patch %s is not in series file") % patch)
         start = q.series.index(patch) + 1
     else:
-        start = q.series_end()
-    q.qseries(repo, start=start, summary=opts.get('summary'))
+        start = q.series_end(True)
+    q.qseries(repo, start=start, status='U', summary=opts.get('summary'))
 
 def qimport(ui, repo, *filename, **opts):
     """import a patch