Patchwork [3,of,3,evolve-ext] evolve: support templater argument to list

login
register
mail settings
Submitter timeless
Date April 21, 2016, 6:26 a.m.
Message ID <bb64200f4d2d944281a7.1461220005@gcc2-power8.osuosl.org>
Download mbox | patch
Permalink /patch/14758/
State Rejected
Delegated to: Pierre-Yves David
Headers show

Comments

timeless - April 21, 2016, 6:26 a.m.
# HG changeset patch
# User timeless@gmail.com
# Date 1461219768 0
#      Thu Apr 21 06:22:48 2016 +0000
# Node ID bb64200f4d2d944281a765c2081c3ce2ac02cb3c
# Parent  ec9eea37f26590ea7840077c4dd44857138dd4a0
# Available At https://bitbucket.org/timeless/mutable-history/
#              hg pull https://bitbucket.org/timeless/mutable-history/ -r bb64200f4d2d
evolve: support templater argument to list
Simon Farnsworth - April 25, 2016, 10:05 p.m.
Any tests for these three changes?

On 21/04/2016 07:26, timeless wrote:
> # HG changeset patch
> # User timeless@gmail.com
> # Date 1461219768 0
> #      Thu Apr 21 06:22:48 2016 +0000
> # Node ID bb64200f4d2d944281a765c2081c3ce2ac02cb3c
> # Parent  ec9eea37f26590ea7840077c4dd44857138dd4a0
> # Available At https://urldefense.proofpoint.com/v2/url?u=https-3A__bitbucket.org_timeless_mutable-2Dhistory_&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=gZnm-BYLtKgccUQKYOrZN99EV_AXS2hUxizJNKzWzlc&s=vtBK2y7t08Afl9CjUZWLpmv5Qc7y7oYTipZeHkI04h4&e=
> #              hg pull https://urldefense.proofpoint.com/v2/url?u=https-3A__bitbucket.org_timeless_mutable-2Dhistory_&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=gZnm-BYLtKgccUQKYOrZN99EV_AXS2hUxizJNKzWzlc&s=vtBK2y7t08Afl9CjUZWLpmv5Qc7y7oYTipZeHkI04h4&e=  -r bb64200f4d2d
> evolve: support templater argument to list
>
> diff -r ec9eea37f265 -r bb64200f4d2d hgext/evolve.py
> --- a/hgext/evolve.py	Thu Apr 21 06:12:20 2016 +0000
> +++ b/hgext/evolve.py	Thu Apr 21 06:22:48 2016 +0000
> @@ -1647,7 +1647,7 @@
>                             'current  working directory and its descendants')),
>       ('c', 'continue', False, _('continue an interrupted evolution')),
>       ('l', 'list', False, 'provide details on troubled changesets in the repo'),
> -    ] + mergetoolopts,
> +    ] + mergetoolopts + commands.formatteropts,
>       _('[OPTIONS]...'))
>   def evolve(ui, repo, **opts):
>       """solve troubled changesets in your repository
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=gZnm-BYLtKgccUQKYOrZN99EV_AXS2hUxizJNKzWzlc&s=-8l5oSgo1hLMLbhkmQjVgz7S1dFkXWz9JFFFE5GyqxQ&e=
>
timeless - April 26, 2016, 3:27 a.m.
No. At this time, we can't queue this anyway, as it depends on a fix
to Mercurial...

On Mon, Apr 25, 2016 at 6:05 PM, Simon Farnsworth <simonfar@fb.com> wrote:
> Any tests for these three changes?
>
> On 21/04/2016 07:26, timeless wrote:
>>
>> # HG changeset patch
>> # User timeless@gmail.com
>> # Date 1461219768 0
>> #      Thu Apr 21 06:22:48 2016 +0000
>> # Node ID bb64200f4d2d944281a765c2081c3ce2ac02cb3c
>> # Parent  ec9eea37f26590ea7840077c4dd44857138dd4a0
>> # Available At
>> https://urldefense.proofpoint.com/v2/url?u=https-3A__bitbucket.org_timeless_mutable-2Dhistory_&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=gZnm-BYLtKgccUQKYOrZN99EV_AXS2hUxizJNKzWzlc&s=vtBK2y7t08Afl9CjUZWLpmv5Qc7y7oYTipZeHkI04h4&e=
>> #              hg pull
>> https://urldefense.proofpoint.com/v2/url?u=https-3A__bitbucket.org_timeless_mutable-2Dhistory_&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=gZnm-BYLtKgccUQKYOrZN99EV_AXS2hUxizJNKzWzlc&s=vtBK2y7t08Afl9CjUZWLpmv5Qc7y7oYTipZeHkI04h4&e=
>> -r bb64200f4d2d
>> evolve: support templater argument to list
>>
>> diff -r ec9eea37f265 -r bb64200f4d2d hgext/evolve.py
>> --- a/hgext/evolve.py   Thu Apr 21 06:12:20 2016 +0000
>> +++ b/hgext/evolve.py   Thu Apr 21 06:22:48 2016 +0000
>> @@ -1647,7 +1647,7 @@
>>                             'current  working directory and its
>> descendants')),
>>       ('c', 'continue', False, _('continue an interrupted evolution')),
>>       ('l', 'list', False, 'provide details on troubled changesets in the
>> repo'),
>> -    ] + mergetoolopts,
>> +    ] + mergetoolopts + commands.formatteropts,
>>       _('[OPTIONS]...'))
>>   def evolve(ui, repo, **opts):
>>       """solve troubled changesets in your repository
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@mercurial-scm.org
>>
>> https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=gZnm-BYLtKgccUQKYOrZN99EV_AXS2hUxizJNKzWzlc&s=-8l5oSgo1hLMLbhkmQjVgz7S1dFkXWz9JFFFE5GyqxQ&e=
>>
>
> --
> Simon Farnsworth
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff -r ec9eea37f265 -r bb64200f4d2d hgext/evolve.py
--- a/hgext/evolve.py	Thu Apr 21 06:12:20 2016 +0000
+++ b/hgext/evolve.py	Thu Apr 21 06:22:48 2016 +0000
@@ -1647,7 +1647,7 @@ 
                           'current  working directory and its descendants')),
     ('c', 'continue', False, _('continue an interrupted evolution')),
     ('l', 'list', False, 'provide details on troubled changesets in the repo'),
-    ] + mergetoolopts,
+    ] + mergetoolopts + commands.formatteropts,
     _('[OPTIONS]...'))
 def evolve(ui, repo, **opts):
     """solve troubled changesets in your repository