Show More
@@ -63,7 +63,10 b' def load(ui, name, path):' | |||||
63 | commands.table.update(cmdtable) |
|
63 | commands.table.update(cmdtable) | |
64 |
|
64 | |||
65 | def loadall(ui): |
|
65 | def loadall(ui): | |
66 | for name, path in ui.extensions(): |
|
66 | result = ui.configitems("extensions") | |
|
67 | for i, (name, path) in enumerate(result): | |||
|
68 | if path: | |||
|
69 | path = os.path.expanduser(path) | |||
67 | try: |
|
70 | try: | |
68 | load(ui, name, path) |
|
71 | load(ui, name, path) | |
69 | except (util.SignalInterrupt, KeyboardInterrupt): |
|
72 | except (util.SignalInterrupt, KeyboardInterrupt): |
@@ -319,13 +319,6 b' class ui(object):' | |||||
319 | for name, value in self.configitems(section, untrusted): |
|
319 | for name, value in self.configitems(section, untrusted): | |
320 | yield section, name, str(value).replace('\n', '\\n') |
|
320 | yield section, name, str(value).replace('\n', '\\n') | |
321 |
|
321 | |||
322 | def extensions(self): |
|
|||
323 | result = self.configitems("extensions") |
|
|||
324 | for i, (key, value) in enumerate(result): |
|
|||
325 | if value: |
|
|||
326 | result[i] = (key, os.path.expanduser(value)) |
|
|||
327 | return result |
|
|||
328 |
|
||||
329 | def hgignorefiles(self): |
|
322 | def hgignorefiles(self): | |
330 | result = [] |
|
323 | result = [] | |
331 | for key, value in self.configitems("ui"): |
|
324 | for key, value in self.configitems("ui"): |
General Comments 0
You need to be logged in to leave comments.
Login now