Only look up tags and branches as a last resort

mercurial/localrepo.py

@@ -336,13 +336,16 b' class localrepository(repo.repository):'
             key = self.dirstate.parents()[0]
             if key == nullid:
                 raise repo.RepoError(_("no revision checked out"))
+        n = self.changelog._match(key)
+        if n:
+            return n
         if key in self.tags():
             return self.tags()[key]
         if key in self.branchtags():
             return self.branchtags()[key]
-        try:
-            return self.changelog.lookup(key)
-        except:
+        n = self.changelog._partialmatch(key)
+        if n:
+            return n
             raise repo.RepoError(_("unknown revision '%s'") % key)
 
     def dev(self):

mercurial/revlog.py

@@ -746,11 +746,7 b' class revlog(object):'
                     continue
         return c
 
-    def lookup(self, id):
-        """locate a node based on:
-            - revision number or str(revision number)
-            - nodeid or subset of hex nodeid
-        """
+    def _match(self, id):
         if isinstance(id, (long, int)):
             # rev
             return self.node(id)
@@ -772,13 +768,18 b' class revlog(object):'
             return self.node(rev)
         except (ValueError, OverflowError):
             pass
+        if len(id) == 40:
         try:
-            if len(id) == 40:
                 # a full hex nodeid?
                 node = bin(id)
                 r = self.rev(node)
                 return node
-            elif len(id) < 40:
+            except TypeError:
+                pass
+
+    def _partialmatch(self, id):
+        if len(id) < 40:
+            try:
                 # hex(node)[:...]
                 bin_id = bin(id[:len(id) & ~1]) # grab an even number of digits
                 node = None
@@ -792,6 +793,19 b' class revlog(object):'
         except TypeError:
             pass
 
+    def lookup(self, id):
+        """locate a node based on:
+            - revision number or str(revision number)
+            - nodeid or subset of hex nodeid
+        """
+
+        n = self._match(id)
+        if n is not None:
+            return n
+        n = self._partialmatch(id)
+        if n:
+            return n
+
         raise RevlogError(_("No match found"))
 
     def cmp(self, node, text):