Mercurial > hg
changeset 4343:077aafddd35f
Merge with crew-stable
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Thu, 12 Apr 2007 15:07:05 -0700 |
| parents | 35ad84669ca5 (current diff) 7ae02bce8de2 (diff) |
| children | 345ed833854d |
| files | hgext/mq.py |
| diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Tue Apr 10 10:34:43 2007 -0700 +++ b/hgext/mq.py Thu Apr 12 15:07:05 2007 -0700 @@ -1586,7 +1586,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'))
--- a/tests/test-mq-guards Tue Apr 10 10:34:43 2007 -0700 +++ b/tests/test-mq-guards Thu Apr 12 15:07:05 2007 -0700 @@ -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
--- a/tests/test-mq-guards.out Tue Apr 10 10:34:43 2007 -0700 +++ b/tests/test-mq-guards.out Thu Apr 12 15:07:05 2007 -0700 @@ -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