##// END OF EJS Templates
mq: rename parse_series to parseseries
Adrian Buehlmann -
r14575:845c8642 default
parent child Browse files
Show More
@@ -309,12 +309,12 b' class queue(object):'
309 309
310 310 @util.propertycache
311 311 def series(self):
312 self.parse_series()
312 self.parseseries()
313 313 return self.series
314 314
315 315 @util.propertycache
316 316 def seriesguards(self):
317 self.parse_series()
317 self.parseseries()
318 318 return self.seriesguards
319 319
320 320 def invalidate(self):
@@ -371,7 +371,7 b' class queue(object):'
371 371
372 372 guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)')
373 373
374 def parse_series(self):
374 def parseseries(self):
375 375 self.series = []
376 376 self.seriesguards = []
377 377 for l in self.fullseries:
@@ -443,7 +443,7 b' class queue(object):'
443 443 raise util.Abort(bad)
444 444 drop = self.guard_re.sub('', self.fullseries[idx])
445 445 self.fullseries[idx] = drop + ''.join([' #' + g for g in guards])
446 self.parse_series()
446 self.parseseries()
447 447 self.series_dirty = True
448 448
449 449 def pushable(self, idx):
@@ -763,7 +763,7 b' class queue(object):'
763 763 msg = _('unknown patches: %s\n')
764 764 raise util.Abort(''.join(msg % p for p in unknown))
765 765
766 self.parse_series()
766 self.parseseries()
767 767 self.series_dirty = 1
768 768
769 769 def _revpatches(self, repo, revs):
@@ -947,7 +947,7 b' class queue(object):'
947 947 try:
948 948 self.fullseries[insert:insert] = [patchfn]
949 949 self.applied.append(statusentry(n, patchfn))
950 self.parse_series()
950 self.parseseries()
951 951 self.series_dirty = 1
952 952 self.applied_dirty = 1
953 953 if msg:
@@ -1159,7 +1159,7 b' class queue(object):'
1159 1159 fullpatch = self.fullseries[index]
1160 1160 del self.fullseries[index]
1161 1161 self.fullseries.insert(start, fullpatch)
1162 self.parse_series()
1162 self.parseseries()
1163 1163 self.series_dirty = 1
1164 1164
1165 1165 self.applied_dirty = 1
@@ -1640,7 +1640,7 b' class queue(object):'
1640 1640 self.ui.warn(_("restoring status: %s\n") % lines[0])
1641 1641 self.fullseries = series
1642 1642 self.applied = applied
1643 self.parse_series()
1643 self.parseseries()
1644 1644 self.series_dirty = 1
1645 1645 self.applied_dirty = 1
1646 1646 heads = repo.changelog.heads()
@@ -1800,7 +1800,7 b' class queue(object):'
1800 1800
1801 1801 self.added.append(patchname)
1802 1802 patchname = None
1803 self.parse_series()
1803 self.parseseries()
1804 1804 self.applied_dirty = 1
1805 1805 self.series_dirty = True
1806 1806
@@ -1846,7 +1846,7 b' class queue(object):'
1846 1846 if patchname not in self.series:
1847 1847 index = self.full_series_end() + i
1848 1848 self.fullseries[index:index] = [patchname]
1849 self.parse_series()
1849 self.parseseries()
1850 1850 self.series_dirty = True
1851 1851 self.ui.warn(_("adding %s to series file\n") % patchname)
1852 1852 self.added.append(patchname)
@@ -2596,7 +2596,7 b' def rename(ui, repo, patch, name=None, *'
2596 2596 i = q.findseries(patch)
2597 2597 guards = q.guard_re.findall(q.fullseries[i])
2598 2598 q.fullseries[i] = name + ''.join([' #' + g for g in guards])
2599 q.parse_series()
2599 q.parseseries()
2600 2600 q.series_dirty = 1
2601 2601
2602 2602 info = q.isapplied(patch)
General Comments 0
You need to be logged in to leave comments. Login now