# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1176680422 18000
# Node ID 9bfe93edfbb0e5aef004f0009d35f202340e42b2
# Parent  26a2fa9433b87e30f82828c075e24a449ab66de6# Parent  7ae02bce8de27d0b3f8c3148bf443fa81426467d
Merge with crew

diff -r 26a2fa9433b8 -r 9bfe93edfbb0 hgext/mq.py
--- a/hgext/mq.py	Thu Apr 12 11:00:21 2007 -0500
+++ b/hgext/mq.py	Sun Apr 15 18:40:22 2007 -0500
@@ -1547,7 +1547,7 @@
 def top(ui, repo, **opts):
     """print the name of the current patch"""
     q = repo.mq
-    t = len(q.applied)
+    t = q.series_end()
     if t:
         return q.qseries(repo, start=t-1, length=1, status='A',
                          summary=opts.get('summary'))
diff -r 26a2fa9433b8 -r 9bfe93edfbb0 tests/test-mq-guards
--- a/tests/test-mq-guards	Thu Apr 12 11:00:21 2007 -0500
+++ b/tests/test-mq-guards	Sun Apr 15 18:40:22 2007 -0500
@@ -76,6 +76,10 @@
 hg qselect 2
 echo % should push b.patch
 hg qpush
+hg qpush -a
+# Used to be an issue with holes in the patch sequence
+# So, put one hole on the base and ask for topmost patch.
+hg qtop
 hg qpop -a
 
 hg qselect 1 2
diff -r 26a2fa9433b8 -r 9bfe93edfbb0 tests/test-mq-guards.out
--- a/tests/test-mq-guards.out	Thu Apr 12 11:00:21 2007 -0500
+++ b/tests/test-mq-guards.out	Sun Apr 15 18:40:22 2007 -0500
@@ -46,6 +46,9 @@
 % should push b.patch
 applying b.patch
 Now at: b.patch
+applying c.patch
+Now at: c.patch
+c.patch
 Patch queue now empty
 number of unguarded, unapplied patches has changed from 2 to 3
 % should push a.patch, b.patch