824 |
824 |
825 patches.append(patch) |
825 patches.append(patch) |
826 return patches |
826 return patches |
827 |
827 |
828 def finish(self, repo, revs): |
828 def finish(self, repo, revs): |
|
829 # Manually trigger phase computation to ensure phasedefaults is |
|
830 # executed before we remove the patches. |
|
831 repo._phaserev |
829 patches = self._revpatches(repo, sorted(revs)) |
832 patches = self._revpatches(repo, sorted(revs)) |
830 qfinished = self._cleanup(patches, len(patches)) |
833 qfinished = self._cleanup(patches, len(patches)) |
831 if qfinished: |
834 if qfinished and repo.ui.configbool('mq', 'secret', False): |
|
835 # only use this logic when the secret option is added |
832 oldqbase = repo[qfinished[0]] |
836 oldqbase = repo[qfinished[0]] |
833 if oldqbase.p1().phase() < phases.secret: |
837 if oldqbase.p1().phase() < phases.secret: |
834 phases.advanceboundary(repo, phases.draft, qfinished) |
838 phases.advanceboundary(repo, phases.draft, qfinished) |
835 |
839 |
836 def delete(self, repo, patches, opts): |
840 def delete(self, repo, patches, opts): |