equal
deleted
inserted
replaced
3051 for mod, name in added: |
3051 for mod, name in added: |
3052 uisetup = getattr(mod, 'uisetup', None) |
3052 uisetup = getattr(mod, 'uisetup', None) |
3053 if uisetup: |
3053 if uisetup: |
3054 uisetup(ui) |
3054 uisetup(ui) |
3055 cmdtable = getattr(mod, 'cmdtable', {}) |
3055 cmdtable = getattr(mod, 'cmdtable', {}) |
3056 for t in cmdtable: |
3056 overrides = [cmd for cmd in cmdtable if cmd in table] |
3057 if t in table: |
3057 if overrides: |
3058 ui.warn(_("module %s overrides %s\n") % (name, t)) |
3058 ui.warn(_("extension '%s' overrides commands: %s\n") |
|
3059 % (name, " ".join(overrides))) |
3059 table.update(cmdtable) |
3060 table.update(cmdtable) |
3060 |
3061 |
3061 def parseconfig(config): |
3062 def parseconfig(config): |
3062 """parse the --config options from the command line""" |
3063 """parse the --config options from the command line""" |
3063 parsed = [] |
3064 parsed = [] |