##// END OF EJS Templates
mq: fix qnext when all remaining patches are guarded...
Patrick Mezard -
r16063:c36db39b stable
parent child Browse files
Show More
@@ -1757,9 +1757,9 b' class queue(object):'
1757 for i in xrange(start, len(self.series)):
1757 for i in xrange(start, len(self.series)):
1758 p, reason = self.pushable(i)
1758 p, reason = self.pushable(i)
1759 if p:
1759 if p:
1760 break
1760 return i
1761 self.explainpushable(i)
1761 self.explainpushable(i)
1762 return i
1762 return len(self.series)
1763 if self.applied:
1763 if self.applied:
1764 p = self.applied[-1].name
1764 p = self.applied[-1].name
1765 try:
1765 try:
@@ -2205,7 +2205,7 b' def top(ui, repo, **opts):'
2205
2205
2206 @command("qnext", seriesopts, _('hg qnext [-s]'))
2206 @command("qnext", seriesopts, _('hg qnext [-s]'))
2207 def next(ui, repo, **opts):
2207 def next(ui, repo, **opts):
2208 """print the name of the next patch
2208 """print the name of the next pushable patch
2209
2209
2210 Returns 0 on success."""
2210 Returns 0 on success."""
2211 q = repo.mq
2211 q = repo.mq
@@ -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
@@ -72,7 +72,7 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 patch
78 qpush push the next patch onto the stack
78 qpush push the next patch onto the stack
General Comments 0
You need to be logged in to leave comments. Login now