changeset 17866:75b43843eb4d stable

bookmark: simplify nodemap check introduced in the previous changeset
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 26 Oct 2012 09:29:50 +0200
parents daf32ebfde6b
children c9339efed653
files mercurial/bookmarks.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bookmarks.py	Thu Oct 25 23:43:52 2012 +0200
+++ b/mercurial/bookmarks.py	Fri Oct 26 09:29:50 2012 +0200
@@ -268,7 +268,7 @@
                     # 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