Show More
@@ -232,6 +232,18 def loadall(ui, whitelist=None): | |||||
232 | if isinstance(inst, error.Hint) and inst.hint: |
|
232 | if isinstance(inst, error.Hint) and inst.hint: | |
233 | ui.warn(_("*** (%s)\n") % inst.hint) |
|
233 | ui.warn(_("*** (%s)\n") % inst.hint) | |
234 | ui.traceback() |
|
234 | ui.traceback() | |
|
235 | # list of (objname, loadermod, loadername) tuple: | |||
|
236 | # - objname is the name of an object in extension module, | |||
|
237 | # from which extra information is loaded | |||
|
238 | # - loadermod is the module where loader is placed | |||
|
239 | # - loadername is the name of the function, | |||
|
240 | # which takes (ui, extensionname, extraobj) arguments | |||
|
241 | # | |||
|
242 | # This one is for the list of item that must be run before running any setup | |||
|
243 | earlyextraloaders = [ | |||
|
244 | ('configtable', configitems, 'loadconfigtable'), | |||
|
245 | ] | |||
|
246 | _loadextra(ui, newindex, earlyextraloaders) | |||
235 |
|
247 | |||
236 | broken = set() |
|
248 | broken = set() | |
237 | for name in _order[newindex:]: |
|
249 | for name in _order[newindex:]: | |
@@ -280,7 +292,6 def loadall(ui, whitelist=None): | |||||
280 | extraloaders = [ |
|
292 | extraloaders = [ | |
281 | ('cmdtable', commands, 'loadcmdtable'), |
|
293 | ('cmdtable', commands, 'loadcmdtable'), | |
282 | ('colortable', color, 'loadcolortable'), |
|
294 | ('colortable', color, 'loadcolortable'), | |
283 | ('configtable', configitems, 'loadconfigtable'), |
|
|||
284 | ('filesetpredicate', fileset, 'loadpredicate'), |
|
295 | ('filesetpredicate', fileset, 'loadpredicate'), | |
285 | ('internalmerge', filemerge, 'loadinternalmerge'), |
|
296 | ('internalmerge', filemerge, 'loadinternalmerge'), | |
286 | ('revsetpredicate', revset, 'loadpredicate'), |
|
297 | ('revsetpredicate', revset, 'loadpredicate'), |
General Comments 0
You need to be logged in to leave comments.
Login now