Show More
@@ -195,7 +195,11 b' class phasecache(object):' | |||||
195 | def getphaserevs(self, repo): |
|
195 | def getphaserevs(self, repo): | |
196 | if self._phaserevs is None: |
|
196 | if self._phaserevs is None: | |
197 | try: |
|
197 | try: | |
198 | self._phaserevs = self.getphaserevsnative(repo) |
|
198 | if repo.ui.configbool('experimental', | |
|
199 | 'nativephaseskillswitch'): | |||
|
200 | self.computephaserevspure(repo) | |||
|
201 | else: | |||
|
202 | self._phaserevs = self.getphaserevsnative(repo) | |||
199 | except AttributeError: |
|
203 | except AttributeError: | |
200 | self.computephaserevspure(repo) |
|
204 | self.computephaserevspure(repo) | |
201 | return self._phaserevs |
|
205 | return self._phaserevs |
@@ -456,8 +456,12 b' move changeset backward' | |||||
456 | o 0 public A |
|
456 | o 0 public A | |
457 |
|
457 | |||
458 |
|
458 | |||
459 | move changeset forward and backward |
|
459 | move changeset forward and backward and test kill switch | |
460 |
|
460 | |||
|
461 | $ cat <<EOF >> $HGRCPATH | |||
|
462 | > [experimental] | |||
|
463 | > nativephaseskillswitch = true | |||
|
464 | > EOF | |||
461 | $ hg phase --draft --force 1::4 |
|
465 | $ hg phase --draft --force 1::4 | |
462 | $ hg log -G --template "{rev} {phase} {desc}\n" |
|
466 | $ hg log -G --template "{rev} {phase} {desc}\n" | |
463 | @ 7 secret merge B' and E |
|
467 | @ 7 secret merge B' and E | |
@@ -478,6 +482,10 b' move changeset forward and backward' | |||||
478 |
|
482 | |||
479 | test partial failure |
|
483 | test partial failure | |
480 |
|
484 | |||
|
485 | $ cat <<EOF >> $HGRCPATH | |||
|
486 | > [experimental] | |||
|
487 | > nativephaseskillswitch = false | |||
|
488 | > EOF | |||
481 | $ hg phase --public 7 |
|
489 | $ hg phase --public 7 | |
482 | $ hg phase --draft '5 or 7' |
|
490 | $ hg phase --draft '5 or 7' | |
483 | cannot move 1 changesets to a higher phase, use --force |
|
491 | cannot move 1 changesets to a higher phase, use --force |
General Comments 0
You need to be logged in to leave comments.
Login now