diff -r 5eb4d206202b -r 63d4deda1b31 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Mar 28 06:01:31 2017 +0200
+++ b/mercurial/localrepo.py	Tue Mar 28 06:13:49 2017 +0200
@@ -707,10 +707,11 @@
         # be one tagtype for all such "virtual" tags?  Or is the status
         # quo fine?
 
-        alltags = {}                    # map tag name to (node, hist)
-        tagtypes = {}
 
-        tagsmod.findglobaltags(self.ui, self, alltags, tagtypes)
+        globaldata = tagsmod.findglobaltags(self.ui, self)
+        alltags = globaldata[0]   # map tag name to (node, hist)
+        tagtypes = globaldata[1]  # map tag name to tag type
+
         tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
 
         # Build the return dicts.  Have to re-encode tag names because