Show More
@@ -826,9 +826,13 b' class queue(object):' | |||||
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) |
@@ -1464,3 +1464,22 b' 1. mq.secret=false' | |||||
1464 | 0: secret |
|
1464 | 0: secret | |
1465 | 1: secret |
|
1465 | 1: secret | |
1466 | 2: secret |
|
1466 | 2: secret | |
|
1467 | ||||
|
1468 | Test that qfinish change phase when mq.secret=true | |||
|
1469 | ||||
|
1470 | $ hg qfinish qbase | |||
|
1471 | patch add-file1 finalized without changeset message | |||
|
1472 | $ hg phase 'all()' | |||
|
1473 | 0: draft | |||
|
1474 | 1: secret | |||
|
1475 | 2: secret | |||
|
1476 | ||||
|
1477 | Test that qfinish preserve phase when mq.secret=false | |||
|
1478 | ||||
|
1479 | $ sed -i'' $HGRCPATH -e 's/secret=true/secret=false/' | |||
|
1480 | $ hg qfinish qbase | |||
|
1481 | patch add-file2 finalized without changeset message | |||
|
1482 | $ hg phase 'all()' | |||
|
1483 | 0: draft | |||
|
1484 | 1: secret | |||
|
1485 | 2: secret |
General Comments 0
You need to be logged in to leave comments.
Login now