# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1297367188 21600
# Node ID 999f616b09dc854f63ea1d77c27c8059e1030641
# Parent  ee01d9d84115b9085ec1cc9519d3b3a52228cac3
bookmarks: merge lookup into localrepo

diff -r ee01d9d84115 -r 999f616b09dc hgext/bookmarks.py
--- a/hgext/bookmarks.py	Thu Feb 10 13:46:28 2011 -0600
+++ b/hgext/bookmarks.py	Thu Feb 10 13:46:28 2011 -0600
@@ -134,11 +134,6 @@
         return
 
     class bookmark_repo(repo.__class__):
-        def lookup(self, key):
-            if key in self._bookmarks:
-                key = self._bookmarks[key]
-            return super(bookmark_repo, self).lookup(key)
-
         def pull(self, remote, heads=None, force=False):
             result = super(bookmark_repo, self).pull(remote, heads, force)
 
diff -r ee01d9d84115 -r 999f616b09dc mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu Feb 10 13:46:28 2011 -0600
+++ b/mercurial/localrepo.py	Thu Feb 10 13:46:28 2011 -0600
@@ -520,6 +520,8 @@
         n = self.changelog._match(key)
         if n:
             return n
+        if key in self._bookmarks:
+            return self._bookmarks[key]
         if key in self.tags():
             return self.tags()[key]
         if key in self.branchtags():