# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1407837058 18000
# Node ID fd172ba5c64b32801e0ffae6bea8e769431a7ecf
# Parent  9a299c39de015231a8b2b6530b3d5a6dd4eaff85# Parent  e5dfa8689cf09c701304a4d8e7aad7e326489877
merge with stable

diff -r 9a299c39de01 -r fd172ba5c64b mercurial/commands.py
--- a/mercurial/commands.py	Tue Aug 12 04:11:32 2014 -0500
+++ b/mercurial/commands.py	Tue Aug 12 04:50:58 2014 -0500
@@ -5892,7 +5892,6 @@
     fnames = (fname1,) + fnames
 
     lock = repo.lock()
-    wc = repo['.']
     try:
         for fname in fnames:
             f = hg.openpath(ui, fname)
diff -r 9a299c39de01 -r fd172ba5c64b mercurial/repoview.py
--- a/mercurial/repoview.py	Tue Aug 12 04:11:32 2014 -0500
+++ b/mercurial/repoview.py	Tue Aug 12 04:50:58 2014 -0500
@@ -41,7 +41,8 @@
         tags = {}
         tagsmod.readlocaltags(repo.ui, repo, tags, {})
         if tags:
-            blockers.extend(cl.rev(t[0]) for t in tags.values())
+            rev, nodemap = cl.rev, cl.nodemap
+            blockers.extend(rev(t[0]) for t in tags.values() if t[0] in nodemap)
     return blockers
 
 def computehidden(repo):
diff -r 9a299c39de01 -r fd172ba5c64b mercurial/revset.py
--- a/mercurial/revset.py	Tue Aug 12 04:11:32 2014 -0500
+++ b/mercurial/revset.py	Tue Aug 12 04:50:58 2014 -0500
@@ -449,7 +449,7 @@
                        _('the argument to bookmark must be a string'))
         kind, pattern, matcher = _stringmatcher(bm)
         if kind == 'literal':
-            bmrev = repo._bookmarks.get(bm, None)
+            bmrev = repo._bookmarks.get(pattern, None)
             if not bmrev:
                 raise util.Abort(_("bookmark '%s' does not exist") % bm)
             bmrev = repo[bmrev].rev()
diff -r 9a299c39de01 -r fd172ba5c64b tests/test-bookmarks.t
--- a/tests/test-bookmarks.t	Tue Aug 12 04:11:32 2014 -0500
+++ b/tests/test-bookmarks.t	Tue Aug 12 04:50:58 2014 -0500
@@ -98,6 +98,14 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
+  $ hg log -r 'bookmark("literal:X")'
+  changeset:   0:f7b1eb17ad24
+  bookmark:    X
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     0
+  
+
   $ hg log -r 'bookmark(unknown)'
   abort: bookmark 'unknown' does not exist
   [255]