merge with stable

hgext/mq.py

@@ -1488,8 +1488,11 b' class queue(object):'
             return True
 
     def qrepo(self, create=False):
+        ui = self.ui.copy()
+        ui.setconfig('paths', 'default', '', overlay=False)
+        ui.setconfig('paths', 'default-push', '', overlay=False)
         if create or os.path.isdir(self.join(".hg")):
-            return hg.repository(self.ui, path=self.path, create=create)
+            return hg.repository(ui, path=self.path, create=create)
 
     def restore(self, repo, rev, delete=None, qupdate=None):
         desc = repo[rev].description().strip()

mercurial/help/templates.txt

@@ -142,6 +142,9 b' List of filters:'
 
 :shortdate: Date. Returns a date like "2006-09-18".
 
+:stringify: Any type. Turns the value into text by converting values into
+    text and concatenating them.
+
 :strip: Any text. Strips all leading and trailing whitespace.
 
 :tabindent: Any text. Returns the text, with every line except the

mercurial/ui.py

@@ -121,9 +121,11 b' class ui(object):'
         self._trustusers.update(self.configlist('trusted', 'users'))
         self._trustgroups.update(self.configlist('trusted', 'groups'))
 
-    def setconfig(self, section, name, value):
-        for cfg in (self._ocfg, self._tcfg, self._ucfg):
-            cfg.set(section, name, value)
+    def setconfig(self, section, name, value, overlay=True):
+        if overlay:
+            self._ocfg.set(section, name, value)
+        self._tcfg.set(section, name, value)
+        self._ucfg.set(section, name, value)
         self.fixconfig()
 
     def _data(self, untrusted):