diff --git a/mercurial/configitems.py b/mercurial/configitems.py index 0c70d888a484a94becc71ea233b6c9f407d36d3f_bWVyY3VyaWFsL2NvbmZpZ2l0ZW1zLnB5..74fb1842f8b962cf03d7cd5b841dbcf2ae065587_bWVyY3VyaWFsL2NvbmZpZ2l0ZW1zLnB5 100644 --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -1425,5 +1425,8 @@ default=False, experimental=True, ) + +# Moving this on by default means we are confident about the scaling of phases. +# This is not garanteed to be the case at the time this message is written. coreconfigitem( b'format', @@ -1428,6 +1431,6 @@ coreconfigitem( b'format', - b'internal-phase', + b'use-internal-phase', default=False, experimental=True, ) diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py index 0c70d888a484a94becc71ea233b6c9f407d36d3f_bWVyY3VyaWFsL2xvY2FscmVwby5weQ==..74fb1842f8b962cf03d7cd5b841dbcf2ae065587_bWVyY3VyaWFsL2xvY2FscmVwby5weQ== 100644 --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -3662,7 +3662,7 @@ requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) # experimental config: format.internal-phase - if ui.configbool(b'format', b'internal-phase'): + if ui.configbool(b'format', b'use-internal-phase'): requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) # experimental config: format.exp-archived-phase diff --git a/mercurial/requirements.py b/mercurial/requirements.py index 0c70d888a484a94becc71ea233b6c9f407d36d3f_bWVyY3VyaWFsL3JlcXVpcmVtZW50cy5weQ==..74fb1842f8b962cf03d7cd5b841dbcf2ae065587_bWVyY3VyaWFsL3JlcXVpcmVtZW50cy5weQ== 100644 --- a/mercurial/requirements.py +++ b/mercurial/requirements.py @@ -29,7 +29,7 @@ # Enables the internal phase which is used to hide changesets instead # of stripping them -INTERNAL_PHASE_REQUIREMENT = b'internal-phase' +INTERNAL_PHASE_REQUIREMENT = b'internal-phase-2' # Enables the internal phase which is used to hide changesets instead # of stripping them diff --git a/tests/test-phases.t b/tests/test-phases.t index 0c70d888a484a94becc71ea233b6c9f407d36d3f_dGVzdHMvdGVzdC1waGFzZXMudA==..74fb1842f8b962cf03d7cd5b841dbcf2ae065587_dGVzdHMvdGVzdC1waGFzZXMudA== 100644 --- a/tests/test-phases.t +++ b/tests/test-phases.t @@ -879,7 +879,7 @@ Check we deny its usage on older repository - $ hg init no-internal-phase --config format.internal-phase=no + $ hg init no-internal-phase --config format.use-internal-phase=no $ cd no-internal-phase $ hg debugrequires | grep internal-phase [1] @@ -900,6 +900,6 @@ Check it works fine with repository that supports it. - $ hg init internal-phase --config format.internal-phase=yes + $ hg init internal-phase --config format.use-internal-phase=yes $ cd internal-phase $ hg debugrequires | grep internal-phase @@ -904,6 +904,6 @@ $ cd internal-phase $ hg debugrequires | grep internal-phase - internal-phase + internal-phase-2 $ mkcommit A test-debug-phase: new rev 0: x -> 1 test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256: -> draft diff --git a/tests/test-shelve.t b/tests/test-shelve.t index 0c70d888a484a94becc71ea233b6c9f407d36d3f_dGVzdHMvdGVzdC1zaGVsdmUudA==..74fb1842f8b962cf03d7cd5b841dbcf2ae065587_dGVzdHMvdGVzdC1zaGVsdmUudA== 100644 --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -14,7 +14,7 @@ $ cat <<EOF >> $HGRCPATH > [format] - > internal-phase = yes + > use-internal-phase = yes > EOF #endif diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t index 0c70d888a484a94becc71ea233b6c9f407d36d3f_dGVzdHMvdGVzdC1zaGVsdmUyLnQ=..74fb1842f8b962cf03d7cd5b841dbcf2ae065587_dGVzdHMvdGVzdC1zaGVsdmUyLnQ= 100644 --- a/tests/test-shelve2.t +++ b/tests/test-shelve2.t @@ -16,7 +16,7 @@ $ cat <<EOF >> $HGRCPATH > [format] - > internal-phase = yes + > use-internal-phase = yes > EOF #endif