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