# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1149202509 25200
# Node ID 8d31c71e814853a6819e84cd6eff5cf0e749aefa
# Parent  609c56df709a884895cc61430f877d8b6bcd6487# Parent  62ce297f214f87fc6b5e67cebc44e2c01b43d6e4
merge with crew.

diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
@@ -165,6 +165,14 @@ extensions::
   the path to the ".py" file (including the file name extension) that
   defines the extension.
 
+  Example for ~/.hgrc:
+
+    [extensions]
+    # (the mq extension will get loaded from mercurial's path)
+    hgext.mq =
+    # (this extension will get loaded from the file specified)
+    myfeature = ~/.hgext/myfeature.py
+
 hooks::
   Commands or Python functions that get automatically executed by
   various actions such as starting or finishing a commit. Multiple
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -142,7 +142,10 @@ class ui(object):
                 yield parent
 
     def extensions(self):
-        return self.configitems("extensions")
+        ret = self.configitems("extensions")
+        for i, (k, v) in enumerate(ret):
+            if v: ret[i] = (k, os.path.expanduser(v))
+        return ret
 
     def hgignorefiles(self):
         ret = []