From patchwork Mon Dec 15 03:35:32 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2,of,3] namespaces: add tags
From: Ryan McElroy <rm@fb.com>
X-Patchwork-Id: 7111
Message-Id: <8b7c99b4d8ef8cd40712.1418614532@devbig105.prn2.facebook.com>
To: <mercurial-devel@selenic.com>
Date: Sun, 14 Dec 2014 19:35:32 -0800

# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1413584853 25200
#      Fri Oct 17 15:27:33 2014 -0700
# Node ID 8b7c99b4d8ef8cd40712ad4c154111a51871e1b4
# Parent  2def00d143fbcc131a79c974ad66ab5ae5f02e89
namespaces: add tags

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -415,10 +415,6 @@ class changectx(basectx):
             except KeyError:
                 pass
 
-            if changeid in repo._tagscache.tags:
-                self._node = repo._tagscache.tags[changeid]
-                self._rev = repo.changelog.rev(self._node)
-                return
             try:
                 self._node = repo.branchtip(changeid)
                 self._rev = repo.changelog.rev(self._node)
diff --git a/mercurial/namespaces.py b/mercurial/namespaces.py
--- a/mercurial/namespaces.py
+++ b/mercurial/namespaces.py
@@ -34,10 +34,15 @@ class namespaces(object):
     def __init__(self):
         self._names = util.sortdict()
 
+        addns = self.addnamespace
+
         # we need current mercurial named objects (bookmarks, tags, and
         # branches) to be initialized somewhere, so that place is here
-        self.addnamespace("bookmarks",
-                          lambda repo, name: tolist(repo._bookmarks.get(name)))
+        addns("bookmarks",
+              lambda repo, name: tolist(repo._bookmarks.get(name)))
+
+        addns("tags",
+              lambda repo, name: tolist(repo._tagscache.tags.get(name)))
 
     def addnamespace(self, namespace, namemap, order=None):
         """