Re: [PATCH] phases: remove experimental.nativephaseskillswitch

2017-03-04 Thread Yuya Nishihara
On Wed, 1 Mar 2017 15:51:08 -0800, Jun Wu wrote:
> # HG changeset patch
> # User Jun Wu 
> # Date 1488412201 28800
> #  Wed Mar 01 15:50:01 2017 -0800
> # Node ID 85e43415eb995e9096feb3d8b543320dd0b891c5
> # Parent  0bb3089fe73527c64f1afc40b86ecb8dfe7fd7aa
> # Available At https://bitbucket.org/quark-zju/hg-draft
> #  hg pull https://bitbucket.org/quark-zju/hg-draft -r 
> 85e43415eb99
> phases: remove experimental.nativephaseskillswitch
> 
> The native code has been used for a long time. Therefore drop the
> experimental config option.

Sounds good. Queued, thanks.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


[PATCH] phases: remove experimental.nativephaseskillswitch

2017-03-01 Thread Jun Wu
# HG changeset patch
# User Jun Wu 
# Date 1488412201 28800
#  Wed Mar 01 15:50:01 2017 -0800
# Node ID 85e43415eb995e9096feb3d8b543320dd0b891c5
# Parent  0bb3089fe73527c64f1afc40b86ecb8dfe7fd7aa
# Available At https://bitbucket.org/quark-zju/hg-draft
#  hg pull https://bitbucket.org/quark-zju/hg-draft -r 85e43415eb99
phases: remove experimental.nativephaseskillswitch

The native code has been used for a long time. Therefore drop the
experimental config option.

diff --git a/mercurial/phases.py b/mercurial/phases.py
--- a/mercurial/phases.py
+++ b/mercurial/phases.py
@@ -225,10 +225,6 @@ class phasecache(object):
 if self._phaserevs is None:
 try:
-if repo.ui.configbool('experimental',
-  'nativephaseskillswitch'):
-self._computephaserevspure(repo)
-else:
-res = self._getphaserevsnative(repo)
-self._phaserevs, self._phasesets = res
+res = self._getphaserevsnative(repo)
+self._phaserevs, self._phasesets = res
 except AttributeError:
 self._computephaserevspure(repo)
diff --git a/tests/test-phases.t b/tests/test-phases.t
--- a/tests/test-phases.t
+++ b/tests/test-phases.t
@@ -480,10 +480,6 @@ move changeset backward
   
 
-move changeset forward and backward and test kill switch
+move changeset forward and backward
 
-  $ cat <> $HGRCPATH
-  > [experimental]
-  > nativephaseskillswitch = true
-  > EOF
   $ hg phase --draft --force 1::4
   $ hg log -G --template "{rev} {phase} {desc}\n"
@@ -506,8 +502,4 @@ move changeset forward and backward and 
 test partial failure
 
-  $ cat <> $HGRCPATH
-  > [experimental]
-  > nativephaseskillswitch = false
-  > EOF
   $ hg phase --public 7
   $ hg phase --draft '5 or 7'
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel