Show More
@@ -267,7 +267,7 b' class queue(object):' | |||||
267 | self.path = patchdir or curpath |
|
267 | self.path = patchdir or curpath | |
268 | self.opener = scmutil.opener(self.path) |
|
268 | self.opener = scmutil.opener(self.path) | |
269 | self.ui = ui |
|
269 | self.ui = ui | |
270 |
self.applied |
|
270 | self.applieddirty = 0 | |
271 | self.series_dirty = 0 |
|
271 | self.series_dirty = 0 | |
272 | self.added = [] |
|
272 | self.added = [] | |
273 | self.seriespath = "series" |
|
273 | self.seriespath = "series" | |
@@ -321,7 +321,7 b' class queue(object):' | |||||
321 | for a in 'applied fullseries series seriesguards'.split(): |
|
321 | for a in 'applied fullseries series seriesguards'.split(): | |
322 | if a in self.__dict__: |
|
322 | if a in self.__dict__: | |
323 | delattr(self, a) |
|
323 | delattr(self, a) | |
324 |
self.applied |
|
324 | self.applieddirty = 0 | |
325 | self.series_dirty = 0 |
|
325 | self.series_dirty = 0 | |
326 | self.guardsdirty = False |
|
326 | self.guardsdirty = False | |
327 | self.activeguards = None |
|
327 | self.activeguards = None | |
@@ -495,7 +495,7 b' class queue(object):' | |||||
495 | for i in items: |
|
495 | for i in items: | |
496 | fp.write("%s\n" % i) |
|
496 | fp.write("%s\n" % i) | |
497 | fp.close() |
|
497 | fp.close() | |
498 |
if self.applied |
|
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_dirty: |
|
500 | if self.series_dirty: | |
501 | write_list(self.fullseries, self.seriespath) |
|
501 | write_list(self.fullseries, self.seriespath) | |
@@ -587,7 +587,7 b' class queue(object):' | |||||
587 | n = repo.commit('[mq]: merge marker', force=True) |
|
587 | n = repo.commit('[mq]: merge marker', force=True) | |
588 | self.removeundo(repo) |
|
588 | self.removeundo(repo) | |
589 | self.applied.append(statusentry(n, pname)) |
|
589 | self.applied.append(statusentry(n, pname)) | |
590 |
self.applied |
|
590 | self.applieddirty = 1 | |
591 |
|
591 | |||
592 | head = self.qparents(repo) |
|
592 | head = self.qparents(repo) | |
593 |
|
593 | |||
@@ -608,7 +608,7 b' class queue(object):' | |||||
608 | err, head = self.mergeone(repo, mergeq, head, patch, rev, diffopts) |
|
608 | err, head = self.mergeone(repo, mergeq, head, patch, rev, diffopts) | |
609 | if head: |
|
609 | if head: | |
610 | self.applied.append(statusentry(head, patch)) |
|
610 | self.applied.append(statusentry(head, patch)) | |
611 |
self.applied |
|
611 | self.applieddirty = 1 | |
612 | if err: |
|
612 | if err: | |
613 | return (err, head) |
|
613 | return (err, head) | |
614 | self.savedirty() |
|
614 | self.savedirty() | |
@@ -742,7 +742,7 b' class queue(object):' | |||||
742 | if numrevs: |
|
742 | if numrevs: | |
743 | qfinished = self.applied[:numrevs] |
|
743 | qfinished = self.applied[:numrevs] | |
744 | del self.applied[:numrevs] |
|
744 | del self.applied[:numrevs] | |
745 |
self.applied |
|
745 | self.applieddirty = 1 | |
746 |
|
746 | |||
747 | unknown = [] |
|
747 | unknown = [] | |
748 |
|
748 | |||
@@ -949,7 +949,7 b' class queue(object):' | |||||
949 | self.applied.append(statusentry(n, patchfn)) |
|
949 | self.applied.append(statusentry(n, patchfn)) | |
950 | self.parseseries() |
|
950 | self.parseseries() | |
951 | self.series_dirty = 1 |
|
951 | self.series_dirty = 1 | |
952 |
self.applied |
|
952 | self.applieddirty = 1 | |
953 | if msg: |
|
953 | if msg: | |
954 | msg = msg + "\n\n" |
|
954 | msg = msg + "\n\n" | |
955 | p.write(msg) |
|
955 | p.write(msg) | |
@@ -1162,7 +1162,7 b' class queue(object):' | |||||
1162 | self.parseseries() |
|
1162 | self.parseseries() | |
1163 | self.series_dirty = 1 |
|
1163 | self.series_dirty = 1 | |
1164 |
|
1164 | |||
1165 |
self.applied |
|
1165 | self.applieddirty = 1 | |
1166 | if start > 0: |
|
1166 | if start > 0: | |
1167 | self.checktoppatch(repo) |
|
1167 | self.checktoppatch(repo) | |
1168 | if not patch: |
|
1168 | if not patch: | |
@@ -1265,7 +1265,7 b' class queue(object):' | |||||
1265 | break |
|
1265 | break | |
1266 | update = needupdate |
|
1266 | update = needupdate | |
1267 |
|
1267 | |||
1268 |
self.applied |
|
1268 | self.applieddirty = 1 | |
1269 | end = len(self.applied) |
|
1269 | end = len(self.applied) | |
1270 | rev = self.applied[start].node |
|
1270 | rev = self.applied[start].node | |
1271 | if update: |
|
1271 | if update: | |
@@ -1494,7 +1494,7 b' class queue(object):' | |||||
1494 | # assumes strip can roll itself back if interrupted |
|
1494 | # assumes strip can roll itself back if interrupted | |
1495 | repo.dirstate.setparents(*cparents) |
|
1495 | repo.dirstate.setparents(*cparents) | |
1496 | self.applied.pop() |
|
1496 | self.applied.pop() | |
1497 |
self.applied |
|
1497 | self.applieddirty = 1 | |
1498 | self.strip(repo, [top], update=False, |
|
1498 | self.strip(repo, [top], update=False, | |
1499 | backup='strip') |
|
1499 | backup='strip') | |
1500 | except: |
|
1500 | except: | |
@@ -1642,7 +1642,7 b' class queue(object):' | |||||
1642 | self.applied = applied |
|
1642 | self.applied = applied | |
1643 | self.parseseries() |
|
1643 | self.parseseries() | |
1644 | self.series_dirty = 1 |
|
1644 | self.series_dirty = 1 | |
1645 |
self.applied |
|
1645 | self.applieddirty = 1 | |
1646 | heads = repo.changelog.heads() |
|
1646 | heads = repo.changelog.heads() | |
1647 | if delete: |
|
1647 | if delete: | |
1648 | if rev not in heads: |
|
1648 | if rev not in heads: | |
@@ -1690,7 +1690,7 b' class queue(object):' | |||||
1690 | self.ui.warn(_("repo commit failed\n")) |
|
1690 | self.ui.warn(_("repo commit failed\n")) | |
1691 | return 1 |
|
1691 | return 1 | |
1692 | self.applied.append(statusentry(n, '.hg.patches.save.line')) |
|
1692 | self.applied.append(statusentry(n, '.hg.patches.save.line')) | |
1693 |
self.applied |
|
1693 | self.applieddirty = 1 | |
1694 | self.removeundo(repo) |
|
1694 | self.removeundo(repo) | |
1695 |
|
1695 | |||
1696 | def fullseriesend(self): |
|
1696 | def fullseriesend(self): | |
@@ -1801,7 +1801,7 b' class queue(object):' | |||||
1801 | self.added.append(patchname) |
|
1801 | self.added.append(patchname) | |
1802 | patchname = None |
|
1802 | patchname = None | |
1803 | self.parseseries() |
|
1803 | self.parseseries() | |
1804 |
self.applied |
|
1804 | self.applieddirty = 1 | |
1805 | self.series_dirty = True |
|
1805 | self.series_dirty = True | |
1806 |
|
1806 | |||
1807 | for i, filename in enumerate(files): |
|
1807 | for i, filename in enumerate(files): | |
@@ -2602,7 +2602,7 b' def rename(ui, repo, patch, name=None, *' | |||||
2602 | info = q.isapplied(patch) |
|
2602 | info = q.isapplied(patch) | |
2603 | if info: |
|
2603 | if info: | |
2604 | q.applied[info[0]] = statusentry(info[1], name) |
|
2604 | q.applied[info[0]] = statusentry(info[1], name) | |
2605 |
q.applied |
|
2605 | q.applieddirty = 1 | |
2606 |
|
2606 | |||
2607 | destdir = os.path.dirname(absdest) |
|
2607 | destdir = os.path.dirname(absdest) | |
2608 | if not os.path.isdir(destdir): |
|
2608 | if not os.path.isdir(destdir): | |
@@ -2745,7 +2745,7 b' def strip(ui, repo, *revs, **opts):' | |||||
2745 | # refresh queue state if we're about to strip |
|
2745 | # refresh queue state if we're about to strip | |
2746 | # applied patches |
|
2746 | # applied patches | |
2747 | if cl.rev(repo.lookup('qtip')) in strippedrevs: |
|
2747 | if cl.rev(repo.lookup('qtip')) in strippedrevs: | |
2748 |
q.applied |
|
2748 | q.applieddirty = True | |
2749 | start = 0 |
|
2749 | start = 0 | |
2750 | end = len(q.applied) |
|
2750 | end = len(q.applied) | |
2751 | for i, statusentry in enumerate(q.applied): |
|
2751 | for i, statusentry in enumerate(q.applied): |
General Comments 0
You need to be logged in to leave comments.
Login now