Show More
@@ -1758,9 +1758,9 b' class queue(object):' | |||||
1758 | for i in xrange(start, len(self.series)): |
|
1758 | for i in xrange(start, len(self.series)): | |
1759 | p, reason = self.pushable(i) |
|
1759 | p, reason = self.pushable(i) | |
1760 | if p: |
|
1760 | if p: | |
1761 |
|
|
1761 | return i | |
1762 | self.explainpushable(i) |
|
1762 | self.explainpushable(i) | |
1763 | return i |
|
1763 | return len(self.series) | |
1764 | if self.applied: |
|
1764 | if self.applied: | |
1765 | p = self.applied[-1].name |
|
1765 | p = self.applied[-1].name | |
1766 | try: |
|
1766 | try: | |
@@ -2206,7 +2206,7 b' def top(ui, repo, **opts):' | |||||
2206 |
|
2206 | |||
2207 | @command("qnext", seriesopts, _('hg qnext [-s]')) |
|
2207 | @command("qnext", seriesopts, _('hg qnext [-s]')) | |
2208 | def next(ui, repo, **opts): |
|
2208 | def next(ui, repo, **opts): | |
2209 | """print the name of the next patch |
|
2209 | """print the name of the next pushable patch | |
2210 |
|
2210 | |||
2211 | Returns 0 on success.""" |
|
2211 | Returns 0 on success.""" | |
2212 | q = repo.mq |
|
2212 | q = repo.mq | |
@@ -2218,7 +2218,7 b' def next(ui, repo, **opts):' | |||||
2218 |
|
2218 | |||
2219 | @command("qprev", seriesopts, _('hg qprev [-s]')) |
|
2219 | @command("qprev", seriesopts, _('hg qprev [-s]')) | |
2220 | def prev(ui, repo, **opts): |
|
2220 | def prev(ui, repo, **opts): | |
2221 | """print the name of the previous patch |
|
2221 | """print the name of the previous applied patch | |
2222 |
|
2222 | |||
2223 | Returns 0 on success.""" |
|
2223 | Returns 0 on success.""" | |
2224 | q = repo.mq |
|
2224 | q = repo.mq | |
@@ -2229,7 +2229,8 b' def prev(ui, repo, **opts):' | |||||
2229 | if not l: |
|
2229 | if not l: | |
2230 | ui.write(_("no patches applied\n")) |
|
2230 | ui.write(_("no patches applied\n")) | |
2231 | return 1 |
|
2231 | return 1 | |
2232 | q.qseries(repo, start=l - 2, length=1, status='A', |
|
2232 | idx = q.series.index(q.applied[-2].name) | |
|
2233 | q.qseries(repo, start=idx, length=1, status='A', | |||
2233 | summary=opts.get('summary')) |
|
2234 | summary=opts.get('summary')) | |
2234 |
|
2235 | |||
2235 | def setupheaderopts(ui, opts): |
|
2236 | def setupheaderopts(ui, opts): |
@@ -107,6 +107,9 b' should skip c.patch' | |||||
107 | applying b.patch |
|
107 | applying b.patch | |
108 | skipping c.patch - guarded by '-a' |
|
108 | skipping c.patch - guarded by '-a' | |
109 | now at: b.patch |
|
109 | now at: b.patch | |
|
110 | $ hg qnext | |||
|
111 | all patches applied | |||
|
112 | [1] | |||
110 |
|
113 | |||
111 | should display b.patch |
|
114 | should display b.patch | |
112 |
|
115 | |||
@@ -169,6 +172,8 b' should push b.patch' | |||||
169 | $ hg qpush -a |
|
172 | $ hg qpush -a | |
170 | applying c.patch |
|
173 | applying c.patch | |
171 | now at: c.patch |
|
174 | now at: c.patch | |
|
175 | $ hg qprev | |||
|
176 | b.patch | |||
172 |
|
177 | |||
173 | Used to be an issue with holes in the patch sequence |
|
178 | Used to be an issue with holes in the patch sequence | |
174 | So, put one hole on the base and ask for topmost patch. |
|
179 | So, put one hole on the base and ask for topmost patch. |
@@ -72,9 +72,9 b' help' | |||||
72 | qheader print the header of the topmost or specified patch |
|
72 | qheader print the header of the topmost or specified patch | |
73 | qimport import a patch |
|
73 | qimport import a patch | |
74 | qnew create a new patch |
|
74 | qnew create a new patch | |
75 | qnext print the name of the next patch |
|
75 | qnext print the name of the next pushable patch | |
76 | qpop pop the current patch off the stack |
|
76 | qpop pop the current patch off the stack | |
77 | qprev print the name of the previous patch |
|
77 | qprev print the name of the previous applied patch | |
78 | qpush push the next patch onto the stack |
|
78 | qpush push the next patch onto the stack | |
79 | qqueue manage multiple patch queues |
|
79 | qqueue manage multiple patch queues | |
80 | qrefresh update the current patch |
|
80 | qrefresh update the current patch | |
@@ -1476,7 +1476,7 b' Test that qfinish change phase when mq.s' | |||||
1476 |
|
1476 | |||
1477 | Test that qfinish preserve phase when mq.secret=false |
|
1477 | Test that qfinish preserve phase when mq.secret=false | |
1478 |
|
1478 | |||
1479 |
$ sed -i |
|
1479 | $ sed -i.bak -e 's/secret=true/secret=false/' $HGRCPATH | |
1480 | $ hg qfinish qbase |
|
1480 | $ hg qfinish qbase | |
1481 | patch add-file2 finalized without changeset message |
|
1481 | patch add-file2 finalized without changeset message | |
1482 | $ hg phase 'all()' |
|
1482 | $ hg phase 'all()' |
General Comments 0
You need to be logged in to leave comments.
Login now