# HG changeset patch # User Greg Ward # Date 1402006059 14400 # Node ID 6d691fefdbd1ceb0f2b65862a76e7352098a68d4 # Parent fc7ca26f74915c371f9cf2f1cfca85206edb7f55 evolve: fix createmarkers() wrapper to accept an iterable Docstring in mercurial.obsolete says " must be an iterable of ...", and hgsubversion takes it at its word and passes a generator. Until around Mercurial 3.0, this did not cause any problems, but now it does: in a repo with both evolve and hgsubversion enabled, pushing to Subversion when obsolete changesets are present causes a crash: [...] File "/home/gward/src/hgsubversion/hgsubversion/wrappers.py", line 346, in push obsolete.createmarkers(repo, relations) File "/home/gward/src/hg-stable/mercurial/extensions.py", line 196, in wrap return wrapper(origfn, *args, **kwargs) File "/home/gward/src/hg-evolve/hgext/evolve.py", line 332, in _createmarkers relations[idx] = (prec, sucs, meta) TypeError: 'generator' object does not support item assignment Since hgsubersion is playing by the documented rules, evolve must be the guilty party here. diff -r fc7ca26f7491 -r 6d691fefdbd1 hgext/evolve.py --- a/hgext/evolve.py Tue Jun 03 16:44:24 2014 -0700 +++ b/hgext/evolve.py Thu Jun 05 18:07:39 2014 -0400 @@ -331,6 +331,7 @@ # every time this test is run, a kitten is slain. # Change it as soon as possible if '[,{metadata}]' in orig.__doc__: + relations = list(relations) for idx, rel in enumerate(relations): prec = rel[0] sucs = rel[1]