Show More
@@ -268,7 +268,7 b' class queue(object):' | |||||
268 | self.opener = scmutil.opener(self.path) |
|
268 | self.opener = scmutil.opener(self.path) | |
269 | self.ui = ui |
|
269 | self.ui = ui | |
270 | self.applieddirty = 0 |
|
270 | self.applieddirty = 0 | |
271 |
self.series |
|
271 | self.seriesdirty = 0 | |
272 | self.added = [] |
|
272 | self.added = [] | |
273 | self.seriespath = "series" |
|
273 | self.seriespath = "series" | |
274 | self.statuspath = "status" |
|
274 | self.statuspath = "status" | |
@@ -322,7 +322,7 b' class queue(object):' | |||||
322 | if a in self.__dict__: |
|
322 | if a in self.__dict__: | |
323 | delattr(self, a) |
|
323 | delattr(self, a) | |
324 | self.applieddirty = 0 |
|
324 | self.applieddirty = 0 | |
325 |
self.series |
|
325 | self.seriesdirty = 0 | |
326 | self.guardsdirty = False |
|
326 | self.guardsdirty = False | |
327 | self.activeguards = None |
|
327 | self.activeguards = None | |
328 |
|
328 | |||
@@ -444,7 +444,7 b' class queue(object):' | |||||
444 | drop = self.guard_re.sub('', self.fullseries[idx]) |
|
444 | drop = self.guard_re.sub('', self.fullseries[idx]) | |
445 | self.fullseries[idx] = drop + ''.join([' #' + g for g in guards]) |
|
445 | self.fullseries[idx] = drop + ''.join([' #' + g for g in guards]) | |
446 | self.parseseries() |
|
446 | self.parseseries() | |
447 |
self.series |
|
447 | self.seriesdirty = True | |
448 |
|
448 | |||
449 | def pushable(self, idx): |
|
449 | def pushable(self, idx): | |
450 | if isinstance(idx, str): |
|
450 | if isinstance(idx, str): | |
@@ -497,7 +497,7 b' class queue(object):' | |||||
497 | fp.close() |
|
497 | fp.close() | |
498 | if self.applieddirty: |
|
498 | if self.applieddirty: | |
499 | write_list(map(str, self.applied), self.statuspath) |
|
499 | write_list(map(str, self.applied), self.statuspath) | |
500 |
if self.series |
|
500 | if self.seriesdirty: | |
501 | write_list(self.fullseries, self.seriespath) |
|
501 | write_list(self.fullseries, self.seriespath) | |
502 | if self.guardsdirty: |
|
502 | if self.guardsdirty: | |
503 | write_list(self.activeguards, self.guardspath) |
|
503 | write_list(self.activeguards, self.guardspath) | |
@@ -764,7 +764,7 b' class queue(object):' | |||||
764 | raise util.Abort(''.join(msg % p for p in unknown)) |
|
764 | raise util.Abort(''.join(msg % p for p in unknown)) | |
765 |
|
765 | |||
766 | self.parseseries() |
|
766 | self.parseseries() | |
767 |
self.series |
|
767 | self.seriesdirty = 1 | |
768 |
|
768 | |||
769 | def _revpatches(self, repo, revs): |
|
769 | def _revpatches(self, repo, revs): | |
770 | firstrev = repo[self.applied[0].node].rev() |
|
770 | firstrev = repo[self.applied[0].node].rev() | |
@@ -948,7 +948,7 b' class queue(object):' | |||||
948 | self.fullseries[insert:insert] = [patchfn] |
|
948 | self.fullseries[insert:insert] = [patchfn] | |
949 | self.applied.append(statusentry(n, patchfn)) |
|
949 | self.applied.append(statusentry(n, patchfn)) | |
950 | self.parseseries() |
|
950 | self.parseseries() | |
951 |
self.series |
|
951 | self.seriesdirty = 1 | |
952 | self.applieddirty = 1 |
|
952 | self.applieddirty = 1 | |
953 | if msg: |
|
953 | if msg: | |
954 | msg = msg + "\n\n" |
|
954 | msg = msg + "\n\n" | |
@@ -1160,7 +1160,7 b' class queue(object):' | |||||
1160 | del self.fullseries[index] |
|
1160 | del self.fullseries[index] | |
1161 | self.fullseries.insert(start, fullpatch) |
|
1161 | self.fullseries.insert(start, fullpatch) | |
1162 | self.parseseries() |
|
1162 | self.parseseries() | |
1163 |
self.series |
|
1163 | self.seriesdirty = 1 | |
1164 |
|
1164 | |||
1165 | self.applieddirty = 1 |
|
1165 | self.applieddirty = 1 | |
1166 | if start > 0: |
|
1166 | if start > 0: | |
@@ -1641,7 +1641,7 b' class queue(object):' | |||||
1641 | self.fullseries = series |
|
1641 | self.fullseries = series | |
1642 | self.applied = applied |
|
1642 | self.applied = applied | |
1643 | self.parseseries() |
|
1643 | self.parseseries() | |
1644 |
self.series |
|
1644 | self.seriesdirty = 1 | |
1645 | self.applieddirty = 1 |
|
1645 | self.applieddirty = 1 | |
1646 | heads = repo.changelog.heads() |
|
1646 | heads = repo.changelog.heads() | |
1647 | if delete: |
|
1647 | if delete: | |
@@ -1802,7 +1802,7 b' class queue(object):' | |||||
1802 | patchname = None |
|
1802 | patchname = None | |
1803 | self.parseseries() |
|
1803 | self.parseseries() | |
1804 | self.applieddirty = 1 |
|
1804 | self.applieddirty = 1 | |
1805 |
self.series |
|
1805 | self.seriesdirty = True | |
1806 |
|
1806 | |||
1807 | for i, filename in enumerate(files): |
|
1807 | for i, filename in enumerate(files): | |
1808 | if existing: |
|
1808 | if existing: | |
@@ -1847,7 +1847,7 b' class queue(object):' | |||||
1847 | index = self.fullseriesend() + i |
|
1847 | index = self.fullseriesend() + i | |
1848 | self.fullseries[index:index] = [patchname] |
|
1848 | self.fullseries[index:index] = [patchname] | |
1849 | self.parseseries() |
|
1849 | self.parseseries() | |
1850 |
self.series |
|
1850 | self.seriesdirty = True | |
1851 | self.ui.warn(_("adding %s to series file\n") % patchname) |
|
1851 | self.ui.warn(_("adding %s to series file\n") % patchname) | |
1852 | self.added.append(patchname) |
|
1852 | self.added.append(patchname) | |
1853 | patchname = None |
|
1853 | patchname = None | |
@@ -2597,7 +2597,7 b' def rename(ui, repo, patch, name=None, *' | |||||
2597 | guards = q.guard_re.findall(q.fullseries[i]) |
|
2597 | guards = q.guard_re.findall(q.fullseries[i]) | |
2598 | q.fullseries[i] = name + ''.join([' #' + g for g in guards]) |
|
2598 | q.fullseries[i] = name + ''.join([' #' + g for g in guards]) | |
2599 | q.parseseries() |
|
2599 | q.parseseries() | |
2600 |
q.series |
|
2600 | q.seriesdirty = 1 | |
2601 |
|
2601 | |||
2602 | info = q.isapplied(patch) |
|
2602 | info = q.isapplied(patch) | |
2603 | if info: |
|
2603 | if info: |
General Comments 0
You need to be logged in to leave comments.
Login now