diff -r c8f1e8412db4 -r 1944aaaecabf mercurial/obsutil.py --- a/mercurial/obsutil.py Fri Nov 08 14:19:53 2019 +0100 +++ b/mercurial/obsutil.py Fri Nov 08 14:20:48 2019 +0100 @@ -328,7 +328,7 @@ if repo.obsstore: # We only need this complicated logic if there is obsolescence # XXX will probably deserve an optimised revset. - nm = repo.changelog.nodemap + has_node = repo.changelog.index.has_node plen = -1 # compute the whole set of successors or descendants while len(foreground) != plen: @@ -336,7 +336,7 @@ succs = set(c.node() for c in foreground) mutable = [c.node() for c in foreground if c.mutable()] succs.update(allsuccessors(repo.obsstore, mutable)) - known = (n for n in succs if n in nm) + known = (n for n in succs if has_node(n)) foreground = set(repo.set(b'%ln::', known)) return set(c.node() for c in foreground)