Mercurial > hg
comparison mercurial/bookmarks.py @ 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 | ed225834b372 |
comparison
equal
deleted
inserted
replaced
17865:daf32ebfde6b | 17866:75b43843eb4d |
---|---|
266 for c in validdests: | 266 for c in validdests: |
267 if c.phase() > phases.public: | 267 if c.phase() > phases.public: |
268 # obsolescence marker does not apply to public changeset | 268 # obsolescence marker does not apply to public changeset |
269 succs.update(obsolete.allsuccessors(repo.obsstore, | 269 succs.update(obsolete.allsuccessors(repo.obsstore, |
270 [c.node()])) | 270 [c.node()])) |
271 known = (n for n in succs if nm.get(n) is not None) | 271 known = (n for n in succs if n in nm) |
272 validdests = set(repo.set('%ln::', known)) | 272 validdests = set(repo.set('%ln::', known)) |
273 validdests.remove(old) | 273 validdests.remove(old) |
274 return new in validdests | 274 return new in validdests |
275 else: | 275 else: |
276 return old.descendant(new) | 276 return old.descendant(new) |