464         else:

   464         else:

   465             matchrevs = set()

   465             matchrevs = set()

   466             for name, bmrev in repo._bookmarks.iteritems():

   466             for name, bmrev in repo._bookmarks.iteritems():

   467                 if matcher(name):

   467                 if matcher(name):

   468                     matchrevs.add(bmrev)

   468                     matchrevs.add(bmrev)

   472             for bmrev in matchrevs:

   469             for bmrev in matchrevs:

   473                 bms.add(repo[bmrev].rev())

   470                 bms.add(repo[bmrev].rev())

   474     else:

   471     else:

   475         bms = {repo[r].rev() for r in repo._bookmarks.values()}

   472         bms = {repo[r].rev() for r in repo._bookmarks.values()}

   476     bms -= {node.nullrev}

   473     bms -= {node.nullrev}

  1328         namespaces.add(repo.names[pattern])

  1325         namespaces.add(repo.names[pattern])

  1329     else:

  1326     else:

  1330         for name, ns in repo.names.iteritems():

  1327         for name, ns in repo.names.iteritems():

  1331             if matcher(name):

  1328             if matcher(name):

  1332                 namespaces.add(ns)

  1329                 namespaces.add(ns)

  1336 

  1330 

  1337     names = set()

  1331     names = set()

  1338     for ns in namespaces:

  1332     for ns in namespaces:

  1339         for name in ns.listnames(repo):

  1333         for name in ns.listnames(repo):

  1340             if name not in ns.deprecated:

  1334             if name not in ns.deprecated: