--- a/mercurial/extensions.py
+++ b/mercurial/extensions.py
@@ -63,7 +63,10 @@ def load(ui, name, path):
commands.table.update(cmdtable)
def loadall(ui):
- for name, path in ui.extensions():
+ result = ui.configitems("extensions")
+ for i, (name, path) in enumerate(result):
+ if path:
+ path = os.path.expanduser(path)
try:
load(ui, name, path)
except (util.SignalInterrupt, KeyboardInterrupt):
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -319,13 +319,6 @@ class ui(object):
for name, value in self.configitems(section, untrusted):
yield section, name, str(value).replace('\n', '\\n')
- def extensions(self):
- result = self.configitems("extensions")
- for i, (key, value) in enumerate(result):
- if value:
- result[i] = (key, os.path.expanduser(value))
- return result
-
def hgignorefiles(self):
result = []
for key, value in self.configitems("ui"):