Show More
@@ -1564,15 +1564,13 b' class queue(object):' | |||||
1564 | """ |
|
1564 | """ | |
1565 | end = 0 |
|
1565 | end = 0 | |
1566 | def next(start): |
|
1566 | def next(start): | |
1567 | if all_patches: |
|
1567 | if all_patches or start >= len(self.series): | |
1568 | return start |
|
1568 | return start | |
1569 | i = start |
|
1569 | for i in xrange(start, len(self.series)): | |
1570 | while i < len(self.series): |
|
|||
1571 | p, reason = self.pushable(i) |
|
1570 | p, reason = self.pushable(i) | |
1572 | if p: |
|
1571 | if p: | |
1573 | break |
|
1572 | break | |
1574 | self.explain_pushable(i) |
|
1573 | self.explain_pushable(i) | |
1575 | i += 1 |
|
|||
1576 | return i |
|
1574 | return i | |
1577 | if self.applied: |
|
1575 | if self.applied: | |
1578 | p = self.applied[-1].name |
|
1576 | p = self.applied[-1].name | |
@@ -1611,7 +1609,6 b' class queue(object):' | |||||
1611 | if (len(files) > 1 or len(rev) > 1) and patchname: |
|
1609 | if (len(files) > 1 or len(rev) > 1) and patchname: | |
1612 | raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
1610 | raise util.Abort(_('option "-n" not valid when importing multiple ' | |
1613 | 'patches')) |
|
1611 | 'patches')) | |
1614 | i = 0 |
|
|||
1615 | added = [] |
|
1612 | added = [] | |
1616 | if rev: |
|
1613 | if rev: | |
1617 | # If mq patches are applied, we can only import revisions |
|
1614 | # If mq patches are applied, we can only import revisions | |
@@ -1667,7 +1664,7 b' class queue(object):' | |||||
1667 | self.parse_series() |
|
1664 | self.parse_series() | |
1668 | self.applied_dirty = 1 |
|
1665 | self.applied_dirty = 1 | |
1669 |
|
1666 | |||
1670 | for filename in files: |
|
1667 | for i, filename in enumerate(files): | |
1671 | if existing: |
|
1668 | if existing: | |
1672 | if filename == '-': |
|
1669 | if filename == '-': | |
1673 | raise util.Abort(_('-e is incompatible with import from -')) |
|
1670 | raise util.Abort(_('-e is incompatible with import from -')) | |
@@ -1700,7 +1697,6 b' class queue(object):' | |||||
1700 | self.full_series[index:index] = [patchname] |
|
1697 | self.full_series[index:index] = [patchname] | |
1701 | self.parse_series() |
|
1698 | self.parse_series() | |
1702 | self.ui.warn(_("adding %s to series file\n") % patchname) |
|
1699 | self.ui.warn(_("adding %s to series file\n") % patchname) | |
1703 | i += 1 |
|
|||
1704 | added.append(patchname) |
|
1700 | added.append(patchname) | |
1705 | patchname = None |
|
1701 | patchname = None | |
1706 | self.series_dirty = 1 |
|
1702 | self.series_dirty = 1 |
General Comments 0
You need to be logged in to leave comments.
Login now