Mercurial > evolve
changeset 5880:1ed3e1f2d2c3 stable
next: make aspchildren filtering code work correctly
`aspchildren` contains revs, not contexts.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 21 Apr 2021 19:44:26 +0800 |
| parents | cd344c0c89f0 |
| children | 9a06d69d2ac7 |
| files | hgext3rd/evolve/__init__.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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