Show More
@@ -267,8 +267,8 class queue(object): | |||
|
267 | 267 | self.path = patchdir or curpath |
|
268 | 268 | self.opener = scmutil.opener(self.path) |
|
269 | 269 | self.ui = ui |
|
270 |
self.applieddirty = |
|
|
271 |
self.seriesdirty = |
|
|
270 | self.applieddirty = False | |
|
271 | self.seriesdirty = False | |
|
272 | 272 | self.added = [] |
|
273 | 273 | self.seriespath = "series" |
|
274 | 274 | self.statuspath = "status" |
@@ -327,8 +327,8 class queue(object): | |||
|
327 | 327 | for a in 'applied fullseries series seriesguards'.split(): |
|
328 | 328 | if a in self.__dict__: |
|
329 | 329 | delattr(self, a) |
|
330 |
self.applieddirty = |
|
|
331 |
self.seriesdirty = |
|
|
330 | self.applieddirty = False | |
|
331 | self.seriesdirty = False | |
|
332 | 332 | self.guardsdirty = False |
|
333 | 333 | self.activeguards = None |
|
334 | 334 | |
@@ -593,7 +593,7 class queue(object): | |||
|
593 | 593 | n = repo.commit('[mq]: merge marker', force=True) |
|
594 | 594 | self.removeundo(repo) |
|
595 | 595 | self.applied.append(statusentry(n, pname)) |
|
596 |
self.applieddirty = |
|
|
596 | self.applieddirty = True | |
|
597 | 597 | |
|
598 | 598 | head = self.qparents(repo) |
|
599 | 599 | |
@@ -614,7 +614,7 class queue(object): | |||
|
614 | 614 | err, head = self.mergeone(repo, mergeq, head, patch, rev, diffopts) |
|
615 | 615 | if head: |
|
616 | 616 | self.applied.append(statusentry(head, patch)) |
|
617 |
self.applieddirty = |
|
|
617 | self.applieddirty = True | |
|
618 | 618 | if err: |
|
619 | 619 | return (err, head) |
|
620 | 620 | self.savedirty() |
@@ -749,7 +749,7 class queue(object): | |||
|
749 | 749 | if numrevs: |
|
750 | 750 | qfinished = self.applied[:numrevs] |
|
751 | 751 | del self.applied[:numrevs] |
|
752 |
self.applieddirty = |
|
|
752 | self.applieddirty = True | |
|
753 | 753 | |
|
754 | 754 | unknown = [] |
|
755 | 755 | |
@@ -771,7 +771,7 class queue(object): | |||
|
771 | 771 | raise util.Abort(''.join(msg % p for p in unknown)) |
|
772 | 772 | |
|
773 | 773 | self.parseseries() |
|
774 |
self.seriesdirty = |
|
|
774 | self.seriesdirty = True | |
|
775 | 775 | |
|
776 | 776 | def _revpatches(self, repo, revs): |
|
777 | 777 | firstrev = repo[self.applied[0].node].rev() |
@@ -955,8 +955,8 class queue(object): | |||
|
955 | 955 | self.fullseries[insert:insert] = [patchfn] |
|
956 | 956 | self.applied.append(statusentry(n, patchfn)) |
|
957 | 957 | self.parseseries() |
|
958 |
self.seriesdirty = |
|
|
959 |
self.applieddirty = |
|
|
958 | self.seriesdirty = True | |
|
959 | self.applieddirty = True | |
|
960 | 960 | if msg: |
|
961 | 961 | msg = msg + "\n\n" |
|
962 | 962 | p.write(msg) |
@@ -1165,9 +1165,9 class queue(object): | |||
|
1165 | 1165 | del self.fullseries[index] |
|
1166 | 1166 | self.fullseries.insert(start, fullpatch) |
|
1167 | 1167 | self.parseseries() |
|
1168 |
self.seriesdirty = |
|
|
1169 | ||
|
1170 |
self.applieddirty = |
|
|
1168 | self.seriesdirty = True | |
|
1169 | ||
|
1170 | self.applieddirty = True | |
|
1171 | 1171 | if start > 0: |
|
1172 | 1172 | self.checktoppatch(repo) |
|
1173 | 1173 | if not patch: |
@@ -1260,7 +1260,7 class queue(object): | |||
|
1260 | 1260 | if not force and update: |
|
1261 | 1261 | self.checklocalchanges(repo) |
|
1262 | 1262 | |
|
1263 |
self.applieddirty = |
|
|
1263 | self.applieddirty = True | |
|
1264 | 1264 | end = len(self.applied) |
|
1265 | 1265 | rev = self.applied[start].node |
|
1266 | 1266 | if update: |
@@ -1483,7 +1483,7 class queue(object): | |||
|
1483 | 1483 | # assumes strip can roll itself back if interrupted |
|
1484 | 1484 | repo.dirstate.setparents(*cparents) |
|
1485 | 1485 | self.applied.pop() |
|
1486 |
self.applieddirty = |
|
|
1486 | self.applieddirty = True | |
|
1487 | 1487 | self.strip(repo, [top], update=False, |
|
1488 | 1488 | backup='strip') |
|
1489 | 1489 | except: |
@@ -1630,8 +1630,8 class queue(object): | |||
|
1630 | 1630 | self.fullseries = series |
|
1631 | 1631 | self.applied = applied |
|
1632 | 1632 | self.parseseries() |
|
1633 |
self.seriesdirty = |
|
|
1634 |
self.applieddirty = |
|
|
1633 | self.seriesdirty = True | |
|
1634 | self.applieddirty = True | |
|
1635 | 1635 | heads = repo.changelog.heads() |
|
1636 | 1636 | if delete: |
|
1637 | 1637 | if rev not in heads: |
@@ -1679,7 +1679,7 class queue(object): | |||
|
1679 | 1679 | self.ui.warn(_("repo commit failed\n")) |
|
1680 | 1680 | return 1 |
|
1681 | 1681 | self.applied.append(statusentry(n, '.hg.patches.save.line')) |
|
1682 |
self.applieddirty = |
|
|
1682 | self.applieddirty = True | |
|
1683 | 1683 | self.removeundo(repo) |
|
1684 | 1684 | |
|
1685 | 1685 | def fullseriesend(self): |
@@ -1793,7 +1793,7 class queue(object): | |||
|
1793 | 1793 | self.added.append(patchname) |
|
1794 | 1794 | patchname = None |
|
1795 | 1795 | self.parseseries() |
|
1796 |
self.applieddirty = |
|
|
1796 | self.applieddirty = True | |
|
1797 | 1797 | self.seriesdirty = True |
|
1798 | 1798 | |
|
1799 | 1799 | for i, filename in enumerate(files): |
@@ -2594,12 +2594,12 def rename(ui, repo, patch, name=None, * | |||
|
2594 | 2594 | guards = q.guard_re.findall(q.fullseries[i]) |
|
2595 | 2595 | q.fullseries[i] = name + ''.join([' #' + g for g in guards]) |
|
2596 | 2596 | q.parseseries() |
|
2597 |
q.seriesdirty = |
|
|
2597 | q.seriesdirty = True | |
|
2598 | 2598 | |
|
2599 | 2599 | info = q.isapplied(patch) |
|
2600 | 2600 | if info: |
|
2601 | 2601 | q.applied[info[0]] = statusentry(info[1], name) |
|
2602 |
q.applieddirty = |
|
|
2602 | q.applieddirty = True | |
|
2603 | 2603 | |
|
2604 | 2604 | destdir = os.path.dirname(absdest) |
|
2605 | 2605 | if not os.path.isdir(destdir): |
General Comments 0
You need to be logged in to leave comments.
Login now