[PATCH 1 of 2 evolve-ext-V2] evolve: improve the help of the fold command

[Pierre-Yves David]

On 06/25/2015 05:16 PM, Laurent Charignon wrote:
> # HG changeset patch
> # User Laurent Charignon <lcharignon at fb.com>
> # Date 1435251233 25200
> #      Thu Jun 25 09:53:53 2015 -0700
> # Node ID f812058b33ee82caf35d8da6771ef88f02e6d26c
> # Parent  d3328e6775b1f23c6ab41ccd8712e02abb6eea72
> evolve: improve the help of the fold command
>
> The help of the fold command needed a little rework. This patch makes it a
> little less verbose and adds an example. It also highlights a little more the
> importance of the --exact flag.

I guess this is an improvement, pushed to main.

>
> diff --git a/hgext/evolve.py b/hgext/evolve.py
> --- a/hgext/evolve.py
> +++ b/hgext/evolve.py
> @@ -2580,9 +2580,8 @@ def touch(ui, repo, *revs, **opts):
>   def fold(ui, repo, *revs, **opts):
>       """fold multiple revisions into a single one
>
> -    Folds a set of revisions with the parent of the working directory.
> -    All revisions linearly between the given revisions and the parent
> -    of the working directory will also be folded.
> +    By default, folds all the revisions linearly between the given revisions
> +    and the parent of the working directory.
>
>       Use --exact for folding only the specified revisions while ignoring the
>       parent of the working directory. In this case, the given revisions must
> @@ -2607,6 +2606,10 @@ def fold(ui, repo, *revs, **opts):
>
>            hg fold 3:6

I've pushed another change to remove the use of :

>
> +     - Fold revisions 3 and 4:
> +
> +        hg fold '3 + 4' --exact
> +

I've the fixed the quoting in flight.


-- 
Pierre-Yves David