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

Laurent Charignon lcharignon at fb.com
Thu Jun 25 20:01:25 CDT 2015


Thanks, I will send a v3


> On Jun 25, 2015, at 5:24 PM, Matt Mackall <mpm at selenic.com> wrote:
> 
>> On Thu, 2015-06-25 at 17:16 -0700, 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.
>> 
>> 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
>> 
>> +     - Fold revisions 3 and 4:
>> +
>> +        hg fold '3 + 4' --exact
> 
> Please always use double quotes for command-line examples. Windows users
> don't have single quotes and frequently don't know how shell quoting
> works, so they can't fix the example.
> 
> -- 
> Mathematics is the supreme nostalgia of our time.
> 


More information about the Mercurial-devel mailing list