Patchwork [1,of,2,evolve-ext] evolve: rename util.any -> any

login
register
mail settings
Submitter Matt Harbison
Date May 19, 2015, 4:11 a.m.
Message ID <6be7a61ecc5285b58e3b.1432008717@Envy>
Download mbox | patch
Permalink /patch/9161/
State Not Applicable
Headers show

Comments

Matt Harbison - May 19, 2015, 4:11 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1432007976 14400
#      Mon May 18 23:59:36 2015 -0400
# Node ID 6be7a61ecc5285b58e3bd55efc84edbb14d626a0
# Parent  b8f880d4171d3e0ed10ce85976408681fa1f8b39
evolve: rename util.any -> any

This syncs with hg ac2e66f481c9.
Pierre-Yves David - May 19, 2015, 5:46 a.m.
On 05/18/2015 11:11 PM, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1432007976 14400
> #      Mon May 18 23:59:36 2015 -0400
> # Node ID 6be7a61ecc5285b58e3bd55efc84edbb14d626a0
> # Parent  b8f880d4171d3e0ed10ce85976408681fa1f8b39
> evolve: rename util.any -> any
>
> This syncs with hg ac2e66f481c9.

Such patch is actually already in the repo as f455ce2a3587
Matt Harbison - May 19, 2015, 10:57 p.m.
On Tue, 19 May 2015 01:46:22 -0400, Pierre-Yves David  
<pierre-yves.david@ens-lyon.org> wrote:

>
>
> On 05/18/2015 11:11 PM, Matt Harbison wrote:
>> # HG changeset patch
>> # User Matt Harbison <matt_harbison@yahoo.com>
>> # Date 1432007976 14400
>> #      Mon May 18 23:59:36 2015 -0400
>> # Node ID 6be7a61ecc5285b58e3bd55efc84edbb14d626a0
>> # Parent  b8f880d4171d3e0ed10ce85976408681fa1f8b39
>> evolve: rename util.any -> any
>>
>> This syncs with hg ac2e66f481c9.
>
> Such patch is actually already in the repo as f455ce2a3587

Pulling from https://bitbucket.org/marmoute/mutable-history doesn't get  
any more csets, and I don't have the one you referenced locally.
Pierre-Yves David - May 19, 2015, 11:01 p.m.
On 05/19/2015 05:57 PM, Matt Harbison wrote:
> On Tue, 19 May 2015 01:46:22 -0400, Pierre-Yves David
> <pierre-yves.david@ens-lyon.org> wrote:
>
>>
>>
>> On 05/18/2015 11:11 PM, Matt Harbison wrote:
>>> # HG changeset patch
>>> # User Matt Harbison <matt_harbison@yahoo.com>
>>> # Date 1432007976 14400
>>> #      Mon May 18 23:59:36 2015 -0400
>>> # Node ID 6be7a61ecc5285b58e3bd55efc84edbb14d626a0
>>> # Parent  b8f880d4171d3e0ed10ce85976408681fa1f8b39
>>> evolve: rename util.any -> any
>>>
>>> This syncs with hg ac2e66f481c9.
>>
>> Such patch is actually already in the repo as f455ce2a3587
>
> Pulling from https://bitbucket.org/marmoute/mutable-history doesn't get
> any more csets, and I don't have the one you referenced locally.

The officiel repo moved here: http://42.netv6.net/evolve-main/

and the auto sync to the bitbucket repo is broken for some reason…

Patch

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -88,7 +88,7 @@ 
     raise ImportError('evolve needs version %s or above' % min(testedwith.split()))
 
 aliases, entry = cmdutil.findcmd('commit', commands.table)
-hasinteractivemode = util.any(['interactive' in e for e in entry[1]])
+hasinteractivemode = any(['interactive' in e for e in entry[1]])
 if hasinteractivemode:
     interactiveopt = [['i', 'interactive', None, _('use interactive mode')]]
 else:
@@ -1109,10 +1109,10 @@ 
         # cluster handling
         nodes = set(mark[1])
         nodes.add(mark[0])
-        _updateclustermap(nodes, mark, clustersmap) 
+        _updateclustermap(nodes, mark, clustersmap)
         # same with parent data
         nodes.update(parents)
-        _updateclustermap(nodes, mark, pclustersmap) 
+        _updateclustermap(nodes, mark, pclustersmap)
 
     # freezing the result
     for c in clustersmap.values():
@@ -1313,7 +1313,7 @@ 
             count = len(_revs)
             for rev in _revs:
                 progresscb()
-                _solveone(ui, repo, repo[rev], dryrunopt, confirmopt, 
+                _solveone(ui, repo, repo[rev], dryrunopt, confirmopt,
                         progresscb)
                 seen += 1
             progresscb()
@@ -1910,7 +1910,7 @@ 
 
         # create markers
         obsolete.createmarkers(repo, relations, metadata=metadata)
-        
+
         # informs that changeset have been pruned
         ui.status(_('%i changesets pruned\n') % len(precs))