Patchwork phases: mention how to make secret commits in help

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 22, 2015, 8:41 p.m.
Message ID <a9e8d6e4ef9b3c1b48f3.1450816914@waste.org>
Download mbox | patch
Permalink /patch/12250/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

timeless@mozdev.org - Dec. 22, 2015, 8:41 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450815022 0
#      Tue Dec 22 20:10:22 2015 +0000
# Node ID a9e8d6e4ef9b3c1b48f318f7b4d913dba729afc8
# Parent  3dea4eae4eebac11741f0c1dc5dcd9c88d8f4554
phases: mention how to make secret commits in help
Yuya Nishihara - Dec. 26, 2015, 12:35 p.m.
On Tue, 22 Dec 2015 14:41:54 -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450815022 0
> #      Tue Dec 22 20:10:22 2015 +0000
> # Node ID a9e8d6e4ef9b3c1b48f318f7b4d913dba729afc8
> # Parent  3dea4eae4eebac11741f0c1dc5dcd9c88d8f4554
> phases: mention how to make secret commits in help
> 
> diff --git a/mercurial/help/phases.txt b/mercurial/help/phases.txt
> --- a/mercurial/help/phases.txt
> +++ b/mercurial/help/phases.txt
> @@ -28,6 +28,12 @@
>  Phases can also be manually manipulated with the :hg:`phase` command
>  if needed. See :hg:`help -v phase` for examples.
>  
> +To make yours commits secret by default, put this in your
> +configuration file::
> +
> +  [phases]
> +  new-commit = secret

Looks good, pushed to the clowncopter, thanks.
Pierre-Yves David - Dec. 30, 2015, 7:34 p.m.
On 12/26/2015 01:35 PM, Yuya Nishihara wrote:
> On Tue, 22 Dec 2015 14:41:54 -0600, timeless wrote:
>> # HG changeset patch
>> # User timeless <timeless@mozdev.org>
>> # Date 1450815022 0
>> #      Tue Dec 22 20:10:22 2015 +0000
>> # Node ID a9e8d6e4ef9b3c1b48f318f7b4d913dba729afc8
>> # Parent  3dea4eae4eebac11741f0c1dc5dcd9c88d8f4554
>> phases: mention how to make secret commits in help
>>
>> diff --git a/mercurial/help/phases.txt b/mercurial/help/phases.txt
>> --- a/mercurial/help/phases.txt
>> +++ b/mercurial/help/phases.txt
>> @@ -28,6 +28,12 @@
>>   Phases can also be manually manipulated with the :hg:`phase` command
>>   if needed. See :hg:`help -v phase` for examples.
>>
>> +To make yours commits secret by default, put this in your
>> +configuration file::
>> +
>> +  [phases]
>> +  new-commit = secret
>
> Looks good, pushed to the clowncopter, thanks.

I'm pretty unconvinced by this patch. Secret changeset are still on a 
new head and we should still point that out. the secret changeset will 
eventually become draft and still be a new head. `hg push` will properly 
ignores the secret changeset and not complains about the new head (which 
is what matters).

For better management of development heads we should more forward on 
solving release branch workflow instead.

I think I would prefer this one to be backed out.
Yuya Nishihara - Dec. 31, 2015, 12:41 p.m.
On Wed, 30 Dec 2015 20:34:49 +0100, Pierre-Yves David wrote:
> On 12/26/2015 01:35 PM, Yuya Nishihara wrote:
> > On Tue, 22 Dec 2015 14:41:54 -0600, timeless wrote:
> >> # HG changeset patch
> >> # User timeless <timeless@mozdev.org>
> >> # Date 1450815022 0
> >> #      Tue Dec 22 20:10:22 2015 +0000
> >> # Node ID a9e8d6e4ef9b3c1b48f318f7b4d913dba729afc8
> >> # Parent  3dea4eae4eebac11741f0c1dc5dcd9c88d8f4554
> >> phases: mention how to make secret commits in help
> >>
> >> diff --git a/mercurial/help/phases.txt b/mercurial/help/phases.txt
> >> --- a/mercurial/help/phases.txt
> >> +++ b/mercurial/help/phases.txt
> >> @@ -28,6 +28,12 @@
> >>   Phases can also be manually manipulated with the :hg:`phase` command
> >>   if needed. See :hg:`help -v phase` for examples.
> >>
> >> +To make yours commits secret by default, put this in your
> >> +configuration file::
> >> +
> >> +  [phases]
> >> +  new-commit = secret
> >
> > Looks good, pushed to the clowncopter, thanks.
> 
> I'm pretty unconvinced by this patch. Secret changeset are still on a 
> new head and we should still point that out. the secret changeset will 
> eventually become draft and still be a new head. `hg push` will properly 
> ignores the secret changeset and not complains about the new head (which 
> is what matters).

This patch just added "how to configure the default phase." I think your
argument is about the issue5017.

https://bz.mercurial-scm.org/show_bug.cgi?id=5017

FWIW, it seems we are using the secret phase for different meanings:

 a. a local revision that will never ever be public
 b. a revision under development that should eventually be public

For (b), "new head" should be warned no matter if it is a secret revision.
timeless - Dec. 31, 2015, 3:28 p.m.
On Wed, Dec 30, 2015 at 2:34 PM, Pierre-Yves David
<pierre-yves.david@ens-lyon.org> wrote:
>
>
> On 12/26/2015 01:35 PM, Yuya Nishihara wrote:
>>
>> On Tue, 22 Dec 2015 14:41:54 -0600, timeless wrote:
>>>
>>> # HG changeset patch
>>> # User timeless <timeless@mozdev.org>
>>> # Date 1450815022 0
>>> #      Tue Dec 22 20:10:22 2015 +0000
>>> # Node ID a9e8d6e4ef9b3c1b48f318f7b4d913dba729afc8
>>> # Parent  3dea4eae4eebac11741f0c1dc5dcd9c88d8f4554
>>> phases: mention how to make secret commits in help
>>>
>>> diff --git a/mercurial/help/phases.txt b/mercurial/help/phases.txt
>>> --- a/mercurial/help/phases.txt
>>> +++ b/mercurial/help/phases.txt
>>> @@ -28,6 +28,12 @@
>>>   Phases can also be manually manipulated with the :hg:`phase` command
>>>   if needed. See :hg:`help -v phase` for examples.
>>>
>>> +To make yours commits secret by default, put this in your
>>> +configuration file::
>>> +
>>> +  [phases]
>>> +  new-commit = secret
>>
>>
>> Looks good, pushed to the clowncopter, thanks.
>
>
> I'm pretty unconvinced by this patch. Secret changeset are still on a new
> head and we should still point that out. the secret changeset will
> eventually become draft and still be a new head. `hg push` will properly
> ignores the secret changeset and not complains about the new head (which is
> what matters).
>
> For better management of development heads we should more forward on solving
> release branch workflow instead.
>
> I think I would prefer this one to be backed out.


huh? this is just documentation for how to enable the feature, it's
definitely where it belongs.
Pierre-Yves David - Jan. 2, 2016, 12:06 p.m.
On 12/31/2015 04:28 PM, timeless wrote:
> On Wed, Dec 30, 2015 at 2:34 PM, Pierre-Yves David
> <pierre-yves.david@ens-lyon.org> wrote:
>>
>>
>> On 12/26/2015 01:35 PM, Yuya Nishihara wrote:
>>>
>>> On Tue, 22 Dec 2015 14:41:54 -0600, timeless wrote:
>>>>
>>>> # HG changeset patch
>>>> # User timeless <timeless@mozdev.org>
>>>> # Date 1450815022 0
>>>> #      Tue Dec 22 20:10:22 2015 +0000
>>>> # Node ID a9e8d6e4ef9b3c1b48f318f7b4d913dba729afc8
>>>> # Parent  3dea4eae4eebac11741f0c1dc5dcd9c88d8f4554
>>>> phases: mention how to make secret commits in help
>>>>
>>>> diff --git a/mercurial/help/phases.txt b/mercurial/help/phases.txt
>>>> --- a/mercurial/help/phases.txt
>>>> +++ b/mercurial/help/phases.txt
>>>> @@ -28,6 +28,12 @@
>>>>    Phases can also be manually manipulated with the :hg:`phase` command
>>>>    if needed. See :hg:`help -v phase` for examples.
>>>>
>>>> +To make yours commits secret by default, put this in your
>>>> +configuration file::
>>>> +
>>>> +  [phases]
>>>> +  new-commit = secret
>>>
>>>
>>> Looks good, pushed to the clowncopter, thanks.
>>
>>
>> I'm pretty unconvinced by this patch. Secret changeset are still on a new
>> head and we should still point that out. the secret changeset will
>> eventually become draft and still be a new head. `hg push` will properly
>> ignores the secret changeset and not complains about the new head (which is
>> what matters).
>>
>> For better management of development heads we should more forward on solving
>> release branch workflow instead.
>>
>> I think I would prefer this one to be backed out.
>
>
> huh? this is just documentation for how to enable the feature, it's
> definitely where it belongs.

I replied to the wrong email (I had this one and the one about secret 
and new head warning open). Sorry about that.

Patch

diff --git a/mercurial/help/phases.txt b/mercurial/help/phases.txt
--- a/mercurial/help/phases.txt
+++ b/mercurial/help/phases.txt
@@ -28,6 +28,12 @@ 
 Phases can also be manually manipulated with the :hg:`phase` command
 if needed. See :hg:`help -v phase` for examples.
 
+To make yours commits secret by default, put this in your
+configuration file::
+
+  [phases]
+  new-commit = secret
+
 Phases and servers
 ==================