Mercurial > hg > mercurial-crew-with-dirclash
changeset 4346:c593e502f7fd
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Apr 2007 18:42:38 -0500 |
parents | 8b4d4f84b739 (current diff) 9bfe93edfbb0 (diff) |
children | 70d1491d3db2 |
files | hgext/mq.py mercurial/hgweb/hgweb_mod.py |
diffstat | 4 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py +++ b/hgext/mq.py @@ -1586,7 +1586,7 @@ def series(ui, repo, **opts): 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/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -703,7 +703,7 @@ class hgweb(object): # strip leading / pi = pi[1:] if pi: - root = root[:-len(pi)] + root = root[:root.rfind(root, pi)] if req.env.has_key('REPO_NAME'): rn = req.env['REPO_NAME'] + '/' root += rn
--- a/tests/test-mq-guards +++ b/tests/test-mq-guards @@ -76,6 +76,10 @@ hg qpop -a 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 +++ b/tests/test-mq-guards.out @@ -46,6 +46,9 @@ Patch queue now empty % 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