--- a/mercurial/revset.py	Sat Feb 28 01:12:54 2015 -0500
+++ b/mercurial/revset.py	Mon Mar 02 01:20:14 2015 -0600
@@ -527,7 +527,7 @@
     import branchmap
     urepo = repo.unfiltered()
     ucl = urepo.changelog
-    getbi = branchmap.revbranchcache(urepo).branchinfo
+    getbi = branchmap.revbranchcache(urepo, readonly=True).branchinfo
 
     try:
         b = getstring(x, '')
@@ -1277,7 +1277,8 @@
     names = set()
     for ns in namespaces:
         for name in ns.listnames(repo):
-            names.update(repo[n].rev() for n in ns.nodes(repo, name))
+            if name not in ns.deprecated:
+                names.update(repo[n].rev() for n in ns.nodes(repo, name))
 
     names -= set([node.nullrev])
     return subset & names