--- a/mercurial/url.py	Fri Aug 13 10:10:11 2010 +0200
+++ b/mercurial/url.py	Fri Aug 13 10:53:10 2010 +0200
@@ -156,7 +156,8 @@
                 continue
             group, setting = key.split('.', 1)
             gdict = config.setdefault(group, dict())
-            val = util.expandpath(val)
+            if setting in ('username', 'cert', 'key'):
+                val = util.expandpath(val)
             gdict[setting] = val
 
         # Find the best match