diff -r 65d6770273c8 -r 45d123d84011 mercurial/revset.py --- a/mercurial/revset.py Sat Nov 09 13:23:53 2019 +0100 +++ b/mercurial/revset.py Sat Nov 09 13:23:53 2019 +0100 @@ -2406,10 +2406,10 @@ filtering. """ cl = repo.unfiltered().changelog - torev = cl.rev + torev = cl.index.get_rev tonode = cl.node - nodemap = cl.nodemap - result = set(torev(n) for n in f(tonode(r) for r in s) if n in nodemap) + result = set(torev(n) for n in f(tonode(r) for r in s)) + result.discard(None) return smartset.baseset(result - repo.changelog.filteredrevs)