# HG changeset patch # User Anton Shestakov # Date 1619005466 -28800 # Node ID 1ed3e1f2d2c39a9fba37f5619d86ed3e43be3862 # Parent cd344c0c89f046392834b73fab6000b9f814c968 next: make aspchildren filtering code work correctly `aspchildren` contains revs, not contexts. diff -r cd344c0c89f0 -r 1ed3e1f2d2c3 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Wed Apr 21 19:41:41 2021 +0800 +++ b/hgext3rd/evolve/__init__.py Wed Apr 21 19:44:26 2021 +0800 @@ -857,9 +857,9 @@ needevolve = False aspchildren = evolvecmd._aspiringchildren(repo, [repo[b'.'].rev()]) if topic: - filtered.update(repo[c] for c in aspchildren - if repo[c].topic() != topic) - aspchildren = [ctx for ctx in aspchildren if ctx not in filtered] + filtered.update(repo[rev] for rev in aspchildren + if repo[rev].topic() != topic) + aspchildren = [rev for rev in aspchildren if repo[rev] not in filtered] # To catch and prevent the case when `next` would get confused by split, # lets filter those aspiring children which can be stablized on one of