comparison mercurial/bookmarks.py @ 17866:75b43843eb4d stable

bookmark: simplify nodemap check introduced in the previous changeset

17865:daf32ebfde6b

            for c in validdests:
                if c.phase() > phases.public:
                    # 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)
            validdests = set(repo.set('%ln::', known))
        validdests.remove(old)
        return new in validdests
    else:
        return old.descendant(new)

17866:75b43843eb4d

            for c in validdests:
                if c.phase() > phases.public:
                    # obsolescence marker does not apply to public changeset
                    succs.update(obsolete.allsuccessors(repo.obsstore,
                                                        [c.node()]))
            known = (n for n in succs if n in nm)
            validdests = set(repo.set('%ln::', known))
        validdests.remove(old)
        return new in validdests
    else:
        return old.descendant(new)