# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1282231541 18000
# Node ID fca15617721c55e0c6f5d8cf6843aea71b4d03cf
# Parent  52ec5c8137235ad79a71c2595b4c4606cd9d637b# Parent  77f1f206e1355a770e811cda32f78b22e82b3c19
merge with stable

diff -r 52ec5c813723 -r fca15617721c hgext/mq.py
--- a/hgext/mq.py	Wed Jul 28 23:05:03 2010 -0600
+++ b/hgext/mq.py	Thu Aug 19 10:25:41 2010 -0500
@@ -1488,8 +1488,11 @@
             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()
diff -r 52ec5c813723 -r fca15617721c mercurial/help/templates.txt
--- a/mercurial/help/templates.txt	Wed Jul 28 23:05:03 2010 -0600
+++ b/mercurial/help/templates.txt	Thu Aug 19 10:25:41 2010 -0500
@@ -142,6 +142,9 @@
 
 :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
diff -r 52ec5c813723 -r fca15617721c mercurial/ui.py
--- a/mercurial/ui.py	Wed Jul 28 23:05:03 2010 -0600
+++ b/mercurial/ui.py	Thu Aug 19 10:25:41 2010 -0500
@@ -121,9 +121,11 @@
         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):