Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 13363:999f616b09dc
bookmarks: merge lookup into localrepo
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 10 Feb 2011 13:46:28 -0600 |
parents | bab5490eb2bc |
children | ddddb76f2da3 |
line wrap: on
line diff
--- 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():