# HG changeset patch # User Thomas Arendsen Hein # Date 2012-10-26 07:29:50 # Node ID 75b43843eb4d4302f4584034e2e629e1edafe1a9 # Parent daf32ebfde6bd2f45c28f7e26e33f83e64c2f24e bookmark: simplify nodemap check introduced in the previous changeset diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -268,7 +268,7 @@ def validdest(repo, old, new): # obsolescence marker does not apply to public changeset succs.update(obsolete.allsuccessors(repo.obsstore, [c.node()])) - known = (n for n in succs if nm.get(n) is not None) + known = (n for n in succs if n in nm) validdests = set(repo.set('%ln::', known)) validdests.remove(old) return new in validdests