Patchwork [evolve-ext] evolve: further clarify that update is performed only when requested

login
register
mail settings
Submitter via Mercurial-devel
Date July 17, 2019, 7:06 p.m.
Message ID <CAMSrhaWmGw7LG_FzEXN20rptOCvysQeaUZ3i4XtajGDWx9O0JQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/40955/
State New
Headers show

Comments

via Mercurial-devel - July 17, 2019, 7:06 p.m.
Here is an updated patch:

# HG changeset patch
# User kevpeng@google.com
# Date 1560563083 25200
#      Fri Jun 14 18:44:43 2019 -0700
# Node ID 8716e0b2ff1cf09efa79dca6303a83600ee42824
# Parent  8195452be71d446eff972ea128199f943731b7fb
evolve: further clarify when update is performed


On Wed, Jul 17, 2019 at 9:03 AM Pierre-Yves David
<pierre-yves.david@ens-lyon.org> wrote:
>
>
>
> On 7/13/19 2:23 AM, Kevin Peng wrote:
> > LGTM. Anton Shestakov also pointed out that evolve will also
> > automatically update if the working dir parent is obsolete; perhaps we
> > should mention that as well?
> >
> > What about:
> >       When ``--update`` is set, a successful evolve operation will update the
> >       working copy to the newly created changeset. Moreover, an update will
> >       always be performed if the current working directory parent is obsolete.
> >
> > If this looks good to you, then I can send an updated patch.
>
> This looks good. Anton, what do you think about it?
>
> --
> Pierre-Yves David
Anton Shestakov - July 18, 2019, 9:51 a.m.
On Wed, 17 Jul 2019 12:06:14 -0700
Kevin Peng via Mercurial-devel <mercurial-devel@mercurial-scm.org>
wrote:

> Here is an updated patch:
> 
> # HG changeset patch
> # User kevpeng@google.com
> # Date 1560563083 25200
> #      Fri Jun 14 18:44:43 2019 -0700
> # Node ID 8716e0b2ff1cf09efa79dca6303a83600ee42824
> # Parent  8195452be71d446eff972ea128199f943731b7fb
> evolve: further clarify when update is performed
> 
> diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py
> --- a/hgext3rd/evolve/evolvecmd.py
> +++ b/hgext3rd/evolve/evolvecmd.py
> @@ -1536,9 +1536,9 @@ def evolve(ui, repo, **opts):
>      If so, evolve rebases that changeset. If not, evolve refuses to guess your
>      intention, and gives a hint about what you might want to do next.
> 
> -    Any time evolve creates a changeset, it updates the working copy to the new
> -    changeset. Using ``--update`` will make evolve perform an update after any
> -    successful evolve operation.
> +    When ``--update`` is set, a successful evolve operation will update the
> +    working copy to the newly created changeset. Moreover, an update will
> +    always be performed if the current working directory parent is obsolete.
> 
>      Automatic mode only handles common use cases. For example, it avoids taking
>      action in the case of ambiguity, and it ignores orphan changesets that are

We already pushed your previous patch after some copy editing, so I
took the liberty of amending this one to apply it cleanly. It can be
seen and reviewed (if you have bitbucket account) at:
https://bitbucket.org/octobus/evolve-devel/commits/d0965c5c5335d14ea0bcb4e0bf336f43ba4fe381

And it looks good to me.
via Mercurial-devel - July 18, 2019, 5:03 p.m.
I see. Thanks!

On Thu, Jul 18, 2019 at 2:51 AM Anton Shestakov <av6@dwimlabs.net> wrote:
>
> On Wed, 17 Jul 2019 12:06:14 -0700
> Kevin Peng via Mercurial-devel <mercurial-devel@mercurial-scm.org>
> wrote:
>
> > Here is an updated patch:
> >
> > # HG changeset patch
> > # User kevpeng@google.com
> > # Date 1560563083 25200
> > #      Fri Jun 14 18:44:43 2019 -0700
> > # Node ID 8716e0b2ff1cf09efa79dca6303a83600ee42824
> > # Parent  8195452be71d446eff972ea128199f943731b7fb
> > evolve: further clarify when update is performed
> >
> > diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py
> > --- a/hgext3rd/evolve/evolvecmd.py
> > +++ b/hgext3rd/evolve/evolvecmd.py
> > @@ -1536,9 +1536,9 @@ def evolve(ui, repo, **opts):
> >      If so, evolve rebases that changeset. If not, evolve refuses to guess your
> >      intention, and gives a hint about what you might want to do next.
> >
> > -    Any time evolve creates a changeset, it updates the working copy to the new
> > -    changeset. Using ``--update`` will make evolve perform an update after any
> > -    successful evolve operation.
> > +    When ``--update`` is set, a successful evolve operation will update the
> > +    working copy to the newly created changeset. Moreover, an update will
> > +    always be performed if the current working directory parent is obsolete.
> >
> >      Automatic mode only handles common use cases. For example, it avoids taking
> >      action in the case of ambiguity, and it ignores orphan changesets that are
>
> We already pushed your previous patch after some copy editing, so I
> took the liberty of amending this one to apply it cleanly. It can be
> seen and reviewed (if you have bitbucket account) at:
> https://bitbucket.org/octobus/evolve-devel/commits/d0965c5c5335d14ea0bcb4e0bf336f43ba4fe381
>
> And it looks good to me.
Pierre-Yves David - July 18, 2019, 6:29 p.m.
I pushed the result, thanks !

On 7/18/19 7:03 PM, Kevin Peng wrote:
> I see. Thanks!
> 
> On Thu, Jul 18, 2019 at 2:51 AM Anton Shestakov <av6@dwimlabs.net> wrote:
>>
>> On Wed, 17 Jul 2019 12:06:14 -0700
>> Kevin Peng via Mercurial-devel <mercurial-devel@mercurial-scm.org>
>> wrote:
>>
>>> Here is an updated patch:
>>>
>>> # HG changeset patch
>>> # User kevpeng@google.com
>>> # Date 1560563083 25200
>>> #      Fri Jun 14 18:44:43 2019 -0700
>>> # Node ID 8716e0b2ff1cf09efa79dca6303a83600ee42824
>>> # Parent  8195452be71d446eff972ea128199f943731b7fb
>>> evolve: further clarify when update is performed
>>>
>>> diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py
>>> --- a/hgext3rd/evolve/evolvecmd.py
>>> +++ b/hgext3rd/evolve/evolvecmd.py
>>> @@ -1536,9 +1536,9 @@ def evolve(ui, repo, **opts):
>>>       If so, evolve rebases that changeset. If not, evolve refuses to guess your
>>>       intention, and gives a hint about what you might want to do next.
>>>
>>> -    Any time evolve creates a changeset, it updates the working copy to the new
>>> -    changeset. Using ``--update`` will make evolve perform an update after any
>>> -    successful evolve operation.
>>> +    When ``--update`` is set, a successful evolve operation will update the
>>> +    working copy to the newly created changeset. Moreover, an update will
>>> +    always be performed if the current working directory parent is obsolete.
>>>
>>>       Automatic mode only handles common use cases. For example, it avoids taking
>>>       action in the case of ambiguity, and it ignores orphan changesets that are
>>
>> We already pushed your previous patch after some copy editing, so I
>> took the liberty of amending this one to apply it cleanly. It can be
>> seen and reviewed (if you have bitbucket account) at:
>> https://bitbucket.org/octobus/evolve-devel/commits/d0965c5c5335d14ea0bcb4e0bf336f43ba4fe381
>>
>> And it looks good to me.

Patch

diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py
+++ b/hgext3rd/evolve/evolvecmd.py
@@ -1536,9 +1536,9 @@  def evolve(ui, repo, **opts):
     If so, evolve rebases that changeset. If not, evolve refuses to guess your
     intention, and gives a hint about what you might want to do next.

-    Any time evolve creates a changeset, it updates the working copy to the new
-    changeset. Using ``--update`` will make evolve perform an update after any
-    successful evolve operation.
+    When ``--update`` is set, a successful evolve operation will update the
+    working copy to the newly created changeset. Moreover, an update will
+    always be performed if the current working directory parent is obsolete.

     Automatic mode only handles common use cases. For example, it avoids taking
     action in the case of ambiguity, and it ignores orphan changesets that are