Merge with crew-stable.

HG: changed hgext/mq.py

hgext/mq.py

@@ -1303,6 +1303,10 b' class queue:'
         return 0
 
     def series_end(self, all_patches=False):
+        """If all_patches is False, return the index of the next pushable patch
+        in the series, or the series length. If all_patches is True, return the
+        index of the first patch past the last applied one.
+        """
         end = 0
         def next(start):
             if all_patches:
@@ -1589,7 +1593,7 b' def series(ui, repo, **opts):'
 def top(ui, repo, **opts):
     """print the name of the current patch"""
     q = repo.mq
-    t = q.series_end()
+    t = q.applied and q.series_end(True) or 0
     if t:
         return q.qseries(repo, start=t-1, length=1, status='A',
                          summary=opts.get('summary'))

tests/test-mq-guards

@@ -54,6 +54,8 b' hg qguard c.patch'
 
 echo % should skip c.patch
 hg qpush -a
+echo % should display b.patch
+hg qtop
 
 hg qguard -n c.patch
 echo % should push c.patch

tests/test-mq-guards.out

@@ -25,6 +25,8 b' c.patch: -a'
 applying b.patch
 skipping c.patch - guarded by '-a'
 Now at: b.patch
+% should display b.patch
+b.patch
 % should push c.patch
 applying c.patch
 Now at: c.patch